diff --git a/01mac.el b/01mac.el
index 55bb5cb..aff0179 100644
--- a/01mac.el
+++ b/01mac.el
@@ -1,7 +1,13 @@
+;;; 01mac -- summary
+;;; Commentary:
+;;; Make Emacs play nicer with MacOS.
+;;; Code:
+
 ;;;;;;;;; GC configuration ;;;;;;;;;;;;;;;;;;;
 (setq gc-cons-threshold 50000000)
 
 ;;;;;;;;; TRAMP configuration ;;;;;;;;;;;;;;;;
+(require 'tramp)
 (setq tramp-default-method "ssh")
 
 ;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;;
@@ -75,7 +81,7 @@
 ;; Kill current buffer and window
 (global-set-key (kbd "C-c q") 'kill-buffer-and-window)
 
-;; ibuffer
+;; List buffers
 (global-set-key (kbd "C-c b") 'ibuffer)
 
 ;; Move buffers around with buffer keys
@@ -174,3 +180,6 @@
 
 (keyfreq-mode t)
 (keyfreq-autosave-mode t)
+
+(provide '01mac)
+;;; 01mac.el ends here
diff --git a/02ivy.el b/02ivy.el
index 24de38b..1f5c71c 100644
--- a/02ivy.el
+++ b/02ivy.el
@@ -1,3 +1,8 @@
+;;; 02ivy -- summary
+;;; Commentary:
+;;; Counsel, Swiper and Ivy.
+;;; Code:
+
 (use-package counsel :ensure t :defer t)
 (use-package swiper :ensure t :defer t)
 
@@ -19,3 +24,6 @@
 (global-set-key (kbd "<f1> l") 'counsel-find-library)
 (global-set-key (kbd "<f2> i") 'counsel-info-lookup-symbol)
 (global-set-key (kbd "<f2> u") 'counsel-unicode-char)
+
+(provide '02ivy)
+;;; 02ivy.el ends here
diff --git a/03hydra.el b/03hydra.el
index 65cc2a2..8401194 100644
--- a/03hydra.el
+++ b/03hydra.el
@@ -1,9 +1,15 @@
+;;; 03hydra -- summary
+;;; Commentary:
+;;; Global hydra definitions.
+;;; Code:
 (use-package hydra
   :ensure t
   :defer t
   :config
   (defhydra hydra-file-switcher-menu (:color teal :hint nil)
     "
+  General Actions
+
    ^Ivy^                           ^Projectile^                  ^Magit^
 ^^^^^^^^------------------------------------------------------------------------
 _a_: ag                         _s_: Switch project           _m_: Git status
@@ -80,6 +86,22 @@ _v_: split vertically           _<up>_: Move up
     ("p"       previous-buffer)
     ("n"       next-buffer))
 
+  (defhydra hydra-language-context-actions (:color teal :hint nil)
+    "
+  Context actions
+
+   ^Context^                          ^Actions^
+^^^^^^^^-----------------------------------------------------------------------
+_r_: reload buffer
+"
+    ("q" nil "cancel" :color blue)
+
+    ("r" revert-buffer-no-confirm))
+
   :bind ("C-c p" . hydra-file-switcher-menu/body)
         ("C-c c" . hydra-programming-actions/body)
-        ("C-c w" . hydra-window-actions/body))
+        ("C-c w" . hydra-window-actions/body)
+        ("C-c l" . hydra-language-context-actions/body))
+
+(provide '03hydra)
+;;; 03hydra.el ends here
diff --git a/04magit.el b/04magit.el
index e7c3281..bfdac07 100644
--- a/04magit.el
+++ b/04magit.el
@@ -1,4 +1,7 @@
-;;; Magit
+;;; 04magit -- summary
+;;; Commentary:
+;;; Code:
+
 (use-package magit
   :ensure t
   :defer t
@@ -7,3 +10,6 @@
         ("<f5> g" . magit-status)
         (:map magit-blame-mode-map
               ("<f5> b" . 'magit-blame-quit)))
+
+(provide '04magit)
+;;; 04magit.el ends here
diff --git a/05prog-mode.el b/05prog-mode.el
index 6e03a19..c1232d1 100644
--- a/05prog-mode.el
+++ b/05prog-mode.el
@@ -1,4 +1,6 @@
-;;; Programmers mode
+;;; 05prog-mode -- summary
+;;; Commentary:
+;;; Code:
 
 ;;; Wrap long lines
 (toggle-truncate-lines t)
@@ -10,6 +12,7 @@
 (global-eldoc-mode t)
 
 ;; Revert tag tables without asking
+(require 'etags)
 (setq tags-revert-without-query t)
 
 ;;; Show trailing whitespace and remove whitespace on save
diff --git a/06company-yasnippet.el b/06company-yasnippet.el
index a098033..2c11200 100644
--- a/06company-yasnippet.el
+++ b/06company-yasnippet.el
@@ -1,4 +1,8 @@
-;; Company completion framework configuration
+;;; 06company-yasnippet -- summary
+;;; Commentary:
+;;; Company completion framework configuration
+;;; Code:
+
 (use-package yasnippet
   :ensure t
   :defer t)
@@ -66,3 +70,6 @@
 (define-key text-mode-map (kbd "C-c y") 'company-yasnippet)
 (define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete)
 (define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
+
+(provide '06company-yasnippet)
+;;; 06company-yasnippet.el ends here
diff --git a/07projectile.el b/07projectile.el
index 3e94fea..3b207c7 100644
--- a/07projectile.el
+++ b/07projectile.el
@@ -1,3 +1,8 @@
+;;; 07projectile -- summary
+;;; Commentary:
+;;; Project management based on git repos
+;;; Code:
+
 (use-package counsel-projectile :ensure t :defer t)
 
 (use-package projectile
@@ -14,3 +19,6 @@
                 ))
 
 (projectile-mode t)
+
+(provide '07projectile)
+;;; 07projectile.el ends here
diff --git a/08ctags.el b/08ctags.el
index 2a0c966..3904920 100644
--- a/08ctags.el
+++ b/08ctags.el
@@ -1,14 +1,21 @@
+;;; 08ctags -- summary
+;;; Commentary:
+;;; Old and rudimental completion framework.
+;;; Code:
+(require 'projectile)
+
 ;; Do not mix ctags between folders
 (provide 'my-ctags-config)
 
 (setq tags-add-tables nil)
-(setq ctags/refresh-command
+
+(defvar ctags/refresh-command
       (format "uctags -e -R -f %sTAGS %s."
               default-directory default-directory))
 
 ;; Sentinel function for capturing ctags
 (defun ctags/process-callback (process event)
-  "Show status of asynchronous ctags/process after it finishes."
+  "Show status of asynchronous ctags PROCESS after it send finished EVENT."
   (cond
    ((string-equal event "finished\n")
     (message "Creating tag files...completed")
@@ -35,7 +42,7 @@
 (define-key prog-mode-map (kbd "C-c E") 'ctags/refresh-ctags)
 
 ;; Automatically update tags on save, but be silent about it.
-(setq ctags/major-modes-to-update-on-save '())
+(defvar ctags/major-modes-to-update-on-save '())
 (defun ctags/update-tags-on-save ()
   "Update tags if current major mode is part of the list."
   (interactive)
@@ -47,3 +54,5 @@
   (add-to-list (make-local-variable 'ctags/major-modes-to-update-on-save) mode))
 
 (add-hook 'after-save-hook 'ctags/update-tags-on-save)
+(provide '08ctags)
+;;; 08ctags.el ends here
diff --git a/09ispell.el b/09ispell.el
index ce6b742..50dd9c9 100644
--- a/09ispell.el
+++ b/09ispell.el
@@ -1,7 +1,14 @@
-;; Highlight misspelled words
+;;; 09ispell -- summary
+;;; Commentary:
+;;; Highlight misspelled words
+;;; Code:
+
 (use-package ispell
   :ensure t
   :config (setq ispell-program-name "aspell")
           (setq ispell-extra-args
                 '("--run-together" "--run-together-limit=5" "--run-together-min=2"))
-  :hook ((prog-mode text-mode) . flyspell-mode))
+          :hook ((prog-mode text-mode) . flyspell-mode))
+
+(provide '09ispell)
+;;; 09ispell.el ends here
diff --git a/10deft.el b/10deft.el
index b9dad1d..0316e02 100644
--- a/10deft.el
+++ b/10deft.el
@@ -1,4 +1,8 @@
-;; Notational velocity things
+;;; 10deft.el -- summary
+;;; Commentary:
+;;; Notational velocity, backed by OneDrive.
+;;; Code:
+
 (use-package deft
   :ensure t
   :defer t
@@ -8,3 +12,6 @@
            deft-auto-save-interval 30.0))
 
 (global-set-key (kbd "C-c d d") 'deft)
+
+(provide '10deft)
+;;; 10deft.el ends here
diff --git a/11lsp.el b/11lsp.el
index 7ea31cb..40e8dc8 100644
--- a/11lsp.el
+++ b/11lsp.el
@@ -1,3 +1,8 @@
+;;; 11lsp -- summary
+;;; Commentary:
+;;; Global Language Server Protocol Config
+;;; Code:
+
 (use-package lsp-mode
   :ensure t
   :defer t
@@ -18,3 +23,6 @@
       lsp-ui-header t
       lsp-ui-doc-include-signature t
       lsp-log-io nil)
+
+(provide '11lsp)
+;;; 11lsp.el ends here