diff --git a/src/theme/globals.mixins.ionic.scss b/src/theme/globals.mixins.ionic.scss
index e609daf1f..cd4a762ca 100644
--- a/src/theme/globals.mixins.ionic.scss
+++ b/src/theme/globals.mixins.ionic.scss
@@ -98,7 +98,7 @@
 // Generates the color classes and variables based on the
 // colors map
 
-@mixin generate-color($color-name) {
+@mixin generate-color($color-name, $colors) {
     $value: map-get($colors, $color-name);
 
     $base: map-get($value, base);
diff --git a/src/theme/globals.variables.scss b/src/theme/globals.variables.scss
index 23e5aa06d..f30a600d0 100644
--- a/src/theme/globals.variables.scss
+++ b/src/theme/globals.variables.scss
@@ -132,15 +132,7 @@ $colors:  (
 
 // Just swipe light and dark.
 $colors-dark:  (
-    primary: map-get($colors, primary),
-    secondary: map-get($colors, secondary),
-    tertiary: map-get($colors, tertiary),
-    success: map-get($colors, success),
-    warning: map-get($colors, warning),
-    danger: map-get($colors, danger),
-    info: map-get($colors, info),
     light: map-get($colors, dark),
-    medium: map-get($colors, medium),
     dark: map-get($colors, light),
 ) !default;
 
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss
index ef871c0e6..69be801f8 100644
--- a/src/theme/theme.dark.scss
+++ b/src/theme/theme.dark.scss
@@ -38,7 +38,7 @@
     --dark: #{$light};
 
     @each $color-name, $value in $colors-dark {
-        @include generate-color($color-name);
+        @include generate-color($color-name, $colors-dark);
     }
 
     --ion-tab-bar-background: #1f1f1f;
diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss
index 62527d5e9..4431c5075 100644
--- a/src/theme/theme.light.scss
+++ b/src/theme/theme.light.scss
@@ -59,7 +59,7 @@
     --medium: #{$medium};
 
     @each $color-name, $value in $colors {
-        @include generate-color($color-name);
+        @include generate-color($color-name, $colors);
     }
 
     // Accessibility vars.