diff --git a/.emacs.d/lisp/mode-cc.el b/.emacs.d/lisp/mode-cc.el
index 4db0f9d3..6961131d 100644
--- a/.emacs.d/lisp/mode-cc.el
+++ b/.emacs.d/lisp/mode-cc.el
@@ -10,6 +10,16 @@
   ;; (define-key map (kbd "C-c o") 'ff-find-other-file)
   (define-key map (kbd "M-TAB") 'semantic-complete-analyze-inline))
 
+;;; C additional keywords.
+;;; Useless in quasi-monochrome.
+;; (dolist (mode '(c-mode c++-mode))
+;;   (font-lock-add-keywords
+;;    mode
+;;    '(("\\<\\(and\\|or\\|not\\)\\>" . font-lock-keyword-face)
+;;      ;; Functions.
+;;      ("\\<\\(\\sw+\\)(" 1 'font-lock-function-name-face)
+;;      ("\\<\\(\\sw+\\)<\\sw+>(" 1 'font-lock-function-name-face))))
+
 (when (require 'company nil t)
   (local-set-key (kbd "M-TAB") (if (require 'helm-company nil t) 'helm-company 'company-complete)))
 
diff --git a/.emacs.d/lisp/mode-sh.el b/.emacs.d/lisp/mode-sh.el
index ddcdd41a..290d738f 100644
--- a/.emacs.d/lisp/mode-sh.el
+++ b/.emacs.d/lisp/mode-sh.el
@@ -8,6 +8,10 @@
 (setq-default sh-shell-file sh-shell-file)
 ;; (setq-default sh-shell 'sh)
 
+;;; Faces
+(set-face-foreground 'sh-heredoc "#00bfff")
+(set-face-bold 'sh-heredoc nil)
+
 (defun sh-set-compiler ()
   "Set shell interpreter.
 Set `sh-shell', `sh-shell-file' and `compile-command' according to the following rules:
diff --git a/.emacs.d/lisp/visual.el b/.emacs.d/lisp/visual.el
index ce04eb03..8fa5aab2 100644
--- a/.emacs.d/lisp/visual.el
+++ b/.emacs.d/lisp/visual.el
@@ -56,26 +56,11 @@
 (set-face-foreground 'font-lock-type-face (face-foreground 'default))
 (set-face-foreground 'font-lock-variable-name-face (face-foreground 'default))
 
-;;; Sh-mode
-(with-eval-after-load 'sh-script
-  (set-face-foreground 'sh-heredoc "#00bfff")
-  (set-face-bold 'sh-heredoc nil))
-
 ;;; Compilation mode
 (with-eval-after-load 'compile
   (set-face-foreground 'compilation-column-number "cyan")
   (set-face-foreground 'compilation-line-number "cyan"))
 
-;;; C additional keywords.
-;;; Useless in quasi-monochrome.
-;; (dolist (mode '(c-mode c++-mode))
-;;   (font-lock-add-keywords
-;;    mode
-;;    '(("\\<\\(and\\|or\\|not\\)\\>" . font-lock-keyword-face)
-;;      ;; Functions.
-;;      ("\\<\\(\\sw+\\)(" 1 'font-lock-function-name-face)
-;;      ("\\<\\(\\sw+\\)<\\sw+>(" 1 'font-lock-function-name-face))))
-
 ;;; Ediff
 (with-eval-after-load 'ediff-init
   (set-face-attribute 'ediff-even-diff-A nil :inherit 'ediff-current-diff-A :foreground 'unspecified :background 'unspecified :box nil)