diff --git a/contrib/colors/README.md b/contrib/colors/README.md
index e8646a4ea..140b41635 100644
--- a/contrib/colors/README.md
+++ b/contrib/colors/README.md
@@ -57,11 +57,11 @@ To enable the package `rainbow-identifiers` set the variable
 ### Enable Nyan cat
 
 To enable the package `nyan-mode` set the variable
-`colors-enable-nyan-cat` to `t`:
+`colors-enable-nyan-cat-progress-bar` to `t`:
 
 ```elisp
 (setq-default dotspacemacs-configuration-layers '(
-  (colors :variables colors-enable-nyan-cat t))
+  (colors :variables colors-enable-nyan-cat-progress-bar t))
   "List of contribution to load."
 )
 ```
diff --git a/contrib/colors/config.el b/contrib/colors/config.el
index d92097fc0..9e729da51 100644
--- a/contrib/colors/config.el
+++ b/contrib/colors/config.el
@@ -19,7 +19,7 @@
 (defvar colors-enable-rainbow-identifiers nil
   "if non nil the `rainbow-identifers' package is enabled.")
 
-(defvar colors-enable-nyan-cat nil
+(defvar colors-enable-nyan-cat-progress-bar nil
   "if non nil all nyan cat packges are enabled (for now only `nyan-mode').")
 
 ;; Command prefixes
diff --git a/contrib/colors/extensions.el b/contrib/colors/extensions.el
index c6b391956..c0c8bf532 100644
--- a/contrib/colors/extensions.el
+++ b/contrib/colors/extensions.el
@@ -2,14 +2,14 @@
 
 (defun colors/init-nyan-mode ()
   (use-package nyan-mode
-    :if colors-enable-nyan-cat
+    :if colors-enable-nyan-cat-progress-bar
     :init
     (progn
       (setq nyan-wavy-trail t)
       (setq nyan-animate-nyancat t)
       (nyan-mode)
 
-      (spacemacs|add-toggle nyan-cat-mode-line
+      (spacemacs|add-toggle nyan-cat-progress-bar
                             :status nyan-mode
                             :on (nyan-mode)
                             :off (nyan-mode -1)
diff --git a/spacemacs/packages.el b/spacemacs/packages.el
index 20443c56a..87774ca2c 100644
--- a/spacemacs/packages.el
+++ b/spacemacs/packages.el
@@ -1045,14 +1045,13 @@ which require an initialization must be listed explicitly in the list.")
   (use-package golden-ratio
     :defer t
     :init
-    (eval `(spacemacs|add-toggle
-            golden-ratio
-            :status golden-ratio-mode
-            :on (golden-ratio-mode) (golden-ratio)
-            :off (golden-ratio-mode -1) (balance-windows)
-            :documentation ,(concat "Dynamically resize the focused window "
-                                    "using the golden ratio.")
-            :evil-leader "tg"))
+    (spacemacs|add-toggle
+     golden-ratio
+     :status golden-ratio-mode
+     :on (golden-ratio-mode) (golden-ratio)
+     :off (golden-ratio-mode -1) (balance-windows)
+     :documentation "Dynamically resize the focused window using the golden ratio."
+     :evil-leader "tg")
     :config
     (progn
       (setq golden-ratio-extra-commands