diff --git a/lisp/mitch-keybinds.el b/lisp/mitch-keybinds.el
index 0d2a876..a7ce9c8 100644
--- a/lisp/mitch-keybinds.el
+++ b/lisp/mitch-keybinds.el
@@ -22,7 +22,8 @@
  :non-normal-prefix "SPC"
  "w" 'evil-window-map
  "h" 'help-command
- "b" 'switch-to-buffer
+ "b" 'ibuffer
+ "g" 'magit
  "SPC" 'evil-buffer)
 (general-define-key
  :states '(normal visual)
diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 0bf134d..fe02328 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -519,7 +519,6 @@
 (use-package popper
   :custom
   (display-buffer-base-action '(display-buffer-pop-up-window))
-  (ibuffer-use-other-window t)
   (popper-reference-buffers
    '(
      helpful-mode
@@ -533,6 +532,12 @@
   (popper-mode +1)
   (popper-echo-mode +1))
 
+(use-package ibuffer
+  :straight (:type built-in)
+  :custom
+  (ibuffer-use-other-window t))
+
+
 ;; (use-package mini-frame
 ;;   :init (mini-frame-mode))
 (use-package xwidget ;-webkit