diff --git a/src/theme.less b/src/theme.less
index 7a5db1cb0..c71ba3cd3 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -4,25 +4,32 @@
 
 @theme : @@element;
 
-/*------------------
-    Default Theme
--------------------*/
 
+/*--------------------
+   Site Variables
+---------------------*/
+
+/* Default */
 @import "@{themesFolder}/default/globals/site.variables";
-@import "@{themesFolder}/default/@{type}s/@{element}.variables";
 
-/*------------------
-   Packaged Theme
--------------------*/
+/* Packaged Theme */
+@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
 
-@import "@{themesFolder}/@{site}/globals/site.variables";
-@import "@{themesFolder}/@{theme}/@{type}s/@{element}.variables";
+/* Site Theme */
+@import (optional) "@{siteFolder}/globals/site.variables";
 
-/*------------------
-     Site Theme
--------------------*/
 
-@import (optional) "@{siteFolder}/globals/site.variables";
+/*-------------------
+ Component Variables
+---------------------*/
+
+/* Default */
+@import "@{themesFolder}/default/@{type}s/@{element}.variables";
+
+/* Packaged Theme */
+@import "@{themesFolder}/@{theme}/@{type}s/@{element}.variables";
+
+/* Site Theme */
 @import (optional) "@{siteFolder}/@{type}s/@{element}.variables";