diff --git a/pxtarget.json b/pxtarget.json
index 58615a5c..b3e54f17 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -210,7 +210,7 @@
         "hideSideDocs": true,
         "invertedMenu": true,
         "invertedToolbox": true,
-        "monacoToolbox": false,
+        "monacoToolbox": true,
         "hasAudio": true,      
         "highContrast": true,          
         "simAnimationEnter": "rotate in",
diff --git a/theme/blockly.less b/theme/blockly.less
index 10aeeba7..d0d5a807 100644
--- a/theme/blockly.less
+++ b/theme/blockly.less
@@ -19,8 +19,6 @@ div.blocklyTreeRow {
     border-radius:8px;
     box-shadow: inset 0 -1px 0 0 #ecf0f1;
 
-    margin-bottom: 0px !important;
-
     -webkit-transition-property: background-color; /* Safari */
     -webkit-transition-duration: 1s; /* Safari */
     transition-property: background-color;
@@ -52,6 +50,10 @@ span.blocklyTreeLabel {
     border-radius: 10px;
 }
 
+.blocklyFlyoutBackground {
+    fill: #42495F !important;
+}
+
 /* Mobile */
 @media only screen and (max-width: @largestMobileScreen) {
     .blocklyToolboxDiv, .monacoToolboxDiv {
diff --git a/theme/site/collections/menu.variables b/theme/site/collections/menu.variables
index c46b8f2e..df35e326 100644
--- a/theme/site/collections/menu.variables
+++ b/theme/site/collections/menu.variables
@@ -4,10 +4,3 @@
 
 @invertedBackground: #525A67;
 @dropdownMenuDistance: 0px;
-
-/*******************************
-    PXT Theme Overrides
-*******************************/
-
-@mainMenuHeight: 5rem;
-@mainMenuMinHeight: (@itemVerticalPadding * 2) + 2em;
diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables
index 0bf60d2a..e13f9e3e 100644
--- a/theme/site/globals/site.variables
+++ b/theme/site/globals/site.variables
@@ -32,8 +32,6 @@
          PXT Overrides
 *******************************/
 
-@mainMenuHeight: 5rem;
-@mobileMenuHeight: 5rem;
-
 @blocklyToolboxColor: #F6F4E6;
 
+@blocklyFlyoutColor: #42495F;