diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 29155f2..b19bef4 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -7,12 +7,55 @@
 ;;; Code:
 
 ;; diminish
-(use-package diminish)
+(use-package diminish
+  ;; :straight (:type built-in)
+  )
 (use-package eldoc
+  :straight (:type built-in)
   :custom
   (eldoc-echo-area-use-multiline-p nil)
   :defer 1
   :diminish)
+(use-package tramp
+  :straight (:type built-in)
+  :custom (tramp-mode nil))
+(use-package savehist
+  :straight (:type built-in)
+  :init (savehist-mode))
+(use-package whitespace
+  :straight (:type built-in)
+  :defer 1
+  :diminish global-whitespace-mode
+  :custom
+  (whitespace-style '(face lines-tail))
+  (whitespace-line-column 80)
+  :config (global-whitespace-mode t))
+(use-package eshell
+  :straight (:type built-in)
+  :hook (eshell-mode . mitch/terminal-setup)
+  :commands (eshell/emacs eshell/man)
+  :config
+  (require 'eshell)
+  (require 'em-unix)
+  (require 'eshell-settings))
+(use-package ibuffer
+  :straight (:type built-in)
+  :commands ibuffer
+  :custom
+  (ibuffer-use-other-window t))
+(use-package dired
+  :straight (:type built-in)
+  :commands dired
+  :custom
+  (dired-always-read-filesystem t)
+  (dired-vc-rename-file t)
+  :hook (dired-mode . dired-hide-details-mode)
+  (dired-mode . wdired-mode))
+(use-package image-mode
+  :straight (:type built-in)
+  :config
+  (turn-off-line-numbers)
+  (blink-cursor-mode -1))
 
 ;; Keybinding manager
 (use-package general
@@ -518,14 +561,6 @@
           (corfu-terminal-mode +1)))
 
 ;; Visualize whitespace. In a very chill and invisible way.
-(use-package whitespace
-  :straight (:type built-in)
-  :defer 1
-  :diminish global-whitespace-mode
-  :custom
-  (whitespace-style '(face lines-tail))
-  (whitespace-line-column 80)
-  :config (global-whitespace-mode t))
 
 ;; (use-package lsp-dart
 ;;   ;; :custom (lsp-dart-dap-flutter-hot-reload t)
@@ -537,14 +572,6 @@
 ;; 			  #'(lambda ()
 ;; 			      (lsp-dart-dap-flutter-hot-reload))))))
 
-(use-package eshell
-  :straight (:type built-in)
-  :hook (eshell-mode . mitch/terminal-setup)
-  :commands (eshell/emacs eshell/man)
-  :config
-  (require 'eshell)
-  (require 'em-unix)
-  (require 'eshell-settings))
 
 ;; (use-package popper
 ;;   :custom
@@ -561,11 +588,6 @@
 ;;   (popper-echo-mode +1))
 ;; (setq display-buffer-base-action '(display-buffer-pop-up-window . nil))
 
-(use-package ibuffer
-  :straight (:type built-in)
-  :commands ibuffer
-  :custom
-  (ibuffer-use-other-window t))
 
 
 (use-package xwidget ;-webkit
@@ -594,14 +616,6 @@
   (:type git
          :repo "https://git.mitchmarq42.xyz/mitch/dconf-mode.el"))
 
-(use-package dired
-  :straight (:type built-in)
-  :commands dired
-  :custom
-  (dired-always-read-filesystem t)
-  (dired-vc-rename-file t)
-  :hook (dired-mode . dired-hide-details-mode)
-  (dired-mode . wdired-mode))
 
 (use-package info-variable-pitch
   :straight
@@ -610,11 +624,6 @@
   :config
   (add-hook 'Info-mode-hook #'info-variable-pitch-mode))
 
-(use-package image-mode
-  :straight (:type built-in)
-  :config
-  (turn-off-line-numbers)
-  (blink-cursor-mode -1))
 
 ;; (use-package empv
 ;;   :straight