diff --git a/src/lib/blocks.js b/src/lib/blocks.js
index f86f5e29f40..db74aa619df 100644
--- a/src/lib/blocks.js
+++ b/src/lib/blocks.js
@@ -149,6 +149,20 @@ export default function (vm) {
         return sprites;
     };
 
+    const allSpritesMenu = function () {
+        const sprites = [];
+        for (const targetId in vm.runtime.targets) {
+            if (!Object.prototype.hasOwnProperty.call(vm.runtime.targets, targetId)) continue;
+            if (vm.runtime.targets[targetId].isOriginal) {
+                if (!vm.runtime.targets[targetId].isStage) {
+                    sprites.push([vm.runtime.targets[targetId].sprite.name, vm.runtime.targets[targetId].sprite.name]);
+                }
+            }
+        }
+        if (sprites.length === 0) return [['', '']];
+        return sprites;
+    };
+
     const cloneMenu = function () {
         if (vm.editingTarget && vm.editingTarget.isStage) {
             const menu = spriteMenu();
@@ -391,6 +405,11 @@ export default function (vm) {
         this.jsonInit(json);
     };
 
+    ScratchBlocks.Blocks.sensing_sprites.init = function () {
+        const json = jsonForMenuBlock('SPRITE', allSpritesMenu, ScratchBlocks.Colours.sensing, []);
+        this.jsonInit(json);
+    };
+
     ScratchBlocks.Blocks.sensing_touchingobjectmenu.init = function () {
         const mouse = ScratchBlocks.ScratchMsgs.translate('SENSING_TOUCHINGOBJECT_POINTER', 'mouse-pointer');
         const edge = ScratchBlocks.ScratchMsgs.translate('SENSING_TOUCHINGOBJECT_EDGE', 'edge');
diff --git a/src/lib/make-toolbox-xml.js b/src/lib/make-toolbox-xml.js
index 67e3506a482..69da9535ff4 100644
--- a/src/lib/make-toolbox-xml.js
+++ b/src/lib/make-toolbox-xml.js
@@ -279,6 +279,8 @@ const looks = function (isInitialSetup, isStage, targetId, costumeName, backdrop
                     </shadow>
                 </value>
             </block>
+            ${blockSeparator}
+            <block type="looks_backdrops" />
         ` : `
             <block id="${targetId}_switchcostumeto" type="looks_switchcostumeto">
                 <value name="COSTUME">
@@ -310,6 +312,9 @@ const looks = function (isInitialSetup, isStage, targetId, costumeName, backdrop
                 </value>
             </block>
             ${blockSeparator}
+            <block type="looks_costume" />
+            <block type="looks_backdrops" />
+            ${blockSeparator}
             <block type="looks_changesizeby">
                 <value name="CHANGE">
                     <shadow type="math_number">
@@ -526,6 +531,8 @@ const sound = function (isInitialSetup, isStage, targetId, soundName, colour) {
                 </shadow>
             </value>
         </block>
+        ${blockSeparator}
+        <block type="sound_sounds_menu" />
         ${categorySeparator}
     </category>
     `;
@@ -575,6 +582,7 @@ const events = function (isInitialSetup, isStage, targetId, colour) {
               <shadow type="event_broadcast_menu"></shadow>
             </value>
         </block>
+        <block type="event_broadcast_menu" />
         ${categorySeparator}
     </category>
     `;
@@ -924,13 +932,14 @@ const sensing = function (isInitialSetup, isStage, targetId, colour) {
                 <shadow type="text" />
             </value>
         </block>
+        <block type="sensing_sprites" />
         ${blockSeparator}
         <block id="current" type="sensing_current"/>
         <block type="sensing_dayssince2000"/>
         ${blockSeparator}
         <block type="sensing_username"/>
-        <block id="online" type="sensing_online"/>
         <block type="sensing_loggedin"/>
+        <block id="online" type="sensing_online"/>
         ${categorySeparator}
     </category>
     `;
@@ -1229,6 +1238,7 @@ const operators = function (isInitialSetup, isStage, targetId, colour) {
                 </shadow>
             </value>
         </block>
+        <block type="operator_constant" />
         ${blockSeparator}
         <block type="operator_distanceTo">
             <value name="x1">