diff --git a/config.org b/config.org
index 738962b..d1dbbed 100644
--- a/config.org
+++ b/config.org
@@ -267,6 +267,49 @@ Automatically delete trailing whitespace when saving a file.
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
 #+END_SRC
 
+** Angry faces
+
+#+BEGIN_SRC emacs-lisp
+;; make angry face to get my attention
+(setq prog-modes '(c++-mode python-mode erlang-mode java-mode c-mode emacs-lisp-mode scheme-mode prog-mode))
+(make-face 'font-lock-angry-face)
+(modify-face 'font-lock-angry-face "Red" "Yellow" nil t nil t nil nil)
+
+;; Add keywords to recognize to angry face
+(mapc (lambda (mode)
+		(font-lock-add-keywords
+		 mode
+		 '(("\\<\\(FIXME\\)" 1 'font-lock-angry-face t)))
+		)
+	  prog-modes)
+(mapc (lambda (mode)
+		(font-lock-add-keywords
+		 mode
+		 '(("\\<\\(TODO\\)" 1 'font-lock-angry-face t)))
+		)
+	  prog-modes)
+#+END_SRC
+
+** C Coding settings
+
+Some basic C-coding settings (style, indentation offset, ...).
+
+#+BEGIN_SRC emacs-lisp
+;; default coding style
+(setq c-default-style "linux")
+
+;; sane indentation offset
+(setq c-basic-offset 4)
+#+END_SRC
+
+** Tabs vs spaces
+
+Tabs are evil.
+
+#+BEGIN_SRC emacs-lisp
+(setq-default indent-tabs-mode nil)
+#+END_SRC
+
 * Undo-tree
 
 Undo with =C-/=.
diff --git a/custom/setup-coding.el b/custom/setup-coding.el
index def1407..c4beb5f 100644
--- a/custom/setup-coding.el
+++ b/custom/setup-coding.el
@@ -1,35 +1,3 @@
-;; make angry face to get my attention
-(setq prog-modes '(c++-mode python-mode erlang-mode java-mode c-mode emacs-lisp-mode scheme-mode prog-mode))
-(make-face 'font-lock-angry-face)
-(modify-face 'font-lock-angry-face "Red" "Yellow" nil t nil t nil nil)
-
-;; Add keywords to recognize to angry face
-(mapc (lambda (mode)
-		(font-lock-add-keywords
-		 mode
-		 '(("\\<\\(FIXME\\)" 1 'font-lock-angry-face t)))
-		)
-	  prog-modes)
-(mapc (lambda (mode)
-		(font-lock-add-keywords
-		 mode
-		 '(("\\<\\(TODO\\)" 1 'font-lock-angry-face t)))
-		)
-	  prog-modes)
-
-;; default coding style
-(setq c-default-style "linux")
-
-;; sane indentation offset
-(setq c-basic-offset 4)
-
-;; Tab-space strategy
-;; we use spaces, deal with it
-(setq-default indent-tabs-mode nil)
-
-;; Enable subword mode for handling CamelCase format
-(global-subword-mode t)
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;              Python                          ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;