diff --git a/configs/init-base.el b/configs/init-base.el
index c5f6c61..e695a35 100644
--- a/configs/init-base.el
+++ b/configs/init-base.el
@@ -67,15 +67,15 @@
 ;; Block until current queue processed.
 (elpaca-wait)
 
-;; ;; Theme
+;; Theme
+
 ;; (use-package dracula-theme
 ;;   :defer t
 ;;   :hook
 ;;   (elpaca-after-init . (lambda()
 ;;                          (load-theme 'dracula t)
+;;                          (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
 ;;                          ))
-;;   :config
-;;   (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
 ;;   )
 
 ;; (use-package adwaita-dark-theme
@@ -83,9 +83,18 @@
 ;;   :hook
 ;;   (elpaca-after-init . (lambda()
 ;;                          (load-theme 'adwaita-dark t)
+;;                          (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
+;;                          ))
+;;   )
+
+;; (use-package adwaita-theme
+;;   :elpaca nil
+;;   :defer t
+;;   :hook
+;;   (elpaca-after-init . (lambda()
+;;                          (load-theme 'adwaita t)
+;;                          (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
 ;;                          ))
-;;   :config
-;;   (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
 ;;   )
 
 (use-package modus-themes
@@ -94,9 +103,8 @@
   :hook
   (elpaca-after-init . (lambda()
                          (load-theme 'modus-operandi-tinted t)
+                         (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
                          ))
-  :config
-  (set-face-attribute 'default nil :font "Fira Code Retina" :height 112) ; Font
   )
 
 (defconst private-dir  (expand-file-name "private" user-emacs-directory))