diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 5cb53ec..da540bc 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -394,13 +394,7 @@
 
 (with-eval-after-load 'circe (load "oni-circe-init"))
 
-(eval-when-compile (require 'lui))
-
-(with-eval-after-load 'lui
-  (setq lui-time-stamp-position 'right-margin))
-
-(with-eval-after-load 'lui
-  (setq lui-time-stamp-format "%H:%M"))
+(with-eval-after-load 'lui (load "oni-lui-init"))
 
 (defun oni:set-circe-margin-width ()
   (setq right-margin-width 5))
diff --git a/emacs/.emacs.d/init/oni-lui-init.el b/emacs/.emacs.d/init/oni-lui-init.el
new file mode 100755
index 0000000..93ee82e
--- /dev/null
+++ b/emacs/.emacs.d/init/oni-lui-init.el
@@ -0,0 +1,37 @@
+;;; oni-lui-init.el --- Linewise User Interface 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 customizations to the Linewise User Interface. Used by both
+;; Circe and emacs-slack.
+
+;;; Code:
+
+(require 'lui)
+
+(with-eval-after-load 'lui
+  (setq lui-time-stamp-position 'right-margin))
+
+(with-eval-after-load 'lui
+  (setq lui-time-stamp-format "%H:%M"))
+
+(provide 'oni-lui-init)
+;;; oni-lui-init.el ends here