diff --git a/modules/navigation/siren-helm.el b/modules/navigation/siren-helm.el
index 97efc6a..7031d53 100755
--- a/modules/navigation/siren-helm.el
+++ b/modules/navigation/siren-helm.el
@@ -40,10 +40,11 @@
   (helm-echo-input-in-header-line t)
   (helm-file-name-case-fold-search 'smart)
   (helm-split-window-default-side 'below)
-  (siren-helm--did-hide-neotree nil)
-  (siren-helm--did-hide-treemacs nil)
 
   :init
+  (defvar siren-helm--did-hide-neotree nil)
+  (defvar siren-helm--did-hide-treemacs nil)
+
   ;; From: https://www.reddit.com/r/emacs/comments/3asbyn/new_and_very_useful_helm_feature_enter_search/
   (defun siren-helm--hide-minibuffer-maybe ()
     (when (with-helm-buffer helm-echo-input-in-header-line)
diff --git a/modules/themes/siren-doom-themes.el b/modules/themes/siren-doom-themes.el
index fcb3e4e..7e314d4 100644
--- a/modules/themes/siren-doom-themes.el
+++ b/modules/themes/siren-doom-themes.el
@@ -11,9 +11,6 @@
 
 (use-package doom-themes
   :custom
-  ;; Initial theme to load.
-  (siren-doom-themes-init-theme 'doom-vibrant)
-
   ;; Global doom-themes options
   (doom-themes-enable-bold t)    ; if nil, bold is universally disabled
   (doom-themes-enable-italic t)  ; if nil, italics is universally disabled
@@ -34,7 +31,7 @@
 
   :config
   ;; By default load the doom-vibrant theme.
-  (siren-doom-themes-load siren-doom-themes-init-theme)
+  (siren-doom-themes-load 'doom-vibrant)
 
   ;; Enable flashing mode-line on errors
   (doom-themes-visual-bell-config)
@@ -50,7 +47,9 @@
     (interactive (list (completing-read "Choose theme: "
                                         (siren-doom-themes-list))))
 
-    (mapc #'disable-theme custom-enabled-themes)
+    (dolist (theme custom-enabled-themes)
+      (when (not (string= theme "use-package"))
+        (disable-theme theme)))
     (load-theme (if (string= (type-of theme) "string") (intern theme) theme) t)
     (siren-doom-themes-overrides))
 
diff --git a/modules/workspaces/siren-desktop.el b/modules/workspaces/siren-desktop.el
index 676c70e..cbaf927 100644
--- a/modules/workspaces/siren-desktop.el
+++ b/modules/workspaces/siren-desktop.el
@@ -74,9 +74,6 @@
   :hook
   (emacs-startup . siren-desktop+-setup)
 
-  :custom
-  (desktop+-base-dir (expand-file-name "desktops" siren-dir))
-
   :bind
   (:map siren-workspace-map
         ("C-z c" . desktop+-create)
@@ -89,20 +86,22 @@
         ("C-z C-l" . desktop+-load))
 
   :init
+  (defvar siren-desktop+-base-dir (expand-file-name "desktops" siren-dir))
+
   (defun siren-desktop+-setup ()
-    (unless (file-exists-p desktop+-base-dir)
-      (make-directory desktop+-base-dir)))
+    (unless (file-exists-p siren-desktop+-base-dir)
+      (make-directory siren-desktop+-base-dir)))
 
   (defun siren-desktop+-current-desktop ()
     (when (and (boundp 'desktop-dirname) desktop-dirname)
       (let ((dir (directory-file-name desktop-dirname))
-              (base-dir (expand-file-name desktop+-base-dir)))
+              (base-dir (expand-file-name siren-desktop+-base-dir)))
           (when (string-prefix-p base-dir dir)
             (file-name-nondirectory dir)))))
 
   (defun siren-desktop+-list ()
     "Return a list of available desktops"
-    (remove "." (remove ".." (directory-files desktop+-base-dir))))
+    (remove "." (remove ".." (directory-files siren-desktop+-base-dir))))
 
   (defun siren-desktop+-list-interactive ()
     (let ((current (siren-desktop+-current-desktop))
@@ -124,7 +123,7 @@
 
   (defun siren-desktop+-create-new (name)
     "Create a new empty session, identified by a name.
-The session is created in a subdirectory of `desktop+-base-dir'.
+The session is created in a subdirectory of `siren-desktop+-base-dir'.
 It can afterwards be reloaded using `desktop+-load'.
 
 As a special case, if NAME is left blank, the session is
diff --git a/straight/versions/default.el b/straight/versions/default.el
index 87f62c6..9192c1a 100644
--- a/straight/versions/default.el
+++ b/straight/versions/default.el
@@ -179,7 +179,7 @@
  ("typescript.el" . "1043025d42602d560949955410d3afa2562130ee")
  ("undo-tree" . "e326c6135e62f5fe8536528d3acd5e798f847407")
  ("undohist" . "6c905772e6aa9969fd9ca500d2fe93e114130fe6")
- ("use-package" . "caa92f1d64fc25480551757d854b4b49981dfa6b")
+ ("use-package" . "365c73d2618dd0040a32c2601c5456ab5495b812")
  ("uuidgen-el" . "b50e6fef2de4199a8f207b46588c2cb3890ddd85")
  ("vue-html-mode" . "1514939804bad558584feeb6298b38d22eadf64e")
  ("vue-mode" . "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71")