diff --git a/ansible/roles/emacs/files/elisp/base.el b/ansible/roles/emacs/files/elisp/base.el
index 9ecf297..8033f27 100644
--- a/ansible/roles/emacs/files/elisp/base.el
+++ b/ansible/roles/emacs/files/elisp/base.el
@@ -24,27 +24,51 @@
 (setq autoload-directory (concat user-emacs-directory (file-name-as-directory "elisp") (file-name-as-directory "autoload")))
 (add-to-list 'load-path (assert-directory autoload-directory))
 
-;; Disable backup files and lockfiles
 (setq-default
+ ;; Disable backup files and lockfiles
  make-backup-files nil
  auto-save-default nil
- create-lockfiles nil)
+ create-lockfiles nil
+ ;; Unless otherwise specified, always install packages if they are absent.
+ use-package-always-ensure t
+ ;; Point custom-file at /dev/null so emacs does not write any settings to my dotfiles.
+ custom-file "/dev/null"
+ ;; Don't pop up a small window at the bottom of emacs at launch.
+ inhibit-startup-screen t
+ inhibit-startup-message t
+ ;; Give the scratch buffer a clean slate.
+ initial-major-mode 'fundamental-mode
+ initial-scratch-message nil
+ ;; Send prompts to mini-buffer not the GUI
+ use-dialog-box nil
+ ;; End files with line break
+ require-final-newline t
+ ;; Use spaces, not tabs
+ indent-tabs-mode nil
+ ;; Use a better frame title
+ frame-title-format '("" invocation-name ": "(:eval (if (buffer-file-name)
+                                                        (abbreviate-file-name (buffer-file-name))
+                                                      "%b")))
+ ;; Use 'y' or 'n' instead of 'yes' or 'no'
+ use-short-answers t
+ ;; Natively compile packages
+ package-native-compile t
+ ;; Typed text replaces selection
+ delete-selection-mode t
+ )
+
+;; (setq-default fringes-outside-margins t)
+
+(pixel-scroll-precision-mode)
 
 
 ;; ;; Emacs customizations
 ;; (setq-default
-;;  inhibit-startup-screen              t
-;;  initial-scratch-message             nil
-;;  ;; Send prompts to mini-buffer not the GUI
-;;  use-dialog-box                      nil
 ;;  confirm-nonexistent-file-or-buffer  t
 ;;  save-interprogram-paste-before-kill t
 ;;  mouse-yank-at-point                 t
-;;  require-final-newline               t
 ;;  visible-bell                        nil
 ;;  ring-bell-function                  'ignore
-;;  ;; Write custom variables to an unused file so in-editor changes do not persist.
-;;  custom-file                         "~/.emacs.d/.custom.el"
 ;;  ;; http://ergoemacs.org/emacs/emacs_stop_cursor_enter_prompt.html
 ;;  minibuffer-prompt-properties
 ;;  '(read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)
@@ -54,23 +78,14 @@
 ;;  highlight-nonselected-windows      nil
 ;;  ;; PATH
 ;;  exec-path                          (append exec-path '("/usr/local/bin/"))
-;;  indent-tabs-mode                   nil
 ;;  tab-width                          4
-;;  inhibit-startup-message            t
 ;;  fringes-outside-margins            t
 ;;  x-select-enable-clipboard          t
-;;  use-package-always-ensure          t
 ;;  ispell-program-name                "aspell"
 ;;  browse-url-browser-function        'browse-url-generic
 ;;  browse-url-generic-program         "firefox-developer-edition"
-;;  frame-title-format                 '("" invocation-name ": "(:eval (if (buffer-file-name)
-;;                                                                         (abbreviate-file-name (buffer-file-name))
-;;                                                                       "%b")))
 ;;  ;; mouse-wheel-progressive-speed      nil ;; Don't accelerate mouse wheel
 ;;  ;; mouse-wheel-scroll-amount '(5 ((shift) . 3))
-;;  use-short-answers                  t
-;;  package-native-compile             t
-;;  delete-selection-mode              t
 ;;  )
 
 
diff --git a/ansible/roles/emacs/files/elisp/lang-bash.el b/ansible/roles/emacs/files/elisp/lang-bash.el
index b64f517..8ae8b0f 100644
--- a/ansible/roles/emacs/files/elisp/lang-bash.el
+++ b/ansible/roles/emacs/files/elisp/lang-bash.el
@@ -2,7 +2,7 @@
 
 (use-package bash-ts-mode
   :ensure nil
-  :commands bash-ts-mode
+  :commands (bash-ts-mode)
   :init
   (add-to-list 'major-mode-remap-alist '(sh-mode . bash-ts-mode))
   (add-to-list 'treesit-language-source-alist '(bash "https://github.com/tree-sitter/tree-sitter-bash"))
diff --git a/ansible/roles/emacs/files/elisp/lang-rust.el b/ansible/roles/emacs/files/elisp/lang-rust.el
index c78cd01..6cb30bf 100644
--- a/ansible/roles/emacs/files/elisp/lang-rust.el
+++ b/ansible/roles/emacs/files/elisp/lang-rust.el
@@ -29,6 +29,7 @@
   :mode (
          ("\\.rs\\'" . rust-ts-mode)
          )
+  :commands (rust-ts-mode)
   :hook (
          (rust-ts-mode . (lambda ()
                         (eglot-ensure)
diff --git a/ansible/roles/emacs/files/elisp/lang-yaml.el b/ansible/roles/emacs/files/elisp/lang-yaml.el
index 1456df5..bf8cde1 100644
--- a/ansible/roles/emacs/files/elisp/lang-yaml.el
+++ b/ansible/roles/emacs/files/elisp/lang-yaml.el
@@ -12,6 +12,7 @@
    ("environments/[^/]*/group_vars/[^/]*\\'" . yaml-ts-mode)
    ("environments/[^/]*/host_vars/[^/]*\\'" . yaml-ts-mode)
    )
+  :commands (yaml-ts-mode)
   :hook (
          (yaml-ts-mode . (lambda ()
                         (add-hook 'before-save-hook 'yaml-format-buffer nil 'local)