diff --git a/articles/c-d_to_close_eshell.org b/articles/c-d_to_close_eshell.org
index 525e462..0be307a 100644
--- a/articles/c-d_to_close_eshell.org
+++ b/articles/c-d_to_close_eshell.org
@@ -1,4 +1,8 @@
-#+TITLE: C-d to close eshell
+#+TITLE:
+#+OPTIONS: toc:nil
+#+HTML_LINK_UP: ../blog.html
+
+* C-d to close eshell                      :eshell:emacs:elisp:config:
 
 One of the "tricks" that I have learned to use when working with
 terminals is using ~C-d~ to close them, or when working on a TTY
diff --git a/articles/mounting_music_dir_before_mpd.org b/articles/mounting_music_dir_before_mpd.org
index da9918f..4ef2676 100644
--- a/articles/mounting_music_dir_before_mpd.org
+++ b/articles/mounting_music_dir_before_mpd.org
@@ -2,7 +2,7 @@
 #+OPTIONS: toc:nil c:t
 #+HTML_LINK_UP: ../blog.html
 
-* Mounting music dir before MPD                     :systemd:mpd:conf:
+* Mounting music dir before MPD                   :systemd:mpd:config:
 
 Systemd allows you to specify a program to run before running the main
 daemon (or program) with =ExecStartPre=. This can, for instance, be used
diff --git a/articles/rlwrapping_sbcl.org b/articles/rlwrapping_sbcl.org
index cc8d94d..c625d88 100644
--- a/articles/rlwrapping_sbcl.org
+++ b/articles/rlwrapping_sbcl.org
@@ -1,4 +1,8 @@
-#+TITLE: rlwrapping sbcl
+#+TITLE:
+#+OPTIONS: toc:nil
+#+HTML_LINK_UP: ../blog.html
+
+* rlwrapping sbcl                                  :sbcl:lisp:utility:
 
 [[http://sbcl.org][SBCL]] is an excellent lisp implementation. The only thing that's not so
 nice about it is overly simple command-line interface. The absence of
diff --git a/articles/some_quick_git_diff_tips.org b/articles/some_quick_git_diff_tips.org
index e9d3f39..beaf735 100644
--- a/articles/some_quick_git_diff_tips.org
+++ b/articles/some_quick_git_diff_tips.org
@@ -1,56 +1,60 @@
-#+TITLE: Some quick git diff tips
+#+TITLE:
+#+OPTIONS: toc:nil
+#+HTML_LINK_UP: ../blog.html
+
+* Some quick git diff tips                           :org:lisp:config:
 
 A couple of quick tips.  As you possibly know you can specify some
 options to be used for diffs (and other things) per file type.  The
 one I'm interested in is the function name.
 
-* For org-mode
+** For org-mode
 
-  The primary way of identifying which part of an org-mode document
-  a change occurs in seems to me to be the heading.  So, in your
-  ~$HOME/.gitconfig~ put:
+   The primary way of identifying which part of an org-mode document
+   a change occurs in seems to me to be the heading.  So, in your
+   ~$HOME/.gitconfig~ put:
 
-  #+BEGIN_SRC conf
-    [diff "org"]
-          xfuncname = "^\\*+.*"
-  #+END_SRC
+   #+BEGIN_SRC conf
+     [diff "org"]
+           xfuncname = "^\\*+.*"
+   #+END_SRC
 
-  Which should show any lines starting with one or more ~*~
-  characters.  And then in ~$XDG_CONFIG_HOME/git/attributes~ or
-  ~$HOME/.config/git/attributes~ put:
+   Which should show any lines starting with one or more ~*~
+   characters.  And then in ~$XDG_CONFIG_HOME/git/attributes~ or
+   ~$HOME/.config/git/attributes~ put:
 
-  #+BEGIN_EXAMPLE
-    ,*.org   diff=org
-  #+END_EXAMPLE
+   #+BEGIN_EXAMPLE
+     ,*.org   diff=org
+   #+END_EXAMPLE
 
-* For lisp and lisp-like langauges
+** For lisp and lisp-like langauges
 
-  For anything that resembles lisp (so Common Lisp, Emacs Lisp, Hy,
-  scheme, etc.) I would think that the easiest thing to do is just
-  see the closes top-level form.  So, in your ~$HOME/.gitconfig~ put:
+   For anything that resembles lisp (so Common Lisp, Emacs Lisp, Hy,
+   scheme, etc.) I would think that the easiest thing to do is just
+   see the closes top-level form.  So, in your ~$HOME/.gitconfig~ put:
 
-  #+BEGIN_SRC conf
-    [diff "lisp"]
-          xfuncname = "^\\([^ ]+ [^ ]+"
-  #+END_SRC
+   #+BEGIN_SRC conf
+     [diff "lisp"]
+           xfuncname = "^\\([^ ]+ [^ ]+"
+   #+END_SRC
 
-  Which should show the opening parenthesis and the first two words.
-  For example:
+   Which should show the opening parenthesis and the first two words.
+   For example:
 
-  #+BEGIN_EXAMPLE
-    (defun some-function-name
-    (defclass my-awesome-class
-    (define-route this-strange-route
-  #+END_EXAMPLE
+   #+BEGIN_EXAMPLE
+     (defun some-function-name
+     (defclass my-awesome-class
+     (define-route this-strange-route
+   #+END_EXAMPLE
 
-  And then put in your ~$XDG_CONFIG_HOME/git/attributes~ or
-  ~$HOME/.config/git/attributes~:
+   And then put in your ~$XDG_CONFIG_HOME/git/attributes~ or
+   ~$HOME/.config/git/attributes~:
 
-  #+BEGIN_EXAMPLE
-    ,*.lisp  diff=lisp
-    ,*.el    diff=lisp
-    ,*.hy    diff=lisp
-    ,*.scm   diff=lisp
-  #+END_EXAMPLE
+   #+BEGIN_EXAMPLE
+     ,*.lisp  diff=lisp
+     ,*.el    diff=lisp
+     ,*.hy    diff=lisp
+     ,*.scm   diff=lisp
+   #+END_EXAMPLE
 
-  And possibly any other lisp-like language files you can think of.
+   And possibly any other lisp-like language files you can think of.