diff --git a/docs/alpha-ref.json b/docs/alpha-ref.json
index 58f715cc1..b2abd85dc 100644
--- a/docs/alpha-ref.json
+++ b/docs/alpha-ref.json
@@ -1,3 +1,3 @@
 {
     "appref": "v"
-}
+}
\ No newline at end of file
diff --git a/docs/calliope/firststeps.md b/docs/calliope/firststeps.md
index fad0b9c07..fc3d397bc 100644
--- a/docs/calliope/firststeps.md
+++ b/docs/calliope/firststeps.md
@@ -10,8 +10,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Get Ready",
   "url":"/calliope/firststeps/firstSteps",
   "description": "Find out how to start working with the Calliope mini",
-  "imageUrl": "/calliope/firststeps/connecting.jpg",
-  "largeImageUrl": "/calliope/firststeps/firstSteps.jpg",
+  "imageUrl": "/static/calliope/firststeps/connecting.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/firstSteps.jpg",
   "cardType": "tutorial",
   "label": "Never seen a mini? Start Here!",
   "labelClass": "green small ribbon"
@@ -20,8 +20,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "The 5x5 LED matrix",
   "url":"/calliope/firststeps/5x5LED",
   "description": "Learn how to create and show images, numbers or letters on the LED matrix",
-  "imageUrl": "/calliope/firststeps/5x5LED.jpg",
-  "largeImageUrl": "/calliope/firststeps/5x5LED_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/5x5LED.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/5x5LED_L.jpg",
   "cardType": "tutorial",
   "label": "New? Start Here!",
   "labelClass": "yellow small ribbon"
@@ -30,8 +30,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Radio",
   "url":"/calliope/firststeps/Radio",
   "description": "Find out how to use the radion function and how to send messages from one Calliope mini to another one",
-  "imageUrl": "/calliope/firststeps/Radio.jpg",
-  "largeImageUrl": "/calliope/firststeps/Radio_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Radio.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Radio_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "orange small ribbon"
@@ -40,8 +40,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Loops",
   "url":"/calliope/firststeps/Loops",
   "description": "Loops are important to be able to execute program instructions multiple times",
-  "imageUrl": "/calliope/firststeps/Loops.jpg",
-  "largeImageUrl": "/calliope/firststeps/Loops_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Loops.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Loops_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -50,8 +50,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Mathematics",
   "url":"/calliope/firststeps/Mathematics",
   "description": "The Calliope mini can become your little math helper",
-  "imageUrl": "/calliope/firststeps/Mathematics.jpg",
-  "largeImageUrl": "/calliope/firststeps/Mathematics_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Mathematics.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Mathematics_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -60,8 +60,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Inputs",
   "url":"/calliope/firststeps/Inputs",
   "description": "Use conditions for different actions",
-  "imageUrl": "/calliope/firststeps/Inputs.jpg",
-  "largeImageUrl": "/calliope/firststeps/Inputs_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Inputs.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Inputs_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -70,8 +70,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Sensors",
   "url":"/calliope/firststeps/Sensors",
   "description": "Measure temperature, light and orientation",
-  "imageUrl": "/calliope/firststeps/Sensors.jpg",
-  "largeImageUrl": "/calliope/firststeps/Sensors_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Sensors.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Sensors_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -80,8 +80,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Output",
   "url":"/calliope/firststeps/Output",
   "description": "Audio, light and motion",
-  "imageUrl": "/calliope/firststeps/Output.jpg",
-  "largeImageUrl": "/calliope/firststeps/Output_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Output.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Output_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -90,8 +90,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Decisions",
   "url":"/calliope/firststeps/Decisions",
   "description": "If..., then it happens... or it happens...",
-  "imageUrl": "/calliope/firststeps/Decisions.jpg",
-  "largeImageUrl": "/calliope/firststeps/Decisions_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Decisions.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Decisions_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
@@ -100,8 +100,8 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Variables",
   "url":"/calliope/firststeps/Variables",
   "description": "A variable is not a static value, it’s what you determine it to be.",
-  "imageUrl": "/calliope/firststeps/Variables.jpg",
-  "largeImageUrl": "/calliope/firststeps/Variables_L.jpg",
+  "imageUrl": "/static/calliope/firststeps/Variables.jpg",
+  "largeImageUrl": "/static/calliope/firststeps/Variables_L.jpg",
   "cardType": "tutorial",
   "label": "",
   "labelClass": "green small ribbon"
diff --git a/docs/calliope/firststeps/firstSteps.md b/docs/calliope/firststeps/firstSteps.md
index 2a12fc839..936947370 100644
--- a/docs/calliope/firststeps/firstSteps.md
+++ b/docs/calliope/firststeps/firstSteps.md
@@ -14,7 +14,7 @@ For example drag and drop some blocks and try your program on the Simulator with
 
 Click the Download button in the editor. This will download a 'hex' file, which is a compact format of your program that your mini can read. Once the file has been downloaded, just copy it to your Calliope mini just like copying a file to a USB stick.
 
-![Connecting Image](/calliope/firststeps/connecting.jpg)
+![Connecting Image](/static/calliope/firststeps/connecting.jpg)
 
 
 ## Introduction @unplugged
@@ -32,7 +32,7 @@ Be careful to insure that the ridge on the plug is facing upwards.
 
 If the plug slides easily into the socket then you are attaching it correctly. Otherwise, turn the plug round and re-insert it into the socket. Slide it to "on“ and your Calliope mini is powered by the batteries.
 
-![Powering Image](/calliope/firststeps/powerItUp.png)
+![Powering Image](/static/calliope/firststeps/powerItUp.png)
 
 
 ## Introduction @unplugged
diff --git a/docs/calliope/links.md b/docs/calliope/links.md
index 40bb6eee6..bfde38c3e 100644
--- a/docs/calliope/links.md
+++ b/docs/calliope/links.md
@@ -10,7 +10,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Shop",
   "url":"https://shop.calliope.cc",
   "description": "You can get the mini at the official calliope store.",
-  "imageUrl": "/calliope/links/thumbnail_shop.gif",
+  "imageUrl": "/static/calliope/links/thumbnail_shop.gif",
   "largeImageUrl": "",
   "label": "",
   "buttonLabel": "Open Calliope Shop",
@@ -19,7 +19,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Projects",
   "url":"https://calliope.cc/en/projekte",
   "description": "A collection of calliope mini projects",
-  "imageUrl": "/calliope/links/thumbnail_projects.gif",
+  "imageUrl": "/static/calliope/links/thumbnail_projects.gif",
   "largeImageUrl": "",
   "label": "",
   "buttonLabel": "View Projects",
@@ -28,7 +28,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Teaching materials",
   "url":"https://calliope.cc/schulen/schulmaterial",
   "description": "",
-  "imageUrl": "/calliope/links/thumbnail_didactic_material.gif",
+  "imageUrl": "/static/calliope/links/thumbnail_didactic_material.gif",
   "largeImageUrl": "",
   "label": "",
   "buttonLabel": "View",
@@ -37,7 +37,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Tools",
   "url":"https://calliope.cc/programmieren/tools",
   "description": "",
-  "imageUrl": "/calliope/links/thumbnail_screenshots.gif",
+  "imageUrl": "/static/calliope/links/thumbnail_screenshots.gif",
   "largeImageUrl": "",
   "label": "",
   "buttonLabel": "View",
@@ -46,7 +46,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Forum",
   "url":"https://forum.calliope.cc",
   "description": "Be a part of our comunity",
-  "imageUrl": "/calliope/links/thumbnail_community.gif",
+  "imageUrl": "/static/calliope/links/thumbnail_community.gif",
   "largeImageUrl": "",
   "label": "",
   "buttonLabel": "Open Forum",
diff --git a/docs/calliope/templates.md b/docs/calliope/templates.md
index d1403f8a1..3de6d1211 100644
--- a/docs/calliope/templates.md
+++ b/docs/calliope/templates.md
@@ -10,16 +10,16 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Calliope mini 2.x",
   "url":"_f7ACuxgaocvr",
   "description": "The Calliope mini 2.0 and newer has a larger memory than the previous versions. If you use this template for your project, you can make the most of all the features on your Calliope mini!",
-  "imageUrl": "/calliope/templates/32KB.png",
-  "largeImageUrl": "/calliope/templates/32KB_L.png",
+  "imageUrl": "/static/calliope/templates/32KB.png",
+  "largeImageUrl": "/static/calliope/templates/32KB_L.png",
   "cardType": "sharedExample",
   "buttonLabel": "New project"
 },{
   "name": "Calliope mini 1.x",
   "url":"_7YbU6iMhoTdR",
   "description": "This template is designed for all Calliope mini, but especially for those up to version 1.3. If you have such a Calliope mini or an earlier version, you can start directly with this template.",
-  "imageUrl": "/calliope/templates/16KB.png",
-  "largeImageUrl": "/calliope/templates/16KB_L.png",
+  "imageUrl": "/static/calliope/templates/16KB.png",
+  "largeImageUrl": "/static/calliope/templates/16KB_L.png",
   "cardType": "sharedExample",
   "buttonLabel": "New project"
 }
diff --git a/docs/calliope/tutorials.md b/docs/calliope/tutorials.md
index 7d6ba78c8..1ac8d2d8a 100644
--- a/docs/calliope/tutorials.md
+++ b/docs/calliope/tutorials.md
@@ -9,7 +9,7 @@ Here are some cool tutorials to get you started with your @boardname@!
   "name": "Flashing Heart",
   "url":"/projects/flashing-heart",
   "description": "Make an animated flashing heart.",
-  "imageUrl": "/calliope/tutorials/01_flashing_heart.gif",
+  "imageUrl": "/static/calliope/tutorials/01_flashing_heart.gif",
   "largeImageUrl": "",
   "cardType": "tutorial",
   "label": "",
@@ -17,57 +17,39 @@ Here are some cool tutorials to get you started with your @boardname@!
 }, {
   "name": "Name Tag",
   "description": "Scroll your name on the screen",
-  "imageUrl": "/calliope/tutorials/02_nametag.gif",
+  "imageUrl": "/static/calliope/tutorials/02_nametag.gif",
   "url": "/projects/name-tag",
   "cardType": "tutorial"
 }, {
   "name": "Smiley Buttons",
   "url":"/projects/smiley-buttons",
   "description": "Show different smiley images by pressing the buttons.",
-  "imageUrl": "/calliope/tutorials/03_smiley_button.gif",
+  "imageUrl": "/static/calliope/tutorials/03_smiley_button.gif",
   "largeImageUrl": "",
   "cardType": "tutorial"
 }, {
   "name": "Dice",
   "url":"/projects/dice",
   "description": "Shake the dice and see what number comes up!",
-  "imageUrl": "/calliope/tutorials/04_dice.gif",
+  "imageUrl": "/static/calliope/tutorials/04_dice.gif",
   "cardType": "tutorial"
 }, {
   "name": "Love Meter",
   "url":"/projects/love-meter",
   "description": "The @boardname@ is feeling the love, see how much!",
-  "imageUrl":"/calliope/tutorials/05_love_meter.gif",
-  "cardType": "tutorial"
-}, {
-  "name": "Mini Chat",
-  "url":"/projects/mini-chat",
-  "description": "Build your own social network made of minis.",
-  "imageUrl": "/calliope/tutorials/06_mini_chat.gif",
+  "imageUrl":"/static/calliope/tutorials/05_love_meter.gif",
   "cardType": "tutorial"
 }, {
   "name": "Rock Paper Scissors",
   "url":"/projects/rock-paper-scissors",
   "description": "Make the Rock-Paper-Scissors game on your @boardname@ and challenge your friends.",
-  "imageUrl":"/calliope/tutorials/07_stone_paper_scissors.gif",
+  "imageUrl":"/static/calliope/tutorials/07_stone_paper_scissors.gif",
   "cardType": "tutorial"
 }, {
   "name": "Coin Flipper",
   "url":"/projects/coin-flipper",
   "description": "Guess the coin toss and see if you're lucky.",
-  "imageUrl": "/calliope/tutorials/08_coin_flipper.gif",
-  "cardType": "tutorial"
-}, {
-  "name": "Snap the dot",
-  "url": "/projects/snap-the-dot",
-  "description": "Use the game blocks to create a skill game",
-  "imageUrl": "/calliope/tutorials/09_snap_the_dot.gif",
-  "cardType": "tutorial"
-}, {
-  "name": "Multi Dice",
-  "url": "/projects/multi-dice",
-  "description": "Compete with multiple dices",
-  "imageUrl": "/calliope/tutorials/10_multi_dice.gif",
+  "imageUrl": "/static/calliope/tutorials/08_coin_flipper.gif",
   "cardType": "tutorial"
 }
 ]
diff --git a/docs/index-ref.json b/docs/index-ref.json
index f06a1286a..aa455ccd8 100644
--- a/docs/index-ref.json
+++ b/docs/index-ref.json
@@ -1,3 +1,3 @@
 {
-    "appref": "v6.0.27"
+    "appref": "v6.0.28"
 }
diff --git a/docs/projects.md b/docs/projects.md
index c7638eed7..ea2ebe604 100644
--- a/docs/projects.md
+++ b/docs/projects.md
@@ -5,12 +5,12 @@
     {
         "name": "Tutorials",
         "url": "/calliope/tutorials",
-        "imageUrl": "/calliope/tutorials/01_flashing_heart.gif"
+        "imageUrl": "/static/calliope/tutorials/01_flashing_heart.gif"
     },
     {
         "name": "Calliope Links",
         "url": "/calliope/links",
-        "imageUrl": "/calliope/links/thumbnail_shop.gif"
+        "imageUrl": "/static/calliope/links/thumbnail_shop.gif"
     }
 ]
 ```
diff --git a/docs/projects/SUMMARY.md b/docs/projects/SUMMARY.md
index 38f34207b..682538592 100644
--- a/docs/projects/SUMMARY.md
+++ b/docs/projects/SUMMARY.md
@@ -6,11 +6,8 @@
   * [Smiley Buttons](/projects/smiley-buttons)
   * [Dice](/projects/dice)
   * [Love Meter](/projects/love-meter)
-  * [Mini Chat](/projects/mini-chat)
   * [Rock Paper Scissors](/projects/rock-paper-scissors)
   * [Coin Flipper](/projects/coin-flipper)
-  * [Snap the dot](/projects/snap-the-dot)
-  * [Multi Dice](/projects/multi-dice)
 * [Calliope Links](/calliope/links)
   * [Shop](https://shop.calliope.cc)
   * [Projects](https://calliope.cc/en/projekte)
diff --git a/docs/projects/coin-flipper.md b/docs/projects/coin-flipper.md
index bd4051701..821daa83e 100644
--- a/docs/projects/coin-flipper.md
+++ b/docs/projects/coin-flipper.md
@@ -4,7 +4,7 @@
 
 Let's create a coin flipping program to simulate a real coin toss. We'll use icon images to represent a ``heads`` or ``tails`` result.
 
-![Simulating coin toss](/calliope/tutorials/08_coin_flipper_animation.gif)
+![Simulating coin toss](/static/calliope/tutorials/08_coin_flipper_animation.gif)
 
 ## Step 1
 
diff --git a/docs/projects/dice.md b/docs/projects/dice.md
index 251e44c92..34f3afc0a 100644
--- a/docs/projects/dice.md
+++ b/docs/projects/dice.md
@@ -5,7 +5,7 @@
 Let's turn the @boardname@ into a dice!
 (Want to learn how the accelerometer works? [Watch this video](https://youtu.be/byngcwjO51U)).
 
-![A mini dice](/calliope/tutorials/04_dice_animation.gif)
+![A mini dice](/static/calliope/tutorials/04_dice_animation.gif)
 
 ## Step 1 @fullscreen
 
diff --git a/docs/projects/flashing-heart.md b/docs/projects/flashing-heart.md
index 7452436c3..fe1e7def9 100644
--- a/docs/projects/flashing-heart.md
+++ b/docs/projects/flashing-heart.md
@@ -6,13 +6,13 @@ Learn how to use the LEDs and make a flashing heart!
 (Want to learn how lights work? [Watch this video](https://youtu.be/qqBmvHD5bCw)).
 
 
-![Heart shape in the LEDs](/calliope/tutorials/01_flashing_heart_animation.gif)
+![Heart shape in the LEDs](/static/calliope/tutorials/01_flashing_heart_animation.gif)
 
 ## Step 1 @fullscreen
 
 Place the ``||basic:show leds||`` block in the ``||basic:forever||`` block and draw a heart.
 
-![An animation that shows how to drag a block and paint a heart](/calliope/tutorials/add_show_led.gif)
+![An animation that shows how to drag a block and paint a heart](/static/calliope/tutorials/add_show_led.gif)
 
 ## Step 2 @fullscreen
 
@@ -39,7 +39,7 @@ basic.forever(function() {
 
 Look at the virtual @boardname@, you should see the heart and your drawing blink on the screen.
 
-![Heart shape in the LEDs](/calliope/tutorials/01_flashing_heart_animation.gif)
+![Heart shape in the LEDs](/static/calliope/tutorials/01_flashing_heart_animation.gif)
 
 ## Step 4 @fullscreen
 
diff --git a/docs/projects/love-meter.md b/docs/projects/love-meter.md
index c0a429f9b..4722aab39 100644
--- a/docs/projects/love-meter.md
+++ b/docs/projects/love-meter.md
@@ -4,7 +4,7 @@
 
 Make a love meter, how sweet! The @boardname@ is feeling the love, then sometimes not so much!
 
-![Love meter banner message](/calliope/tutorials/05_love_meter_animation.gif)
+![Love meter banner message](/static/calliope/tutorials/05_love_meter_animation.gif)
 
 ## Step 1
 
@@ -42,7 +42,3 @@ input.onPinTouchEvent(TouchPin.P0, input.buttonEventValue(ButtonEvent.Down), ()
 ## Step 5
 
 Click ``|Download|`` to transfer your code in your @boardname@. Hold the **GND** pin with one hand and press pin **0** with the other hand to trigger this code.
-
-```template
-input.onPinPressed(TouchPin.P0, function() {})
-```
diff --git a/docs/projects/mini-chat.md b/docs/projects/mini-chat.md
index 5f7d19ad9..deae3568f 100644
--- a/docs/projects/mini-chat.md
+++ b/docs/projects/mini-chat.md
@@ -2,7 +2,7 @@
 
 ## {Introduction @unplugged}
 
-![Two @boardname@ connected via radio](/calliope/tutorials/06_mini_chat_animation.gif)
+![Two @boardname@ connected via radio](/static/calliope/tutorials/06_mini_chat_animation.gif)
 
 Use the Calliope mini 📻 radio to send and receive 💬 messages between Calliope minis!
 
diff --git a/docs/projects/multi-dice.md b/docs/projects/multi-dice.md
index ce42b85b6..fc9826916 100644
--- a/docs/projects/multi-dice.md
+++ b/docs/projects/multi-dice.md
@@ -2,7 +2,7 @@
 
 ## {Introduction @unplugged}
 
-![Multiple @boardname@ throwing a dice](/calliope/tutorials/10_multi_dice_animation.gif)
+![Multiple @boardname@ throwing a dice](/static/calliope/tutorials/10_multi_dice_animation.gif)
 
 Build a multi-player dice game using the **radio**. The **radio** blocks let you send wireless messages between a @boardname@ and another @boardname@.
 
diff --git a/docs/projects/name-tag.md b/docs/projects/name-tag.md
index 853a087ca..8187a77d1 100644
--- a/docs/projects/name-tag.md
+++ b/docs/projects/name-tag.md
@@ -4,7 +4,7 @@
 
 Tell everyone who you are. Show you name on the LEDs.
 
-![Name scrolling on the LEDs](/calliope/tutorials/02_nametag_animation.gif)
+![Name scrolling on the LEDs](/static/calliope/tutorials/02_nametag_animation.gif)
 
 ## Step 1
 
@@ -20,7 +20,7 @@ basic.forever(() => {
 
 Look at the simulator and make sure it shows your name on the screen.
 
-![Name scrolling on the LEDs](/calliope/tutorials/02_nametag_animation.gif)
+![Name scrolling on the LEDs](/static/calliope/tutorials/02_nametag_animation.gif)
 
 
 Place more ``||basic:show string||`` blocks to create your own story.
diff --git a/docs/projects/rock-paper-scissors.md b/docs/projects/rock-paper-scissors.md
index 8c6377a09..cbf7beef9 100644
--- a/docs/projects/rock-paper-scissors.md
+++ b/docs/projects/rock-paper-scissors.md
@@ -2,7 +2,7 @@
 
 ## {Introduction @unplugged}
 
-![Animation of the Rock Paper Scissors game](/calliope/tutorials/07_stone_paper_scissors_animation.gif)
+![Animation of the Rock Paper Scissors game](/static/calliope/tutorials/07_stone_paper_scissors_animation.gif)
 
 Turn your Calliope mini into a **Rock Paper Scissors** game that you can play with your friends!
 
diff --git a/docs/projects/smiley-buttons.md b/docs/projects/smiley-buttons.md
index 1fa05ddcd..d5bff525c 100644
--- a/docs/projects/smiley-buttons.md
+++ b/docs/projects/smiley-buttons.md
@@ -5,7 +5,7 @@
 Code the buttons on the @boardname@ to show that it's happy or sad.
 (Want to learn how the buttons works? [Watch this video](https://youtu.be/t_Qujjd_38o)).
 
-![Pressing the A and B buttons](/calliope/tutorials/03_smiley_button_animation.gif)
+![Pressing the A and B buttons](/static/calliope/tutorials/03_smiley_button_animation.gif)
 
 ## Step 1 @fullscreen
 
@@ -80,5 +80,5 @@ If you have a @boardname@, connect it to USB and click ``|Download|`` to transfe
 Nice! Now go and show it off to your friends!
 
 ```template
-input.onButtonPressed(Button.A, function() {})
+//
 ```
\ No newline at end of file
diff --git a/docs/projects/snap-the-dot.md b/docs/projects/snap-the-dot.md
index 5856d9462..8cb575604 100644
--- a/docs/projects/snap-the-dot.md
+++ b/docs/projects/snap-the-dot.md
@@ -2,7 +2,7 @@
 
 ## Introduction @unplugged
 
-![Animation of the snap the dot game](/calliope/tutorials/09_snap_the_dot_animation.gif)
+![Animation of the snap the dot game](/static/calliope/tutorials/09_snap_the_dot_animation.gif)
 
 Snap the dot is a game of skill where the player has to press **A** exactly when the dot reaches the center of the screen.
 
diff --git a/docs/calliope/experiment/remoteCar.jpg b/docs/static/calliope/experiment/remoteCar.jpg
similarity index 100%
rename from docs/calliope/experiment/remoteCar.jpg
rename to docs/static/calliope/experiment/remoteCar.jpg
diff --git a/docs/calliope/experiment/remoteCar_L.jpg b/docs/static/calliope/experiment/remoteCar_L.jpg
similarity index 100%
rename from docs/calliope/experiment/remoteCar_L.jpg
rename to docs/static/calliope/experiment/remoteCar_L.jpg
diff --git a/docs/calliope/firststeps/5x5LED.jpg b/docs/static/calliope/firststeps/5x5LED.jpg
similarity index 100%
rename from docs/calliope/firststeps/5x5LED.jpg
rename to docs/static/calliope/firststeps/5x5LED.jpg
diff --git a/docs/calliope/firststeps/5x5LED_L.jpg b/docs/static/calliope/firststeps/5x5LED_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/5x5LED_L.jpg
rename to docs/static/calliope/firststeps/5x5LED_L.jpg
diff --git a/docs/calliope/firststeps/Decisions.jpg b/docs/static/calliope/firststeps/Decisions.jpg
similarity index 100%
rename from docs/calliope/firststeps/Decisions.jpg
rename to docs/static/calliope/firststeps/Decisions.jpg
diff --git a/docs/calliope/firststeps/Decisions_L.jpg b/docs/static/calliope/firststeps/Decisions_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Decisions_L.jpg
rename to docs/static/calliope/firststeps/Decisions_L.jpg
diff --git a/docs/calliope/firststeps/Inputs.jpg b/docs/static/calliope/firststeps/Inputs.jpg
similarity index 100%
rename from docs/calliope/firststeps/Inputs.jpg
rename to docs/static/calliope/firststeps/Inputs.jpg
diff --git a/docs/calliope/firststeps/Inputs_L.jpg b/docs/static/calliope/firststeps/Inputs_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Inputs_L.jpg
rename to docs/static/calliope/firststeps/Inputs_L.jpg
diff --git a/docs/calliope/firststeps/Loops.jpg b/docs/static/calliope/firststeps/Loops.jpg
similarity index 100%
rename from docs/calliope/firststeps/Loops.jpg
rename to docs/static/calliope/firststeps/Loops.jpg
diff --git a/docs/calliope/firststeps/Loops_L.jpg b/docs/static/calliope/firststeps/Loops_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Loops_L.jpg
rename to docs/static/calliope/firststeps/Loops_L.jpg
diff --git a/docs/calliope/firststeps/Mathematics.jpg b/docs/static/calliope/firststeps/Mathematics.jpg
similarity index 100%
rename from docs/calliope/firststeps/Mathematics.jpg
rename to docs/static/calliope/firststeps/Mathematics.jpg
diff --git a/docs/calliope/firststeps/Mathematics_L.jpg b/docs/static/calliope/firststeps/Mathematics_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Mathematics_L.jpg
rename to docs/static/calliope/firststeps/Mathematics_L.jpg
diff --git a/docs/calliope/firststeps/Output.jpg b/docs/static/calliope/firststeps/Output.jpg
similarity index 100%
rename from docs/calliope/firststeps/Output.jpg
rename to docs/static/calliope/firststeps/Output.jpg
diff --git a/docs/calliope/firststeps/Output_L.jpg b/docs/static/calliope/firststeps/Output_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Output_L.jpg
rename to docs/static/calliope/firststeps/Output_L.jpg
diff --git a/docs/calliope/firststeps/Radio.jpg b/docs/static/calliope/firststeps/Radio.jpg
similarity index 100%
rename from docs/calliope/firststeps/Radio.jpg
rename to docs/static/calliope/firststeps/Radio.jpg
diff --git a/docs/calliope/firststeps/Radio_L.jpg b/docs/static/calliope/firststeps/Radio_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Radio_L.jpg
rename to docs/static/calliope/firststeps/Radio_L.jpg
diff --git a/docs/calliope/firststeps/Sensors.jpg b/docs/static/calliope/firststeps/Sensors.jpg
similarity index 100%
rename from docs/calliope/firststeps/Sensors.jpg
rename to docs/static/calliope/firststeps/Sensors.jpg
diff --git a/docs/calliope/firststeps/Sensors_L.jpg b/docs/static/calliope/firststeps/Sensors_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Sensors_L.jpg
rename to docs/static/calliope/firststeps/Sensors_L.jpg
diff --git a/docs/calliope/firststeps/Variables.jpg b/docs/static/calliope/firststeps/Variables.jpg
similarity index 100%
rename from docs/calliope/firststeps/Variables.jpg
rename to docs/static/calliope/firststeps/Variables.jpg
diff --git a/docs/calliope/firststeps/Variables_L.jpg b/docs/static/calliope/firststeps/Variables_L.jpg
similarity index 100%
rename from docs/calliope/firststeps/Variables_L.jpg
rename to docs/static/calliope/firststeps/Variables_L.jpg
diff --git a/docs/calliope/firststeps/connecting.jpg b/docs/static/calliope/firststeps/connecting.jpg
similarity index 100%
rename from docs/calliope/firststeps/connecting.jpg
rename to docs/static/calliope/firststeps/connecting.jpg
diff --git a/docs/calliope/firststeps/firstSteps.jpg b/docs/static/calliope/firststeps/firstSteps.jpg
similarity index 100%
rename from docs/calliope/firststeps/firstSteps.jpg
rename to docs/static/calliope/firststeps/firstSteps.jpg
diff --git a/docs/calliope/firststeps/powerItUp.png b/docs/static/calliope/firststeps/powerItUp.png
similarity index 100%
rename from docs/calliope/firststeps/powerItUp.png
rename to docs/static/calliope/firststeps/powerItUp.png
diff --git a/docs/calliope/links/thumbnail_community.gif b/docs/static/calliope/links/thumbnail_community.gif
similarity index 100%
rename from docs/calliope/links/thumbnail_community.gif
rename to docs/static/calliope/links/thumbnail_community.gif
diff --git a/docs/calliope/links/thumbnail_didactic_material.gif b/docs/static/calliope/links/thumbnail_didactic_material.gif
similarity index 100%
rename from docs/calliope/links/thumbnail_didactic_material.gif
rename to docs/static/calliope/links/thumbnail_didactic_material.gif
diff --git a/docs/calliope/links/thumbnail_projects.gif b/docs/static/calliope/links/thumbnail_projects.gif
similarity index 100%
rename from docs/calliope/links/thumbnail_projects.gif
rename to docs/static/calliope/links/thumbnail_projects.gif
diff --git a/docs/calliope/links/thumbnail_screenshots.gif b/docs/static/calliope/links/thumbnail_screenshots.gif
similarity index 100%
rename from docs/calliope/links/thumbnail_screenshots.gif
rename to docs/static/calliope/links/thumbnail_screenshots.gif
diff --git a/docs/calliope/links/thumbnail_shop.gif b/docs/static/calliope/links/thumbnail_shop.gif
similarity index 100%
rename from docs/calliope/links/thumbnail_shop.gif
rename to docs/static/calliope/links/thumbnail_shop.gif
diff --git a/docs/calliope/templates/16KB.png b/docs/static/calliope/templates/16KB.png
similarity index 100%
rename from docs/calliope/templates/16KB.png
rename to docs/static/calliope/templates/16KB.png
diff --git a/docs/calliope/templates/16KB_L.png b/docs/static/calliope/templates/16KB_L.png
similarity index 100%
rename from docs/calliope/templates/16KB_L.png
rename to docs/static/calliope/templates/16KB_L.png
diff --git a/docs/calliope/templates/32KB.png b/docs/static/calliope/templates/32KB.png
similarity index 100%
rename from docs/calliope/templates/32KB.png
rename to docs/static/calliope/templates/32KB.png
diff --git a/docs/calliope/templates/32KB_L.png b/docs/static/calliope/templates/32KB_L.png
similarity index 100%
rename from docs/calliope/templates/32KB_L.png
rename to docs/static/calliope/templates/32KB_L.png
diff --git a/docs/calliope/templates/info.png b/docs/static/calliope/templates/info.png
similarity index 100%
rename from docs/calliope/templates/info.png
rename to docs/static/calliope/templates/info.png
diff --git a/docs/calliope/templates/info_L.png b/docs/static/calliope/templates/info_L.png
similarity index 100%
rename from docs/calliope/templates/info_L.png
rename to docs/static/calliope/templates/info_L.png
diff --git a/docs/calliope/tutorials/01_flashing_heart.gif b/docs/static/calliope/tutorials/01_flashing_heart.gif
similarity index 100%
rename from docs/calliope/tutorials/01_flashing_heart.gif
rename to docs/static/calliope/tutorials/01_flashing_heart.gif
diff --git a/docs/calliope/tutorials/01_flashing_heart_animation.gif b/docs/static/calliope/tutorials/01_flashing_heart_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/01_flashing_heart_animation.gif
rename to docs/static/calliope/tutorials/01_flashing_heart_animation.gif
diff --git a/docs/calliope/tutorials/02_nametag.gif b/docs/static/calliope/tutorials/02_nametag.gif
similarity index 100%
rename from docs/calliope/tutorials/02_nametag.gif
rename to docs/static/calliope/tutorials/02_nametag.gif
diff --git a/docs/calliope/tutorials/02_nametag_animation.gif b/docs/static/calliope/tutorials/02_nametag_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/02_nametag_animation.gif
rename to docs/static/calliope/tutorials/02_nametag_animation.gif
diff --git a/docs/calliope/tutorials/03_smiley_button.gif b/docs/static/calliope/tutorials/03_smiley_button.gif
similarity index 100%
rename from docs/calliope/tutorials/03_smiley_button.gif
rename to docs/static/calliope/tutorials/03_smiley_button.gif
diff --git a/docs/calliope/tutorials/03_smiley_button_animation.gif b/docs/static/calliope/tutorials/03_smiley_button_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/03_smiley_button_animation.gif
rename to docs/static/calliope/tutorials/03_smiley_button_animation.gif
diff --git a/docs/calliope/tutorials/04_dice.gif b/docs/static/calliope/tutorials/04_dice.gif
similarity index 100%
rename from docs/calliope/tutorials/04_dice.gif
rename to docs/static/calliope/tutorials/04_dice.gif
diff --git a/docs/calliope/tutorials/04_dice_animation.gif b/docs/static/calliope/tutorials/04_dice_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/04_dice_animation.gif
rename to docs/static/calliope/tutorials/04_dice_animation.gif
diff --git a/docs/calliope/tutorials/05_love_meter.gif b/docs/static/calliope/tutorials/05_love_meter.gif
similarity index 100%
rename from docs/calliope/tutorials/05_love_meter.gif
rename to docs/static/calliope/tutorials/05_love_meter.gif
diff --git a/docs/calliope/tutorials/05_love_meter_animation.gif b/docs/static/calliope/tutorials/05_love_meter_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/05_love_meter_animation.gif
rename to docs/static/calliope/tutorials/05_love_meter_animation.gif
diff --git a/docs/calliope/tutorials/06_mini_chat.gif b/docs/static/calliope/tutorials/06_mini_chat.gif
similarity index 100%
rename from docs/calliope/tutorials/06_mini_chat.gif
rename to docs/static/calliope/tutorials/06_mini_chat.gif
diff --git a/docs/calliope/tutorials/06_mini_chat_animation.gif b/docs/static/calliope/tutorials/06_mini_chat_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/06_mini_chat_animation.gif
rename to docs/static/calliope/tutorials/06_mini_chat_animation.gif
diff --git a/docs/calliope/tutorials/07_stone_paper_scissors.gif b/docs/static/calliope/tutorials/07_stone_paper_scissors.gif
similarity index 100%
rename from docs/calliope/tutorials/07_stone_paper_scissors.gif
rename to docs/static/calliope/tutorials/07_stone_paper_scissors.gif
diff --git a/docs/calliope/tutorials/07_stone_paper_scissors_animation.gif b/docs/static/calliope/tutorials/07_stone_paper_scissors_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/07_stone_paper_scissors_animation.gif
rename to docs/static/calliope/tutorials/07_stone_paper_scissors_animation.gif
diff --git a/docs/calliope/tutorials/08_coin_flipper.gif b/docs/static/calliope/tutorials/08_coin_flipper.gif
similarity index 100%
rename from docs/calliope/tutorials/08_coin_flipper.gif
rename to docs/static/calliope/tutorials/08_coin_flipper.gif
diff --git a/docs/calliope/tutorials/08_coin_flipper_animation.gif b/docs/static/calliope/tutorials/08_coin_flipper_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/08_coin_flipper_animation.gif
rename to docs/static/calliope/tutorials/08_coin_flipper_animation.gif
diff --git a/docs/calliope/tutorials/09_snap_the_dot.gif b/docs/static/calliope/tutorials/09_snap_the_dot.gif
similarity index 100%
rename from docs/calliope/tutorials/09_snap_the_dot.gif
rename to docs/static/calliope/tutorials/09_snap_the_dot.gif
diff --git a/docs/calliope/tutorials/09_snap_the_dot_animation.gif b/docs/static/calliope/tutorials/09_snap_the_dot_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/09_snap_the_dot_animation.gif
rename to docs/static/calliope/tutorials/09_snap_the_dot_animation.gif
diff --git a/docs/calliope/tutorials/10_multi_dice.gif b/docs/static/calliope/tutorials/10_multi_dice.gif
similarity index 100%
rename from docs/calliope/tutorials/10_multi_dice.gif
rename to docs/static/calliope/tutorials/10_multi_dice.gif
diff --git a/docs/calliope/tutorials/10_multi_dice_animation.gif b/docs/static/calliope/tutorials/10_multi_dice_animation.gif
similarity index 100%
rename from docs/calliope/tutorials/10_multi_dice_animation.gif
rename to docs/static/calliope/tutorials/10_multi_dice_animation.gif
diff --git a/docs/calliope/tutorials/add_show_led.gif b/docs/static/calliope/tutorials/add_show_led.gif
similarity index 100%
rename from docs/calliope/tutorials/add_show_led.gif
rename to docs/static/calliope/tutorials/add_show_led.gif
diff --git a/libs/bluetooth-android/README.md b/libs/bluetooth-android/README.md
new file mode 100644
index 000000000..67cbd4a53
--- /dev/null
+++ b/libs/bluetooth-android/README.md
@@ -0,0 +1,13 @@
+# Bluetooth settings for Android and Calliope mini 1 and 2
+
+This extensiion set the BLE settings to make sure they work with the Android App:
+
+```
+"bluetooth": {
+    "open": 0,
+    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
+    "whitelist": 1
+}
+```
+
+These settings are the default for Calliope mini 3, so this extension is only required to be included for Projects using the Calliope mini 1 or Calliope mini 2.
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/android-bluetooth-ble-jsdoc-strings.json b/libs/bluetooth-android/_locales/android-bluetooth-ble-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/android-bluetooth-ble-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/android-bluetooth-ble-strings.json b/libs/bluetooth-android/_locales/android-bluetooth-ble-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/android-bluetooth-ble-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/ble-android-jsdoc-strings.json b/libs/bluetooth-android/_locales/ble-android-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/ble-android-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/ble-android-strings.json b/libs/bluetooth-android/_locales/ble-android-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/ble-android-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-ble-jsdoc-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-ble-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-ble-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-ble-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-ble-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-ble-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-jsdoc-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-settings-jsdoc-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-settings-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-settings-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-settings-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-settings-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-settings-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-android-strings.json b/libs/bluetooth-android/_locales/bluetooth-android-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-android-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-jsdoc-strings.json b/libs/bluetooth-android/_locales/bluetooth-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/_locales/bluetooth-strings.json b/libs/bluetooth-android/_locales/bluetooth-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-android/_locales/bluetooth-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-android/pxt.json b/libs/bluetooth-android/pxt.json
new file mode 100644
index 000000000..41056c0e9
--- /dev/null
+++ b/libs/bluetooth-android/pxt.json
@@ -0,0 +1,25 @@
+{
+    "name": "bluetooth-android-settings",
+    "description": "Bluetooth settings for Android and Calliope mini 1 and 2.",
+    "dependencies": {
+        "core": "file:../core"
+    },
+    "files": [
+        "README.md"
+    ],
+    "public": true,
+    "searchOnly": true,
+    "weight": 100,
+    "icon": "./static/packages/bluetooth/icon.png",
+    "yotta": {
+        "config": {
+            "microbit-dal": {
+                "bluetooth": {
+                    "open": 0,
+                    "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
+                    "whitelist": 1
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/README.md b/libs/bluetooth-disabled/README.md
new file mode 100644
index 000000000..335e80535
--- /dev/null
+++ b/libs/bluetooth-disabled/README.md
@@ -0,0 +1,13 @@
+# Bluetooth services disabled
+
+This extensions disables the BLE in the program.
+
+If this extension is included into the Project it will stop loading the BLE stack.
+
+Pressing A+B+Reset or Tripple-Reset is then required to restart into DFU-Mode for flashing the Calliope mini via Bluetooth.
+
+```
+"bluetooth": {
+    "enabled": 0
+}
+```
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/_locales/ble-disabled-jsdoc-strings.json b/libs/bluetooth-disabled/_locales/ble-disabled-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-disabled/_locales/ble-disabled-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/_locales/ble-disabled-strings.json b/libs/bluetooth-disabled/_locales/ble-disabled-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-disabled/_locales/ble-disabled-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/_locales/bluetooth-disabled-jsdoc-strings.json b/libs/bluetooth-disabled/_locales/bluetooth-disabled-jsdoc-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-disabled/_locales/bluetooth-disabled-jsdoc-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/_locales/bluetooth-disabled-strings.json b/libs/bluetooth-disabled/_locales/bluetooth-disabled-strings.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/libs/bluetooth-disabled/_locales/bluetooth-disabled-strings.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/libs/bluetooth-disabled/pxt.json b/libs/bluetooth-disabled/pxt.json
new file mode 100644
index 000000000..f83e545d6
--- /dev/null
+++ b/libs/bluetooth-disabled/pxt.json
@@ -0,0 +1,23 @@
+{
+    "name": "bluetooth-disabled",
+    "description": "Disables Bluetooth. Require AB+Reset to start bluetooth.",
+    "dependencies": {
+        "core": "file:../core"
+    },
+    "files": [
+        "README.md"
+    ],
+    "public": true,
+    "weight": 10,
+    "searchOnly": true,
+    "icon": "./static/packages/bluetooth/icon.png",
+    "yotta": {
+        "config": {
+            "microbit-dal": {
+                "bluetooth": {
+                    "enabled": 0
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/libs/bluetooth/pxt.json b/libs/bluetooth/pxt.json
index c63bd13e5..69081ac3d 100644
--- a/libs/bluetooth/pxt.json
+++ b/libs/bluetooth/pxt.json
@@ -1,6 +1,6 @@
 {
     "name": "bluetooth",
-    "description": "Bluetooth services",
+    "description": "Adds blocks for Bluetooth",
     "dependencies": {
         "core": "file:../core"
     },
diff --git a/libs/core/codal.cpp b/libs/core/codal.cpp
index 70275c4b5..c5ea59b67 100644
--- a/libs/core/codal.cpp
+++ b/libs/core/codal.cpp
@@ -50,7 +50,7 @@ MicroBitEvent lastEvent;
 bool serialLoggingDisabled;
 
 void platform_init() {
-    microbit_seed_random();
+    // microbit_seed_random();
     int seed = microbit_random(0x7fffffff);
     DMESG("random seed: %d", seed);
     seedRandom(seed);
diff --git a/libs/core/pxt.json b/libs/core/pxt.json
index b9c19fce2..989aac1e8 100644
--- a/libs/core/pxt.json
+++ b/libs/core/pxt.json
@@ -128,52 +128,6 @@
                 "debug": 0,
                 "heap_debug": 0
             }
-        },
-        "userConfigs": [
-            {
-                "description": "Only load Bluetooth while Paring-Mode is activated (holding A+B and briefly the Reset button)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "enabled": 0
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Disable partial flashing (increases available RAM)",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "partial_flashing": 0
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Bluetooth: No pairing required",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 1,
-                            "security_level": null,
-                            "whitelist": 0
-                        }
-                    }
-                }
-            },
-            {
-                "description": "Bluetooth: Pairing required",
-                "config": {
-                    "microbit-dal": {
-                        "bluetooth": {
-                            "open": 0,
-                            "security_level": "SECURITY_MODE_ENCRYPTION_NO_MITM",
-                            "whitelist": 1
-                        }
-                    }
-                }
-            }
-        ]
+        }
     }
 }
diff --git a/libs/servo/_locales/servo-strings.json b/libs/servo/_locales/servo-strings.json
index b5591fe29..64322007f 100644
--- a/libs/servo/_locales/servo-strings.json
+++ b/libs/servo/_locales/servo-strings.json
@@ -1,5 +1,21 @@
 {
+  "servos.C10|block": "servo C10",
+  "servos.C11|block": "servo C11",
+  "servos.C12|block": "servo C12",
+  "servos.C13|block": "servo C13",
+  "servos.C14|block": "servo C14",
+  "servos.C15|block": "servo C15",
+  "servos.C16|block": "servo C16 (A1 RX)",
+  "servos.C17|block": "servo C17 (A1 TX)",
+  "servos.C4|block": "servo C4",
+  "servos.C5|block": "servo C5",
+  "servos.C6|block": "servo C6",
+  "servos.C7|block": "servo C7",
+  "servos.C8|block": "servo C8",
+  "servos.C9|block": "servo C9",
   "servos.P0|block": "servo P0",
+  "servos.P1|block": "servo P0",
+  "servos.P2|block": "servo P2",
   "servos.P3|block": "servo P3",
   "servos.Servo.run|block": "continuous %servo run at %speed=speedPicker \\%",
   "servos.Servo.setAngle|block": "set %servo angle to %degrees=protractorPicker °",
diff --git a/libs/servo/targetoverrides.ts b/libs/servo/targetoverrides.ts
index 3a05732f7..b708032a0 100644
--- a/libs/servo/targetoverrides.ts
+++ b/libs/servo/targetoverrides.ts
@@ -1,6 +1,38 @@
 namespace servos {
     //% block="servo P0" fixedInstance whenUsed
     export const P0 = new servos.PinServo(pins.P0);
+    //% block="servo P0" fixedInstance whenUsed
+    export const P1 = new servos.PinServo(pins.P1);
+    //% block="servo P2" fixedInstance whenUsed
+    export const P2 = new servos.PinServo(pins.P2);
     //% block="servo P3" fixedInstance whenUsed
     export const P3 = new servos.PinServo(pins.P3);
+    //% block="servo C4" fixedInstance whenUsed
+    export const C4 = new servos.PinServo(pins.C4);
+    //% block="servo C5" fixedInstance whenUsed
+    export const C5 = new servos.PinServo(pins.C5);
+    //% block="servo C6" fixedInstance whenUsed
+    export const C6 = new servos.PinServo(pins.C6);
+    //% block="servo C7" fixedInstance whenUsed
+    export const C7 = new servos.PinServo(pins.C7);
+    //% block="servo C8" fixedInstance whenUsed
+    export const C8 = new servos.PinServo(pins.C8);
+    //% block="servo C9" fixedInstance whenUsed
+    export const C9 = new servos.PinServo(pins.C9);
+    //% block="servo C10" fixedInstance whenUsed
+    export const C10 = new servos.PinServo(pins.C10);
+    //% block="servo C11" fixedInstance whenUsed
+    export const C11 = new servos.PinServo(pins.C11);
+    //% block="servo C12" fixedInstance whenUsed
+    export const C12 = new servos.PinServo(pins.C12);
+    //% block="servo C13" fixedInstance whenUsed
+    export const C13 = new servos.PinServo(pins.C13);
+    //% block="servo C14" fixedInstance whenUsed
+    export const C14 = new servos.PinServo(pins.C14);
+    //% block="servo C15" fixedInstance whenUsed
+    export const C15 = new servos.PinServo(pins.C15);
+    //% block="servo C16 (A1 RX)" fixedInstance whenUsed
+    export const C16 = new servos.PinServo(pins.C16);
+    //% block="servo C17 (A1 TX)" fixedInstance whenUsed
+    export const C17 = new servos.PinServo(pins.C17);
 }
\ No newline at end of file
diff --git a/libs/v1/pxt.json b/libs/v1/pxt.json
index 3ce782597..e25bf6d75 100644
--- a/libs/v1/pxt.json
+++ b/libs/v1/pxt.json
@@ -10,7 +10,8 @@
     "core": true,
     "dependencies": {
         "core": "file:../core",
-        "core-mini-dal": "file:../core-mini-dal"
+        "core-mini-dal": "file:../core-mini-dal",
+        "bluetooth-disabled": "file:../bluetooth-disabled"
     },
     "icon": "./static/devices/mini1.png",
     "files": [
diff --git a/pxtarget.json b/pxtarget.json
index c6b6b7964..d5c7bd1b1 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -15,6 +15,8 @@
         "libs/radio",
         "libs/devices",
         "libs/bluetooth",
+        "libs/bluetooth-android",
+        "libs/bluetooth-disabled",
         "libs/servo",
         "libs/radio-broadcast",
         "libs/microphone",
diff --git a/targetconfig.json b/targetconfig.json
index 12f35700f..89dd82251 100644
--- a/targetconfig.json
+++ b/targetconfig.json
@@ -213,6 +213,9 @@
             "callitgs3/pxt-calliope-grovepcf85063tp",
             "calliope-net/i2c-liste",
             "calliope-edu/pxt-storage",
+            "MKleinSB/pxt-calliope-jacdac",
+            "calliope-edu/warte-bis",
+            "joernalraun/mkcd-ml-machine",
             "wappsto/pxt-wappsto"
         ],
         "preferredRepos": [
@@ -248,16 +251,13 @@
             "mkleinsb/pxt-pca9685",
             "mkleinsb/pxt-seeed-temperature",
             "mkleinsb/pxt-serialmp3",
-            "mkleinsb/pxt-grove-ultrasonic-jacdac",
-            "mkleinsb/pxt-grove-soilmoisture-jacdac",
-            "mkleinsb/pxt-grove-lcd/jacdac",
-            "mkleinsb/co2-sensor-scd40/jacdac",
             "calliope-edu/pxt-ki-in-schulen",
             "microsoft/pxt-microturtle",
             "microsoft/pxt-neopixel",
             "calliope-edu/pxt-faces",
             "calliope-net/i2c-liste",
             "calliope-edu/pxt-storage",
+            "calliope-edu/warte-bis",
             "wappsto/pxt-wappsto"
         ],
         "approvedRepoLib": {
@@ -307,6 +307,12 @@
                 "preferred": true
             },
             "calliope-edu/pxt-power": {"preferred": true},
+             "microsoft/pxt-jacdac": {
+                "tags": [
+                    "Jacdac"
+                ],
+                "preferred": true
+            },
             "tinysuperlab/motionkitv2": {
                 "tags": [
                     "Motor"
@@ -324,13 +330,12 @@
                     "Audio"
                 ]
             },
-            "microsoft/pxt-jacdac": {
+            "calliope-edu/pxt-ki-in-schulen": {
                 "tags": [
-                    "Jacdac"
-                ],
-                "preferred": true
+                    "AI"
+                ]
             },
-            "calliope-edu/pxt-ki-in-schulen": {
+            "joernalraun/mkcd-ml-machine": {
                 "tags": [
                     "AI"
                 ]
@@ -345,6 +350,9 @@
                     "Display"
                 ]
             },
+            "calliope-edu/warte-bis": {
+                "preferred": true
+            },
             "calliope-edu/pxt-faces": {
                 "tags": [
                     "Display"
@@ -549,26 +557,22 @@
             "mkleinsb/pxt-grove-ultrasonic-jacdac": {
                 "tags": [
                     "Jacdac"
-                ],
-                "preferred": true
+                ]
             },
             "mkleinsb/pxt-grove-soilmoisture-jacdac": {
                 "tags": [
                     "Jacdac"
-                ],
-                "preferred": true
+                ]
             },
             "mkleinsb/pxt-grove-lcd/jacdac": {
                 "tags": [
                     "Jacdac"
-                ],
-                "preferred": true
+                ]
             },
             "mkleinsb/co2-sensor-scd40/jacdac": {
                 "tags": [
                     "Jacdac"
-                ],
-                "preferred": true
+                ]
             },
             "microsoft/pxt-bluetooth-max6675": {},
             "microsoft/pxt-bluetooth-midi": {
@@ -637,6 +641,11 @@
                     "IoT"
                 ]
             },
+            "mkleinsb/pxt-calliope-jacdac": {
+                "tags": [
+                    "Jacdac"
+                ]
+            },
             "assirati/pxt-inventura": {},
             "cgs-matthew-pham/pxt-hitechnic-irseeker-v2": {},
             "coding4coconut/pxt-lcd128x160-st7735s": {