diff --git a/pxtarget.json b/pxtarget.json
index 8a21111ec35..964af8816f0 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -522,15 +522,7 @@
         "emptyRunCode": "pxsim.pxtcore.updateScreen(new pxsim.RefImage(160, 120, 4))",
         "aspectRatio": 0.85,
         "dynamicBoardDefinition": true,
-        "keymap": true,
-        "messageSimulators": {
-            "jacdac": {
-                "url": "https://microsoft.github.io/jacdac-docs/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$",
-                "localHostUrl": "http://localhost:8000/tools/makecode-sim?webusb=0&parentOrigin=$PARENT_ORIGIN$",
-                "aspectRatio": "0.89",
-                "permanent": true
-            }
-        }
+        "keymap": true
     },
     "appTheme": {
         "logoUrl": "https://makecode.com/org",
diff --git a/targetconfig.json b/targetconfig.json
index 088e159446b..263b7e3e049 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -16,6 +16,7 @@
             "microsoft/pxt-tilemaps",
             "microsoft/pxt-skillmap-sample",
             "microsoft/pxt-jacdac",
+            "jacdac/pxt-jacdac",
             "mr-coxall/turtle-logo",
             "microsoft/arcade-storytelling",
             "microsoft/arcade-background-scroll",
@@ -95,7 +96,16 @@
             },
             "microsoft/pxt-skillmap-sample": {},
             "microsoft/pxt-jacdac": {
-                "tags": [ "Hardware" ]
+                "tags": [ "Hardware" ],
+                "upgrades": [ "move:jacdac/pxt-jacdac" ],
+                "hidden": true
+            },
+            "jacdac/pxt-jacdac": {
+                "tags": [ "Hardware" ],
+                "simx": {
+                    "sha": "80d8581b59c501e4cdfaf8ec84e00682264dd9f6",
+                    "devUrl": "https://jacdac.github.io/jacdac-docs/tools/makecode-sim/"
+                }
             },
             "microsoft/arcade-storytelling": {
                 "preferred": true,
@@ -198,10 +208,7 @@
         "upgrades": {
             "microsoft/pxt-tilemaps": "min:v1.8.1",
             "microsoft/arcade-sprite-data": "min:v0.0.6"
-        },
-        "approvedEditorExtensionUrls": [
-            "https://microsoft.github.io/jacdac-docs/tools/makecode-editor-extension"
-        ]
+        }
     },
     "shareLinks": {
         "approved": [
@@ -286,6 +293,13 @@
             "url": "https://shop.elecfreaks.com/products/elecfreaks-retro-makecode-arcade-for-education",
             "variant": "hw---stm32f401"
         },
+        {
+            "name": "micro:bit Retro Shield",
+            "description": "Use the micro:bit with an expansion board from Elecfreaks",
+            "imageUrl": "/static/hardware/retro-shield.jpg",
+            "url": "https://shop.elecfreaks.com/products/micro-bit-retro-programming-arcade",
+            "variant": "hw---n3"
+        },
         {
             "name": "TinkerGen GameGo",
             "description": "A fun-sized console to play the games you code.",
@@ -293,6 +307,13 @@
             "url": "https://www.tinkergen.com/gamego",
             "variant": "hw---stm32f401"
         },
+        {
+            "name": "Kitronik ARCADE",
+            "description": "ARCADE is a programmable gamepad for use with MakeCode Arcade.",
+            "imageUrl": "/static/hardware/kitronik.jpg",
+            "url": "https://www.kitronik.co.uk/arcade",
+            "variant": "hw---samd51"
+        },
         {
             "name": "MRT Game Maker Kit",
             "description": " Sleek hand-held game device with a hard case and a USB-C port.",
@@ -301,12 +322,12 @@
             "variant": "hw---stm32f401"
         },
         {
-            "name": "Kitronik ARCADE",
-            "description": "ARCADE is a programmable gamepad for use with MakeCode Arcade.",
-            "imageUrl": "/static/hardware/kitronik.jpg",
-            "url": "https://www.kitronik.co.uk/arcade",
-            "variant": "hw---samd51"
-        },
+            "name": "Kitronik Arcade for micro:bit",
+            "description": "Use the micro:bit with an expansion board from Kitronik",
+            "imageUrl": "/static/hardware/kitronik-shield.png",
+            "url": "https://kitronik.co.uk/56116",
+            "variant": "hw---n3"
+        }
         {
             "name": "Adafruit PyBadge",
             "description": "It's a badge, it's an arcade, it's a PyBadge",
@@ -356,26 +377,12 @@
             "url": "https://www.kittenbot.cc/products/newbit-arcade-shield",
             "variant": "hw---n3"
         },
-        {
-            "name": "micro:bit Retro Shield",
-            "description": "Use the micro:bit with an expansion board from Elecfreaks",
-            "imageUrl": "/static/hardware/retro-shield.jpg",
-            "url": "https://shop.elecfreaks.com/products/micro-bit-retro-programming-arcade",
-            "variant": "hw---n3"
-        },
         {
             "name": "micro:bit Game:Bit Shield",
             "description": "Use the micro:bit with an expansion board from iCShop",
             "imageUrl": "/static/hardware/bit-shield.png",
             "url": "https://www.icshop.com.tw/products/368112100137?locale=en",
             "variant": "hw---n3"
-        },
-        {
-            "name": "Kitronik Arcade for micro:bit",
-            "description": "Use the micro:bit with an expansion board from Kitronik",
-            "imageUrl": "/static/hardware/kitronik-shield.png",
-            "url": "https://kitronik.co.uk/56116",
-            "variant": "hw---n3"
         }
     ],
     "galleries": {