diff --git a/lisp/icejam-base.el b/lisp/icejam-base.el
index 1b68014..7be5613 100644
--- a/lisp/icejam-base.el
+++ b/lisp/icejam-base.el
@@ -72,7 +72,7 @@
 (setq ring-bell-function 'ignore)
 
 ;; Enable y/n answers to questions
-(fset 'yes-or-no-p 'y-or-n-p)
+(setopt use-short-answers t)
 
 ;; Only warn if a file is bigger than 50 MB when trying to open it
 (setq large-file-warning-threshold 50000000)
diff --git a/lisp/icejam-deft.el b/lisp/icejam-deft.el
index b84b6cb..29951a7 100644
--- a/lisp/icejam-deft.el
+++ b/lisp/icejam-deft.el
@@ -12,7 +12,9 @@
   :config (setq
            deft-directory (substitute-in-file-name "$DEFT_PATH")
            deft-default-extension "md"
-           deft-ignore-file-regexp "^\\._[0-9-A-Z]+.md$"
+           ;; NB! deft returns absolute paths as filenames, so
+           ;; ignore works slightly differently.
+           deft-ignore-file-regexp "\\._[0-9-A-Z]+\\.md$"
            deft-strip-summary-regexp (concat "\\("
               "[\n\t]" ;; blank
               "\\|^:[[:ascii:]]+:.*$" ;; org-mode properties string
diff --git a/lisp/icejam-themes.el b/lisp/icejam-themes.el
index c7b6c7f..013f94a 100644
--- a/lisp/icejam-themes.el
+++ b/lisp/icejam-themes.el
@@ -4,7 +4,12 @@
 
 (use-package spaceline :straight t :defer t)
 
-(use-package base16-theme :straight t :defer t)
+(use-package base16-theme :straight t
+  :defer t
+  :config
+  ;; Set themes for terminal mode
+  (setq base16-theme-256-color-source "colors"))
+
 (use-package apropospriate-theme :straight t :defer t)
 (use-package leuven-theme :straight t :defer t)
 (use-package modus-themes :straight t :defer t)
@@ -15,9 +20,6 @@
 ;; Disable cursor blinking
 (blink-cursor-mode 0)
 
-;; Set themes for terminal mode
-(setq base16-theme-256-color-source "colors")
-
 ;; Light themes
 (load-theme 'apropospriate-light t t)
 (load-theme 'leuven t t)
@@ -43,8 +45,11 @@
 (load-theme 'sanityinc-tomorrow-night t t)
 
 ;; My own theme modifications:
-(require 'icejam-base16-zenburn)
-(require 'icejam-base16-harmonic-light)
+(with-eval-after-load 'base16-theme
+  (require 'icejam-base16-zenburn)
+  (require 'icejam-base16-harmonic-light))
+
+(declare-function spaceline-emacs-theme nil)
 
 (spaceline-emacs-theme)
 (enable-theme 'icejam-base16-zenburn)
diff --git a/lisp/langs/icejam-lang-rust.el b/lisp/langs/icejam-lang-rust.el
index 590d525..6d512f4 100644
--- a/lisp/langs/icejam-lang-rust.el
+++ b/lisp/langs/icejam-lang-rust.el
@@ -6,7 +6,9 @@
 
 (use-package rust-mode
   :straight t
-  :defer t)
+  :defer t
+  :config
+  (setq rust-mode-treesitter-derive t))
 
 (use-package flycheck-rust
   :straight t
diff --git a/lisp/themes/icejam-base16-harmonic-light.el b/lisp/themes/icejam-base16-harmonic-light.el
index 6d642fc..174b783 100644
--- a/lisp/themes/icejam-base16-harmonic-light.el
+++ b/lisp/themes/icejam-base16-harmonic-light.el
@@ -7,6 +7,7 @@
 
 ;;; Code:
 
+(declare-function base16-theme-define (theme-name colors))
 (use-package base16-theme :straight t :defer t)
 
 (defvar icejam-base16-harmonic-light-colors
diff --git a/lisp/themes/icejam-base16-zenburn.el b/lisp/themes/icejam-base16-zenburn.el
index 01fa2ab..950e917 100644
--- a/lisp/themes/icejam-base16-zenburn.el
+++ b/lisp/themes/icejam-base16-zenburn.el
@@ -16,8 +16,8 @@
 ;; 04 made darker by 5%   #808080 => #7a7a7a
 ;; 0B made lighter by 10% #5f7f5f => #799979
 
-
 (use-package base16-theme :straight t)
+(declare-function base16-theme-define "base16-theme" (theme-name theme-colors))
 
 (defvar icejam-base16-zenburn-colors
   '(:base00 "#383838"