diff --git a/modules/editing.el b/modules/editing.el
index 7c7c408..bb7ff0e 100644
--- a/modules/editing.el
+++ b/modules/editing.el
@@ -20,7 +20,6 @@
       '(duplicate-thing
         expand-region
         fill-column-indicator
-        rainbow-mode
         undo-tree
         volatile-highlights
         whole-line-or-region
@@ -52,29 +51,21 @@
   ;; Column indicator.
   ;; --------------------------------------------------------------------------
 
-  (defun fci-mode-unless-large-file ()
-    "Enable fci-mode unless the file is too large."
-    (interactive)
-    (unless (> (count-lines (point-min) (point-max)) 9999)
-      (fci-mode)))
-
-
   (use-package fill-column-indicator
     :defer t
     :bind
     (("C-x t f" . fci-mode))
     :init
+    ;; (defun fci-mode-unless-large-file ()
+    ;;   "Enable fci-mode unless the file is too large."
+    ;;   (interactive)
+    ;;   (unless (> (count-lines (point-min) (point-max)) 9999)
+    ;;     (fci-mode)))
+
     ;; (add-hook 'prog-mode-hook 'fci-mode-unless-large-file)
     ;; (add-hook 'text-mode-hook 'fci-mode-unless-large-file)
     )
 
-  ;; --------------------------------------------------------------------------
-  ;; Rainbow mode.
-  ;; --------------------------------------------------------------------------
-
-  (use-package rainbow-mode
-    :defer t)
-
   ;; --------------------------------------------------------------------------
   ;; Undo tree.  To undo "C-\", to redo "C-_", undo tree "C-x u".
   ;; --------------------------------------------------------------------------
diff --git a/modules/files.el b/modules/files.el
index 7b6ce29..c8e2d18 100644
--- a/modules/files.el
+++ b/modules/files.el
@@ -25,6 +25,14 @@
 
 (defun init-packages/init-files ()
 
+  ;; --------------------------------------------------------------------------
+  ;; View large files.
+  ;; --------------------------------------------------------------------------
+
+  (use-package vlf-integrate
+    :init
+    (setq-default vlf-application 'dont-ask))
+
   ;; --------------------------------------------------------------------------
   ;; Large file threshold.
   ;; --------------------------------------------------------------------------
@@ -97,14 +105,6 @@
   (recentf-mode 1)
   (use-package recentf-ext)
 
-  ;; --------------------------------------------------------------------------
-  ;; View large files.
-  ;; --------------------------------------------------------------------------
-
-  (use-package vlf-integrate
-    :config
-    (setq-default vlf-application 'dont-ask))
-
   ;; --------------------------------------------------------------------------
   ;; Remember location in file.
   ;; --------------------------------------------------------------------------
diff --git a/modules/helm.el b/modules/helm.el
index 5bd10a4..b7a4306 100644
--- a/modules/helm.el
+++ b/modules/helm.el
@@ -18,8 +18,8 @@
 (setq init-packages/helm-packages
 
       '(helm
-        helm-projectile
-        helm-descbinds)
+        helm-descbinds
+        helm-projectile)
 
       )
 
diff --git a/modules/parentheses.el b/modules/parentheses.el
index d336e20..f36e22f 100644
--- a/modules/parentheses.el
+++ b/modules/parentheses.el
@@ -18,8 +18,8 @@
 
 (setq init-packages/parentheses-packages
 
-      '(rainbow-delimiters
-        highlight-parentheses
+      '(highlight-parentheses
+        rainbow-delimiters
         smartparens)
 
       )
@@ -28,15 +28,6 @@
 
 (defun init-packages/init-parentheses ()
 
-  ;; --------------------------------------------------------------------------
-  ;; Rainbow delimiters - colours are set by theme.
-  ;; --------------------------------------------------------------------------
-
-  (use-package rainbow-delimiters
-    :defer t
-    :init
-    (add-hook 'prog-mode-hook 'rainbow-delimiters-mode))
-
   ;; --------------------------------------------------------------------------
   ;; Highlight parentheses - this package does not use faces for colours,
   ;; instead it uses the `hl-parens-colors' variable.  This can be set in the
@@ -48,6 +39,19 @@
     :init
     (add-hook 'prog-mode-hook 'highlight-parentheses-mode))
 
+  ;; --------------------------------------------------------------------------
+  ;; Rainbow delimiters - colours are set by theme.
+  ;; --------------------------------------------------------------------------
+
+  (use-package rainbow-delimiters
+    :defer t
+    :init
+    (add-hook 'prog-mode-hook 'rainbow-delimiters-mode))
+
+  ;; --------------------------------------------------------------------------
+  ;; Smartparens highlighting.
+  ;; --------------------------------------------------------------------------
+
   (use-package smartparens
     :init
     (smartparens-global-mode t)
@@ -100,7 +104,7 @@
     (sp-with-modes 'rst-mode
       (sp-local-pair "`" nil :actions nil)
       (sp-local-pair "``" "``"))
-    
+
     ;; Smartparens custom settings --------------------------------------------
 
     (setq-default