diff --git a/init.el b/init.el
index c102256..67c000a 100644
--- a/init.el
+++ b/init.el
@@ -194,11 +194,10 @@
   :init
   (appt-activate +1))
 
-(setq inhibit-splash-screen t
-      use-dialog-box nil
-      minibuffer-follows-selected-frame nil
-      truncate-lines nil
-      truncate-partial-width-windows nil)
+(setq inhibit-splash-screen t)
+
+(setq-default truncate-lines t
+              truncate-partial-width-windows nil)
 
 (global-prettify-symbols-mode +1)
 (global-display-line-numbers-mode -1)
@@ -280,18 +279,6 @@
   :requires nerd-icons
   :hook (after-init . (lambda () (nerd-icons-completion-mode +1))))
 
-(use-package nerd-icons-corfu
-  :diminish
-  :functions nerd-icons-corfu-formatter
-  :requires (corfu nerd-icons)
-  :config (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
-
-(use-package treemacs-nerd-icons
-  :diminish
-  :requires (treemacs nerd-icons)
-  :config
-  (treemacs-load-theme "nerd-icons"))
-
 (use-package ligature
   :functions (ligature-set-ligatures
               global-ligature-mode)
@@ -704,6 +691,11 @@
                                    (eglot (styles orderless))
                                    (eglot-capf (styles  orderless)))))
 
+(use-package nerd-icons-corfu
+  :diminish
+  :functions nerd-icons-corfu-formatter
+  :requires nerd-icons)
+
 (use-package corfu
   :defines (corfu-map
             corfu-mode-map
@@ -726,30 +718,28 @@
   (corfu-cycle t)
   (corfu-auto nil)
   :config
-  (require 'corfu-popupinfo)
-  (require 'corfu-terminal))
+  (when (require 'nerd-icons-corfu nil :noerror)
+    (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
+  (when (require 'corfu-popupinfo nil :noerror)
+    (corfu-popupinfo-mode +1))
+  (when (and (require 'corfu-terminal nil :noerror)
+             (not (display-graphic-p)))
+    (corfu-terminal-mode +1)))
 
 (use-package corfu-popupinfo
   :requires corfu
   :defines corfu-popupinfo-map
   :functions corfu-popupinfo-mode
-  :hook (corfu-mode . (lambda () (corfu-popupinfo-mode +1)))
-  ;; :bind ( :map corfu-mode-map
-  ;;         ("M-d" . corfu-popupinfo-toggle)
-  ;;         :map corfu-popupinfo-map
-  ;;         ("M-n" . corfu-popupinfo-scroll-up)
-  ;;         ("M-p" . corfu-popupinfo-scroll-down))
+  :bind ( :map corfu-popupinfo-map
+          ("M-d" . corfu-popupinfo-toggle)
+          ("M-n" . corfu-popupinfo-scroll-up)
+          ("M-p" . corfu-popupinfo-scroll-down))
   :custom
-  (corfu-popupinfo-delay 0.3)
-  :config
-  (corfu-popupinfo-mode +1))
+  (corfu-popupinfo-delay 0.3))
 
 (use-package corfu-terminal
   :requires corfu
-  :functions corfu-terminal-mode
-  :if (not (display-graphic-p))
-  :custom
-  (corfu-terminal-mode t))
+  :functions corfu-terminal-mode)
 
 (use-package cape
   :after corfu
@@ -1000,9 +990,14 @@ Calls `project-remember-projects-under' for ~/Projects/"
 (use-package treemacs
   :functions (treemacs treemacs-load-theme)
   :bind (("M-g t" . treemacs-select-window))
-  :hook (treemacs-mode . (lambda ()
-                           (visual-line-mode -1)
-                           (toggle-truncate-lines -1))))
+  :hook (treemacs-mode . (lambda () (visual-line-mode -1)))
+  :config
+  (when (require 'treemacs-nerd-icons nil :noerror)
+    (treemacs-load-theme "nerd-icons")))
+
+(use-package treemacs-nerd-icons
+  :diminish
+  :requires nerd-icons)
 
 (use-package aggressive-indent
   :hook (elisp-mode