diff --git a/src/theme.less b/src/theme.less
index fee27fa725..494e40efb7 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -16,7 +16,9 @@
 @import "@{themesFolder}/default/globals/site.variables";
 
 /* Packaged site.variables */
-@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
+& when not (@site = "default") {
+    @import (optional) "@{themesFolder}/@{site}/globals/site.variables";
+}
 
 /* Component's site.variables */
 & when not (@theme = "default") {
@@ -46,8 +48,18 @@
 /* Default */
 @import "@{themesFolder}/default/globals/colors.less";
 
+/* Packaged colors.less */
+& when not (@site = "default") {
+    @import (optional) "@{themesFolder}/@{site}/globals/colors.less";
+}
+
+/* Packaged Theme */
+& when not (@theme = "default") {
+    @import (optional) "@{themesFolder}/@{theme}/globals/colors.less";
+}
+
 /* Site Theme */
-@import (optional) "@{themesFolder}/@{site}/globals/colors.less";
+@import (optional) "@{siteFolder}/globals/colors.less";
 
 /*******************************
              Mix-ins