       ("<" self-insert-command "<")
       ("o" nil         "quit"))
 
-    (defun hot-expand (str)
-      "Expand org template."
-      (insert str)
-      (org-try-structure-completion))
-
-    (define-key org-mode-map "<" (lambda ()
-                                   (interactive)
-                                   (if (looking-back "^")
-                                       (hydra-org-template/body)
-                                     (self-insert-command 1))))
-    ))
+    (defun modi/org-template-maybe ()
+      "Insert org-template if point is at the beginning of the line,
+else call `self-insert-command'."
+      (interactive)
+      (if (looking-back "^")
+          (hydra-org-template/body)
+        (self-insert-command 1)))
+
+    (defun modi/reset-local-set-keys ()
+      (local-unset-key (kbd "<f10>"))
+      (local-unset-key (kbd "<s-f10>"))
+      (local-unset-key (kbd "<S-f10>"))
+      (local-unset-key (kbd "<C-f10>")))
+    (add-hook 'org-mode-hook #'modi/reset-local-set-keys)
+
+    (bind-keys
+     :map org-mode-map
+      ("C-m" . modi/org-return-no-indent)
+      (">"   . modi/org-template-maybe))
+
+    (bind-keys
+     :map modi-mode-map
+      ("C-c a" . org-agenda)
+      ("C-c c" . org-capture))))
 
 
 (provide 'setup-org)

                (replace-regexp "\\[\\[.*?\\(\\]\\[\\(.*?\\)\\)*\\]\\]" "\\2"
                                nil start end)))))))

    ;; epresent
    (use-package epresent
      :commands (epresent-run))

    ;; org-tree-slide
    ;; https://github.com/takaxp/org-tree-slide
    (use-package org-tree-slide
      :load-path "elisp/org-tree-slide"

                           ("\\subsection{%s}"     . "\\subsection*{%s}")
                           ("\\subsubsection{%s}"  . "\\subsubsection*{%s}")))))

;;;; ox-reveal - Presentations using reveal.js
        ;; Download reveal.js from https://github.com/hakimel/reveal.js/
        (use-package ox-reveal
          :config
