Fix doom theme loading

uno/modules/ui/theme.org

@@ -20,7 +20,6 @@ Define UI theme package.
     :custom
     (doom-themes-enable-bold t)
     (doom-themes-enable-italic t)
-    (doom-themes-treemacs-theme "doom-colors")
     :config
     (load-theme 'doom-one t)
     (set-face-attribute 'font-lock-comment-face nil :slant 'italic)
@@ -28,11 +27,16 @@ Define UI theme package.
 
   (use-package emacs
     :after (uno-ui-theme doom-themes org)
-    (require 'doom-themes-ext-org))
+    :config
+    (doom-themes-org-config))
 
   (use-package emacs
     :after (uno-ui-theme doom-themes treemacs)
-    (require 'doom-themes-treemacs-config))
+    :custom
+    (doom-themes-treemacs-theme "doom-colors")
+    (doom-themes-treemacs-enable-variable-pitch t)
+    :config
+    (doom-themes-treemacs-config))
 #+END_SRC
 
 * Font