diff --git a/lisp/editor.el b/lisp/editor.el
index 5291e1b..7b44d2b 100644
--- a/lisp/editor.el
+++ b/lisp/editor.el
@@ -9,11 +9,24 @@
 ;;; evil - A Vi Layer inside of Emacs
 (use-package evil
   :custom
+  (evil-want-keybinding nil) ; Make room for evil-collection
   (evil-want-integration t) ; Same as above
   (evil-undo-system 'undo-fu) ; Set the undo/redo system
   :config
   (evil-mode 1))
 
+;; evil-collection - A collection of keybinds for evil
+(use-package evil-collection
+  :custom (evil-collection-setup-minibuffer t)
+  :init (evil-collection-init))
+
+;; evil-escape - Escape from insert mode using jk
+(use-package evil-escape
+  :config
+  (setq-default evil-escape-key-sequence "jk")
+  :init
+  (evil-escape-mode 1))
+
 ;; undo-fu, used by evil for undo/redo functionality
 (use-package undo-fu)
 
diff --git a/lisp/keybinds.el b/lisp/keybinds.el
index 81dab5f..f5aef58 100644
--- a/lisp/keybinds.el
+++ b/lisp/keybinds.el
@@ -9,5 +9,15 @@
  "f f" '(find-file :wk "Find File")
  "f s" '(save-buffer :wk "Save Buffer"))
 
+;; Magit
+(general-create-definer diancite/magit
+  :prefix leader-key)
+
+(diancite/magit
+ :keymaps 'normal
+ "m s" '(magit-status :wk "Status")
+ "m d" '(magit-dispatch :wk "Dispatch")
+ "m f" '(magit-status :wk "File Dispatch"))
+
 ;; Provide file file init.el
 (provide 'keybinds)