diff --git a/playground/index.html b/playground/index.html
index c08854f88..8ba16c2c1 100644
--- a/playground/index.html
+++ b/playground/index.html
@@ -33,259 +33,302 @@
     <div id="blocks"></div>
 
     <xml id="toolbox" style="display: none">
-        <category name="Events">
-          <block type="event_whenflagclicked"></block>
-          <block type="event_whenbroadcastreceived">
-            <value name="BROADCAST_OPTION">
-              <shadow type="event_broadcast_menu"></shadow>
-            </value>
-          </block>
-          <block type="event_broadcast">
-            <value name="BROADCAST_OPTION">
-              <shadow type="event_broadcast_menu"></shadow>
-            </value>
-          </block>
-          <block type="event_broadcastandwait">
-            <value name="BROADCAST_OPTION">
-              <shadow type="event_broadcast_menu"></shadow>
-            </value>
-          </block>
-        </category>
-        <category name="Control">
-          <block type="control_wait">
-            <value name="DURATION">
-              <shadow type="math_number">
-                <field name="NUM">1</field>
-              </shadow>
-            </value>
-          </block>
-          <block type="control_repeat">
-            <value name="TIMES">
-              <shadow type="math_number">
-                <field name="NUM">4</field>
-              </shadow>
-            </value>
-          </block>
-          <block type="control_forever"></block>
-          <block type="control_if"></block>
-          <block type="control_if_else"></block>
-          <block type="control_wait_until"></block>
-          <block type="control_repeat_until"></block>
-          <block type="control_stop">
-            <value name="STOP_OPTION">
-              <shadow type="control_stop_menu"></shadow>
-            </value>
-          </block>
-          <block type="control_start_as_clone"></block>
-          <block type="control_create_clone_of">
-            <value name="CLONE_OPTION">
-              <shadow type="control_create_clone_of_menu"></shadow>
-            </value>
-          </block>
-          <block type="control_delete_this_clone"></block>
-        </category>
-        <category name="Operators">
-            <block type="operator_add">
-              <value name="NUM1">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-              <value name="NUM2">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_subtract">
-              <value name="NUM1">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-              <value name="NUM2">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_multiply">
-              <value name="NUM1">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-              <value name="NUM2">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_divide">
-              <value name="NUM1">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-              <value name="NUM2">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_random">
-              <value name="FROM">
-                <shadow type="math_number">
-                  <field name="NUM">1</field>
-                </shadow>
-              </value>
-              <value name="TO">
-                <shadow type="math_number">
-                  <field name="NUM">10</field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_lt">
-              <value name="OPERAND1">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-              <value name="OPERAND2">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_equals">
-              <value name="OPERAND1">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-              <value name="OPERAND2">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_gt">
-              <value name="OPERAND1">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-              <value name="OPERAND2">
-                <shadow type="text">
-                  <field name="TEXT"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_and"></block>
-            <block type="operator_or"></block>
-            <block type="operator_not"></block>
-            <block type="operator_join">
-              <value name="STRING1">
-                <shadow type="text">
-                  <field name="TEXT">hello</field>
-                </shadow>
-              </value>
-              <value name="STRING2">
-                <shadow type="text">
-                  <field name="TEXT">world</field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_letter_of">
-              <value name="LETTER">
-                <shadow type="math_number">
-                  <field name="NUM">1</field>
-                </shadow>
-              </value>
-              <value name="STRING">
-                <shadow type="text">
-                  <field name="TEXT">world</field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_length">
-              <value name="STRING">
-                <shadow type="text">
-                  <field name="TEXT">world</field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_mod">
-              <value name="NUM1">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-              <value name="NUM2">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_round">
-              <value name="NUM">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-            <block type="operator_mathop">
-              <value name="OPERATOR">
-                <shadow type="operator_mathop_menu"></shadow>
-              </value>
-              <value name="NUM">
-                <shadow type="math_number">
-                  <field name="NUM"></field>
-                </shadow>
-              </value>
-            </block>
-        </category>
-        <category name="Looks">
-        <block type="looks_show"></block>
-        <block type="looks_hide"></block>
-        <block type="looks_changeeffectby">
-          <value name="EFFECT">
-            <shadow type="looks_effectmenu"></shadow>
-          </value>
-          <value name="CHANGE">
+    <category name="Events">
+      <block type="event_whenflagclicked"></block>
+      <block type="event_whenkeypressed">
+        <value name="KEY_OPTION">
+          <shadow type="event_keyoptions"></shadow>
+        </value>
+      </block>
+      <block type="event_whenbroadcastreceived">
+        <value name="BROADCAST_OPTION">
+          <shadow type="event_broadcast_menu"></shadow>
+        </value>
+      </block>
+      <block type="event_broadcast">
+        <value name="BROADCAST_OPTION">
+          <shadow type="event_broadcast_menu"></shadow>
+        </value>
+      </block>
+      <block type="event_broadcastandwait">
+        <value name="BROADCAST_OPTION">
+          <shadow type="event_broadcast_menu"></shadow>
+        </value>
+      </block>
+    </category>
+    <category name="Control">
+      <block type="control_wait">
+        <value name="DURATION">
+          <shadow type="math_positive_number">
+            <field name="NUM">1</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="control_repeat">
+        <value name="TIMES">
+          <shadow type="math_whole_number">
+            <field name="NUM">10</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="control_forever"></block>
+      <block type="control_if"></block>
+      <block type="control_if_else"></block>
+      <block type="control_wait_until"></block>
+      <block type="control_repeat_until"></block>
+      <block type="control_stop">
+        <value name="STOP_OPTION">
+          <shadow type="control_stop_menu"></shadow>
+        </value>
+      </block>
+      <block type="control_start_as_clone"></block>
+      <block type="control_create_clone_of">
+        <value name="CLONE_OPTION">
+          <shadow type="control_create_clone_of_menu"></shadow>
+        </value>
+      </block>
+      <block type="control_delete_this_clone"></block>
+    </category>
+    <category name="Operators">
+        <block type="operator_add">
+          <value name="NUM1">
             <shadow type="math_number">
-              <field name="NUM">25</field>
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+          <value name="NUM2">
+            <shadow type="math_number">
+              <field name="NUM"></field>
             </shadow>
           </value>
         </block>
-        <block type="looks_seteffectto">
-          <value name="EFFECT">
-            <shadow type="looks_effectmenu"></shadow>
-          </value>
-          <value name="VALUE">
+        <block type="operator_subtract">
+          <value name="NUM1">
             <shadow type="math_number">
-              <field name="NUM">0</field>
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+          <value name="NUM2">
+            <shadow type="math_number">
+              <field name="NUM"></field>
             </shadow>
           </value>
         </block>
-        <block type="looks_cleargraphiceffects"></block>
-        <block type="looks_changesizeby">
-          <value name="CHANGE">
+        <block type="operator_multiply">
+          <value name="NUM1">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+          <value name="NUM2">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_divide">
+          <value name="NUM1">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+          <value name="NUM2">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_random">
+          <value name="FROM">
+            <shadow type="math_number">
+              <field name="NUM">1</field>
+            </shadow>
+          </value>
+          <value name="TO">
             <shadow type="math_number">
               <field name="NUM">10</field>
             </shadow>
           </value>
         </block>
-        <block type="looks_setsizeto">
-          <value name="SIZE">
-            <shadow type="math_number">
-              <field name="NUM">100</field>
+        <block type="operator_lt">
+          <value name="OPERAND1">
+            <shadow type="text">
+              <field name="TEXT"></field>
+            </shadow>
+          </value>
+          <value name="OPERAND2">
+            <shadow type="text">
+              <field name="TEXT"></field>
             </shadow>
           </value>
         </block>
-        <block type="looks_size"></block>
-      </category>
-      <category name="Motion">
+        <block type="operator_equals">
+          <value name="OPERAND1">
+            <shadow type="text">
+              <field name="TEXT"></field>
+            </shadow>
+          </value>
+          <value name="OPERAND2">
+            <shadow type="text">
+              <field name="TEXT"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_gt">
+          <value name="OPERAND1">
+            <shadow type="text">
+              <field name="TEXT"></field>
+            </shadow>
+          </value>
+          <value name="OPERAND2">
+            <shadow type="text">
+              <field name="TEXT"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_and"></block>
+        <block type="operator_or"></block>
+        <block type="operator_not"></block>
+        <block type="operator_join">
+          <value name="STRING1">
+            <shadow type="text">
+              <field name="TEXT">hello</field>
+            </shadow>
+          </value>
+          <value name="STRING2">
+            <shadow type="text">
+              <field name="TEXT">world</field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_letter_of">
+          <value name="LETTER">
+            <shadow type="math_whole_number">
+              <field name="NUM">1</field>
+            </shadow>
+          </value>
+          <value name="STRING">
+            <shadow type="text">
+              <field name="TEXT">world</field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_length">
+          <value name="STRING">
+            <shadow type="text">
+              <field name="TEXT">world</field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_mod">
+          <value name="NUM1">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+          <value name="NUM2">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_round">
+          <value name="NUM">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+        </block>
+        <block type="operator_mathop">
+          <value name="OPERATOR">
+            <shadow type="operator_mathop_menu"></shadow>
+          </value>
+          <value name="NUM">
+            <shadow type="math_number">
+              <field name="NUM"></field>
+            </shadow>
+          </value>
+        </block>
+    </category>
+    <category name="Looks">
+      <block type="looks_sayforsecs">
+        <value name="MESSAGE">
+          <shadow type="text">
+            <field name="TEXT">Hello!</field>
+          </shadow>
+        </value>
+        <value name="SECS">
+          <shadow type="math_number">
+            <field name="NUM">2</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_say">
+        <value name="MESSAGE">
+          <shadow type="text">
+            <field name="TEXT">Hello!</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_thinkforsecs">
+        <value name="MESSAGE">
+          <shadow type="text">
+            <field name="TEXT">Hmm...</field>
+          </shadow>
+        </value>
+        <value name="SECS">
+          <shadow type="math_number">
+            <field name="NUM">2</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_think">
+        <value name="MESSAGE">
+          <shadow type="text">
+            <field name="TEXT">Hmm...</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_show"></block>
+      <block type="looks_hide"></block>
+      <block type="looks_changeeffectby">
+        <value name="EFFECT">
+          <shadow type="looks_effectmenu"></shadow>
+        </value>
+        <value name="CHANGE">
+          <shadow type="math_number">
+            <field name="NUM">10</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_seteffectto">
+        <value name="EFFECT">
+          <shadow type="looks_effectmenu"></shadow>
+        </value>
+        <value name="VALUE">
+          <shadow type="math_number">
+            <field name="NUM">10</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_cleargraphiceffects"></block>
+      <block type="looks_changesizeby">
+        <value name="CHANGE">
+          <shadow type="math_number">
+            <field name="NUM">10</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_setsizeto">
+        <value name="SIZE">
+          <shadow type="math_number">
+            <field name="NUM">100</field>
+          </shadow>
+        </value>
+      </block>
+      <block type="looks_size"></block>
+    </category>
+    <category name="Motion">
       <block type="motion_movesteps">
         <value name="STEPS">
           <shadow type="math_number">
@@ -332,6 +375,29 @@
           </shadow>
         </value>
       </block>
+      <block type="motion_goto">
+        <value name="TO">
+          <shadow type="motion_goto_menu">
+          </shadow>
+        </value>
+      </block>
+      <block type="motion_glidesecstoxy">
+        <value name="SECS">
+          <shadow type="math_number">
+            <field name="NUM">1</field>
+          </shadow>
+        </value>
+        <value name="X">
+          <shadow type="math_number">
+            <field name="NUM">0</field>
+          </shadow>
+        </value>
+        <value name="Y">
+          <shadow type="math_number">
+            <field name="NUM">0</field>
+          </shadow>
+        </value>
+      </block>
       <block type="motion_changexby">
         <value name="DX">
           <shadow type="math_number">
@@ -360,11 +426,17 @@
           </shadow>
         </value>
       </block>
+      <block type="motion_ifonedgebounce"></block>
+      <block type="motion_setrotationstyle">
+        <value name="STYLE">
+          <shadow type="motion_setrotationstyle_menu"></shadow>
+        </value>
+      </block>
       <block type="motion_xposition"></block>
       <block type="motion_yposition"></block>
       <block type="motion_direction"></block>
     </category>
-    </xml>
+  </xml>
 
     <!-- Syntax highlighter -->
     <script src="../node_modules/highlightjs/highlight.pack.min.js"></script>