diff --git a/init.el b/init.el
index 3f2e945..f79e112 100644
--- a/init.el
+++ b/init.el
@@ -164,6 +164,9 @@
 
   (bind-key "<XF86Back>" #'winner-undo)
   (bind-key "<XF86Forward>" #'winner-redo)
+  (bind-key "<f10>" #'magit-status)
+  (bind-key "<f11>" #'org-capture)
+  (bind-key "<f12>" #'db/helm-shortcuts)
   (bind-key "<f1>" #'db/run-or-hide-eshell)
   (bind-key "<f2>" #'hydra-feature-shortcuts/body)
   (bind-key "<f5>" #'rgrep)
@@ -171,14 +174,11 @@
   (bind-key "<f7>" #'dictcc)
   (bind-key "<f8>" #'counsel-locate)
   (bind-key "<f9>" #'helm-org-agenda-files-headings)
-  (bind-key "<f10>" #'magit-status)
-  (bind-key "<f11>" #'org-capture)
-  (bind-key "<f12>" #'db/helm-shortcuts)
+  (bind-key "C-," #'mc/skip-to-previous-like-this)
+  (bind-key "C-." #'mc/skip-to-next-like-this)
   (bind-key "C-;" #'iedit-mode)
   (bind-key "C-<" #'mc/mark-previous-like-this)
   (bind-key "C->" #'mc/mark-next-like-this)
-  (bind-key "C-." #'mc/skip-to-next-like-this)
-  (bind-key "C-," #'mc/skip-to-previous-like-this)
   (bind-key "C-@" #'er/expand-region)
   (bind-key "C-M-\\" #'crux-cleanup-buffer-or-region)
   (bind-key "C-S-c C-S-c" #'mc/edit-lines)
@@ -196,18 +196,17 @@
   (bind-key "C-c j" #'avy-goto-char-timer)
   (bind-key "C-c l" #'org-store-link)
   (bind-key "C-c m" #'music-control/body)
+  (bind-key "C-c n I" #'org-roam-insert-immediate)
+  (bind-key "C-c n i" #'org-roam-insert)
   (bind-key "C-c o" #'hydra-org-clock/body)
   (bind-key "C-c s" #'synonyms)
-  (bind-key "C-c n i" #'org-roam-insert)
-  (bind-key "C-c n I" #'org-roam-insert-immediate)
   (bind-key "C-h C-f" #'find-function)
   (bind-key "C-h C-k" #'find-function-on-key)
-  (bind-key "M-i" #'swiper-from-isearch isearch-mode-map)
+  (bind-key "C-x C-b" #'ibuffer)
   (bind-key "C-x C-d" #'dired)
   (bind-key "C-x C-r" #'revert-buffer)
-  (bind-key "C-x C-b" #'ibuffer)
-  (bind-key "C-x g" #'db/helm-shortcuts)
   (bind-key "C-x SPC" #'hydra-rectangle/body)
+  (bind-key "C-x g" #'db/helm-shortcuts)
   (bind-key "C-x r E" #'db/bookmark-add-external)
   (bind-key "C-x r M" #'db/bookmark-add-url)
   (bind-key "C-x r v" #'list-registers)
@@ -220,14 +219,15 @@
   (bind-key "M-Z" #'zap-to-char)
   (bind-key "M-g j b" #'dumb-jump-back)
   (bind-key "M-g j g" #'dumb-jump-go)
+  (bind-key "M-i" #'swiper-from-isearch isearch-mode-map)
   (bind-key "M-j" #'(lambda () (interactive) (join-line -1)))
-  (unbind-key "M-o" global-map)
   (bind-key "M-z" #'zap-up-to-char)
+  (bind-key [remap fill-paragraph] #'endless/fill-or-unfill)
+  (bind-key [remap keyboard-quit] #'keyboard-quit-context+)
   (unbind-key "<insert>" global-map)
   (unbind-key "<kp-insert>" global-map)
-  (bind-key [remap fill-paragraph] #'endless/fill-or-unfill)
   (unbind-key "C-x C-c" global-map)
-  (bind-key [remap keyboard-quit] #'keyboard-quit-context+)
+  (unbind-key "M-o" global-map)
 
   ;; Overwrite certain keybindings only if packages are avilable