diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-color.scss b/ng2-components/ng2-alfresco-core/styles/_colors.scss
similarity index 100%
rename from ng2-components/ng2-alfresco-core/styles/_variables-color.scss
rename to ng2-components/ng2-alfresco-core/styles/_colors.scss
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss b/ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
similarity index 92%
rename from ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss
rename to ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
index 3070639ed1..5de631c0fe 100644
--- a/ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
@@ -1,4 +1,4 @@
-@import './_variables-color.scss';
+@import 'colors';
 
 $button-fab-color-alt: $alfresco-primary-accent--default;
 
diff --git a/ng2-components/ng2-alfresco-core/styles/_mixins.scss b/ng2-components/ng2-alfresco-core/styles/_mixins.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ng2-components/ng2-alfresco-core/styles/_theming.scss b/ng2-components/ng2-alfresco-core/styles/_theming.scss
index 4f758d6cc0..106d48780d 100644
--- a/ng2-components/ng2-alfresco-core/styles/_theming.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_theming.scss
@@ -1,3 +1,4 @@
-@import './_variables-general';
-@import './_variables-color';
-@import './_variables-mdl-overrides';
+@import 'mixins';
+@import 'variables';
+@import 'colors';
+@import 'mdl-overrides';
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-general.scss b/ng2-components/ng2-alfresco-core/styles/_variables-general.scss
deleted file mode 100644
index db17d1e0dd..0000000000
--- a/ng2-components/ng2-alfresco-core/styles/_variables-general.scss
+++ /dev/null
@@ -1 +0,0 @@
-$ADF: adf;
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables.scss b/ng2-components/ng2-alfresco-core/styles/_variables.scss
new file mode 100644
index 0000000000..3093a068c6
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/styles/_variables.scss
@@ -0,0 +1,3 @@
+@import 'colors';
+
+$ADF: adf;