diff --git a/core/core-themes-support.el b/core/core-themes-support.el
index 764791748c9c..b404c1cdc5eb 100644
--- a/core/core-themes-support.el
+++ b/core/core-themes-support.el
@@ -26,7 +26,7 @@
 
 (defconst spacemacs-theme-name-to-package
   '(
-    (alect-black-alt                  . alect-themes)
+   (alect-black-alt                  . alect-themes)
     (alect-black                      . alect-themes)
     (alect-dark-alt                   . alect-themes)
     (alect-dark                       . alect-themes)
@@ -62,9 +62,15 @@
     (base16-bespin                    . base16-theme)
     (base16-brewer                    . base16-theme)
     (base16-bright                    . base16-theme)
+    (base16-brushtrees                . base16-theme)
+    (base16-brushtrees-dark           . base16-theme)
     (base16-chalk                     . base16-theme)
+    (base16-circus                    . base16-theme)
+    (base16-classic-dark              . base16-theme)
+    (base16-classic-light             . base16-theme)
     (base16-codeschool                . base16-theme)
     (base16-cupcake                   . base16-theme)
+    (base16-cupertino                 . base16-theme)
     (base16-darktooth                 . base16-theme)
     (base16-default-dark              . base16-theme)
     (base16-default-light             . base16-theme)
@@ -77,32 +83,47 @@
     (base16-google-light              . base16-theme)
     (base16-grayscale-dark            . base16-theme)
     (base16-grayscale-light           . base16-theme)
-    (base16-green-screen              . base16-theme)
-    (base16-harmonic16-dark           . base16-theme)
-    (base16-harmonic16-light          . base16-theme)
+    (base16-greenscreen               . base16-theme)
+    (base16-gruvbox-dark-hard         . base16-theme)
+    (base16-gruvbox-dark-medium       . base16-theme)
+    (base16-gruvbox-dark-pale         . base16-theme)
+    (base16-gruvbox-dark-soft         . base16-theme)
+    (base16-gruvbox-light-hard        . base16-theme)
+    (base16-gruvbox-light-medium      . base16-theme)
+    (base16-gruvbox-light-soft        . base16-theme)
+    (base16-harmonic-dark             . base16-theme)
+    (base16-harmonic-light            . base16-theme)
     (base16-hopscotch                 . base16-theme)
-    (base16-ir-black                  . base16-theme)
+    (base16-irblack                   . base16-theme)
     (base16-isotope                   . base16-theme)
     (base16-london-tube               . base16-theme)
     (base16-macintosh                 . base16-theme)
     (base16-marrakesh                 . base16-theme)
     (base16-materia                   . base16-theme)
+    (base16-material-darker           . base16-theme)
+    (base16-material-lighter          . base16-theme)
+    (base16-material-palenight        . base16-theme)
+    (base16-material                  . base16-theme)
+    (base16-mellow-purple             . base16-theme)
     (base16-mexico-light              . base16-theme)
     (base16-mocha                     . base16-theme)
     (base16-monokai                   . base16-theme)
+    (base16-nord                      . base16-theme)
     (base16-ocean                     . base16-theme)
     (base16-oceanicnext               . base16-theme)
     (base16-onedark                   . base16-theme)
+    (base16-one-light                 . base16-theme)
     (base16-paraiso                   . base16-theme)
     (base16-phd                       . base16-theme)
     (base16-pico                      . base16-theme)
     (base16-pop                       . base16-theme)
+    (base16-porple                    . base16-theme)
     (base16-railscasts                . base16-theme)
     (base16-rebecca                   . base16-theme)
     (base16-seti                      . base16-theme)
     (base16-seti-ui                   . base16-theme)
     (base16-shapeshifter              . base16-theme)
-    (base16-solar-flare               . base16-theme)
+    (base16-solarflare                . base16-theme)
     (base16-solarized-dark            . base16-theme)
     (base16-solarized-light           . base16-theme)
     (base16-spacemacs                 . base16-theme)
@@ -115,6 +136,8 @@
     (base16-unikitty-dark             . base16-theme)
     (base16-unikitty-light            . base16-theme)
     (base16-woodland                  . base16-theme)
+    (base16-xcode-dusk                . base16-theme)
+    (base16-zenburn                   . base16-theme)
     (sanityinc-solarized-dark         . color-theme-sanityinc-solarized)
     (sanityinc-solarized-light        . color-theme-sanityinc-solarized)
     (sanityinc-tomorrow-blue          . color-theme-sanityinc-tomorrow)
@@ -122,8 +145,19 @@
     (sanityinc-tomorrow-day           . color-theme-sanityinc-tomorrow)
     (sanityinc-tomorrow-eighties      . color-theme-sanityinc-tomorrow)
     (sanityinc-tomorrow-night         . color-theme-sanityinc-tomorrow)
-    (doom-one                         . doom-themes)
     (doom-molokai                     . doom-themes)
+    (doom-mono-dark                   . doom-themes)
+    (doom-mono-light                  . doom-themes)
+    (doom-nova                        . doom-themes)
+    (doom-one                         . doom-themes)
+    (doom-one-light                   . doom-themes)
+    (doom-peacock                     . doom-themes)
+    (doom-spacegrey                   . doom-themes)
+    (doom-tomorrow-day                . doom-themes)
+    (doom-tomorrow-night              . doom-themes)
+    (doom-tron                        . doom-themes)
+    (doom-vibrant                     . doom-themes)
+    (doom-x                           . doom-themes)
     (solarized-light                  . solarized-theme)
     (solarized-dark                   . solarized-theme)
     (spacemacs-light                  . spacemacs-theme)
@@ -160,6 +194,12 @@
     (tao-yang                         . tao-theme)
     (farmhouse-light                  . farmhouse-theme)
     (farmhouse-dark                   . farmhouse-theme)
+    (gruvbox-dark-soft                . gruvbox-theme)
+    (gruvbox-dark-medium              . gruvbox-theme)
+    (gruvbox-dark-hard                . gruvbox-theme)
+    (gruvbox-light-soft               . gruvbox-theme)
+    (gruvbox-light-medium             . gruvbox-theme)
+    (gruvbox-light-hard               . gruvbox-theme)
     )
   "alist matching a theme name with its package name, required when
 package name does not match theme name + `-theme' suffix.")
diff --git a/layers/+themes/themes-megapack/packages.el b/layers/+themes/themes-megapack/packages.el
index f584cf1758fa..0447c8bb2f29 100644
--- a/layers/+themes/themes-megapack/packages.el
+++ b/layers/+themes/themes-megapack/packages.el
@@ -18,7 +18,7 @@
     apropospriate-theme
     anti-zenburn-theme
     ;; contains errors
-    ; badger-theme
+    ;; badger-theme
     badwolf-theme
     birds-of-paradise-plus-theme
     bubbleberry-theme
@@ -36,8 +36,8 @@
     django-theme
     dracula-theme
     espresso-theme
+    exotica-theme
     farmhouse-theme
-    firebelly-theme
     flatland-theme
     flatui-theme
     gandalf-theme
@@ -64,20 +64,19 @@
     monochrome-theme
     mustang-theme
     naquadah-theme
-    niflheim-theme
     noctilux-theme
     obsidian-theme
     occidental-theme
     omtose-phellack-theme
     oldlace-theme
     organic-green-theme
-    pastels-on-dark-theme
     phoenix-dark-mono-theme
     phoenix-dark-pink-theme
     planet-theme
     professional-theme
     purple-haze-theme
     railscasts-theme
+    rebecca-theme
     reverse-theme
     seti-theme
     smyx-theme
@@ -96,17 +95,16 @@
     tangotango-theme
     tao-theme
     ;; contains error
-    ; tommyh-theme
+    ;; tommyh-theme
     toxi-theme
-    tronesque-theme
     twilight-anti-bright-theme
     twilight-bright-theme
     twilight-theme
     ujelly-theme
     underwater-theme
+    white-sand-theme
     zen-and-art-theme
     zenburn-theme
-    zonokai-theme
     ))
 
 ;; define programmatically the init functions