diff --git a/config.org b/config.org
index 68c5695..a4bfca7 100644
--- a/config.org
+++ b/config.org
@@ -17,8 +17,8 @@
 *** (I don't like having ~#file#~ and ~file~~ everywhere in my directories)
 
 #+begin_src emacs-lisp
-  (setq auto-save-default nil)
-  (setq make-backup-files nil)
+  (setq auto-save-default nil
+        make-backup-files nil)
 #+end_src
 
 ** Enable Real Auto Save
@@ -26,9 +26,10 @@
 #+begin_src emacs-lisp
   (use-package real-auto-save
     :ensure t
+    :hook
+    (prog-mode . real-auto-save-mode)
     :config
-    (setq real-auto-save-interval 1)
-    (add-hook 'prog-mode-hook 'real-auto-save-mode))
+    (setq real-auto-save-interval 1))
 #+end_src
 
 ** No Scratch On Open
@@ -70,14 +71,12 @@
     :config
     (dirvish-peek-mode)
     (dirvish-side-follow-mode)
-    (setq dirvish-mode-line-format
-          '(:left (sort symlink) :right (omit yank index)))
-    (setq dired-listing-switches "-al --ignore='^\\.$' --human-readable --group-directories-first")
-    (setq dired-mouse-drag-files t)
-    (setq mouse-drag-and-drop-region-cross-program t)
-    (setq dirvish-subtree-state-style 'nerd)
-    (setq dirvish-attributes
-          '(vc-state subtree-state nerd-icons collapse git-msg file-time file-size)))
+    (setq dired-listing-switches "-al --ignore='^\\.$' --human-readable --group-directories-first"
+          dired-mouse-drag-files t
+          dirvish-attributes '(vc-state subtree-state nerd-icons collapse git-msg file-time file-size)
+          dirvish-mode-line-format '(:left (sort symlink) :right (omit yank index))
+          dirvish-subtree-state-style 'nerd
+          mouse-drag-and-drop-region-cross-program t))
 
   ;; Addtional syntax highlighting for dired
   (use-package diredfl
@@ -110,14 +109,14 @@
   (use-package evil
     :ensure t
     :init
-    (setq evil-split-window-below t)
-    (setq evil-undo-system 'undo-tree)
-    (setq evil-vsplit-window-right t)
-    (setq evil-want-C-i-jump nil)
-    (setq evil-want-C-u-scroll t)
-    (setq evil-want-integration t)
-    (setq evil-want-integration t)
-    (setq evil-want-keybinding nil)
+    (setq evil-split-window-below t
+          evil-undo-system 'undo-tree
+          evil-vsplit-window-right t
+          evil-want-C-i-jump nil
+          evil-want-C-u-scroll t
+          evil-want-integration t
+          evil-want-integration t
+          evil-want-keybinding nil)
     :config
     (evil-mode 1))
 
@@ -145,8 +144,8 @@
     :config
     (load-theme 'catppuccin t))
 
-  (setq auto-save-default nil)
-  (setq make-backup-files nil)
+  (setq auto-save-default nil
+        make-backup-files nil)
 #+end_src
 
 ** Rainbow Delimiters
@@ -195,10 +194,17 @@
 #+begin_src emacs-lisp
   (cond
    ((eq system-type 'darwin)
+    (set-face-attribute 'default nil :font "Iosevka Comfy-14")
+    (set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy-14")
+    (set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion Duo-16")
     (setq default-frame-alist '((font . "Iosevka Comfy-14"))))
    ((eq system-type 'gnu/linux)
-    (setq default-frame-alist '((font . "Iosevka Comfy Medium-12")
-        (undecorated . t)))))
+    (set-face-attribute 'default nil :font "Iosevka Comfy-12")
+    (set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy-12")
+    (set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion Duo-14")
+    (setq default-frame-alist
+          '((font . "Iosevka Comfy-12")
+            (undecorated . t)))))
 #+end_src
 
 ** Use Short Answers
@@ -231,11 +237,11 @@
     :ensure t
     :config
     (dashboard-setup-startup-hook)
-    (setq dashboard-startup-banner 'logo)
-    (setq dashboard-center-content t)
-    (setq dashboard-vertically-center-content t)
-    (setq dashboard-startup-banner 'logo)
-    (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))))
+    (setq dashboard-startup-banner 'logo
+          dashboard-center-content t
+          dashboard-vertically-center-content t
+          dashboard-startup-banner 'logo
+          initial-buffer-choice (lambda () (get-buffer-create "*dashboard*"))))
 #+end_src
 
 ** Better M-x
@@ -249,8 +255,8 @@
     :ensure t
     :config
     (ivy-mode)
-    (setq ivy-use-virtual-buffers t)
-    (setq enable-recursive-minibuffers t))
+    (setq ivy-use-virtual-buffers t
+          enable-recursive-minibuffers t))
 #+end_src
 
 *** Amx Mode (Better Interface)
@@ -262,28 +268,20 @@
     (amx-mode))
 #+end_src
 
-** Ido Mode
+** Org Mode Improvements
 
 #+begin_src emacs-lisp
-  (set-face-attribute 'default nil :font "Iosevka Comfy-12")
-  (set-face-attribute 'fixed-pitch nil :font "Iosevka Comfy-12")
-  (set-face-attribute 'variable-pitch nil :font "Iosevka Comfy Motion Duo-14")
-
-  (dolist (face '(default fixed-pitch))
-    (set-face-attribute `,face nil :font "Iosevka Comfy-12"))
+  (add-hook 'org-mode-hook 'visual-line-mode)
 
   (use-package mixed-pitch
     :hook
     (org-mode . mixed-pitch-mode))
 
-  (add-hook 'org-mode-hook 'visual-line-mode)
-
-  (setq org-ellipsis "…")
-
   (use-package org-modern
     :ensure t
     :hook (org-mode . org-modern-mode)
     :config
+    (setq org-ellipsis "…")
     (setq org-modern-star 'replace))
 
   (use-package org-modern-indent