diff --git a/init.el b/init.el
index a01684c..2af65fa 100644
--- a/init.el
+++ b/init.el
@@ -12,22 +12,14 @@
 (setq user-full-name "Evie Litherland-Smith"
       user-mail-address "evie@xenia.me.uk"
       use-short-answers t
-      kill-do-not-save-duplicates t)
-
-(set-language-environment "UTF-8")
-(set-default-coding-systems 'utf-8)
-(global-auto-revert-mode +1)
-(delete-selection-mode +1)
-
-;; (setq warning-minimum-level :error)
-
-(keymap-global-set "<mouse-8>" #'previous-buffer)
-(keymap-global-set "<mouse-9>" #'next-buffer)
-
-(setq backup-directory-alist '(("." . "~/.local/state/emacs/backups")))
-
-(use-package secrets
-  :functions (secrets-get-secret))
+      kill-do-not-save-duplicates t
+      backup-directory-alist '(("." . "~/.local/state/emacs/backups"))
+      split-height-threshold nil
+      split-width-threshold 160
+      tab-always-indent 'complete
+      tab-first-completion 'word
+      completion-cycle-threshold nil
+      completions-detailed t)
 
 (setq-default truncate-lines t
               truncate-partial-width-windows nil)
@@ -38,9 +30,19 @@
         tab-bar-show 1
         tab-line-tabs-function 'tab-line-tabs-mode-buffers)
 
+(set-language-environment "UTF-8")
+(set-default-coding-systems 'utf-8)
+(global-auto-revert-mode +1)
+(delete-selection-mode +1)
+
+(keymap-global-set "<mouse-8>" #'previous-buffer)
+(keymap-global-set "<mouse-9>" #'next-buffer)
+
 (menu-bar-mode -1)
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
+(global-so-long-mode +1)
+(global-visual-line-mode +1)
 (global-prettify-symbols-mode +1)
 
 ;; Some witchcraft to enable ligatures, from
@@ -76,6 +78,9 @@
     (set-char-table-range composition-function-table (car char-regexp)
                           `([,(cdr char-regexp) 0 font-shape-gstring]))))
 
+(use-package secrets
+  :functions (secrets-get-secret))
+
 (use-package nerd-icons
   :if (package-installed-p 'nerd-icons)
   :functions (nerd-icons-octicon))
@@ -111,9 +116,6 @@
   (doom-modeline-lsp t)
   (doom-modeline-project-detection 'project)
   :init
-  (line-number-mode +1)
-  (column-number-mode +1)
-  (size-indication-mode -1)
   (doom-modeline-mode +1)
   :config
   (set-face-attribute 'doom-modeline nil :weight 'normal)
@@ -125,25 +127,24 @@
   :custom
   (which-func-modes '(prog-mode)))
 
-(global-so-long-mode +1)
-(global-visual-line-mode +1)
-
-(use-package visual-fill-column
-  :if (package-installed-p 'visual-fill-column)
-  :functions (visual-line-fill-column-mode)
-  :bind (("C-x x w" . visual-line-fill-column-mode))
+(use-package poke-line
+  :if (package-installed-p 'poke-line)
+  :functions (poke-line-global-mode)
   :custom
-  (visual-fill-column-width 120)
-  (visual-fill-column-center-text t)
-  (visual-fill-column-enable-sensible-window-split t))
+  (poke-line-pokemon "rotom")
+  :init
+  (line-number-mode -1)
+  (column-number-mode -1)
+  (size-indication-mode -1)
+  (poke-line-global-mode +1))
 
-(setq split-height-threshold nil
-      split-width-threshold 160)
-
-(setq tab-always-indent 'complete
-      tab-first-completion 'word
-      completion-cycle-threshold nil
-      completions-detailed t)
+(use-package olivetti
+  :if (package-installed-p 'olivetti)
+  :hook (text-mode)
+  :custom
+  (olivetti-style nil)
+  (olivetti-body-width 0.75)
+  (olivetti-minimum-body-width 120))
 
 (use-package tramp
   :defines (tramp-remote-path tramp-default-proxies-alist)