diff --git a/.emacs.d/modules/sqrt-general-ui.el b/.emacs.d/modules/sqrt-general-ui.el
index 42b94b6..4e9994a 100644
--- a/.emacs.d/modules/sqrt-general-ui.el
+++ b/.emacs.d/modules/sqrt-general-ui.el
@@ -138,8 +138,10 @@
 
 (defun my/modus-get-base (color)
   (let ((base-value (string-to-number (substring (symbol-name color) 4 5)))
-        (base-start (cadr (assoc 'bg-main (modus-themes-get-theme-palette))))
-        (base-end (cadr (assoc 'fg-dim (modus-themes-get-theme-palette)))))
+        (base-start (cadr (assoc 'bg-main (modus-themes-get-theme-palette
+                                           (or (my/modus-p) (my/ef-p))))))
+        (base-end (cadr (assoc 'fg-dim (modus-themes-get-theme-palette
+                                        (or (my/modus-p) (my/ef-p)))))))
     (nth base-value (ct-gradient 9 base-start base-end t))))
 
 (defun my/prot-color (color palette)
@@ -179,10 +181,10 @@
      (t (cadr (assoc color palette))))))
 
 (defun my/modus-color (color)
-  (my/prot-color color (modus-themes-get-theme-palette)))
+  (my/prot-color color (modus-themes-get-theme-palette (my/modus-p))))
 
 (defun my/ef-color (color)
-  (my/prot-color color (modus-themes-get-theme-palette)))
+  (my/prot-color color (modus-themes-get-theme-palette (my/ef-p))))
 
 (defconst my/test-colors-list
   '(black red green yellow blue magenta cyan white light-black
@@ -276,6 +278,7 @@
                        (eq enabled-theme theme)))
            do (disable-theme enabled-theme))
   (load-theme theme t)
+  (my/update-my-theme)
   (when current-prefix-arg
     (my/regenerate-desktop)))
 
diff --git a/Emacs.org b/Emacs.org
index 8d0878f..3e5a814 100644
--- a/Emacs.org
+++ b/Emacs.org
@@ -2436,8 +2436,10 @@ And the same for =modus-themes=. =my/modus-color= has to accept the same argumen
 #+begin_src emacs-lisp
 (defun my/modus-get-base (color)
   (let ((base-value (string-to-number (substring (symbol-name color) 4 5)))
-        (base-start (cadr (assoc 'bg-main (modus-themes-get-theme-palette))))
-        (base-end (cadr (assoc 'fg-dim (modus-themes-get-theme-palette)))))
+        (base-start (cadr (assoc 'bg-main (modus-themes-get-theme-palette
+                                           (or (my/modus-p) (my/ef-p))))))
+        (base-end (cadr (assoc 'fg-dim (modus-themes-get-theme-palette
+                                        (or (my/modus-p) (my/ef-p)))))))
     (nth base-value (ct-gradient 9 base-start base-end t))))
 
 (defun my/prot-color (color palette)
@@ -2477,10 +2479,10 @@ And the same for =modus-themes=. =my/modus-color= has to accept the same argumen
      (t (cadr (assoc color palette))))))
 
 (defun my/modus-color (color)
-  (my/prot-color color (modus-themes-get-theme-palette)))
+  (my/prot-color color (modus-themes-get-theme-palette (my/modus-p))))
 
 (defun my/ef-color (color)
-  (my/prot-color color (modus-themes-get-theme-palette)))
+  (my/prot-color color (modus-themes-get-theme-palette (my/ef-p))))
 #+end_src
 
 Test the three functions.