diff --git a/.config/doom/config.el b/.config/doom/config.el
index a2291a5..0ea4e6c 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -157,21 +157,6 @@ Version 2019-11-04 2021-02-16"
       lazy-highlight-cleanup nil
       large-file-warning-threshold 40000000)
 
-(setq initial-major-mode 'org-mode)
-(add-to-list 'auto-mode-alist '("/journal/" . org-mode))
-(add-to-list 'auto-mode-alist '("\\.jrnl\\'" . org-mode))
-
-(add-to-list 'auto-mode-alist '("\\.el##" . emacs-lisp-mode))
-(add-to-list 'auto-mode-alist `(,(getenv "CONFIG_SHELLS") . sh-mode))
-(add-to-list 'auto-mode-alist `(,(getenv "CONFIG_ZSH") . sh-mode))
-(add-to-list 'auto-mode-alist `("\\.local/bin" . sh-mode))
-
-(add-to-list 'auto-mode-alist '("\\.twee\\'" . twee-chapbook-mode))
-(add-hook 'twee-chapbook-mode-hook 'twee-mode)
-
-(add-to-list 'auto-mode-alist `("\\.scss.erb\\'" . scss-mode))
-(add-to-list 'auto-mode-alist `("\\.erb\\'" . html-mode))
-
 (whitespace-mode 0)
 (auto-correct-mode)
 
@@ -687,6 +672,9 @@ Version 2019-11-04 2021-02-16"
       :n "q"  'kill-this-buffer
       :n "+"  'image-increase-size
       :n "-"  'image-decrease-size
+      :map Info-mode-map
+      :desc "Go Home" :n "gu" 'Info-directory
+      :desc "Go Home" :n "gU" 'Info-directory
       :map thumbs-mode-map
       :n "q"  'thumbs-kill-buffer
       )
@@ -832,14 +820,34 @@ Version 2019-11-04 2021-02-16"
     (define-key evil-normal-state-map "K" 'evil-jump-out-args)
   )
 
-;;; File modes
+;;; File Editing Modes
+
+(setq initial-major-mode 'org-mode)
+(add-to-list 'auto-mode-alist '("/journal/" . org-mode))
+(add-to-list 'auto-mode-alist '("\\.jrnl\\'" . org-mode))
+
+(add-to-list 'auto-mode-alist '("\\.el##" . emacs-lisp-mode))
+(add-to-list 'auto-mode-alist `(,(getenv "CONFIG_SHELLS") . sh-mode))
+(add-to-list 'auto-mode-alist `(,(getenv "CONFIG_ZSH") . sh-mode))
+(add-to-list 'auto-mode-alist `("\\.local/bin" . sh-mode))
+
+(add-to-list 'auto-mode-alist '("\\.twee\\'" . twee-chapbook-mode))
+(add-hook 'twee-chapbook-mode-hook 'twee-mode)
+
+(add-to-list 'auto-mode-alist `("\\.scss.erb\\'" . scss-mode))
+(use-package! web-mode
+  :mode "\\.phtml\\'"
+  :mode "\\.tpl\\.php\\'"
+  :mode "\\.[agj]sp\\'"
+  :mode "\\.as[cp]x\\'"
+  :mode "\\.erb\\'"
+  :mode "\\.mustache\\'"
+  :mode "\\.djhtml\\'"
+  )
 
 (use-package! adoc-mode ; Asciidoc, a md alternative
   :mode "\\.adoc\\'"
   )
-(use-package! nov
-  :mode ("\\.epub\\'" . nov-mode)
-  )
 
 (use-package! plantuml-mode ; Diagrams
   :mode "\\.puml\\'"
@@ -949,6 +957,10 @@ Version 2019-11-04 2021-02-16"
     (direnv-mode)
   )
 
+(use-package! nov
+  :mode ("\\.epub\\'" . nov-mode)
+  )
+
 (use-package! recompile-on-save)
 
 ;; https://emacs.stackexchange.com/questions/64532/emms-and-mpd-configuration
diff --git a/.config/doom/packages.el b/.config/doom/packages.el
index 7c378aa..cb16d00 100644
--- a/.config/doom/packages.el
+++ b/.config/doom/packages.el
@@ -40,13 +40,20 @@
 
 (setq straight-host-usernames '((github . "xeruf")))
 
+;;; Multimedia & Integration
 (package! emms)
 (package! exiftool)
-
-(package! dired+)
-
 (package! elpher)
+(package! activity-watch-mode :recipe (:fork t)) ; eagle eyes
 
+(package! kill-or-bury-alive) ; https://github.com/mrkkrp/kill-or-bury-alive
+(package! recompile-on-save)
+
+;;; Prettification
+(package! dired+)
+(package! xterm-color)
+
+;;; ORG
 (package! ox-context
   :recipe (:host github :repo "Jason-S-Ross/ox-context" :branch "develop"))
 (package! ox-bb
@@ -58,28 +65,33 @@
 (package! org-roam-ui
   :recipe (:host github :repo "org-roam/org-roam-ui" :files ("*.el" "out")))
 
-; https://elpa.gnu.org/packages/auto-correct.html
-(package! auto-correct)
+;;; Editing
 
 (package! evil-tutor) ; dark vim tutor
 (package! evil-replace-with-register) ; grrrrr
 (package! visual-fill-column) ; Soft line wrapping at character count
 
-(package! activity-watch-mode :recipe (:fork t)) ; eagle eyes
 (package! togetherly) ; Collaborative editing
-(package! direnv) ; directory-local environment for haskell-nix things
 
-(package! xterm-color)
+; https://elpa.gnu.org/packages/auto-correct.html
+(package! auto-correct)
 
-; Programming
+;;; Viewers
+
+(package! nov) ; epub reader
+(package! picpocket) ; image viewer - https://github.com/johanclaesson/picpocket
+
+(package! dictcc)
+
+;;; Programming
 (package! go-mode)
 (package! haml-mode)
+(package! web-mode)
 
-(package! adoc-mode) ; Asciidoc, a md alternative
-(package! nov) ; epub reader
 (package! pkgbuild-mode) ; AUR PKGBUILDs
-(package! picpocket) ; image viewer - https://github.com/johanclaesson/picpocket
-(package! dictcc)
+(package! adoc-mode) ; Asciidoc, a md alternative
+
+(package! direnv) ; directory-local environment for haskell-nix things
 
 (package! chordpro-mode
   :recipe (:host github :repo "toemacs/chordpro-mode")) ; chord sheets
@@ -95,6 +107,3 @@
   :recipe (:host github :repo "magoyette/twee-mode"))
 (package! twee-chapbot-mode
   :recipe (:host github :repo "magoyette/twee-chapbook-mode"))
-
-(package! kill-or-bury-alive) ; https://github.com/mrkkrp/kill-or-bury-alive
-(package! recompile-on-save)