diff --git a/theme/style.less b/theme/style.less
index 7318ca4b..055e13c8 100644
--- a/theme/style.less
+++ b/theme/style.less
@@ -50,6 +50,17 @@
     border-radius:5px;
 }
 
+/* Specifying top and bottom rounded toolbox borders. */
+.blocklyTreeRow.blocklyTreeRowTop {
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+}
+
+.blocklyTreeRow.blocklyTreeRowBottom {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+}
+
 .blocklyTreeRow:hover {
     background: @invertedBackground !important;
 }
diff --git a/theme/theme.config b/theme/theme.config
index 4ba42506..ea08973c 100644
--- a/theme/theme.config
+++ b/theme/theme.config
@@ -32,7 +32,7 @@
 @input      : 'pxt';
 @label      : 'pxt';
 @list       : 'pxt';
-@loader     : 'pxt';
+@loader     : 'pulsar';
 @rail       : 'pxt';
 @reveal     : 'pxt';
 @segment    : 'pxt';
@@ -41,7 +41,7 @@
 /* Collections */
 @breadcrumb : 'default';
 @form       : 'default';
-@grid       : 'default';
+@grid       : 'pxt';
 @menu       : 'pxt';
 @message    : 'default';
 @table      : 'default';