diff --git a/theme/blockly.less b/theme/blockly.less
index 41e41113..10aeeba7 100644
--- a/theme/blockly.less
+++ b/theme/blockly.less
@@ -11,7 +11,12 @@
              Blockly
 *******************************/
 
+.blocklyToolboxDiv {
+    padding:7px;
+}
+
 div.blocklyTreeRow {
+    border-radius:8px;
     box-shadow: inset 0 -1px 0 0 #ecf0f1;
 
     margin-bottom: 0px !important;
@@ -29,15 +34,10 @@ span.blocklyTreeLabel {
 }
 
 .blocklyToolboxDiv, .monacoToolboxDiv {
-    background-color: white !important;
     border-left: 1px solid #ecf0f1 !important;
     box-shadow: 4px 0px 2px -4px rgba(0,0,0,0.12), 4px 0px 2px -4px rgba(0,0,0,0.24);
 }
 
-.blocklyFlyoutBackground {
-    fill: #525A67 !important;
-}
-
 /* Remove shadow around blockly blocks */
 .blocklyPathDark, .blocklyPathLight {
     display: none;
diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables
index 5d8c65fe..0bf60d2a 100644
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@@ -6,9 +6,6 @@
 
 @fontName  : 'Roboto Mono';
 
-@emSize      : 14px;
-@fontSize    : 13px;
-
 /*-------------------
     Site Colors
 --------------------*/
diff --git a/theme/style.less b/theme/style.less
index 9db73709..1ad967f9 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -47,31 +47,8 @@
   width: 100%;
 }
 
-/*******************************
-             Blockly
-*******************************/
-
-div.blocklyTreeRow {
-    border-radius:8px;
-}
-
-/* This removes any padding at the top of the toolbox */
-div.blocklyTreeRoot {
-    padding: 0px !important;
-}
-
-/* Blockly Text */
-div.blocklyTreeLabel {
-    font-family: @pageFont !important;
-    font-size:1rem !important;
-}
-
-.blocklyFlyoutBackground {
-    fill: @grey;
-}
-
-.blocklyToolboxDiv {
-    padding:7px;
+#downloadArea {
+    background: transparent !important;
 }
 
 .organization {
@@ -85,8 +62,19 @@ div.blocklyTreeLabel {
     }
 }
 
+
+/* Mobile */
+@media only screen and (max-width: @largestMobileScreen) {
+    #filelist {
+        background: transparent !important;
+    }
+}
+
 /* Tablet */
 @media only screen and (min-width: @tabletBreakpoint) and (max-width: @largestTabletScreen) {
+    #filelist {
+        background: transparent !important;
+    }
 }
 
 /* Small Monitor */
@@ -96,15 +84,3 @@ div.blocklyTreeLabel {
 /* Large Monitor */
 @media only screen and (min-width: @largeMonitorBreakpoint) {
 }
-
-/*******************************
-             Menu Bar
-*******************************/
-
-#menubar {
-    height: 5rem;
-}
-
-#fileNameInput {
-    width: 350px;
-}
\ No newline at end of file
diff --git a/theme/theme.config b/theme/theme.config
index 381e8d73..84bac825 100644
--- a/theme/theme.config
+++ b/theme/theme.config
@@ -43,16 +43,16 @@
 @form       : 'default';
 @grid       : 'pxt';
 @menu       : 'pxt';
-@message    : 'default';
+@message    : 'pxt';
 @table      : 'default';
 
 /* Modules */
 @accordion  : 'default';
 @checkbox   : 'default';
-@dimmer     : 'default';
+@dimmer     : 'pxt';
 @dropdown   : 'default';
 @embed      : 'default';
-@modal      : 'default';
+@modal      : 'pxt';
 @nag        : 'default';
 @popup      : 'default';
 @progress   : 'default';
@@ -66,7 +66,7 @@
 
 /* Views */
 @ad         : 'default';
-@card       : 'default';
+@card       : 'pxt';
 @comment    : 'default';
 @feed       : 'default';
 @item       : 'default';
@@ -91,5 +91,9 @@
 
 @fontPath  : 'fonts';
 
+/*
+@headerFont        : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+@pageFont          : 'Segoe UI', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+*/
 
 /* End Config */