diff --git a/01mac.el b/01mac.el
index aff0179..d57537a 100644
--- a/01mac.el
+++ b/01mac.el
@@ -6,6 +6,27 @@
 ;;;;;;;;; GC configuration ;;;;;;;;;;;;;;;;;;;
 (setq gc-cons-threshold 50000000)
 
+;;;;;;;; Other optimizations ;;;;;;;;;;;;;;;;;
+
+;; Update emacs less often
+(setq idle-update-delay 1.0)
+
+;; Disable bidirectional text rendering for a modest performance boost. I've set
+;; this to `nil' in the past, but the `bidi-display-reordering's docs say that
+;; is an undefined state and suggest this to be just as good:
+(setq-default bidi-display-reordering 'left-to-right
+              bidi-paragraph-direction 'left-to-right)
+
+;; Reduce rendering/line scan work for Emacs by not rendering cursors or regions
+;; in non-focused windows.
+(setq-default cursor-in-non-selected-windows nil)
+(setq highlight-nonselected-windows nil)
+
+;; More performant rapid scrolling over unfontified regions. May cause brief
+;; spells of inaccurate syntax highlighting right after scrolling, which should
+;; quickly self-correct.
+(setq fast-but-imprecise-scrolling t)
+
 ;;;;;;;;; TRAMP configuration ;;;;;;;;;;;;;;;;
 (require 'tramp)
 (setq tramp-default-method "ssh")
@@ -169,9 +190,14 @@
 ;; Disable meta on right alt (useful for Polish characters)
 (setq mac-right-option-modifier nil)
 
+;; Draw underline lower
+(setq x-underline-at-descent-line t)
+
 ;;; Get rid of bad parts of the windows
 (tool-bar-mode -1)
 (scroll-bar-mode -1)
+(setq indicate-buffer-boundaries nil
+      indicate-empty-lines nil)
 
 ;;;;;;;;;;;;;;;;; Record frequency of different commands. Review them later
 (use-package keyfreq
diff --git a/init.el b/init.el
index f3c5ded..eedacf0 100644
--- a/init.el
+++ b/init.el
@@ -13,7 +13,7 @@
   (package-refresh-contents))
 
 ;; list the packages you want
-(setq package-list '(
+(defvar package-list '(
                      use-package
                      visual-regexp ;; Regexp replacement with preview in
                      ;; current buffer.
@@ -24,10 +24,6 @@
                      flatui-theme
                      planet-theme
 
-                     ;; Web
-                     web-mode
-                     js2-mode
-
                      ;; Infrastructure files
                      dockerfile-mode
                      terraform-mode
@@ -49,19 +45,19 @@
 (require 'use-package)
 
 ;; Additional files
-(load "$HOME/.emacs.d/01mac.el" 'f 't)
-(load "$HOME/.emacs.d/05macros.el" 'f 't)
-(load "$HOME/.emacs.d/05ivy.el" 'f 't)
-(load "$HOME/.emacs.d/05hydra.el" 'f 't)
-(load "$HOME/.emacs.d/05magit.el" 'f 't)
-(load "$HOME/.emacs.d/05prog-mode.el" 'f 't)
-(load "$HOME/.emacs.d/05company-yasnippet.el" 'f 't)
-(load "$HOME/.emacs.d/05flycheck.el" 'f 't)
-(load "$HOME/.emacs.d/05projectile.el" 'f 't)
-(load "$HOME/.emacs.d/05ctags.el" 'f 't)
-(load "$HOME/.emacs.d/05ispell.el" 'f 't)
-(load "$HOME/.emacs.d/05deft.el" 'f 't)
-(load "$HOME/.emacs.d/05lsp.el" 'f 't)
+(require '01mac "$HOME/.emacs.d/01mac.el")
+(require '05macros "$HOME/.emacs.d/05macros.el")
+(require '05ivy "$HOME/.emacs.d/05ivy.el")
+(require '05hydra "$HOME/.emacs.d/05hydra.el")
+(require '05magit "$HOME/.emacs.d/05magit.el")
+(require '05prog-mode "$HOME/.emacs.d/05prog-mode.el")
+(require '05company-yasnippet "$HOME/.emacs.d/05company-yasnippet.el")
+(require '05flycheck "$HOME/.emacs.d/05flycheck.el")
+(require '05projectile "$HOME/.emacs.d/05projectile.el")
+(require '05ctags "$HOME/.emacs.d/05ctags.el")
+(require '05ispell "$HOME/.emacs.d/05ispell.el")
+(require '05deft "$HOME/.emacs.d/05deft.el")
+(require '05lsp "$HOME/.emacs.d/05lsp.el")
 
 ;; Themes
 (load "$HOME/.emacs.d/themes/themes.el" 'f 't)
@@ -101,3 +97,6 @@
  '(font-lock-constant-face ((((type graphic)) (:foreground "#dfaf8f")) (((min-colors 256)) (:foreground "brightred")) (t (:foreground "brightred"))))
  '(font-lock-type-face ((t (:foreground "#ffcb6b" :family "IBM Plex Mono"))))
  '(markdown-code-face ((t (:inherit fixed-pitch :family "IBM Plex Mono")))))
+
+(provide 'init)
+;;; init.el ends here
diff --git a/themes/themes.el b/themes/themes.el
index 38b59ca..cba0603 100644
--- a/themes/themes.el
+++ b/themes/themes.el
@@ -37,7 +37,7 @@
                      (random 2)
                      '(base16-atelier-forest-light base16-harmonic-light))))
   (progn
-    (setq base16-theme-256-color-source "base16-shell")
+    (defvar base16-theme-256-color-source "base16-shell")
     (enable-theme 'base16-atelier-forest-light)))
 
 ;; Set font face