diff --git a/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.el b/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.el
new file mode 100644
index 0000000..07c50e5
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.el
@@ -0,0 +1,35 @@
+;;; oni-emacs-lisp-mode-init.el --- Emacs Lisp configuration  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2018  Tom Willemse
+
+;; Author: Tom Willemse <tom@ryuslash.org>
+;; Keywords: local
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; My Emacs Lisp configuration.
+
+;;; Code:
+
+(add-hook 'emacs-lisp-mode-hook 'paredit-mode)
+(add-hook 'emacs-lisp-mode-hook 'rainbow-delimiters-mode)
+(add-hook 'emacs-lisp-mode-hook 'company-mode)
+(add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
+(add-hook 'emacs-lisp-mode-hook 'nameless-mode)
+(add-hook 'emacs-lisp-mode-hook 'fci-mode)
+
+(provide 'oni-emacs-lisp-mode-init)
+;;; oni-emacs-lisp-mode-init.el ends here
diff --git a/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.org b/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.org
deleted file mode 100644
index a2a434b..0000000
--- a/emacs/.emacs.d/init/oni-emacs-lisp-mode-init.org
+++ /dev/null
@@ -1,38 +0,0 @@
-#+TITLE: Emacs lisp mode configuration
-
-Enable paredit mode to help always keep parentheses balanced.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'paredit-mode)
-#+END_SRC
-
-Enable rainbow delimiters mode to help visualize the different
-parenthesized levels.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'rainbow-delimiters-mode)
-#+END_SRC
-
-Enable company mode to help complete long symbols and such.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'company-mode)
-#+END_SRC
-
-Enable flycheck mode to help me avoid errors.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'flycheck-mode)
-#+END_SRC
-
-Enable namesless mode to help with viewing name-prefixed symbols.
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'nameless-mode)
-#+END_SRC
-
-Show fill column
-
-#+BEGIN_SRC emacs-lisp
-  (add-hook 'emacs-lisp-mode-hook 'fci-mode)
-#+END_SRC