diff --git a/emacs/init.el b/emacs/init.el
index 598a886..f6f5f82 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -164,58 +164,7 @@
 ;; ===
 
 (use-package org :ensure t 
-  :mode (("\\.org$" . org-mode))
-  :bind (("C-c o a" . org-agenda)
-	 ("C-c o c" . org-capture))
-  :config
-  (defun my/notes-refile-targets ()
-    (directory-files "~/notes" t ".*\\.org$"))
-  (setq org-startup-indented t)
-  (setq org-archive-location "%s_archive::datetree/")
-  (setq org-src-tab-acts-natively t)
-  (setq org-stuck-projects
-        '("+proj-done-hold-maybe/-DONE"
-	  ("STRT" "TODO") nil
-	  "SCHEDULED:\\|DEADLINE:"))
-  (setq org-capture-templates
-	'(("t" "TODO" entry
-	   (file+headline "~/notes/inbox.org" "Tasks")
-	   "* TODO %?\n%i\n%a")
-	  ("n" "Note"
-	   entry (file+headline "~/notes/inbox.org" "Notes")
-	   "* %?\n%i\n%a")
-	  ("j" "Journal"
-	   entry (file+datetree "~/notes/journal.org")
-	   "* %?\nEntered on %U\n")
-	  ("w" "Waiting For"
-	   entry (file "~/org/waitingfor.org")
-	   "* %? :@wait:\nEntered on %U\n")
-	  ("c" "Calendar"
-	   entry (file+headline "~/org/calendar.org" "Calendar")
-	   "* %?\n")))
-  (setq org-agenda-files
-	'("~/org/TODO.org"
-	  "~/org/projects.org"
-	  "~/org/calendar.org"
-	  "~/org/waitingfor.org"))
-  (add-to-list 'org-refile-targets
-	       '(my/notes-refile-targets :maxlevel . 3))
-  (add-to-list 'org-refile-targets
-	       '(org-agenda-files :maxlevel . 2))
-  (setq org-refile-use-outline-path 'file)
-  (setq org-tags-exclude-from-inheritance '("proj"))
-  (setq org-outline-path-complete-in-steps nil)
-  (setq org-agenda-custom-commands
-	'(("w" "@work" tags "@work")
-	  ("h" "@home" tags "@home")
-	  ("W" "Waiting For" tags "@wait")))
-  (setq org-todo-keywords
-        '((sequence "TODO(t)" "|" "DONE(d)")))
-  (setq org-agenda-todo-keywords
-        '((sequence "TODO(t)" "|" "DONE(d)")))
-  (setq org-hide-leading-stars nil
-        org-startup-indented t)
-  (setq org-mouse-1-follows-link nil))
+  :mode (("\\.org$" . org-mode)))
 
 (use-package ob-go :ensure t :defer t)
 
@@ -262,7 +211,6 @@
     (define-key map (kbd "C-c n i") #'denote-link) ; "insert" mnemonic
     (define-key map (kbd "C-c n I") #'denote-add-links)
     (define-key map (kbd "C-c n b") #'denote-backlinks)
-    (define-key-map (kbd "C-c n f") #'denote-open-or-create)
     (define-key map (kbd "C-c n l f") #'denote-find-link)
     (define-key map (kbd "C-c n l b") #'denote-find-backlink)
     ;; Note that `denote-rename-file' can work from any context, not just
@@ -270,6 +218,8 @@
     (define-key map (kbd "C-c n r") #'denote-rename-file)
     (define-key map (kbd "C-c n R") #'denote-rename-file-using-front-matter))
 
+  (global-set-key (kbd "C-c n f") #'denote-open-or-create)
+  
   ;; Key bindings specifically for Dired.
   (let ((map dired-mode-map))
     (define-key map (kbd "C-c C-d C-i") #'denote-link-dired-marked-notes)
@@ -473,7 +423,10 @@
   (setq plantuml-default-exec-mode 'jar
 		plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
 		org-plantuml-jar-path (expand-file-name "/usr/share/plantuml/plantuml.jar"))
-  (org-babel-do-load-languages '((plantuml . t))))
+  (org-babel-do-load-languages
+   'org-babel-load-languages
+   '(
+     (plantuml . t))))
 (use-package kotlin-mode :ensure t :defer t)
 (use-package flycheck-projectile :ensure t)