diff --git a/home/emacs/modules/custom-ui-config.el b/home/emacs/modules/custom-ui-config.el
index 27ce69be..609c3f5f 100644
--- a/home/emacs/modules/custom-ui-config.el
+++ b/home/emacs/modules/custom-ui-config.el
@@ -5,31 +5,10 @@
 
 ;; Author: System Crafters Community
 
-;;; Commentary:
-
-;; User interface customizations. Examples are icons, line numbers,
-;; and how help buffers are displayed.
-
-;; This package provides a basic, customized appearance for
-;; Emacs. Specifically, it uses: Helpful to customize the information
-;; and visual display of help buffers, such as that created by M-x
-;; `describe-function'; All-the-icons, to provide font-based icons
-;; (rather than raster or vector images); and includes some Emacs Lisp
-;; demonstrations.
-
-;;  Run `all-the-icons-install-fonts' to ensure the fonts necessary
-;; for ALL THE ICONS are available on your system. You must run this
-;; function if the "stop" icon at the beginning of this paragraph is
-;; not displayed properly (it appears as a box with some numbers
-;; and/or letters inside it).
-
-;; Read the documentation for `all-the-icons'; on Windows,
-;; `all-the-icons-install-fonts' only downloads fonts, they must be
-;; installed manually. This is necessary if icons are not displaying
-;; properly.
-
 ;;; Code:
 
+(when (require 'page-break nil :noerror) (global-page-break-lines-mode +1))
+
 ;;;; Help Buffers
 
 ;; Make `describe-*' screens more helpful
diff --git a/system/emacs.nix b/system/emacs.nix
index 1b18ae50..0226004f 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -17,7 +17,7 @@
     package = with pkgs;
       ((emacsPackagesFor emacs29-pgtk).emacsWithPackages (epkgs:
         with epkgs; [
-          # Theme
+          # theme-packages
           doom-themes
 
           # completion-packages
@@ -54,15 +54,19 @@
           org-appear
           org-journal
 
+          # project-packages
+          magit
+
           # ui-packages
           all-the-icons
           elisp-demos
           helpful
-
-          # workspaces-packages
-          tabspaces
+          page-break-lines
+          which-key
+          link-hint
 
           # writing-packages
+          pdf-tools
           markdown-mode
           pandoc-mode
           auctex
@@ -78,13 +82,6 @@
           elfeed-webkit
           elfeed-tube
           elfeed-tube-mpv
-
-          # Additional packages
-          which-key
-          link-hint
-          magit
-          vterm
-          pdf-tools
         ]));
   };
 }