diff --git a/contrib/syl20bnr/packages.el b/contrib/syl20bnr/packages.el
index 36fa64005..c19adefc8 100644
--- a/contrib/syl20bnr/packages.el
+++ b/contrib/syl20bnr/packages.el
@@ -53,7 +53,6 @@ disabling some faces in order to make colored identifiers stand out."
 
     :config
     (progn
-      (syl20bnr/tweak-theme-colors 'solarized-light)
       (evil-leader/set-key "tc" 'rainbow-identifiers-mode)
 
       ;; functions to change saturation and lightness of colors
diff --git a/spacemacs/funcs.el b/spacemacs/funcs.el
index 0a82c39ea..c1427eaf9 100644
--- a/spacemacs/funcs.el
+++ b/spacemacs/funcs.el
@@ -75,11 +75,11 @@
 (defadvice load-theme (around spacemacs/load-theme-adv activate)
   "Perform post load processing."
   (let ((theme (ad-get-arg 0)))
+    (setq spacemacs-cur-theme theme)
     (if (and spacemacs-solarized-dark-createdp
              (eq 'solarized-dark theme))
         (create-solarized-theme 'dark 'solarized-dark))
     ad-do-it
-    (setq spacemacs-cur-theme theme)
     (spacemacs/post-theme-init theme)))
 
 (defun spacemacs/post-theme-init (theme)