diff --git a/init.el b/init.el
index 9eec2eee..a8cd3012 100755
--- a/init.el
+++ b/init.el
@@ -174,7 +174,7 @@ There are two things you can do about this warning:
 
 ;; nuke trailing whitespace when writing to a file
 (add-hook 'write-file-hooks 'delete-trailing-whitespace)
-(add-hook 'org-mode-hook 'turn-on-font-lock)
+
 (add-hook 'markdown-mode-hook 'turn-on-font-lock)
 (add-hook 'python-mode-hook 'turn-on-font-lock)
 
@@ -209,13 +209,14 @@ There are two things you can do about this warning:
   (fill-paragraph (point-min) (point-max)))
 
 (put 'upcase-region 'disabled nil)
+
 (setq view-diary-entries-initially t
       mark-diary-entries-in-calendar t
       number-of-diary-entries 7)
 (add-hook 'diary-display-hook 'fancy-diary-display)
 (add-hook 'today-visible-calendar-hook 'calendar-mark-today)
 
-(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
+
 (put 'narrow-to-region 'disabled nil)
 (put 'narrow-to-page 'disabled nil)
 
@@ -233,7 +234,6 @@ There are two things you can do about this warning:
 
 ;; slime
 (setq slime-contribs '(slime-fancy))
-(org-clock-persistence-insinuate)
 
 ;; start a server, unless one is already running
 (when (require 'server nil t) (unless (server-running-p) (server-start)))
@@ -246,11 +246,15 @@ There are two things you can do about this warning:
                 (lambda (status) (switch-to-buffer-other-window (current-buffer))))
   )
 
+;; ===================== Org-mode ====================== ;;
+(add-hook 'org-mode-hook 'turn-on-font-lock)
+(org-clock-persistence-insinuate)
+(setq org-todo-keywords '((sequence "TODO" "FEEDBACK" "VERIFY" "|" "DONE" "DELEGATED")))
 ;; ==================== GLOBAL KEYS ==================== ;;
-(global-set-key "\C-cl" 'org-store-link)
-(global-set-key "\C-ca" 'org-agenda)
-(global-set-key "\C-cc" 'org-capture)
-(global-set-key "\C-cb" 'org-switchb)
+(global-set-key "\C-c l" 'org-store-link)
+(global-set-key "\C-c a" 'org-agenda)
+(global-set-key "\C-c c" 'org-capture)
+(global-set-key "\C-c b" 'org-switchb)
 (global-set-key (kbd "C-x g") 'magit-status)
 (global-set-key (kbd "C-x M-g") 'magit-dispatch)
 (global-unset-key "\C-z")