1.0.4

* lighttheme toc

* use LEGO edu logo everywhere

* bump pxt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,35 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+Add screenshots to help explain your problem. You can copy paste the screenshot in the github report. The .gif screen recording is very useful as well. 
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://ci2.dot.net/buildStatus/icon?job=Private/pxt_project_rainbow/master/pxt-ev3_Push)](https://ci2.dot.net/job/Private/job/pxt_project_rainbow/job/master/job/pxt-ev3_Push/)
 
-This repo contains the editor target hosted at https://makecode.legoeducation.com
+This repo contains the editor target hosted at https://makecode.mindstorms.com
 
 LEGO Auth: https://src.education.lego.com/groups/ev3-makecode (use Google Authenticator)
 LEGO Chat: https://chat.internal.education.lego.com/make-code/channels/town-square
@@ -24,7 +24,6 @@ In a common folder,
 
 ```
 npm install
-typings install
 ```
 
 * go to ``pxt-common-packages`` and run

cmds/pxtrequire.ts

@@ -1,6 +0,0 @@
-/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
-
-import * as path from "path";
-export let pxtCore = require("pxt-core");
-// require.resolve() gives path to [pxt dir]/built/pxt.js, so move up twice to get pxt root dir
-export let pxtCoreDir = path.resolve(require.resolve("pxt-core"), "..", "..");

docfiles/footer.html

@@ -1,16 +1,18 @@
-<footer class="ui inverted accent vertical footer segment hideprint" aria-hidden="false">
+<footer class="ui vertical footer segment hideprint" aria-hidden="false">
     <div class="ui center aligned container">
-        <div class="ui container horizontal inverted small divided link list">
+        <div class="ui section divider"></div>
+        <div class="ui container horizontal small divided link list">
             <!-- <a class="item" href="https://makecode.com/contact" target="_blank" rel="noopener">Contact Us</a> -->
             <a class="item" href="https://makecode.com/privacy" target="_blank" rel="noopener">Privacy &amp; Cookies</a>
             <a class="item" href="https://makecode.com/termsofuse" target="_blank" rel="noopener"> Terms Of Use</a>
             <a class="item" href="https://makecode.com/trademarks" target="_blank" rel="noopener">Trademarks</a>
             <div class="item">© 2018 Microsoft</div>
-            <!-- we need to force the browser to load this font -->
-            <div style='font-family: Icons; color: #010101;' aria-hidden="true">.</div>
         </div>
-        <div class="ui container horizontal inverted small divided link list">
+        <div class="ui container horizontal small divided link list">
             <a class="ui centered item" href="https://makecode.com/" title="Microsoft MakeCode" target="_blank" rel="noopener">Powered by Microsoft MakeCode</a>
         </div>
+        <div class="ui centered container small list">
+            <p class="item">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of the LEGO Group. ©2018 The LEGO Group. All rights reserved.</p>
+        </div>
     </div>
-</footer>
+</footer>

docs/SUMMARY.md

@@ -3,8 +3,8 @@
 ## Support #support
 
 * [Troubleshoot](/troubleshoot)
-* [LEGO Support](http://service.lego.com/)
 * [EV3 Manager](https://ev3manager.education.lego.com/)
+* [LEGO Support](https://www.lego.com/service/)
 
 ## Projects #projects
 
@@ -123,3 +123,7 @@
         * [log](/reference/console/log)
         * [log value](/reference/console/log-value)
         * [send to screen](/reference/console/send-to-screen)
+
+## #misc
+
+## devs

docs/about/editor-features.md

@@ -70,3 +70,12 @@
 | ![Download button](/static/about/download-button.png) |
 | Download Button |
 
+#### #explorer-images
+
+| |
+|-|
+| ![Explorer button](/static/about/explorer-button.png) |
+| Explorer Button |
+|   |
+| ![Explorer File View](/static/about/explorer-view.png) |
+| Explorer File View |

docs/coding/autonomous-parking.md

@@ -12,7 +12,7 @@ Design cars that can park themselves safely without driver intervention.
 * What would it take to ensure that autonomous cars are safe?
 * What types of movements do autonomous cars need to perform?
 
-## Construct 
+## Construct
 
 ### Build
 
@@ -20,6 +20,12 @@ Build a @boardname@ vehicle that can park itself safely without driver intervent
 
 [![EV3- Robot Driving Base](/static/coding/autonomous-parking/ev3-robot-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-driving-base-79bebfc16bd491186ea9c9069842155e.pdf)
 
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ### Check
 
 Before you program, check:
@@ -28,7 +34,7 @@ Before you program, check:
 * Are the wheels correctly installed?
 * Are the wheels rotating freely?
 
-### Program 
+### Program
 
 Write a program that will make the robot turn three times in various ways.
 
@@ -109,7 +115,7 @@ Click Download and follow the instructions to get your code onto your EV3 Brick.
 
 ### Differentiation
 
-Create a program that simulates displaying appropriate warning lights while parking. 
+Create a program that simulates displaying appropriate warning lights while parking.
 
 ### ~hint
 
@@ -164,8 +170,8 @@ Click Download and follow the instructions to get your code onto your EV3 Brick.
 
 * Click on the JavaScript tab and experiment with changing the values in the code.
 * Add a custom image or sounds from the Brick or Music menus.
-* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
-* Include an image of your program with comments. 
-* Add a team photograph! 
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program.
+* Include an image of your program with comments.
+* Add a team photograph!
 
 Congratulations! What will you design next?

docs/coding/line-detection.md

@@ -24,6 +24,12 @@ Build red and green “lights” for your robot to detect. You can use LEGO bric
 
 [![IMAGE: Color Squares](/static/coding/line-detection/ev3-color-squares.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20squares-0a88dfd98bb2e64b5b8151fc422bae36.pdf)
 
+### ~hint
+
+If clicking the above images doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ### Check
 
 Before you program, check:
@@ -51,7 +57,7 @@ Consider using these blocks in your solution:
 
 ```block
 loops.forever(function () {
-	
+
 })
 motors.largeBC.steer(0, 50)
 sensors.color3.pauseUntilColorDetected(ColorSensorColor.Red)
@@ -77,9 +83,9 @@ loops.forever(function () {
 
 ### Download and test
 
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+Click **Download** and follow the instructions to get your code onto your EV3 Brick.
 
-Congratulations! Your robot can stop at a red light. 
+Congratulations! Your robot can stop at a red light.
 
 Now add to your program and have your robot to drive forward again when the light changes from red to green.
 
@@ -102,7 +108,7 @@ loops.forever(function () {
 
 ### Download and test
 
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+Click **Download** and follow the instructions to get your code onto your EV3 Brick.
 
 ## Contemplate
 
@@ -116,7 +122,7 @@ Draw a dark line with tape or marker for your robot to cross.
 
 Consider using these blocks in your solution:
 
-```block 
+```block
 motors.largeBC.steer(0, 50)
 music.playSoundEffect(sounds.systemGeneralAlert)
 ```
@@ -143,7 +149,7 @@ loops.forever(function () {
 
 #### Download and test
 
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+Click **Download** and follow the instructions to get your code onto your EV3 Brick.
 
 #### Differentiation
 
@@ -157,7 +163,7 @@ Consider using these blocks in your solution:
 
 ```block
 while (true) {
-	
+
 }
 motors.largeBC.steer(0, 50)
 ```
@@ -166,7 +172,7 @@ motors.largeBC.steer(0, 50)
 
 ```block
 if (true) {
-	
+
 } else {
 
 }
@@ -215,7 +221,7 @@ forever(function () {
 
 ### Download and test
 
-Click **Download** and follow the instructions to get your code onto your EV3 Brick. 
+Click **Download** and follow the instructions to get your code onto your EV3 Brick.
 
 ### Share
 
@@ -232,8 +238,8 @@ Personalize:
 
 * Click on the **JavaScript** tab and experiment with changing the values in the code.
 * Add a custom image or sounds from the ``||brick:Brick||`` or ``||music:Music||`` menus.
-* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
-* Include an image of your program with comments. 
-* Add a team photograph! 
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program.
+* Include an image of your program with comments.
+* Add a team photograph!
 
 Congratulations! What will you design next?

docs/coding/object-detection.md

@@ -4,7 +4,7 @@ Design ways to avoid accidents between vehicles and objects in the road.
 
 ![Deer in the road](/static/coding/object-detection/road-deer.jpg)
 
-## Connect 
+## Connect
 
 Think about:
 
@@ -12,7 +12,7 @@ Think about:
 * What do you need to be aware of to avoid collisions with obstacles?
 * What causes traffic jams in high density areas?
 
-## Construct 
+## Construct
 
 ### Build
 
@@ -20,10 +20,16 @@ Build a @boardname@ vehicle that can avoid accidents between vehicles and object
 
 [![EV3 Robot Driving Base](/static/coding/object-detection/ev3-robot-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-ultrasonic-sensor-driving-base-61ffdfa461aee2470b8ddbeab16e2070.pdf)
 
-Build an obstacle for your robot to detect. You can build the **cuboid model** out of LEGO bricks or an obstacle of your choice. 
+Build an obstacle for your robot to detect. You can build the **cuboid model** out of LEGO bricks or an obstacle of your choice.
 
 [![Cubiod block](/static/coding/object-detection/ev3-cuboid.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-cuboid-dc93b2e60bed2981e76b3bac9ea04558.pdf)
 
+### ~hint
+
+If clicking the above images doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ### Check
 
 Before you program, check:
@@ -38,7 +44,7 @@ Before you program, check:
 * Program your robot to detect any obstacles that might appear while the robot is moving forward (or backward).
 * Make the robot stop when it detects an object that is less than 20 cm away.
 
-Before you program, think about:  
+Before you program, think about:
 * How will you program the robot to detect obstacles?
 * How will you program the robot to stop at obstacles?
 * Which programming blocks will you use?
@@ -59,7 +65,7 @@ motors.stopAll()
 
 ### ~
 
-### Sample Solution 
+### Sample Solution
 
 1. Start the program when EV3 ``enter`` button is pressed.
 2. Turn motors ``B`` and ``C`` on at speed ``50``.
@@ -80,7 +86,7 @@ Click **Download** and follow the instructions to get your code onto your EV3 Br
 
 ## Contemplate
 
-On the road, when a driver sees and object, they slow their car down before coming to a full stop. 
+On the road, when a driver sees and object, they slow their car down before coming to a full stop.
 
 Program your EV3 Driving Base to do the same.
 
@@ -93,7 +99,7 @@ If the Ultrasonic Sensor:
 ### ~hint
 
 Consider using this block in your solution:
- 
+
 ```block
 if (true) {
 }
@@ -101,7 +107,7 @@ if (true) {
 
 ### ~
 
-### Sample Solution 
+### Sample Solution
 
 ```blocks
 loops.forever(function () {
@@ -118,7 +124,7 @@ loops.forever(function () {
 
 Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the ``center`` button on the EV3 Brick to run the program.
 
-## Continue 
+## Continue
 
 * Get together with other building teams and make a traffic jam by placing all of your robots in a line with varying amounts of space between them.
 * Have everyone start their robots at the same time and see what happens.
@@ -130,8 +136,8 @@ Click **Download** and follow the instructions to get your code onto your EV3 Br
 
 * Share what you think “efficiency in programming” means.
 * Explore the different solutions other programmers came up with.
-* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
-* Include an image of your program with comments. 
-* Add a team photograph! 
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program.
+* Include an image of your program with comments.
+* Add a team photograph!
 
 Congratulations! What will you design next?

docs/design-engineering/make-it-communicate.md

@@ -1,6 +1,6 @@
 # Make A System That Communicates
 
-## Connect 
+## Connect
 
 ### Design Brief
 
@@ -20,10 +20,10 @@ Think about:
 * What kind of motorized mechanism can be used to control the movements of a robot?
 * How can the robot sense where it is along the path?
 * How can the robot communicate its position?
- 
+
 ![EV3 + LEGO Bricks](/static/lessons/make-it-communicate/ev3-plus-parts.jpg)
 
-## Construct 
+## Construct
 
 ### Build
 
@@ -37,13 +37,19 @@ More building ideas:
 
 [![Color Sensor 2](/static/lessons/make-it-communicate/ev3-color-sensor2.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/color%20sensor_v2-e7fd54b6fa3cdfe36f414c1d2510f9cb.pdf)
 
+### ~hint
 
-Build a path for your robot to follow. You can use electrical tape on a floor, or marker on paper. You can use objects as milestones to indicate a path that can be detected by either the Touch Sensor, Color Sensor, or Ultrasonic Sensor. 
+If clicking the above images doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
 
-### Program 
+### ~
+
+
+Build a path for your robot to follow. You can use electrical tape on a floor, or marker on paper. You can use objects as milestones to indicate a path that can be detected by either the Touch Sensor, Color Sensor, or Ultrasonic Sensor.
+
+### Program
+
+Before you program, think about:
 
-Before you program, think about: 
- 
 * How will you program the robot to follow a path?
 * How will you program the robot to communicate its position?
 * Which programming blocks will you use?
@@ -54,7 +60,7 @@ Explore the different Motor and Sensor blocks in the programming menu.
 
 ### ~
 
-### Sample Solution 
+### Sample Solution
 
 [![Video: EV3 Track Rover](/static/lessons/make-it-communicate/ev3-track-rover.jpg)](https://legoeducation.23video.com/v.ihtml/player.html?token=79c99735f906403a4dd7f2909935983d&source=embed&photo%5fid=19857954)
 
@@ -70,15 +76,21 @@ Two copies of the tracks are built: one for the right side and a mirror image fo
 
 [![Track rover assembled](/static/lessons/make-it-communicate/ev3-track-rover2.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/track-rover-bi-6aadb1b053df0c58a0dea108b5ce0eea.pdf)
 
-### Sample Program Solution 
+### ~hint
 
-This program works with the Track Rover. If you create a different robot, adjust the program to fit your solution. 
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
 
-Program summary: 
+### ~
+
+### Sample Program Solution
+
+This program works with the Track Rover. If you create a different robot, adjust the program to fit your solution.
+
+Program summary:
 
 * If the Color Sensor sees black, Motor B runs at -50 power and Motor C turns off.
 * If the Color Sensor sees white, Motor B turns off and Motor C runs at -50 power.
-* If the Color Sensor sees green, all motors stop and the green sound plays. 
+* If the Color Sensor sees green, all motors stop and the green sound plays.
 * The robot waits one second, then motors move forward.
 * If the Color Sensor sees red, all motors stop, and the red sound plays.
 * The robot waits one second, then motors move forward.
@@ -108,44 +120,44 @@ forever(function () {
 
 Click Download and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
 
-## Contemplate 
+## Contemplate
 
-### Test and Analyze 
+### Test and Analyze
 
 As you work on your solution:
 
-1. Describe one part of your design that worked especially well. 
-2. Describe one design change that you had to make. 
-3. What will you try next? 
+1. Describe one part of your design that worked especially well.
+2. Describe one design change that you had to make.
+3. What will you try next?
 
 
-### Review and Revise 
+### Review and Revise
 
-Take a moment to reflect on your robot solution. 
+Take a moment to reflect on your robot solution.
 
 Think about:
 
-* Can the robot’s movement be more accurate? 
+* Can the robot’s movement be more accurate?
 * What are some ways that others have solved the problem?
 
 Describe two ways you could improve your robot.
 
-## Continue 
+## Continue
 
 ### Personalize your project
 
-* Add/remove LEGO elements to improve the way your robot moves. 
+* Add/remove LEGO elements to improve the way your robot moves.
 * Click on the JavaScript tab and experiment with changing the values in the code.
 * Add a custom image or sounds by adding blocks from the Brick or Music menus.
 
-## Communicate 
+## Communicate
 
 Here are some ideas:
 
-* Create a video of your project, especially your final presentation and your robot’s performance. 
-* Explain some important features of your software program. 
-* Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
-* Include an image of your program with comments. 
-* Add a team photograph! 
+* Create a video of your project, especially your final presentation and your robot’s performance.
+* Explain some important features of your software program.
+* Produce a building guide for your model by taking a series of photographs as you deconstruct it.
+* Include an image of your program with comments.
+* Add a team photograph!
 
 Congratulations! What will you design next?

docs/design-engineering/make-it-move.md

@@ -22,7 +22,7 @@ In nature, creatures use many methods to get around. None of them, however, use
 
 ### Build
 
-Think about a creature’s movement for inspiration. Will you make the robot walk, crawl, hop, or wiggle?  Your mechanism can be attached or unattached to the EV3 brick. You can start by tinkering with the LEGO elements in the picture above and then build on.
+Think about a creature’s movement for inspiration. Will you make the robot walk, crawl, hop, or wiggle?  Your mechanism can be attached or unattached to the EV3 Brick. You can start by tinkering with the LEGO elements in the picture above and then build on.
 
 ### Building Hint
 
@@ -30,18 +30,26 @@ If you want some building help you can follow these instructions.
 
 [![Toddle Bot](/static/lessons/make-it-move/toddle-bot.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/toddle%20bot-3dcad146d7f5deac4753f93e9dcc0739.pdf)
 
+Click [here](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/toddle%20bot-3dcad146d7f5deac4753f93e9dcc0739.pdf)
+
+### ~hint
+
+If clicking the above image or link doesn't open the instructions, right-click on the link and choose "Save link as..." to download the PDF.
+
+### ~
+
 ### Program
 
 Before you program, think about:
 
-* How will you program the robot to move? 
+* How will you program the robot to move?
 * How will you program the robot to stop?
 * How will you program the robot to display the distance moved?
 
 Which programming blocks will you use:
 
-* To turn on and turn off the motor or motors? 
-* To display the distance moved? 
+* To turn on and turn off the motor or motors?
+* To display the distance moved?
 
 ### Sample Code
 
@@ -49,7 +57,7 @@ Example code of a robot that moves without wheels using one motor:
 
 * The robot moves with ``large motor D`` rotating at ``-100`` speed
 * The robot moves for ``30000`` milliseconds (30 seconds)
-* The robot stops 
+* The robot stops
 * The robot displays the text ``"30cm"``
 
 ```blocks
@@ -65,7 +73,7 @@ brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
 
 Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
 
-## Contemplate 
+## Contemplate
 
 ### Test and Analyze
 

docs/design-engineering/make-it-smarter.md

@@ -1,6 +1,6 @@
-# Make It Smarter and Faster 
+# Make It Smarter and Faster
 
-## Connect 
+## Connect
 
 ### Design Brief
 
@@ -10,52 +10,52 @@ https://www.youtube.com/watch?v=y9-A_C_08KY
 
 * What do the robots in the video need to be able to sense, plan, and act?
 * What senses do humans have and why are they important to us?
-* How many human-like senses do you see the robots demonstrating? 
+* How many human-like senses do you see the robots demonstrating?
 
-### Brainstorm 
+### Brainstorm
 
 Discuss different solutions to the design brief.
 
-Think about: 
+Think about:
 
-* What kind of creature can it be? 
-* How can it move? 
-* What does it need to be aware so that it stays safe, well fed and warm (or cool)? 
-* Is it looking for food, a safe place to hide or a warm place to soak up the sun? 
-* Will the creature need to move fast or slow? 
-* Will it need to turn? 
+* What kind of creature can it be?
+* How can it move?
+* What does it need to be aware so that it stays safe, well fed and warm (or cool)?
+* Is it looking for food, a safe place to hide or a warm place to soak up the sun?
+* Will the creature need to move fast or slow?
+* Will it need to turn?
 * Will it need to go backward?
 
 ![EV3 and bricks](/static/lessons/make-it-smarter/bricks.png)
 
 ## Construct
- 
+
 ### Build
 
-Think about a creature’s movement for inspiration. Your mechanism can be attached or unattached to the EV3 brick. You can start by tinkering with the LEGO elements in the picture add then build on.
+Think about a creature’s movement for inspiration. Your mechanism can be attached or unattached to the EV3 Brick. You can start by tinkering with the LEGO elements in the picture add then build on.
 
-More building ideas: 
+More building ideas:
 
-| | | | | |
-|-|-|-|-|-|
-|[![EV3 Frames](/static/lessons/make-it-smarter/ev3-parts-frames.jpg)][EV3 Frames] | |[![EV3 Color Sensor 1](/static/lessons/make-it-smarter/ev3-parts-color-sensor-1.jpg)][Color Sensor 1] | |[![EV3 Gyro Sensor](/static/lessons/make-it-smarter/ev3-parts-gyro-sensor.jpg)][Gyro Sensor] |
-| [EV3 Frames] | | [Color Sensor 1] | | [Gyro Sensor] |
-<br/>
 
-| | | | | |
-|-|-|-|-|-|
-|[![EV3 Ultrasonic Sensor](/static/lessons/make-it-smarter/ev3-parts-ultrasonic-sensor.jpg)][Ultrasonic Sensor] | | [![EV3 Touch Sensor](/static/lessons/make-it-smarter/ev3-parts-touch-sensor.jpg)][Touch Sensor] | | [![EV3 Gyro Sensor](/static/lessons/make-it-smarter/ev3-parts-jaw.jpg)][Jaw] |
-| [Ultrasonic Sensor] | | [Touch Sensor] | | [Jaw] |
-<br/>
+* [EV3 Frames]
+* [Color Sensor 1]
+* [Gyro Sensor]
+* [Ultrasonic Sensor]
+* [Touch Sensor]
+* [Jaw]
+* [Leg 1] 
+* [Leg 2]
+* [Leg 3]
 
-| | | | | |
-|-|-|-|-|-|
-| [![EV3 Leg 1](/static/lessons/make-it-smarter/ev3-parts-leg-1.jpg)][Leg 1] | | [![EV3 Leg 2](/static/lessons/make-it-smarter/ev3-parts-leg-2.jpg)][Leg 2] | | [![EV3 Leg 3](/static/lessons/make-it-smarter/ev3-parts-leg-3.jpg)][Leg 3] |
-| [Leg 1] | | [Leg 2] | | [Leg 3] |
+### ~hint
 
-### Program 
+If clicking the above links doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
 
-Before you program, think about:  
+### ~
+
+### Program
+
+Before you program, think about:
 
 * How will you program the robot to sense?
 * How will you program the robot to respond?
@@ -67,7 +67,7 @@ Before you program, think about:
 
 ### ~
 
-### Sample Solution 
+### Sample Solution
 
 The Insect uses its Ultrasonic Sensor to sense danger and move away from a threat.
 
@@ -86,13 +86,19 @@ Building Instructions:
 
 [![Insect robot](/static/lessons/make-it-smarter/insect-bot.jpg)](https://le-www-live-s.legocdn.com/sc/media/files/support/mindstorms%20ev3/building-instructions/design%20engineering%20projects/insect-94b8a46f0dc5082c9d78ddb734626dc9.pdf)
 
-### Sample Solution 
+### ~hint
 
-This program checks if the Ultrasonic Sensor senses something near. 
+If clicking the above images or links doesn't open the instructions, right-click on the link and choose "Save link as..." to download the PDF.
 
-The blocks inside the ``||loops:forever||`` loop have these actions: 
+### ~
 
-1. Turn on the ``green`` EV3 brick Status Light.
+### Sample Solution
+
+This program checks if the Ultrasonic Sensor senses something near.
+
+The blocks inside the ``||loops:forever||`` loop have these actions:
+
+1. Turn on the ``green`` EV3 Brick Status Light.
 2. Wait for Ultrasonic Sensor to detect an object.
 3. Turn on Motors ``A`` and ``D`` in opposite directions.
 4. Wait for one quarter of a second (``1500`` milli seconds).
@@ -119,44 +125,44 @@ forever(function () {
 
 Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
 
-## Contemplate 
+## Contemplate
 
-### Test and Analyze 
+### Test and Analyze
 
-As you work on your solution: 
-1. Describe one part of your design that worked especially well. 
-2. Describe one design change that you had to make. 
-3. What will you try next? 
+As you work on your solution:
+1. Describe one part of your design that worked especially well.
+2. Describe one design change that you had to make.
+3. What will you try next?
 
-### Review and Revise 
+### Review and Revise
 
-Take a moment to reflect on your robot solution. 
+Take a moment to reflect on your robot solution.
 
-Think about: 
+Think about:
 
-* Does your robot move when the sensor is activated? 
-* If not, what will you change to make the robot’s ability to sense and respond more obvious? 
-* What other behaviors can you add to the robot to make it more realistic? 
+* Does your robot move when the sensor is activated?
+* If not, what will you change to make the robot’s ability to sense and respond more obvious?
+* What other behaviors can you add to the robot to make it more realistic?
 
 Describe two ways you could improve your robot.
 
-## Continue 
+## Continue
 
 Personalize your project:
 
-* Add/remove LEGO elements to improve the way your robot moves. 
+* Add/remove LEGO elements to improve the way your robot moves.
 * Click on the JavaScript tab and experiment with changing the values in the code.
 * Add a custom image or sounds by adding blocks from the Brick or Music menus.
 * Does your robot resemble a creature? Maybe add more craft materials to your project.
 
-## Communicate 
+## Communicate
 
-Here are some ideas: 
+Here are some ideas:
 
-* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program. 
-* Produce a building guide for your model by taking a series of photographs as you deconstruct it. 
-* Include an image of your program with comments. 
-* Add a team photograph! 
+* Create a video of your project, especially your final presentation and your robot’s performance. Explain some important features of your software program.
+* Produce a building guide for your model by taking a series of photographs as you deconstruct it.
+* Include an image of your program with comments.
+* Add a team photograph!
 
 Congratulations! What will you design next?
 

docs/getting-started.md

@@ -4,6 +4,14 @@
 
 ```codecard
 [
+{
+    "name": "Prepare",
+    "imageUrl": "/static/lessons/firmware.png",
+    "description": "To use Microsoft MakeCode with your EV3 Brick, you will need to install the latest LEGO® MINDSTORMS® Education EV3 firmware. Follow these steps to make sure you're up to date and install the latest firmware if you need to.",
+    "label": "New? Start Here!",
+    "labelClass": "red ribbon large",
+    "url": "https://makecode.mindstorms.com/troubleshoot"
+},
 {
     "name": "Try",
     "imageUrl": "/static/lessons/try.png",

docs/getting-started/try-tutorial.md

@@ -0,0 +1,194 @@
+# Try
+
+## Introduction @unplugged
+
+Get a quick introduction to programming with EV3.
+
+![Display on EV3 Brick with Music Notes](/static/getting-started/01_EyesOn_Intro.png)
+
+We are excited to help you get started with @boardname@. In this project we will guide you through connecting your EV3 Brick, creating your first program, controlling a Large Motor, a Touch Sensor and a Color Sensor. These steps can take up to 45 minutes.
+
+## Turn on your EV3 Brick @unplugged
+
+Power on your EV3 Brick by pressing the Center Button.
+
+![Hand pressing power button](/static/getting-started/02_PowerOn.png)
+
+## Connect Your EV3 Brick to Your Device @unplugged
+
+Use the USB cable to connect your EV3 Brick to your device.
+
+![Computer and cable connected to EV3 Brick](/static/getting-started/03_insert-usb-02.png)
+
+## Handle a button press @fullscreen
+
+Drag out a ``||brick:on button||`` block from Buttons section in the ``||brick:Brick||`` Toolbox drawer.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+})
+```
+
+## Change of mood @fullscreen
+
+Drag a Brick Screen ``||brick:show mood||`` block inside the ``||brick:on button||`` block.
+Change mood to ``neutral``.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showMood(moods.neutral)
+})
+```
+
+## Simulate @fullscreen
+
+**Try out your code in the simulator!**
+
+Click the center button on the EV3 Brick in the web page. It should display the mood you selected on the screen. Don't hesitate to use the simulator to try out your code during this tutorial!
+
+![EV3 Brick simulator](/static/getting-started/simulate.png)
+
+## Play some tunes @fullscreen
+
+Drag a Music ``||music:play sound effect||`` block below the ``||brick:show mood||`` block.
+Change sound effect to ``communication hello``.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    brick.showMood(moods.neutral)
+    music.playSoundEffect(sounds.communicationHello)
+})
+```
+
+## Download to your brick @unplugged
+
+**Download:** Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+### Did It Work?
+
+Verify that the program you just created shows eyes on the Brick Display, and that the EV3 Brick played the sound “Hello!”
+
+![EV3 Brick with eyes on the display](/static/getting-started/05_EyesOn.png)
+
+
+**Well done!**
+
+## Connect a Large Motor @unplugged
+
+Now you will learn to control the Large Motor.
+
+![EV3 Brick with hands connecting Large Motor to Port D](/static/getting-started/06_PlugInLargeMotor.png)
+
+Connect a Large Motor to **Port D** of your EV3 Brick using any of the connector cables.
+
+## Run a motor @fullscreen
+
+Drag a ``||motors:run large A motor||`` block inside the ``||brick:on button||`` block.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeA.run(50)
+})
+```
+
+## Tune your motor @fullscreen
+
+Change ``large motor A`` to ``large motor D``.
+Click on the **(+)** sign and change to ``1`` rotation.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+## Download @unplugged
+
+**Download:** Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+### Did It Rotate?
+
+Confirm that your motor has turned one rotation at power level 50 before stopping.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different power levels and different rotations.
+
+![Large Motor D w/Rotating “WHRRR,” Hand, EV3 Brick](/static/getting-started/08_WorkingLargeMotor.png)
+
+## Connect a Touch Sensor @unplugged
+
+We will now control the Large Motor using a Touch Sensor.
+
+Keeping the Large Motor connected to **Port D**, connect a Touch Sensor to **Port 1** of your EV3 Brick.
+
+![Hands connecting Touch Sensor to Port 1 on EV3 Brick](/static/getting-started/09_Connect_Touch.png)
+
+## Modify Your Program @fullscreen
+
+* Add a ``||sensors:pause until touch 1 pressed||`` Sensor block on top of the ``||motors:run large motor D||`` block.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.touch1.pauseUntil(ButtonEvent.Pressed)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+## Download @unplugged
+
+**Download:** Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+### Press the Touch Sensor
+
+Confirm that the Large Motor has turned one rotation AFTER you press the Touch Sensor.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Touch Sensor and Large Motor values.
+
+![Hand Touch Sensor Pressed & EV3 Brick & Large Motor](/static/getting-started/11_TouchMotorWorking.png)
+
+## Connect a Color Sensor @unplugged
+
+Now we will try to control the Large Motor using another sensor.
+
+![Hand connecting Color Sensor to Port 4, Large Motor D, EV3 Brick](/static/getting-started/12_ConnectColor.png)
+
+Keeping the Large Motor connected to **Port D**, connect the Color Sensor to **Port 4**.
+
+## Update your code @fullscreen
+
+Using the same program, replace the ``||sensors:pause until touch 1||`` block with a ``||sensors:pause color sensor 3||`` for color block.
+
+```blocks
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+Don't forget to select the color you want to detect (e.g., green)!
+
+## Download @unplugged
+
+**Download:** Click **Download** and follow the instructions to get your code onto your EV3 Brick. Press the center button on the EV3 Brick to run the program.
+
+### Place a Colored Brick in Front of the Color Sensor
+
+Confirm that the Large Motor has turned one rotation AFTER the Color Sensor has detected the colored brick.
+
+Download and run the program as many times as you want in order to verify this, or tinker with different Color Sensor and Large Motor values.
+
+![IMG: Colored bricks in front of Color Sensor, hands, EV3 Brick](/static/getting-started/14_ColorSensorWorking.png)
+
+## JavaScript @fullscreen
+
+Click on the **JavaScript** tab and change the color the Color Sensor detects to Black, Blue, Green, Yellow, Red, White, or Brown. Use Title Case for the color names.
+
+```typescript
+brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
+    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Blue)
+    motors.largeD.run(50, 1, MoveUnit.Rotations)
+})
+```
+
+## Well Done! @unplugged
+
+You have now learned how to control some of the inputs and outputs of the EV3.

docs/getting-started/try.md

@@ -1,10 +1,10 @@
-# Try 
+# Try
 
 Get a quick introduction to programming with EV3.
 
 ![Display on EV3 Brick with Music Notes](/static/getting-started/01_EyesOn_Intro.png)
 
-We are excited to help you get started with @boardname@. In this project we will guide you through connecting your EV3 brick, creating your first program, controlling a Large Motor, a Touch Sensor and a Color Sensor. These steps can take up to 45 minutes.
+We are excited to help you get started with @boardname@. In this project we will guide you through connecting your EV3 Brick, creating your first program, controlling a Large Motor, a Touch Sensor and a Color Sensor. These steps can take up to 45 minutes.
 
 ## Turn on your EV3 Brick
 
@@ -135,15 +135,15 @@ Keeping the Large Motor connected to **Port D**, connect the Color Sensor to **P
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+    sensors.color4.pauseUntilColorDetected(ColorSensorColor.Green)
     motors.largeD.run(50, 1, MoveUnit.Rotations)
 })
 ```
 
-* Using the same program, replace the ``||sensors:pause until touch 1||`` block with a ``||sensors:pause color sensor 3||`` for color block.
+* Using the same program, replace the ``||sensors:pause until touch 1||`` block with a ``||sensors:pause color sensor 4||`` for color block.
 
 ```block
-sensors.color3.pauseUntilColorDetected(ColorSensorColor.Green)
+sensors.color4.pauseUntilColorDetected(ColorSensorColor.Green)
 ```
 
 * Select the color you want to detect (e.g., green).

docs/getting-started/use.md

@@ -20,6 +20,12 @@ Build the robot driving base:
 
 [![EV3 Driving Base](/static/lessons/common/ev3-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-driving-base-79bebfc16bd491186ea9c9069842155e.pdf)
 
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ## Make It Move
 
 **Code it:** Create a program that makes the Driving Base move forward and stop at the finish line, which is ``1`` meter away.
@@ -68,6 +74,12 @@ Build and attach an Ultrasonic Sensor to your driving base:
 
 [![EV3 Ultrasonic Sensor Driving Base Building Instructions Main Image](/static/lessons/common/ev3-ultrasonic-sensor-driving-base.jpg)](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-ultrasonic-sensor-driving-base-61ffdfa461aee2470b8ddbeab16e2070.pdf)
 
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ## Detect an Object
 
 **Code it:**  Create a program that moves the Driving Base and makes it stop ``6`` cm from the Cuboid.

docs/index-ref.json

@@ -1,3 +1,3 @@
 {
-    "appref": "v0.1.27"
+    "appref": "v0.4.2"
 }

docs/lessons/line-detection.md

@@ -3,7 +3,7 @@
 ## Objective
 
 Design ways to improve driving safety by helping to prevent drivers from falling asleep and causing an accident.
- 
+
 ![Car driving on highway](/static/lessons/line-detection/car-driving.jpg)
 
 ## Connect
@@ -20,6 +20,12 @@ Think about what you have learned, then document it. Describe the problem in you
 
 Start by constructing this model. Read the building instructions [here](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/building-instructions/ev3-rem-color-sensor-down-driving-base-d30ed30610c3d6647d56e17bc64cf6e2.pdf) first.
 
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ![Color sensor on the driving base](/static/lessons/line-detection/color-sensor-driving.jpg)
 
 ## Program
@@ -44,13 +50,13 @@ Create a program that drives the robot forward until the Color Sensor sees red.
 
 Place a ``||motors:steer large B+C||`` block from ``||motors:Motors||`` under ``||loops:on start||``. Change the speed to 20%.
 
-```blocks 
+```blocks
 motors.largeBC.steer(0, 20)
 ```
 
 ### Step 2
 
-Place a ``||loops:while||`` loop block under ``||motors:steer large B+C||``.  
+Place a ``||loops:while||`` loop block under ``||motors:steer large B+C||``.
 
 ```blocks
 motors.largeBC.steer(0, 20)
@@ -61,7 +67,7 @@ while (true) {
 ### Step 3
 
 Place a ``||sensors:pause until color detected||`` from ``||sensors:Sensors||`` inside the ``||loops:while||`` loop block. Change the color to red.
- 
+
 ```blocks
 motors.largeBC.steer(0, 20)
 while (true) {
@@ -99,7 +105,7 @@ Place a ``||loops:while||`` loop block under ``||loops:on start||``.
 
 ```blocks
 while (true) {
-    
+
 }
 ```
 
@@ -121,7 +127,7 @@ Place a ``||loops:while||`` loop block under the ``||motors:steer large B+C||``
 while (true) {
     motors.largeBC.steer(0, 20)
     while (true) {
-        
+
     }
 }
 ```
@@ -141,7 +147,7 @@ while (true) {
 
 ### Step 6
 
-Place a ``||motors:stop all motors||`` block under the ``||sensors:pause until color detected||`` block.  
+Place a ``||motors:stop all motors||`` block under the ``||sensors:pause until color detected||`` block.
 
 ```blocks
 while (true) {
@@ -165,7 +171,7 @@ while (true) {
         motors.stopAll()
     }
     while (true) {
-        
+
     }
 }
 ```
@@ -177,7 +183,7 @@ Place a ``||sensors:pause unril color detected||`` block inside the new ``||loop
 What do you think the program will do?
 
 **Hint:** The motors will run until the Color Sensor detects the color red, then it will stop all motors. The motors will also run and not stop when the color sensor detects the color green.
- 
+
 ```blocks
 while (true) {
     motors.largeBC.steer(0, 20)
@@ -212,7 +218,7 @@ sensors.color3.pauseUntilColorDetected(ColorSensorColor.Yellow)
 music.playSoundEffect(sounds.systemGeneralAlert)
 }
 while (true) {
-    while (true) {      
+    while (true) {
         sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
@@ -235,7 +241,7 @@ You will need to constantly debug your program in order to make your robot trave
 
 ```blocks
 while (true) {
-    while (true) {   
+    while (true) {
         sensors.color3.pauseUntilLightDetected(LightIntensityMode.Reflected, Light.Bright)
         motors.largeB.run(10)
         motors.largeC.run(-10)
@@ -252,10 +258,10 @@ while (true) {
 
 Consider the following questions:
 
-1. What challenged you? 
-2. Where there any surprises? 
+1. What challenged you?
+2. Where there any surprises?
 3. How could you improve your program?
-4. Could your program have been more streamlined? 
+4. Could your program have been more streamlined?
 5. Have you used too many blocks?
 6. Is there a more efficient way of building your program?
 7. How could your program be used in real-world scenarios?

docs/lessons/make-it-move-tutorial.md

@@ -1,4 +1,4 @@
-# Make It Move Without Wheels 
+# Make It Move Without Wheels
 
 ## Objective @unplugged
 
@@ -24,7 +24,13 @@ The Walker Bot combines an EV3 Frame and two legs that are mirror-images to crea
 The legs in the Walker Bot are designed to show how to change the rotary motion of a motor to reciprocating motion.
 
 Start by reading [these](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/walker-bot-bi-180fc24f9298e1dd6201099627d43903.pdf) instructions first.
- 
+
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ![@boardname@ Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
 
  
@@ -37,7 +43,7 @@ Place a ``||motors:tank large B+C||`` block from ``||motors:Motors||`` under ``|
 Change the speed to `-60%` (for motor B) and `+60%` (for motor C).
 Change the rotations to `9`.
 
-The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 brick. The motors are set for the reverse direction because they are mounted upside down in this model.
+The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 Brick. The motors are set for the reverse direction because they are mounted upside down in this model.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
@@ -47,7 +53,7 @@ motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
 
 Place a ``||motors:stop all motors||`` block under ``||motors:tank large B+C||``.
 
-The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 brick then stop.
+The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 Brick then stop.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
@@ -59,7 +65,7 @@ motors.stopAll()
 Place a ``||brick:show string||`` block under ``||motors:stop all motors||``.
 Change the `"Hello World"` text to `"30 cm"`.
 
-The ``||motors:tank large B+C||`` will run for `9` rotations when the **center** button is pressed on the EV3 brick then stop and display "30 cm" on the EV3 Brick’s screen.
+The ``||motors:tank large B+C||`` will run for `9` rotations when the **center** button is pressed on the EV3 Brick then stop and display "30 cm" on the EV3 Brick’s screen.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)

docs/lessons/make-it-move.md

@@ -1,4 +1,4 @@
-# Make It Move Without Wheels 
+# Make It Move Without Wheels
 
 ## Objective
 
@@ -23,7 +23,13 @@ The Walker Bot combines an EV3 Frame and two legs that are mirror-images to crea
 The legs in the Walker Bot are designed to show how to change the rotary motion of a motor to reciprocating motion.
 
 Start by reading [these](https://le-www-live-s.legocdn.com/sc/media/lessons/mindstorms-ev3/ev3-dep/building%20instructions/walker-bot-bi-180fc24f9298e1dd6201099627d43903.pdf) instructions first.
- 
+
+### ~hint
+
+If clicking the above image doesn't open the instructions, right-click on the image and choose "Save link as..." to download the PDF.
+
+### ~
+
 ![@boardname@ Walker Bot](/static/lessons/make-it-move/walker-bot.jpg)
 
  
@@ -38,7 +44,7 @@ Place a ``||motors:tank large B+C||`` block from ``||motors:Motors||`` under ``|
 Change the speed to `-60%` (for motor B) and `+60%` (for motor C).
 Change the rotations to `9`.
 
-The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 brick. The motors are set for the reverse direction because they are mounted upside down in this model.
+The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 Brick. The motors are set for the reverse direction because they are mounted upside down in this model.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
@@ -48,7 +54,7 @@ motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
 
 Place a ``||motors:stop all motors||`` block under ``||motors:tank large B+C||``.
 
-The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 brick then stop.
+The ``||motors:tank large B+C||`` block will run for `9` rotations when the **center** button is pressed on the EV3 Brick then stop.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)
@@ -60,7 +66,7 @@ motors.largeBC.stop()
 Place a ``||brick:show string||`` block under ``||motors:stop all motors||``.
 Change the `"Hello World"` text to `"30 cm"`.
 
-The ``||motors:tank large B+C||`` will run for `9` rotations when the **center** button is pressed on the EV3 brick then stop and display "30 cm" on the EV3 Brick’s screen.
+The ``||motors:tank large B+C||`` will run for `9` rotations when the **center** button is pressed on the EV3 Brick then stop and display "30 cm" on the EV3 Brick’s screen.
 
 ```blocks
 motors.largeBC.tank(-60, 60, 9, MoveUnit.Rotations)

docs/maker.md

@@ -1,9 +1,5 @@
 # Maker Activites
 
-These six activities require the [@boardname@ Core Set (45544)](https://education.lego.com/en-us/products/lego-mindstorms-education-ev3-core-set-/5003400). Supporting materials for teachers and middle school students are provided, offering everything teachers and students need to explore their inner makers as they follow the design process to solve open-ended, themed challenges...
-
-* [Download Curriculum Materials](https://education.lego.com/en-us/downloads/mindstorms-ev3/curriculum)
-
 ## Activites
 
 ```codecard

docs/maker/security-gadget.md

@@ -42,14 +42,12 @@ This activity uses sensor inputs. You may want to try the [Use](/getting-started
 
 Follow the steps of the _Maker Design Process_ for this lesson:
 
-| | |
-|-|-|
-| ![Paper sheet icon](/static/maker/design-process-icons/define-problem.png) | **Define the Problem** |
-| ![Lightbulb icon](/static/maker/design-process-icons/brainstorming.png) | **Brainstorming** |
-| ![Checkmark icon](/static/maker/design-process-icons/define-criteria.png) | **Define the Design Criteria** |
-| ![Connector icon](/static/maker/design-process-icons/go-make.png) | **Go Make** |
-| ![Redo icon](/static/maker/design-process-icons/review-revise.png) | **Review and Revise Your Solution** |
-| ![Speaker icon](/static/maker/design-process-icons/communicate.png) | **Communicate Your Solution** |
+* Define the Problem
+* Brainstorming
+* Define the Design Criteria
+* Go Make
+* Review and Revise Your Solution
+* Communicate Your Solution
 
 ### Defining the Problem
 

docs/maker/sound-machine.md

@@ -41,14 +41,12 @@ This activity uses motor rotations and sensor inputs. You may want to try the [U
 
 Follow the steps of the _Maker Design Process_ for this lesson:
 
-| | |
-|-|-|
-| ![Paper sheet icon](/static/maker/design-process-icons/define-problem.png) | **Define the Problem** |
-| ![Lightbulb icon](/static/maker/design-process-icons/brainstorming.png) | **Brainstorming** |
-| ![Checkmark icon](/static/maker/design-process-icons/define-criteria.png) | **Define the Design Criteria** |
-| ![Connector icon](/static/maker/design-process-icons/go-make.png) | **Go Make** |
-| ![Redo icon](/static/maker/design-process-icons/review-revise.png) | **Review and Revise Your Solution** |
-| ![Speaker icon](/static/maker/design-process-icons/communicate.png) | **Communicate Your Solution** |
+* Define the Problem
+* Brainstorming
+* Define the Design Criteria
+* Go Make
+* Review and Revise Your Solution
+* Communicate Your Solution
 
 ### Defining the Problem
 

docs/offline-app.html

@@ -0,0 +1,797 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:fb="http://www.facebook.com/2008/fbml">
+
+<head>
+    <meta charset="UTF-8">
+    <title>LEGO® MINDSTORMS® Education EV3 Offline App</title>
+    <meta name="Description" content="A MakeCode for LEGO® MINDSTORMS® Education EV3 offline app" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- @include indexhead.html -->
+
+    <style>
+        p.item {
+            color: rgba(0, 0, 0, 0.4);
+        }
+
+        .topbar {
+            background: rgb(170, 39, 143) !important;
+        }
+
+        .ui.inverted.content {
+            /* background: #00a5c8; */
+            background: #2a7af3;
+        }
+
+        .content.segment {
+            min-height: 80%;
+        }
+
+        .content .welcomeheader {
+            font-weight: 300;
+        }
+
+        .footer.segment {
+            padding: 5em 0em;
+        }
+
+        .image.left {
+            padding-left: 2em;
+        }
+
+        .image.right {
+            padding-right: 2em;
+            float: right;
+        }
+
+        .segments {
+            max-width: 60%;
+        }
+
+        .segments.terms-container {
+            margin-top: 5em;
+        }
+
+        .terms-container .segment {
+            background-color: rgb(250, 250, 250);
+        }
+
+        @media only screen and (max-width: 800px) {
+            .grid .column .image {
+                display: none;
+            }
+
+            .segments {
+                max-width: 95%;
+            }
+        }
+    </style>
+
+    <!-- Auto-generated styles for the license terms -->
+    <style type="text/css">
+        .terms ol {
+            margin: 0;
+            padding: 0
+        }
+
+        .terms table td,
+        .terms table th {
+            padding: 0
+        }
+
+        .c2 {
+            margin-left: 22.5pt;
+            padding-top: 6pt;
+            text-indent: -18pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c8 {
+            margin-left: 40.5pt;
+            padding-top: 6pt;
+            text-indent: -18pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c15 {
+            padding-top: 0pt;
+            padding-bottom: 12pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left;
+            height: 11pt
+        }
+
+        .c7 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left;
+            height: 11pt
+        }
+
+        .c0 {
+            margin-left: 23pt;
+            padding-top: 6pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c10 {
+            margin-left: 40.5pt;
+            padding-top: 6pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c6 {
+            margin-left: 40.5pt;
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c20 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: center
+        }
+
+        .c4 {
+            color: #000000;
+            font-weight: 700;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-family: "Arial";
+            font-style: normal
+        }
+
+        .c11 {
+            padding-top: 0pt;
+            padding-bottom: 0pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c12 {
+            padding-top: 6pt;
+            padding-bottom: 6pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c3 {
+            color: #000000;
+            font-weight: 400;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-family: "Arial";
+            font-style: normal
+        }
+
+        .c16 {
+            padding-top: 0pt;
+            padding-bottom: 12pt;
+            line-height: 1.15;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .c13 {
+            color: #000000;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-family: "Arial";
+            font-style: italic
+        }
+
+        .c14 {
+            text-decoration-skip-ink: none;
+            -webkit-text-decoration-skip: none;
+            color: #1155cc;
+            text-decoration: underline
+        }
+
+        .c17 {
+            background-color: #ffffff;
+            max-width: 540pt;
+            padding: 36pt 36pt 36pt 36pt
+        }
+
+        .c18 {
+            text-decoration-skip-ink: none;
+            -webkit-text-decoration-skip: none;
+            text-decoration: underline
+        }
+
+        .c9 {
+            color: inherit;
+            text-decoration: inherit
+        }
+
+        .c5 {
+            font-weight: 700
+        }
+
+        .c1 {
+            font-size: 10pt
+        }
+
+        .c19 {
+            font-size: 11pt
+        }
+
+        .terms .title {
+            padding-top: 0pt;
+            color: #000000;
+            font-size: 26pt;
+            padding-bottom: 3pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms .subtitle {
+            padding-top: 0pt;
+            color: #666666;
+            font-size: 15pt;
+            padding-bottom: 16pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms li {
+            color: #000000;
+            font-size: 11pt;
+            font-family: "Arial"
+        }
+
+        .terms p {
+            margin: 0;
+            color: #000000;
+            font-size: 11pt;
+            font-family: "Arial"
+        }
+
+        .terms h1 {
+            padding-top: 20pt;
+            color: #000000;
+            font-size: 20pt;
+            padding-bottom: 6pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms h2 {
+            padding-top: 18pt;
+            color: #000000;
+            font-size: 16pt;
+            padding-bottom: 6pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms h3 {
+            padding-top: 16pt;
+            color: #434343;
+            font-size: 14pt;
+            padding-bottom: 4pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms h4 {
+            padding-top: 14pt;
+            color: #666666;
+            font-size: 12pt;
+            padding-bottom: 4pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms h5 {
+            padding-top: 12pt;
+            color: #666666;
+            font-size: 11pt;
+            padding-bottom: 4pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+
+        .terms h6 {
+            padding-top: 12pt;
+            color: #666666;
+            font-size: 11pt;
+            padding-bottom: 4pt;
+            font-family: "Arial";
+            line-height: 1.15;
+            page-break-after: avoid;
+            font-style: italic;
+            orphans: 2;
+            widows: 2;
+            text-align: left
+        }
+    </style>
+
+    <script>
+        $(document).ready(function () {
+            tickEvent = function (id, data) {
+                if (!pxt.aiTrackEvent) return;
+                if (!data) pxt.aiTrackEvent(id);
+                else {
+                    var props = {};
+                    var measures = {};
+                    for (var k in data)
+                        if (typeof data[k] == "string") props[k] = data[k];
+                        else measures[k] = data[k];
+                    pxt.aiTrackEvent(id, props, measures);
+                }
+            }
+        });
+        function agreeCheckboxChanged() {
+            var downloadSegment = document.getElementById("download-segment");
+            downloadSegment.classList.toggle("hidden");
+        }
+        function downloadWin64() {
+            // TODO: Keep this link up-to-date with the desired release version
+            window.open("https://makecode.com/api/release/ev3/v0.4.2/win64");
+            tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
+        }
+        function downloadMac64() {
+            // TODO: Keep this link up-to-date with the desired release version
+            window.open("https://makecode.com/api/release/ev3/v0.4.2/mac64");
+            tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
+        }
+    </script>
+
+</head>
+
+<body id="root" class="root">
+
+    <div class="ui inverted vertical center aligned segment content">
+
+        <div class="ui grid topbar">
+            <div class="three wide column">
+                <img class="ui small image left" src="/static//lego_education_logo_white.png" />
+            </div>
+            <div class="ten wide column">
+                <h1 class="ui inverted welcomeheader">MakeCode Offline App</h1>
+            </div>
+            <div class="three wide column">
+                <img class="ui small image right" src="/static//Microsoft-logo_rgb_c-white.png" />
+            </div>
+        </div>
+
+        <div class="ui compact segments terms-container">
+            <div class="ui secondary center aligned segment">
+                Please read and accept the following terms to download the app.
+            </div>
+            <div class="ui left aligned segment terms">
+                <div class="c17">
+                    <p class="c11">
+                        <span class="c4 c1">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span>
+                    </p>
+                    <p class="c11">
+                        <span class="c4 c1">MICROSOFT MAKECODE FOR LEGO MINDSTORMS EDUCATION EV3</span>
+                    </p>
+                    <p class="c7">
+                        <span class="c4 c1"></span>
+                    </p>
+                    <p class="c11">
+                        <span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based on where you live, one
+                            of its affiliates) and you. They apply to the software named above. The terms also apply to any
+                            Microsoft services or updates for the software, except to the extent those have additional terms.</span>
+                    </p>
+                    <p class="c7">
+                        <span class="c3 c1"></span>
+                    </p>
+                    <p class="c11">
+                        <span class="c4 c1">IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">1.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">INSTALLATION AND USE RIGHTS. </span>
+                        <span class="c3 c1">You may install and use any number of copies of the software to evaluate it as you develop and test
+                            your software applications for use with Lego Mindstorms Education EV3 hardware.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">2.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">PRE-RELEASE SOFTWARE. </span>
+                        <span class="c3 c1">The software is a pre-release version. It may not work the way a final version of the software will.
+                            Microsoft may change it for the final, commercial version. We also may not release a commercial
+                            version. Microsoft is not obligated to provide maintenance, technical support or updates to you
+                            for the software.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">3.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">Associated Online Services.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software may provide access
+                            to, or rely on, Azure online services, including an associated Azure online service to the software
+                            currently in development (the &ldquo;corresponding service&rdquo;). The use of those services
+                            (but not the software) is governed by the separate terms and privacy policies in the agreement
+                            under which you obtained the Azure services at</span>
+                        <span class="c1">
+                            <a class="c9" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529596153826000">&nbsp;</a>
+                        </span>
+                        <span class="c1 c18">
+                            <a class="c9" href="https://www.google.com/url?q=https://go.microsoft.com/fwLink/p/?LinkID%3D233178&amp;sa=D&amp;ust=1529596153826000">https://go.microsoft.com/fwLink/p/?LinkID=233178</a>
+                        </span>
+                        <span class="c3 c1">&nbsp;(and, with respect to the corresponding service, the additional terms below). Please read them.
+                            The services may not be available in all regions.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">4.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">Licenses for other components.</span>
+                        <span class="c3 c1">&nbsp;The software may include third party components with separate legal notices or governed by
+                            other agreements, as described in the ThirdPartyNotices file accompanying the software. Even
+                            if such components are governed by other agreements, the disclaimers and the limitations on and
+                            exclusions of damages below also apply.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">5.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c1 c4">DATA.</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c5 c1">a.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c1 c5">Data Collection. </span>
+                        <span class="c1">The software may collect information about you and your use of the software, and send that to Microsoft.
+                            Microsoft may use this information to provide services and improve our products and services.
+                            You may opt out of many of these scenarios, but not all, as described in the product documentation.
+                            In using the software, you must comply with applicable law. You can learn more about data collection
+                            and use in the help documentation and the privacy statement at </span>
+                        <span class="c14 c1">
+                            <a class="c9" href="https://www.google.com/url?q=http://go.microsoft.com/fwlink/?LinkId%3D398505&amp;sa=D&amp;ust=1529596153827000">http://go.microsoft.com/fwlink/?LinkId=398505</a>
+                        </span>
+                        <span class="c1">.</span>
+                        <span class="c3 c1">&nbsp;Your use of the software operates as your consent to these practices.</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c5 c1">b.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c5 c1">Processing of Personal Data. </span>
+                        <span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in connection with the software,
+                            Microsoft makes the commitments in the European Union General Data Protection Regulation Terms
+                            of the Online Services Terms to all customers effective May 25, 2018, at </span>
+                        <span class="c1 c14">
+                            <a class="c9" href="https://www.google.com/url?q=http://go.microsoft.com/?linkid%3D9840733&amp;sa=D&amp;ust=1529596153828000">http://go.microsoft.com/?linkid=9840733</a>
+                        </span>
+                        <span class="c3 c1">.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">6.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">FEEDBACK. </span>
+                        <span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft, without charge, the
+                            right to use, share and commercialize your feedback in any way and for any purpose. You will
+                            not give feedback that is subject to a license that requires Microsoft to license its software
+                            or documentation to third parties because we include your feedback in them. These rights survive
+                            this agreement.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">7.</span>
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">SCOPE OF LICENSE.</span>
+                        <span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some rights to use the software.
+                            Microsoft reserves all other rights. Unless applicable law gives you more rights despite this
+                            limitation, you may use the software only as expressly permitted in this agreement. &nbsp;In
+                            doing so, you must comply with any technical limitations in the software that only allow you
+                            to use it in certain ways. You may not:</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the software;</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or attempt to do so, except
+                            and only to the extent required by third party licensing terms governing use of certain open
+                            source components that may be included with the software;</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft or its suppliers in the
+                            software;
+                        </span>
+                    </p>
+                    <p class="c8">
+                        <span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law; or</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the software as a stand-alone
+                            offering for others to use.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">8. &nbsp; UPDATES. </span>
+                        <span class="c3 c1">The software may periodically check for updates and download and install them for you. You may obtain
+                            updates only from Microsoft or authorized sources. Microsoft may need to update your system to
+                            provide you with updates. You agree to receive these automatic updates without any additional
+                            notice. Updates may not include or support all existing software features, services, or peripheral
+                            devices.
+                        </span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">9.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c5 c1">EXPORT RESTRICTIONS.</span>
+                        <span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and regulations that apply
+                            to the software, which include restrictions on destinations, end users and end use. For further
+                            information on export restrictions, visit (aka.ms/exporting).</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">10.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c5 c1">SUPPORT SERVICES. </span>
+                        <span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support services for it.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">11.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c5 c1">ENTIRE AGREEMENT.</span>
+                        <span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based services and support
+                            services that you use, are the entire agreement for the software and support services.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">12.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c5 c1">APPLICABLE LAW. </span>
+                        <span class="c3 c1">If you acquired the software in the United States, Washington State law applies to interpretation
+                            of and claims for breach of this agreement, and the laws of the state where you live apply to
+                            all other claims. If you acquired the software in any other country, its laws apply.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">13.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c5 c1">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span>
+                        <span class="c3 c1">This agreement describes certain legal rights. You may have other rights, including consumer rights,
+                            under the laws of your state or country. Separate and apart from your relationship with Microsoft,
+                            you may also have rights with respect to the party from which you acquired the software. This
+                            agreement does not change those other rights if the laws of your state or country do not permit
+                            it to do so. For example, if you acquired the software in one of the below regions, or mandatory
+                            country law applies, then the following provisions apply to you:</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c5 c1">a.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c5 c1">Australia. </span>
+                        <span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is
+                            intended to affect those rights.</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c5 c1">b.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c5 c1">Canada. </span>
+                        <span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by turning off the automatic
+                            update feature, disconnecting your device from the Internet (if and when you re-connect to the
+                            Internet, however, the software will resume checking for and installing updates), or uninstalling
+                            the software. The product documentation, if any, may also specify how to turn off updates for
+                            your specific device or software.</span>
+                    </p>
+                    <p class="c8">
+                        <span class="c5 c1">c.</span>
+                        <span class="c1">&nbsp; &nbsp;</span>
+                        <span class="c5 c1">Germany and Austria</span>
+                        <span class="c3 c1">.</span>
+                    </p>
+                    <p class="c6">
+                        <span class="c5 c1">(i)</span>
+                        <span class="c1">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">Warranty</span>
+                        <span class="c3 c1">. The properly licensed software will perform substantially as described in any Microsoft materials
+                            that accompany the software. However, Microsoft gives no contractual guarantee in relation to
+                            the licensed software.</span>
+                    </p>
+                    <p class="c6">
+                        <span class="c4 c1">&nbsp;</span>
+                    </p>
+                    <p class="c6">
+                        <span class="c5 c1">(ii)</span>
+                        <span class="c1">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <span class="c5 c1">Limitation of Liability</span>
+                        <span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as
+                            well as, in case of death or personal or physical injury, Microsoft is liable according to the
+                            statutory law.</span>
+                    </p>
+                    <p class="c10">
+                        <span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft
+                            is in breach of such material contractual obligations, the fulfillment of which facilitate the
+                            due performance of this agreement, the breach of which would endanger the purpose of this agreement
+                            and the compliance with which a party may constantly trust in (so-called &quot;cardinal obligations&quot;).
+                            In other cases of slight negligence, Microsoft will not be liable for slight negligence.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">14.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c5 c1">LEGAL EFFECT.</span>
+                        <span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other rights under the laws of
+                            your country. You may also have rights with respect to the party from whom you acquired the software.
+                            This agreement does not change your rights under the laws of your country if the laws of your
+                            country do not permit it to do so.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">15.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; &nbsp;YOU BEAR THE RISK OF
+                            USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED
+                            UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
+                            FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c5 c1">16.</span>
+                        <span class="c1">&nbsp;</span>
+                        <span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT
+                            DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST
+                            PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</span>
+                    </p>
+                    <p class="c0">
+                        <span class="c3 c1">This limitation applies to (a) anything related to the software, services, content (including code)
+                            on third party Internet sites, or third party programs; and (b) claims for breach of contract,
+                            breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the
+                            extent permitted by applicable law.</span>
+                    </p>
+                    <p class="c0">
+                        <span class="c3 c1">It also applies even if Microsoft knew or should have known about the possibility of the damages.
+                            The above limitation or exclusion may not apply to you because your country may not allow the
+                            exclusion or limitation of incidental, consequential or other damages.</span>
+                    </p>
+                    <p class="c12">
+                        <span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the clauses in this agreement
+                            are provided below in French.</span>
+                    </p>
+                    <p class="c12">
+                        <span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, Canada, certaines des clauses
+                            dans ce contrat sont fournies ci-dessous en fran&ccedil;ais.</span>
+                    </p>
+                    <p class="c11">
+                        <span class="c5 c1">EXON&Eacute;RATION DE GARANTIE.</span>
+                        <span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel &raquo;. Toute utilisation
+                            de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde aucune
+                            autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en vertu
+                            du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles
+                            sont permises par le droit locale, les garanties implicites de qualit&eacute; marchande, d&rsquo;ad&eacute;quation
+                            &agrave; un usage particulier et d&rsquo;absence de contrefa&ccedil;on sont exclues.
+                        </span>
+                    </p>
+                    <p class="c11">
+                        <span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
+                        <span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages
+                            directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave; aucune
+                            indemnisation pour les autres dommages, y compris les dommages sp&eacute;ciaux, indirects ou
+                            accessoires et pertes de b&eacute;n&eacute;fices.</span>
+                    </p>
+                    <p class="c12">
+                        <span class="c3 c1">Cette limitation concerne :</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux services ou au contenu
+                            (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et</span>
+                    </p>
+                    <p class="c2">
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation de contrat ou de garantie,
+                            ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre faute
+                            dans la limite autoris&eacute;e par la loi en vigueur.</span>
+                    </p>
+                    <p class="c12">
+                        <span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait ou devrait conna&icirc;tre
+                            l&rsquo;&eacute;ventualit&eacute; d&rsquo;un tel dommage. Si votre pays n&rsquo;autorise pas
+                            l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects, accessoires
+                            ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion ci-dessus
+                            ne s&rsquo;appliquera pas &agrave; votre &eacute;gard.</span>
+                    </p>
+                    <p class="c16">
+                        <span class="c5 c1">EFFET JURIDIQUE.</span>
+                        <span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. Vous pourriez avoir d&rsquo;autres
+                            droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas les
+                            droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent pas.</span>
+                    </p>
+                    <p class="c15">
+                        <span class="c3 c1"></span>
+                    </p>
+                    <p class="c16">
+                        <span class="c3 c1">&nbsp;</span>
+                    </p>
+                    <p class="c11">
+                        <span class="c3 c1">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of
+                            the LEGO Group. &copy;2018 The LEGO Group. All rights reserved.</span>
+                    </p>
+                    <p class="c11">
+                        <span class="c3 c1">&nbsp;</span>
+                    </p>
+                    <p class="c20">
+                        <span class="c5 c1 c13">Remainder of this page intentionally left blank.</span>
+                    </p>
+                    <p class="c7">
+                        <span class="c3 c19"></span>
+                    </p>
+                </div>
+            </div>
+            <div class="ui center aligned segment">
+                <input id="agree-checkbox" type="checkbox" autocomplete="off" onchange="agreeCheckboxChanged(this)">
+                <label for="agree-checkbox">I agree to these Microsoft Software License Terms and to the
+                    <a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement.</a>
+                </label>
+            </div>
+            <div id="download-segment" class="ui center aligned segment hidden">
+                <div class="ui grid">
+                    <div class="eight wide column">
+                        <h3 class="ui">Windows</h3>
+                        <button class="ui icon button" onclick="downloadWin64()">
+                            <i class="download icon"></i>
+                            makecode-ev3-setup-win64.exe
+                        </button>
+                    </div>
+                    <div class="eight wide column">
+                        <h3 class="ui">Mac OS</h3>
+                        <button class="ui icon button" onclick="downloadMac64()">
+                            <i class="download icon"></i>
+                            makecode-ev3-mac64.zip
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+    <!-- @include footer.html -->
+    <!-- @include tracking.html -->
+
+</body>
+
+</html>

docs/static/download/firmware.svg

@@ -1,252 +1,279 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="261.3" height="109.3" viewBox="0 0 69.1 28.9" id="svg9461">
-  <defs id="defs9455">
-    <clipPath id="clipPath8689">
-      <path d="M0 1145.9h1366V0H0z" id="path8687"/>
-    </clipPath>
-    <clipPath id="clipPath8663">
-      <path d="M309.8 89.4h3.7v3.7h-3.7z" id="path8661"/>
-    </clipPath>
-    <clipPath id="clipPath8647">
-      <path d="M0 1145.9h1366V0H0z" id="path8645"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 .6661 -.32488 0 300.7 115)" id="linearGradient8637">
-      <stop offset="0" id="stop8633" stop-color="#757575"/>
-      <stop offset="1" id="stop8635" stop-color="#393939"/>
-    </linearGradient>
-    <clipPath id="clipPath8595">
-      <path d="M0 1145.9h1366V0H0z" id="path8593"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 12.8096 -17.18704 0 300.7 98.4)" id="linearGradient8585">
-      <stop offset="0" id="stop8579" stop-color="#6a6a6a"/>
-      <stop offset=".5" id="stop8581" stop-color="#48e400"/>
-      <stop offset="1" id="stop8583" stop-color="#6a6a6a"/>
-    </linearGradient>
-    <clipPath id="clipPath8561">
-      <path d="M0 1145.9h1366V0H0z" id="path8559"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -1.33016 5.597 0 300.7 88.4)" id="linearGradient8551">
-      <stop offset="0" id="stop8547" stop-color="#a9aba9"/>
-      <stop offset="1" id="stop8549" stop-color="#535453"/>
-    </linearGradient>
-    <clipPath id="clipPath8525">
-      <path d="M0 1145.9h1366V0H0z" id="path8523"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -.56074 .70884 0 300.7 115.6)" id="linearGradient8515">
-      <stop offset="0" id="stop8511" stop-color="#a9aba9"/>
-      <stop offset="1" id="stop8513" stop-color="#818181"/>
-    </linearGradient>
-    <clipPath id="clipPath8493">
-      <path d="M0 1145.9h1366V0H0z" id="path8491"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -2.39765 2.48247 0 300.7 98.1)" id="linearGradient8483">
-      <stop offset="0" id="stop8479" stop-color="#f2f2f2"/>
-      <stop offset="1" id="stop8481" stop-color="#7a7a7a"/>
-    </linearGradient>
-    <clipPath id="clipPath8449">
-      <path d="M0 1145.9h1366V0H0z" id="path8447"/>
-    </clipPath>
-    <clipPath id="clipPath8977">
-      <path d="M0 1145.9h1366V0H0z" id="path8975"/>
-    </clipPath>
-    <clipPath id="clipPath8951">
-      <path d="M593 101h3.6v3.7H593z" id="path8949"/>
-    </clipPath>
-    <clipPath id="clipPath8935">
-      <path d="M0 1145.9h1366V0H0z" id="path8933"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 .67046 -.32706 0 583.8 126.8)" id="linearGradient8925">
-      <stop offset="0" id="stop8921" stop-color="#757575"/>
-      <stop offset="1" id="stop8923" stop-color="#393939"/>
-    </linearGradient>
-    <clipPath id="clipPath8883">
-      <path d="M0 1145.9h1366V0H0z" id="path8881"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 12.89405 -17.29507 0 583.7 110)" id="linearGradient8873">
-      <stop offset="0" id="stop8867" stop-color="#6a6a6a"/>
-      <stop offset=".5" id="stop8869" stop-color="#48e400"/>
-      <stop offset="1" id="stop8871" stop-color="#6a6a6a"/>
-    </linearGradient>
-    <clipPath id="clipPath8849">
-      <path d="M0 1145.9h1366V0H0z" id="path8847"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -1.33884 5.6329 0 583.7 100)" id="linearGradient8839">
-      <stop offset="0" id="stop8835" stop-color="#a9aba9"/>
-      <stop offset="1" id="stop8837" stop-color="#535453"/>
-    </linearGradient>
-    <clipPath id="clipPath8813">
-      <path d="M0 1145.9h1366V0H0z" id="path8811"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -.56429 .71345 0 583.7 127.4)" id="linearGradient8803">
-      <stop offset="0" id="stop8799" stop-color="#a9aba9"/>
-      <stop offset="1" id="stop8801" stop-color="#818181"/>
-    </linearGradient>
-    <clipPath id="clipPath8781">
-      <path d="M0 1145.9h1366V0H0z" id="path8779"/>
-    </clipPath>
-    <linearGradient x2="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -2.41323 2.4988 0 583.7 109.8)" id="linearGradient8771">
-      <stop offset="0" id="stop8767" stop-color="#f2f2f2"/>
-      <stop offset="1" id="stop8769" stop-color="#7a7a7a"/>
-    </linearGradient>
-    <clipPath id="clipPath8737">
-      <path d="M0 1145.9h1366V0H0z" id="path8735"/>
-    </clipPath>
-  </defs>
-  <g id="layer1" transform="translate(0 -268)">
-    <g id="g10860" transform="translate(-20.8 -2)">
-      <g transform="matrix(.35278 0 0 -.35278 62.8 291.4)" id="g8727">
-        <path id="path8729" d="M0 0h24" fill="none" stroke="#000" stroke-width="2"/>
-      </g>
-      <g id="g8731" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8737)" id="g8733">
-          <g transform="translate(458 159.9)" id="g8739">
-            <path id="path8741" d="M0 0h83a4 4 0 0 0 4-4v-52.5H-4V-4a4 4 0 0 0 4 4" fill="#e6e6e6"/>
-          </g>
-          <g transform="translate(458 158.4)" id="g8743">
-            <path id="path8745" d="M0 0h83c1.3 0 2.4-1.1 2.4-2.5V-52c0-.9-.6-1.5-1.5-1.5H-1c-.8 0-1.5.6-1.5 1.5v49.5C-2.5-1.1-1.4 0 0 0z" fill="none" stroke="#282828" stroke-width="3"/>
-          </g>
-          <g transform="translate(445 102.9)" id="g8747">
-            <path id="path8749" d="M0 0h108.8v-1.2a3 3 0 0 0-3-3H3a3 3 0 0 0-3 3z" fill="#626262"/>
-          </g>
-          <g transform="translate(489.8 102.9)" id="g8751">
-            <path id="path8753" d="M0 0h19.3c0-.8-.6-1.4-1.4-1.4H1.4C.6-1.4 0-.8 0 0" fill="#818181"/>
-          </g>
-        </g>
-      </g>
-      <g id="g8755" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g id="g8757">
-          <g id="g8763">
-            <g id="g8765">
-              <path id="path8773" d="M567.9 139.7a.6.6 0 0 1-.6-.6v-30.6c0-.3.2-.6.6-.6h31.7c.3 0 .5.3.5.6v30.6c0 .3-.2.6-.5.6z" fill="url(#linearGradient8771)"/>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g id="g8775" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8781)" id="g8777">
-          <g transform="translate(569.7 111.2)" id="g8783">
-            <path id="path8785" d="M0 0h28c.3 0 .6-.3.6-.6V-12c0-.4-.3-.6-.6-.6H0c-.3 0-.6.2-.6.6V-.6c0 .3.3.6.6.6" fill="#f2f2f2"/>
-          </g>
-        </g>
-      </g>
-      <g id="g8787" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g id="g8789">
-          <g id="g8795">
-            <g id="g8797">
-              <path id="path8805" d="M569.4 149.1a.6.6 0 0 1-.6-.6v-22.3c0-.3.3-.6.6-.6H598c.3 0 .6.3.6.6v22.3c0 .3-.3.6-.6.6z" fill="url(#linearGradient8803)"/>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g id="g8807" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8813)" id="g8809">
-          <g transform="translate(572.7 146)" id="g8815">
-            <path id="path8817" d="M0 0h22.1c.6 0 1.1-.5 1.1-1.1v-12.5c0-.6-.5-1-1-1H0c-.6 0-1.1.4-1.1 1V-1c0 .5.5 1 1.1 1" fill="#393939"/>
-          </g>
-          <g transform="translate(574.4 145.4)" id="g8819">
-            <path id="path8821" d="M0 0h18.8c.4 0 .8-.4.8-.8v-12c0-.4-.4-.8-.8-.8H0c-.4 0-.8.4-.8.8v12c0 .4.4.8.8.8" fill="#98b6a7"/>
-          </g>
-        </g>
-      </g>
-      <g id="g8823" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g id="g8825">
-          <g id="g8831">
-            <g id="g8833">
-              <path id="path8841" d="M569.1 105.6v-6.4c0-.3.3-.6.6-.6h28c.3 0 .6.3.6.6v6.4z" fill="url(#linearGradient8839)"/>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g id="g8843" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8849)" id="g8845">
-          <g transform="translate(581.7 109.3)" id="g8851">
-            <path id="path8853" d="M0 0l-4.2 4.2v.6h-1a2.5 2.5 0 0 0 0 4.9h1v.5L0 14.5h4l4.2-4.2v-.6h1a2.5 2.5 0 0 0 0-5h-1v-.5L4.2 0z" fill="#6a6a6a"/>
-          </g>
-        </g>
-      </g>
-      <g id="g8855" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g id="g8857">
-          <g id="g8863">
-            <g id="g8865">
-              <path id="path8875" d="M581.7 123.8l-4.2-4.2v-.6h-1a2.5 2.5 0 1 1 0-5v.1h1v-.5l4.2-4.3h4.2l4.2 4.3v.5h1a2.5 2.5 0 0 1-.1 4.9h-1v.7l-4.1 4.1z" fill="url(#linearGradient8873)"/>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g id="g8877" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8883)" id="g8879">
-          <g transform="translate(576.4 118.4)" id="g8885">
-            <path id="path8887" d="M0 0h3v-3.6H0A1.8 1.8 0 1 0 0 0" fill="#a9aba9"/>
-          </g>
-          <g transform="translate(591 114.8)" id="g8889">
-            <path id="path8891" d="M0 0h-3v3.6h3A1.8 1.8 0 1 0 0 0" fill="#a9aba9"/>
-          </g>
-          <g transform="translate(582 118.4)" id="g8893">
-            <path id="path8895" d="M0 0h3.6v-3.6H-.1V0H0" fill="#393939"/>
-          </g>
-          <g transform="translate(581.9 123.2)" id="g8897">
-            <path id="path8899" d="M0 0h3.8l2.8-2.9L5.5-4v-2H4.3v1c0 .5-.4 1-1 1h-3a.7.7 0 0 1-.8-.8v-1.4h-1V-4l-1.2 1.2z" fill="#a9aba9"/>
-          </g>
-          <g transform="translate(585.6 110)" id="g8901">
-            <path id="path8903" d="M0 0h-3.8l-2.8 2.9 1.2 1.2v2h1V5c0-.5.5-1 1-1h3.2c.5 0 .8.4.8.8v1.4h1.1V4l1.2-1.2z" fill="#a9aba9"/>
-          </g>
-          <path id="path8905" d="M583.3 131.4h.9v-4.1h-.9z" fill="#393939"/>
-          <path id="path8907" d="M583.3 127.4h.9v-1.8h-.9z" fill="#9b9b9b"/>
-        </g>
-      </g>
-      <g id="g8909" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g id="g8911">
-          <g id="g8917">
-            <g id="g8919">
-              <path id="path8927" d="M583.3 125.6h.9v1.8h-.9z" fill="url(#linearGradient8925)"/>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g id="g8929" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8935)" id="g8931">
-          <path id="path8937" d="M583.3 125.6h.9v-1.8h-.9z" fill="#818181"/>
-          <g transform="translate(571.2 125.6)" id="g8939">
-            <path id="path8941" d="M0 0h7v-1.7L5.3-3.5H.6c-.3 0-.6.3-.6.6z" fill="#a9aba9"/>
-          </g>
-          <path id="path8943" d="M593 104.7h3.6V101H593z" fill="#fff"/>
-        </g>
-      </g>
-      <g id="g8945" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8951)" id="g8947">
-          <g transform="translate(596.4 103.2)" id="g8953">
-            <path id="path8955" d="M0 0v-.3C-.3-.8-.4-1-.8-1l-.3.2a.6.6 0 0 0-.5-.2c-.1 0-.2 0-.3.2C-2-1-2.1-1-2.2-1h-.6a.3.3 0 0 0-.3.2l.3 1h.5l.5.2.2-.1h.4c.1.1.3 0 .4 0V.1l.4.2.3-.1L0 0m-3.4-2.1H.2v3.6h-3.6z" fill="#fe0"/>
-          </g>
-          <g transform="translate(596.5 103)" id="g8957">
-            <path id="path8959" d="M0 0c0-.2 0-.3-.2-.5 0-.2-.3-.4-.6-.4l-.4.1a.7.7 0 0 0-.4-.1H-2a.7.7 0 0 0-.4 0H-3c-.2 0-.3.1-.4.3 0 .4.2.7.4 1 0 .2.2.2.4.2h2.1L0 .5V0m-3.5-2H.1v3.6h-3.6z" fill="#d52715"/>
-          </g>
-          <path id="path8961" d="M596.6 101H593v3.6h3.6zm-3.7 0h3.7v3.7H593z" fill="#171714"/>
-          <g transform="translate(596.5 103.7)" id="g8963">
-            <path id="path8965" d="M0 0v-.2.2m0 0v-.2.1m0 0zm0 0z" fill="#171714"/>
-          </g>
-          <g transform="translate(596 103.2)" id="g8967">
-            <path id="path8969" d="M0 0a3 3 0 0 0-.2-.6h-.1c0 .2 0 .4.2.6H0m.3-.2L0-.6C0-.8-.2-1-.3-1c-.2 0-.3 0-.3.3l.1.4c.1.3.2.5.5.5s.3-.3.3-.5M-1 .1V0l-.3-.5.1-.1.2.2c0 .2 0 .2.2.2s.2-.1.1-.2c0-.3-.2-.5-.5-.5a.3.3 0 0 0-.3.3l.2.5c0 .2.2.4.5.4.2 0 .3 0 .3-.2 0-.1 0-.2-.2-.2h-.1v.2m-1-.5v-.2h.3c0-.2-.2-.3-.3-.3-.2 0-.3.1-.3.2 0 .3 0 .5.2.7 0 .2.2.3.4.3l.2-.1c0-.2 0-.2-.2-.2h-.1v-.1c.1 0 .2 0 .1-.2l-.3-.1m-.6-.2h.2c0-.2-.1-.3-.3-.3 0 0-.2 0-.2.2l.3.9s.1.1.2 0h.1c0-.3-.2-.5-.3-.8M0 .4C-.2.4-.3.4-.4.2l-.4.2-.4-.1-.3.1c-.2 0-.3 0-.4-.2v.1l-.3.1c-.1 0-.2 0-.3-.2-.1-.3-.3-.6-.3-1 0 0 .1-.2.3-.2l.3.1c.1 0 .2-.1.4 0h.6l.5.1.4-.2c.3 0 .5.3.6.6V0a.4.4 0 0 1-.3.4" fill="#171714"/>
-          </g>
-        </g>
-      </g>
-      <g id="g8971" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
-        <g clip-path="url(#clipPath8977)" id="g8973">
-          <g transform="translate(578 103)" id="g8979">
-            <path id="path8981" d="M0 0v-.3h-.6l-.1-.1v-.4H0v-.4h-1l-.2.2h-.3l-.1-.1v-.6H.7V.5h-2.3v-.6h.5V0H0z" fill="#f2f2f2"/>
-          </g>
-          <g transform="translate(576 103.6)" id="g8983">
-            <path id="path8985" d="M0 0h-.5l-.1-.1-.6-1.3L-2-.1V0h-.5s-.1 0 0-.1l.9-2 .2-.1h.5l1 2L0 0" fill="#f2f2f2"/>
-          </g>
-          <g transform="translate(573 102.8)" id="g8987">
-            <path id="path8989" d="M0 0h.1v-.4L0-.5h-1.5v-.3H0L.1-1v-.4h-2.2v2l.1.2H.1V.4h-1.6V0z" fill="#f2f2f2"/>
-          </g>
-          <g transform="translate(583.5 136.6)" id="g8991">
-            <path id="path8993" d="M0 0l-.8 1.3-1.4-2.9 4-1c-.5.5-.5.7-.9 1.3.5.1 1 .4 1.4.7.8.4 1.5 1 2 1.9a4 4 0 0 1-.6 3.6c-.4 0-.8 0-1.3-.2C3.5 3 3.5 1 0 0" fill="#303030"/>
-          </g>
-          <g transform="translate(583.1 141.4)" id="g8995">
-            <path id="path8997" d="M0 0l.8-1.2 1.4 2.8-3.8 1 .7-1.3-1.3-.7a4.5 4.5 0 0 1-2-2c-.4-1-.2-2.4.5-3.4.4 0 .8 0 1.2.2C-3.3-3-3.3-1 0 0" fill="#303030"/>
-          </g>
-        </g>
-      </g>
-    </g>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="svg9461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 85.6 95.6" style="enable-background:new 0 0 85.6 95.6;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#path8773_1_);}
+	.st1{clip-path:url(#SVGID_2_);}
+	.st2{fill:#F2F2F2;}
+	.st3{fill:url(#path8805_1_);}
+	.st4{clip-path:url(#SVGID_4_);}
+	.st5{fill:#393939;}
+	.st6{fill:#98B6A7;}
+	.st7{fill:url(#path8841_1_);}
+	.st8{clip-path:url(#SVGID_6_);}
+	.st9{fill:#6A6A6A;}
+	.st10{fill:url(#path8875_1_);}
+	.st11{clip-path:url(#SVGID_8_);}
+	.st12{fill:#A9ABA9;}
+	.st13{fill:#9B9B9B;}
+	.st14{fill:url(#path8927_1_);}
+	.st15{clip-path:url(#SVGID_10_);}
+	.st16{fill:#818181;}
+	.st17{fill:#FFFFFF;}
+	.st18{clip-path:url(#SVGID_12_);}
+	.st19{fill:#FFEE00;}
+	.st20{fill:#D52715;}
+	.st21{fill:#171714;}
+	.st22{clip-path:url(#SVGID_14_);}
+	.st23{fill:#303030;}
+</style>
+<g id="layer1" transform="translate(0 -268)">
+	<g id="g10860" transform="translate(-20.8 -2)">
+		<g id="g8755" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g id="g8757">
+				<g id="g8763">
+					<g id="g8765">
+						
+							<linearGradient id="path8773_1_" gradientUnits="userSpaceOnUse" x1="-839.9431" y1="-715.001" x2="-838.9431" y2="-715.001" gradientTransform="matrix(0 -3.2193 3.3335 0 2933.3757 -2723.9758)">
+							<stop  offset="0" style="stop-color:#F2F2F2"/>
+							<stop  offset="1" style="stop-color:#7A7A7A"/>
+						</linearGradient>
+						<path id="path8773" class="st0" d="M490.2,93.1c-1.3,0-2.3-1-2.3-2.3V-24.8c0-1.1,0.8-2.3,2.3-2.3h119.9
+							c1.1,0,1.9,1.1,1.9,2.3V90.9c0,1.1-0.8,2.3-1.9,2.3H490.2z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8775" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_1_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_2_">
+					<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8777" class="st1">
+					<g id="g8783" transform="translate(569.7 111.2)">
+						<path id="path8785" class="st2" d="M-72.7-125.8H33.2c1.1,0,2.3-1.1,2.3-2.3v-43.1c0-1.5-1.1-2.3-2.3-2.3H-72.7
+							c-1.1,0-2.3,0.8-2.3,2.3v43.1C-75-127-73.8-125.8-72.7-125.8"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8787" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g id="g8789">
+				<g id="g8795">
+					<g id="g8797">
+						
+							<linearGradient id="path8805_1_" gradientUnits="userSpaceOnUse" x1="106.3515" y1="93.6155" x2="107.3515" y2="93.6155" gradientTransform="matrix(0 -0.7528 0.9518 0 460.8399 126.682)">
+							<stop  offset="0" style="stop-color:#A9ABA9"/>
+							<stop  offset="1" style="stop-color:#818181"/>
+						</linearGradient>
+						<path id="path8805" class="st3" d="M495.9,128.7c-1.3,0-2.3-1-2.3-2.3V42.1c0-1.1,1.1-2.3,2.3-2.3H604c1.1,0,2.3,1.1,2.3,2.3
+							v84.3c0,1.1-1.1,2.3-2.3,2.3H495.9z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8807" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_3_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_4_">
+					<use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8809" class="st4">
+					<g id="g8815" transform="translate(572.7 146)">
+						<path id="path8817" class="st5" d="M-64.4-29h83.6c2.3,0,4.2-1.9,4.2-4.2v-47.3c0-2.3-1.9-3.8-3.8-3.8h-83.9
+							c-2.3,0-4.2,1.5-4.2,3.8v47.6C-68.5-30.9-66.6-29-64.4-29"/>
+					</g>
+					<g id="g8819" transform="translate(574.4 145.4)">
+						<path id="path8821" class="st6" d="M-59.6-30.7h71.1c1.5,0,3-1.5,3-3v-45.4c0-1.5-1.5-3-3-3h-71.1c-1.5,0-3,1.5-3,3v45.4
+							C-62.7-32.2-61.1-30.7-59.6-30.7"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8823" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g id="g8825">
+				<g id="g8831">
+					<g id="g8833">
+						
+							<linearGradient id="path8841_1_" gradientUnits="userSpaceOnUse" x1="-608.1827" y1="-894.7903" x2="-607.1827" y2="-894.7903" gradientTransform="matrix(0 -1.7861 7.5145 0 7273.7993 -1143.2354)">
+							<stop  offset="0" style="stop-color:#A9ABA9"/>
+							<stop  offset="1" style="stop-color:#535453"/>
+						</linearGradient>
+						<path id="path8841" class="st7" d="M494.7-35.8V-60c0-1.1,1.1-2.3,2.3-2.3h105.9c1.1,0,2.3,1.1,2.3,2.3v24.2H494.7z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8843" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_5_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_6_">
+					<use xlink:href="#SVGID_5_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8845" class="st8">
+					<g id="g8851" transform="translate(581.7 109.3)">
+						<path id="path8853" class="st9" d="M-39.3-131.1l-15.9,15.9v2.3H-59c-5.1,1-8.4,6-7.4,11.1c0.8,3.7,3.7,6.6,7.4,7.4h3.8v1.9
+							l15.9,16.3h15.1l15.9-15.9v-2.3h3.8c5.2,0,9.5-4.2,9.5-9.5c0-5.2-4.2-9.5-9.5-9.5h-3.8v-1.9l-15.1-15.9H-39.3z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8855" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g id="g8857">
+				<g id="g8863">
+					<g id="g8865">
+						
+							<linearGradient id="path8875_1_" gradientUnits="userSpaceOnUse" x1="-1182.8013" y1="-1084.7936" x2="-1181.8013" y2="-1084.7936" gradientTransform="matrix(0 17.201 -23.0721 0 -24479.207 20326.2344)">
+							<stop  offset="0" style="stop-color:#6A6A6A"/>
+							<stop  offset="0.5" style="stop-color:#48E400"/>
+							<stop  offset="1" style="stop-color:#6A6A6A"/>
+						</linearGradient>
+						<path id="path8875" class="st10" d="M542.4,33l-15.9-15.9v-2.3h-3.8c-5.2,0-9.5-4.2-9.5-9.5s4.2-9.5,9.5-9.5v0.4h3.8v-1.9
+							l15.9-16.3h15.9l15.9,16.3v1.9h3.8c5.1,1.1,8.3,6.2,7.2,11.3c-0.8,3.7-3.8,6.6-7.5,7.2h-3.8v2.6L558.3,33H542.4z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8877" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_7_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_8_">
+					<use xlink:href="#SVGID_7_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8879" class="st11">
+					<g id="g8885" transform="translate(576.4 118.4)">
+						<path id="path8887" class="st12" d="M-54.1-105.8h11.3v-13.6h-11.3c-3.8,0-6.8,3-6.8,6.8C-60.9-108.9-57.8-105.8-54.1-105.8"
+							/>
+					</g>
+					<g id="g8889" transform="translate(591 114.8)">
+						<path id="path8891" class="st12" d="M-13.5-115.8h-11.3v13.6h11.3c3.8,0,6.8-3,6.8-6.8C-6.6-112.8-9.7-115.8-13.5-115.8"/>
+					</g>
+					<g id="g8893" transform="translate(582 118.4)">
+						<path id="path8895" class="st5" d="M-38.5-105.8h13.6v-13.6h-14v13.6H-38.5"/>
+					</g>
+					<g id="g8897" transform="translate(581.9 123.2)">
+						<path id="path8899" class="st12" d="M-38.8-92.5h14.4l10.6-11l-4.2-4.2v-7.6h-4.5v3.8c0,1.9-1.5,3.8-3.8,3.8h-11.3
+							c-1.4,0.2-2.8-0.8-3-2.2c0-0.3,0-0.5,0-0.8v-5.3h-3.8v8.3L-49-103L-38.8-92.5z"/>
+					</g>
+					<g id="g8901" transform="translate(585.6 110)">
+						<path id="path8903" class="st12" d="M-28.5-129.2h-14.4l-10.6,11l4.5,4.5v7.6h3.8v-4.2c0-1.9,1.9-3.8,3.8-3.8h12.1
+							c1.9,0,3,1.5,3,3v5.3h4.2v-8.3l4.5-4.5L-28.5-129.2z"/>
+					</g>
+					<path id="path8905" class="st5" d="M548.4,61.7h3.4V46.2h-3.4V61.7z"/>
+					<path id="path8907" class="st13" d="M548.4,46.6h3.4v-6.8h-3.4V46.6z"/>
+				</g>
+			</g>
+		</g>
+		<g id="g8909" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g id="g8911">
+				<g id="g8917">
+					<g id="g8919">
+						
+							<linearGradient id="path8927_1_" gradientUnits="userSpaceOnUse" x1="-2168.2661" y1="-3506.5073" x2="-2167.2661" y2="-3506.5073" gradientTransform="matrix(0 0.8944 -0.4363 0 -979.787 1983.6796)">
+							<stop  offset="0" style="stop-color:#757575"/>
+							<stop  offset="1" style="stop-color:#393939"/>
+						</linearGradient>
+						<path id="path8927" class="st14" d="M548.4,39.8h3.4v6.8h-3.4V39.8z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8929" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_9_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_10_">
+					<use xlink:href="#SVGID_9_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8931" class="st15">
+					<path id="path8937" class="st16" d="M548.4,39.8h3.4V33h-3.4V39.8z"/>
+					<g id="g8939" transform="translate(571.2 125.6)">
+						<path id="path8941" class="st12" d="M-68.5-85.8h26.5v-6.4l-6.4-6.8h-17.8c-1.1,0-2.3,1.1-2.3,2.3V-85.8z"/>
+					</g>
+					<path id="path8943" class="st17" d="M585.1-39.2h13.6v-14h-13.6V-39.2z"/>
+				</g>
+			</g>
+		</g>
+		<g id="g8945" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_11_" x="589.5" y="-48.7" width="4.8" height="4.9"/>
+				</defs>
+				<clipPath id="SVGID_12_">
+					<use xlink:href="#SVGID_11_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8947" class="st18">
+					<g id="g8953" transform="translate(596.4 103.2)">
+						<path id="path8955" class="st19" d="M1.6-148.1v-1.1c-1.1-1.9-1.5-2.6-3-2.6l-1.1,0.8c-0.5-0.5-1.2-0.8-1.9-0.8
+							c-0.4,0-0.8,0-1.1,0.8c-0.4-0.8-0.8-0.8-1.1-0.8H-9c-0.5,0-1,0.3-1.1,0.8l1.1,3.8h1.9l1.9,0.8l0.8-0.4H-3c0.4,0.4,1.1,0,1.5,0
+							v-0.8l1.5,0.8l1.1-0.4L1.6-148.1 M-11.3-156H2.3v13.6h-13.6L-11.3-156z"/>
+					</g>
+					<g id="g8957" transform="translate(596.5 103)">
+						<path id="path8959" class="st20" d="M1.8-148.6c0-0.8,0-1.1-0.8-1.9c0-0.8-1.1-1.5-2.3-1.5l-1.5,0.4c-0.5-0.3-1-0.4-1.5-0.4
+							h-1.5c-0.5-0.1-1-0.1-1.5,0h-2.3c-0.8,0-1.1,0.4-1.5,1.1c0,1.5,0.8,2.6,1.5,3.8c0,0.8,0.8,0.8,1.5,0.8H0l1.9-0.4V-148.6
+							 M-11.4-156.2H2.2v13.6h-13.6V-156.2z"/>
+					</g>
+					<path id="path8961" class="st21" d="M598.7-53.2h-13.6v13.6h13.6V-53.2z M584.7-53.2h14v14h-13.6L584.7-53.2z"/>
+					<g id="g8963" transform="translate(596.5 103.7)">
+						<path id="path8965" class="st21" d="M1.8-146.7v-0.8V-146.7 M1.8-146.7v-0.8v0.4V-146.7z"/>
+					</g>
+					<g id="g8967" transform="translate(596 103.2)">
+						<path id="path8969" class="st21" d="M0.5-148.1c-0.2-0.8-0.4-1.5-0.8-2.3h-0.4c0,0.8,0,1.5,0.8,2.3H0.5 M1.6-148.8l-1.1-1.5
+							c0-0.8-0.8-1.5-1.1-1.5c-0.8,0-1.1,0-1.1,1.1l0.4,1.5c0.4,1.1,0.8,1.9,1.9,1.9s1.1-1.1,1.1-1.9 M-3.3-147.7v-0.4l-1.1-1.9
+							l0.4-0.4l0.8,0.8c0,0.8,0,0.8,0.8,0.8s0.8-0.4,0.4-0.8c0-1.1-0.8-1.9-1.9-1.9c-0.6,0-1.1,0.5-1.1,1.1l0,0l0.8,1.9
+							c0,0.8,0.8,1.5,1.9,1.5c0.8,0,1.1,0,1.1-0.8c0-0.4,0-0.8-0.8-0.8h-0.4v0.8 M-6.4-149.6v-0.8h1.1c0-0.8-0.8-1.1-1.1-1.1
+							c-0.8,0-1.1,0.4-1.1,0.8c0,1.1,0,1.9,0.8,2.6c0,0.8,0.8,1.1,1.5,1.1l0.8-0.4c0-0.8,0-0.8-0.8-0.8h-0.4v-0.4
+							c0.4,0,0.8,0,0.4-0.8L-6.4-149.6 M-8.6-150.4h0.8c0-0.8-0.4-1.1-1.1-1.1c0,0-0.8,0-0.8,0.8l1.1,3.4c0,0,0.4,0.4,0.8,0h0.4
+							C-7.5-148.5-8.2-149.2-8.6-150.4 M0.5-146.6c-0.8,0-1.1,0-1.5-0.8l-1.5,0.8l-1.5-0.4l-1.1,0.4c-0.8,0-1.1,0-1.5-0.8v0.4
+							l-1.1,0.4c-0.4,0-0.8,0-1.1-0.8c-0.4-1.1-1.1-2.3-1.1-3.8c0,0,0.4-0.8,1.1-0.8l1.1,0.4c0.4,0,0.8-0.4,1.5,0h2.3l1.9,0.4
+							l1.5-0.8c1.1,0,1.9,1.1,2.3,2.3v1.5C1.6-147.4,1.1-146.8,0.5-146.6"/>
+					</g>
+				</g>
+			</g>
+		</g>
+		<g id="g8971" transform="matrix(.35278 0 0 -.35278 -129 330.1)">
+			<g>
+				<defs>
+					<rect id="SVGID_13_" x="14.3" y="967.1" width="1822.3" height="1528.7"/>
+				</defs>
+				<clipPath id="SVGID_14_">
+					<use xlink:href="#SVGID_13_"  style="overflow:visible;"/>
+				</clipPath>
+				<g id="g8973" class="st22">
+					<g id="g8979" transform="translate(578 103)">
+						<path id="path8981" class="st2" d="M-49.6-148.6v-1.1h-2.3l-0.4-0.4v-1.5h2.6v-1.5h-3.8l-0.8,0.8h-1.1l-0.4-0.4v-2.3h8.7v8.3
+							h-8.7v-2.3h1.9v0.4H-49.6z"/>
+					</g>
+					<g id="g8983" transform="translate(576 103.6)">
+						<path id="path8985" class="st2" d="M-55.2-147h-1.9l-0.4-0.4l-2.3-4.9l-3,4.9v0.4h-1.9c0,0-0.4,0,0-0.4l3.4-7.6l0.8-0.4h1.9
+							l3.8,7.6L-55.2-147"/>
+					</g>
+					<g id="g8987" transform="translate(573 102.8)">
+						<path id="path8989" class="st2" d="M-63.5-149.2h0.4v-1.5l-0.4-0.4h-5.7v-1.1h5.7l0.4-0.8v-1.5h-8.3v7.6l0.4,0.8h7.9v-1.5
+							h-6.1v-1.5H-63.5z"/>
+					</g>
+					<g id="g8991" transform="translate(583.5 136.6)">
+						<path id="path8993" class="st23" d="M-34.3-55.2l-3,4.9l-5.3-11l15.1-3.8c-1.9,1.9-1.9,2.6-3.4,4.9c1.9,0.4,3.8,1.5,5.3,2.6
+							c3,1.5,5.7,3.8,7.6,7.2c1.5,4.6,0.6,9.7-2.3,13.6c-1.5,0-3,0-4.9-0.8C-21.1-43.8-21.1-51.4-34.3-55.2"/>
+					</g>
+					<g id="g8995" transform="translate(583.1 141.4)">
+						<path id="path8997" class="st23" d="M-35.4-41.8l3-4.5l5.3,10.6L-41.5-32l2.6-4.9l-4.9-2.6c-3.3-1.6-5.9-4.3-7.6-7.6
+							c-1.5-3.8-0.8-9.1,1.9-12.9c1.5,0,3,0,4.5,0.8C-47.9-53.2-47.9-45.6-35.4-41.8"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
 </svg>

docs/static/githubfilelogo.svg

@@ -0,0 +1 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414"><path d="M16.097 2.686c-7.64 0-13.834 6.194-13.834 13.835 0 6.113 3.964 11.298 9.462 13.128.692.127.944-.301.944-.667 0-.328-.012-1.199-.019-2.353-3.848.836-4.66-1.855-4.66-1.855-.629-1.598-1.536-2.023-1.536-2.023-1.256-.859.095-.842.095-.842 1.388.099 2.119 1.426 2.119 1.426 1.234 2.114 3.238 1.504 4.027 1.15.125-.894.482-1.504.878-1.85-3.072-.349-6.302-1.536-6.302-6.838 0-1.51.539-2.745 1.424-3.712-.143-.35-.617-1.756.135-3.661 0 0 1.162-.372 3.805 1.418a13.228 13.228 0 0 1 3.464-.465c1.174.005 2.358.158 3.463.465 2.642-1.79 3.801-1.418 3.801-1.418.755 1.905.28 3.311.137 3.661.887.967 1.423 2.202 1.423 3.712 0 5.316-3.235 6.485-6.317 6.827.497.428.939 1.272.939 2.563 0 1.849-.017 3.341-.017 3.795 0 .37.249.8.951.665 5.494-1.833 9.454-7.015 9.454-13.126 0-7.641-6.195-13.835-13.836-13.835" fill="#696969"/></svg>

docs/static/icons/browserconfig.xml

@@ -3,7 +3,7 @@
     <msapplication>
         <tile>
             <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#da532c</TileColor>
+            <TileColor>#33adcb</TileColor>
         </tile>
     </msapplication>
 </browserconfig>

docs/static/icons/safari-pinned-tab.svg

@@ -2,14 +2,60 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
  "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="904.000000pt" height="904.000000pt" viewBox="0 0 904.000000 904.000000"
+ width="326.000000pt" height="326.000000pt" viewBox="0 0 326.000000 326.000000"
  preserveAspectRatio="xMidYMid meet">
 <metadata>
 Created by potrace 1.11, written by Peter Selinger 2001-2013
 </metadata>
-<g transform="translate(0.000000,904.000000) scale(0.100000,-0.100000)"
+<g transform="translate(0.000000,326.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M0 4520 l0 -4510 4520 0 4520 0 0 4510 0 4510 -4520 0 -4520 0 0
--4510z"/>
+<path d="M1535 3046 c-5 -2 -35 -9 -65 -16 -30 -7 -69 -23 -85 -36 -38 -30
+-29 -49 37 -81 131 -64 395 -46 468 32 l22 23 -39 26 c-53 35 -134 53 -239 54
+-49 1 -93 -1 -99 -2z"/>
+<path d="M1122 2799 l-64 -30 56 -41 c74 -54 87 -92 93 -269 5 -129 4 -139
+-20 -190 -97 -213 -600 -265 -788 -82 -38 37 -49 55 -58 101 -6 30 -11 75 -11
+98 0 24 -4 45 -9 48 -8 5 -228 -88 -243 -102 -3 -4 78 -58 180 -121 295 -181
+588 -360 987 -606 204 -125 375 -228 381 -228 6 0 154 87 330 193 175 107 330
+200 344 208 14 7 165 98 335 202 171 103 365 221 432 262 67 40 119 76 115 79
+-18 18 -236 109 -242 102 -4 -4 -10 -37 -13 -73 -10 -105 -22 -134 -79 -184
+-29 -25 -57 -46 -64 -46 -7 0 -33 -9 -58 -20 -39 -16 -128 -31 -201 -34 -62
+-2 -186 18 -248 41 -106 38 -171 87 -204 152 -24 48 -27 63 -24 145 6 224 14
+253 93 316 l57 45 -71 33 c-39 17 -74 32 -78 32 -5 0 -8 -19 -7 -43 2 -78 -21
+-134 -72 -177 -153 -132 -500 -137 -674 -9 -39 28 -50 44 -65 93 -11 33 -19
+77 -18 98 2 47 -6 47 -92 7z m729 -454 c163 -53 253 -149 252 -270 -1 -268
+-14 -325 -95 -396 -38 -33 -77 -55 -138 -78 -74 -26 -203 -49 -250 -44 -8 1
+-46 5 -85 8 -105 10 -220 56 -288 117 -74 66 -87 106 -92 293 -4 128 -2 145
+18 195 29 69 110 135 212 170 92 31 138 37 271 35 90 -2 127 -8 195 -30z"/>
+<path d="M1619 2246 c-2 -2 -33 -7 -69 -10 -91 -10 -176 -43 -222 -87 -46 -43
+-45 -64 3 -115 27 -28 112 -66 179 -79 36 -8 188 -8 230 -1 120 20 220 82 220
+137 0 65 -118 130 -260 145 -36 3 -68 8 -71 10 -3 2 -8 2 -10 0z"/>
+<path d="M1297 1873 c-3 -2 -1 -18 5 -35 68 -194 612 -185 653 11 7 31 5 33
+-11 26 -193 -80 -377 -88 -561 -25 -45 16 -84 26 -86 23z"/>
+<path d="M1350 2775 c0 -68 96 -119 240 -128 144 -9 288 34 309 94 13 39 -1
+45 -59 24 -112 -40 -311 -38 -432 4 -47 16 -58 17 -58 6z"/>
+<path d="M680 2674 c-99 -19 -210 -72 -223 -108 -10 -25 31 -64 91 -87 75 -28
+256 -35 335 -13 107 32 177 77 177 115 0 22 -42 53 -101 74 -44 16 -229 28
+-279 19z"/>
+<path d="M2448 2675 c-2 -2 -30 -5 -63 -8 -99 -8 -184 -54 -185 -99 0 -26 74
+-75 149 -99 96 -30 262 -31 352 0 66 21 90 39 102 73 16 46 -149 121 -285 131
+-37 2 -69 3 -70 2z"/>
+<path d="M1050 2380 c-34 -19 -149 -52 -200 -58 -121 -14 -268 -4 -332 23 -48
+19 -48 19 -48 -9 0 -35 37 -71 101 -97 45 -18 74 -22 174 -22 101 -1 130 3
+185 23 78 28 125 61 138 99 12 33 3 53 -18 41z"/>
+<path d="M2184 2363 c2 -16 7 -36 11 -45 13 -32 112 -84 200 -104 11 -3 65 -5
+120 -6 154 -1 253 41 271 116 6 26 5 28 -12 22 -87 -34 -252 -48 -364 -32 -51
+8 -161 42 -202 63 -27 13 -28 13 -24 -14z"/>
+<path d="M11 2146 c4 -31 10 -88 14 -128 4 -40 9 -80 10 -89 2 -9 6 -40 10
+-70 6 -55 32 -266 40 -329 5 -36 11 -93 20 -177 3 -27 8 -65 11 -85 5 -35 28
+-53 716 -553 391 -284 712 -514 715 -512 2 3 6 237 7 521 2 369 0 520 -8 530
+-9 11 -465 295 -576 358 -19 11 -47 29 -62 39 -14 11 -31 19 -37 19 -6 0 -11
+4 -11 8 0 5 -12 14 -27 21 -14 7 -49 27 -77 45 -52 34 -467 288 -515 316 -14
+8 -68 41 -120 73 -126 79 -119 78 -110 13z"/>
+<path d="M2816 1930 c-236 -143 -431 -260 -433 -260 -3 0 -17 -8 -31 -19 -15
+-10 -166 -103 -337 -206 -170 -103 -313 -191 -316 -196 -7 -13 -12 -1049 -4
+-1049 4 0 382 267 500 354 11 8 135 96 275 196 140 100 262 186 270 193 8 7
+94 68 190 136 96 68 180 128 187 135 10 9 28 108 38 214 2 18 6 45 9 60 3 15
+8 52 11 82 4 30 11 87 16 125 5 39 12 88 15 110 2 22 7 56 9 76 3 20 8 56 10
+80 3 24 7 60 10 79 10 67 17 150 14 150 -2 0 -197 -117 -433 -260z"/>
 </g>
 </svg>

docs/static/icons/site.webmanifest

@@ -1,6 +1,6 @@
 {
-    "name": "",
-    "short_name": "",
+    "name": "MakeCode for EV3",
+    "short_name": "MakeCode for EV3",
     "icons": [
         {
             "src": "/android-chrome-192x192.png",
@@ -8,12 +8,14 @@
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
+            "src": "/android-chrome-256x256.png",
+            "sizes": "256x256",
             "type": "image/png"
         }
     ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
+    "theme_color": "#ff0000",
+    "background_color": "#ff0000",
+    "start_url": "makecode.mindstorms.com",
+    "display": "standalone",
+    "orientation": "portrait"
 }

docs/troubleshoot.md

@@ -1,33 +1,39 @@
 # Troubleshooting download problems
 
-If your're having trouble getting your code onto the EV3 Brick, try these steps to see if you can fix the problem.
+If you're having trouble getting your code onto the EV3 Brick, try these steps to see if you can fix the problem.
 
 ## Check your **@drivename@** firmware
 
-MakeCode requires the firmware version **1.10E** or up. 
+MakeCode needs a firmware version of **1.10E** or higher installed on your brick. 
 
 ### ~hint
 
-Firmware is the software that runs all the basic operations on your brick. Your programs run with the firmware to make the @boardname@ do all the things you want it to do. Your brick comes with the firmware already installed. You could have a brick with an older version of firmware that needs updating in order for it to work properly with MakeCode.
+Firmware is the software that runs all the basic operations on your EV3 Brick. Your programs and the firmware work together to make the EV3 Brick do all things you want it to. Your EV3 Brick comes with firmware pre-installed, but it may need to be updated to work properly with MakeCode.
 
 ### ~
 
-To check the version on your brick,
+To check the the firmware version on your EV3 Brick:
 
-* go to the **Settings** menu (wrench symbol)
-* select to **Brick Info**
+1. Go to the **Settings** menu (it's under the wrench tool symbol)
+2. Select **Brick Info** and press ENTER
 
 ![Brick Info menu](/static/setup/brickinfo.jpg)
 
-* check the version under **Brick FW:**
+3. Check the version number under **Brick FW:**
 
 ![Brick Firmware version](/static/setup/brickfw.jpg)
 
-If you cannot find the **brick info** or the version is less than **1.10E**, **you need to upgrade your firmware**.
+If you can't find the **Brick Info** or you see that the version is less than **1.10E**, **you need to upgrade your firmware**.
 
-**To update your firmware, use the [EV3 manager](https://ev3manager.education.lego.com/)** or follow these instructions: [Updating and Resetting Firmware](https://www.lego.com/en-us/service/help/products/themes-sets/mindstorms/updating-and-resetting-lego-mindstorms-ev3-firmware-408100000007884).
+## Upgrade your **@drivename@**
 
-If your EV3 Brick isn't connected to the internet through a computer, or with some other mobile device, you'll need to do a manual update of the firmware. Read the instructions in the **Manual Firmware Update** section of the [Firmware Update](https://education.lego.com/en-us/support/mindstorms-ev3/firmware-update) support page.
+If your a firmware version level is less than **1.10E**, you need to install an upgraded version. You can upgrade the firmware with the **EV3 Lab** or **EV3 Programming** software. Also, you can do a manual upgrade by downloading the firmware install file. See the [Firmware Update](https://education.lego.com/en-us/support/mindstorms-ev3/firmware-update) support page to learn about the upgrade process.
+
+### ~ hint
+
+**Recommended:** Upgrade with the **[EV3 Device Manager](https://ev3manager.education.lego.com/)**
+
+### ~
 
 ## Can I see the **@drivename@** drive on my computer?
 
@@ -39,27 +45,27 @@ On Windows, it looks like this in Explorer:
 
 If you don't see the **@drivename@** drive, make sure your brick is powered on and check that your USB connection is good.
 
-## Is my brick charged and powered on?
+## The display on the EV3 Brick is blank
 
-Make sure your brick is charged and powered on. If your brick doesn't turn on, find the charger and plug it into wall power, then connect it to your brick. Does it turn on and start up?
+Make sure your EV3 Brick is charged and powered on. If your it doesn't turn on, find the charger and plug it into wall power, then connect it to your EV3 Brick. Does it turn on and start up?
 
-## Is my USB connection good?
+## I still can't see my @drivename@ drive
 
-Make sure that one end of your USB cable is firmly inserted into the port on the computer and the other end is connected to the brick. If you still can't see the **@drivename@** drive, try a different port on the computer. If that doesn't work then maybe your cable is bad or you need to reset the brick.
+Make sure that one end of your USB cable is firmly inserted into a USB port on the computer and the other end is connected to the EV3 Brick. If you still can't see the **@drivename@** drive, try a different port on the computer. If that doesn't work then maybe your cable is faulty or you need to reset the EV3 Brick.
 
-## How do I reset my brick?
+## How do I reset my EV3 Brick?
 
-If you think your USB connection is good and you still can't see your **@drivename@** drive, try giving the brick a reset. You can follow these steps to reset:
+If you think your USB connection is good and you still can't see your **@drivename@** drive, try giving the EV3 Brick a reset. You can follow these steps to reset:
 
 1. Using a finger from one hand, press the **Back** button. Keep holding it.
-2. With your other hand, use two fingers to hold down both the **Left** button and the **Enter** button. You hold these at the same time while you're still pressing the **Back** button.
+2. With your other hand, use two fingers to hold down both the **Left** button and the **Center** button. You hold these at the same time while you're still pressing the **Back** button.
 3. Now, release your finger from the **Back** button.
-4. When the brick says "Starting.." you can let go of the **Left** and **Enter** buttons.
+4. When the EV3 Brick says "Starting.." you can let go of the **Left** and **Enter** buttons.
 
-You can also watch this [How to Reset](https://www.lego.com/en-us/videos/themes/mindstorms/how-to-reset-the-ev3-p-brick-fbcbdbed398e4e12a7ce30fa662c54be) video to see how to do a reset.
+You can also watch this [How to Reset](https://www.lego.com/en-us/videos/themes/mindstorms/how-to-reset-the-ev3-p-brick-fbcbdbed398e4e12a7ce30fa662c54be) video.
 
 ## LEGO Support
 
-If you've checked everything here and can't get the **@drivename@** drive to show up on your computer, you can't make the brick reset, or your program just won't download, then try the [Troubleshooting Walkthrough](https://www.lego.com/en-us/service/help/products/themes-sets/mindstorms/lego-mindstorms-ev3-troubleshooting-walkthrough-408100000009798).
+If you've checked everything here and can't get the **@drivename@** drive to show up on your computer, you can't make the EV3 Brick reset, or your program just won't download, then try the [Troubleshooting Walkthrough](https://www.lego.com/en-us/service/help/products/themes-sets/mindstorms/lego-mindstorms-ev3-troubleshooting-walkthrough-408100000009798).
 
 You can also find more help at [LEGO Support](https://www.lego.com/en-us/mindstorms/support).

docs/tutorials.md

@@ -12,14 +12,14 @@ Step by step guides to coding your @boardname@.
   "url":"/tutorials/wake-up",
   "imageUrl":"/static/tutorials/wake-up.png"
 }, {
-  "name": "Make An Animation",
-  "description": "Create a custom animation on your brick screen.",
+  "name": "Make an Animation",
+  "description": "Create a custom animation on your EV3 Brick Display.",
   "cardType": "tutorial",
   "url":"/tutorials/make-an-animation",
   "imageUrl":"/static/tutorials/make-an-animation.png"
 }, {
   "name": "What Animal Am I?",
-  "description": "Create different animal sounds and have someone guess the what the animal is.",
+  "description": "Create different animal effects and have someone guess what the animal is.",
   "cardType": "tutorial",
   "url":"/tutorials/what-animal-am-i",
   "imageUrl":"/static/tutorials/what-animal-am-i.png"
@@ -37,7 +37,7 @@ Step by step guides to coding your @boardname@.
 ```codecard
 [{
   "name": "Run Motors",
-  "description": "Use the buttons to start and stop the large and medium motors.",
+  "description": "Use the EV3 Brick buttons to start and stop the Large Motor and Medium Motor.",
   "cardType": "tutorial",
   "url":"/tutorials/run-motors",
   "imageUrl":"/static/tutorials/run-motors.png"
@@ -49,13 +49,13 @@ Step by step guides to coding your @boardname@.
 ```codecard
 [{
   "name": "Touch to Run",
-  "description": "Press the Touch sensor and run a motor.",
+  "description": "Press the Touch Sensor and run a motor.",
   "cardType": "tutorial",
   "url":"/tutorials/touch-to-run",
   "imageUrl":"/static/tutorials/touch-to-run.png"
 }, {
   "name": "Touch Sensor Values",
-  "description": "Check the value of a Touch sensor and stop a motor if pressed.",
+  "description": "Check the value of a Touch Sensor and stop a motor if pressed.",
   "cardType": "tutorial",
   "url":"/tutorials/touch-sensor-values",
   "imageUrl":"/static/tutorials/touch-sensor-values.png"
@@ -67,43 +67,31 @@ Step by step guides to coding your @boardname@.
 ```codecard
 [{
   "name": "What Color?",
-  "description": "Use the Color sensor to detect different colors.",
+  "description": "Use the Color Sensor to detect different colors.",
   "cardType": "tutorial",
   "url":"/tutorials/what-color",
   "imageUrl":"/static/tutorials/what-color.png"
 }, {
   "name": "Line Following",
-  "description": "Use the Color sensor to make a robot follow a line.",
+  "description": "Use the Color Sensor to make a robot follow a line.",
   "cardType": "tutorial",
   "url":"/tutorials/line-following",
   "imageUrl":"/static/tutorials/line-following.png"
 }, {
   "name": "Red Light, Green Light",
-  "description": "Play Red Light, Green Light using the Color sensor and the robot.",
+  "description": "Play Red Light, Green Light using the Color Sensor and the robot.",
   "cardType": "tutorial",
   "url":"/tutorials/redlight-greenlight",
   "imageUrl":"/static/tutorials/redlight-greenlight.png"
 }]
 ```
 
-## Ultrasonic Sensor
-
-```codecard
-[{
-  "name": "Object Near?",
-  "description": "Build a program that will detect when an object is nearby.",
-  "cardType": "tutorial",
-  "url":"/tutorials/object-near",
-  "imageUrl":"/static/tutorials/object-near.png"
-}]
-```
-
 ## Infrared Sensor
 
 ```codecard
 [{
   "name": "Security Alert",
-  "description": "Build an security alert using the infrared sensor.",
+  "description": "Build an security alert using the Infrared Sensor.",
   "cardType": "tutorial",
   "url":"/tutorials/security-alert",
   "imageUrl":"/static/tutorials/security-alert.png"

docs/tutorials/line-following.md

@@ -1,8 +1,8 @@
 # Line Following
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Make a program to follow a line using the Color sensor and reflected light. Let's test reflected light to see if it's white or black (on the line), and drive our robot accordingly. 
+Make your @boardname@ robot follow a line using the Color Sensor's Reflected Light Intensity Mode.
 
 ![Brick with color sensors tracking a yellow line](/static/tutorials/line-following/line-following.gif)
 
@@ -36,7 +36,7 @@ forever(function () {
 
 ## Step 3
 
-Open the ``||sensors:Sensors||`` Toolbox drawer. From the **Color Sensor** section, drag out a ``||sensors:color sensor light||`` value block and drop it into the second slot of the ``||logic:0 < 0||`` comparison block, replacing the `0`.
+Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out a ``||sensors:color sensor light||`` value block and drop it into the second slot of the ``||logic:0 < 0||`` comparison block, replacing the second `0`.
 
 ```blocks
 forever(function () {
@@ -50,7 +50,7 @@ forever(function () {
 
 ## Step 4
 
-If the value of the reflected light is greater than 40% (white or very light), our robot is outside the line, so steer to the left. In the ``||logic:0 < 0||`` comparison block change the compared value to `40` replacing `0`. 
+If the value of the reflected light is greater than 40% (white or very light), our robot is outside the line, so steer to the left. In the ``||logic:0 < 0||`` comparison block change the first compared value from `0` to `40`. 
 
 ```blocks
 forever(function () {
@@ -64,7 +64,7 @@ forever(function () {
 
 ## Step 5
 
-Open the ``||motors:Motors||`` Toolbox drawer. Drag out **2** ``||motors:tank large motors||`` blocks and drop one of them into the ``||logic:if||`` part, and the other into the ``||logic:else||`` part of the ``||logic:if then else||`` block.
+Open the ``||motors:Motors||`` Toolbox drawer. Drag out **2** ``||motors:tank motors||`` blocks and drop one of them into the ``||logic:if||`` part, and the other into the ``||logic:else||`` part of the ``||logic:if then else||`` block.
 
 ```blocks
 forever(function () {
@@ -78,7 +78,7 @@ forever(function () {
 
 ## Step 6
 
-In the first ``||motors:tank large motors||`` block in the ``||logic:if||`` clause, change the speed values of the motors from ``50%``, ``50%`` to ``5%``, ``15%``. This slows down the robot, and steers it to the left (because the **C** motor is driving faster than the **B** motor).
+In the first ``||motors:tank motors||`` block in the ``||logic:if||`` clause, change the speed values of the motors from ``50%``, ``50%`` to ``5%``, ``15%``. This slows down the robot and steers it to the left (because the **C** motor is driving faster than the **B** motor).
 
 ```blocks
 forever(function () {
@@ -90,9 +90,9 @@ forever(function () {
 })
 ```
 
-# Step 7
+## Step 7
 
-In the second ``||motors:tank large motors||`` block in the ``||logic:else||`` clause, change the speed values of the motors from ``50%``, ``50%`` to ``15%``, ``5%``.  This slows down the robot, and steers it to the right (because the **B** motor is driving faster than the **C** motor).
+In the second ``||motors:tank motors||`` block in the ``||logic:else||`` clause, change the speed values of the motors from ``50%``, ``50%`` to ``15%``, ``5%``.  This slows down the robot and steers it to the right (because the **B** motor is driving faster than the **C** motor).
 
 ```blocks
 forever(function () {
@@ -110,11 +110,10 @@ Use the EV3 simulator to try out your code.
 
 ![Brick with color sensors tracking a yellow line](/static/tutorials/line-following/line-following.gif)
 
-Move the slider under the Color Sensor to change the reflected light and check that motors 
-are moving as you would expect!
+Move the slider under the Color Sensor to change the reflected light intensity and check that motors are moving as you would expect.
 
 ## Step 9
 
-Plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach a Color Sensor to Port 3 of your brick, and attach your brick to a driving base with large motors attached to Ports B and C. See the instructions for building a _Driving Base with Color Sensor Down_. Test your program by positioning your robot to the right of a dark, thick line and then let it drive! 
+Attach a Color Sensor to Port 3 of your EV3 Brick, and attach your brick to a driving base with large motors attached to Ports B and C. See the instructions for building a _Driving Base with Color Sensor Down_. Test your program by positioning your robot to the right of a dark, thick line and then let it drive! 

docs/tutorials/make-an-animation.md

@@ -1,16 +1,16 @@
 # Make a custom animation
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Create a custom animation for your @boardname@.
+Create a custom animation for your EV3 Brick
  
-![Button press on brick](/static/tutorials/make-an-animation/button-pressed.gif)
+![Button press on EV3 Brick](/static/tutorials/make-an-animation/button-pressed.gif)
 
 ## Step 1
 
 Open the ``||brick:Brick||`` Toolbox drawer. Drag out a ``||brick:show string||`` block onto the Workspace, and drop it into the ``||loops:on Start||`` block. You should hear and see the block click into place.
 
-```block
+```blocks
 brick.showString("Hello world", 1) 
 ```
 
@@ -46,7 +46,7 @@ brick.showString("Press my button!", 1)
 
 ## Step 5
 
-Try out your code in the EV3 simulator!
+Try out your code in the EV3 Brick simulator!
 
 Press the ``Enter`` button and check that the image shows up as you expected.
 
@@ -64,4 +64,4 @@ brick.showString("Press my button!", 1)
 
 ## Step 7
 
-Plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.

docs/tutorials/music-brick.md

@@ -1,6 +1,6 @@
 # Music Brick
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
 Transform your @boardname@ into a musical instrument!
 
@@ -17,21 +17,21 @@ brick.showString("Hello world", 1)
 
 ## Step 2
 
-In the ``||brick:show string||`` block, type the text ``"Press my buttons to make music!"`` to replace ``"Hello world"``.
+In the ``||brick:show string||`` block, type the text ``"Press my buttons!"`` to replace ``"Hello world"``.
 
 ```blocks
-brick.showString("Press my buttons to make music!", 1)
+brick.showString("Press my buttons!", 1)
 ```
 
 ## Step 3
 
-Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out an ``||brick:on button||`` block onto the Workspace (you can put it anywhere).
+Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out an ``||brick:on button||`` block anywhere onto the Workspace.
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
 
 })
-brick.showString("Press my buttons to make music!", 1)
+brick.showString("Press my buttons!", 1)
 ```
 
 ## Step 4
@@ -40,13 +40,13 @@ Open the ``||music:Music||`` Toolbox drawer. Drag out **5** ``||music:play tone|
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
-    music.playTone(0, music.beat(BeatFraction.Half))
-    music.playTone(0, music.beat(BeatFraction.Half))
-    music.playTone(0, music.beat(BeatFraction.Half))
-    music.playTone(0, music.beat(BeatFraction.Half))
-    music.playTone(0, music.beat(BeatFraction.Half))
+    music.playTone(262, music.beat(BeatFraction.Half))
+    music.playTone(262, music.beat(BeatFraction.Half))
+    music.playTone(262, music.beat(BeatFraction.Half))
+    music.playTone(262, music.beat(BeatFraction.Half))
+    music.playTone(262, music.beat(BeatFraction.Half))
 })
-brick.showString("Press my buttons to make music!", 1) 
+brick.showString("Press my buttons!", 1)
 ```
 
 ## Step 5
@@ -63,12 +63,12 @@ brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
     music.playTone(196, music.beat(BeatFraction.Half))
     music.playTone(294, music.beat(BeatFraction.Whole))
 })
-brick.showString("Press my buttons to make music!", 1)
+brick.showString("Press my buttons!", 1)
 ```
 
 ## Step 6
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
 You can add more ``||brick:on button||`` blocks to the Workspace and create other ``||music:play tone||`` melodies when different buttons are pressed to transform your brick into a musical instrument!
  

docs/tutorials/object-near.md

@@ -1,10 +1,10 @@
 # Object Near?
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
 The digital Ultrasonic Sensor generates sound waves and reads their echoes to detect and measure distance from objects in centimeters. Build a program that will detect when an object is nearby.
 
-![Simualtor with brick and ultrasonic sensor](/static/tutorials/object-near/ultrasonic-near.gif)
+![Simulator with brick and ultrasonic sensor](/static/tutorials/object-near/ultrasonic-near.gif)
 
 ## Step 1
 
@@ -134,6 +134,6 @@ forever(function () {
 
 ## Step 10
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach an Ultrasonic Sensor to Port 4 of your brick. Test your program by putting an object at different distances in front of the Ultrasonic Sensor – an object 50 centimeters or closer should be detected. 
+Attach an Ultrasonic Sensor to Port 4 of your EV3 Brick. Test your program by putting an object at different distances in front of the Ultrasonic Sensor – an object 50 centimeters or closer should be detected. 

docs/tutorials/redlight-greenlight.md

@@ -1,14 +1,14 @@
 # Red Light, Green Light
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Use the ``||sensors:pause color sensor||`` block to play Red Light, Green Light with your @boardname@ robot! 
+Use the ``||sensors:pause until color sensor detected||`` block to play Red Light, Green Light with your @boardname@ robot! 
 
 ![Brick simulation with color sensor and motors](/static/tutorials/redlight-greenlight/redlight-greenlight.gif)
 
 ## Step 1
 
-Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **2** ``||sensors:pause color sensor||`` blocks onto the Workspace, and drop them into the ``||loops:forever||`` loop.
+Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **2** ``||sensors:pause until color sensor detected||`` blocks onto the Workspace, and drop them into the ``||loops:forever||`` loop.
 
 ```blocks
 forever(function () { 
@@ -19,7 +19,7 @@ forever(function () {
 
 ## Step 2
 
-In the first ``||sensors:pause color sensor||`` block, use the second drop-down menu to select the "Green" color.  In the second ``||sensors:pause color sensor||`` block, use the second drop-down menu to select the "Red" color. 
+In the first ``||sensors:pause until color sensor detected||`` block, use the second drop-down menu to select the Green color.  In the second ``||sensors:pause until color sensor detected||`` block, use the second drop-down menu to select the Red color. 
 
 ![Color selection dropdown](/static/tutorials/redlight-greenlight/pause-color-sensor-dropdown.png)
 
@@ -32,7 +32,7 @@ forever(function () {
 
 ## Step 3
 
-Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:tank large motors||`` block onto the Workspace, and drop in between the ``||sensors:pause color sensor||`` blocks.
+Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:tank motors||`` block onto the Workspace, and drop in between the ``||sensors:pause until color sensor detected||`` blocks.
 
 ```blocks
 forever(function () { 
@@ -44,7 +44,7 @@ forever(function () {
 
 ## Step 4
 
-Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:stop all motors||`` block onto the Workspace, and drop it in after the second ``||sensors:pause color sensor||`` block in the ``||loops:forever||`` loop.
+Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:stop all motors||`` block onto the Workspace, and drop it in after the second ``||sensors:pause until color sensor detected||`` block in the ``||loops:forever||`` loop.
 
 ```blocks
 forever(function () { 
@@ -57,6 +57,6 @@ forever(function () {
 
 ## Step 5
  
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach a Color Sensor to Port 3 of your brick, and attach your brick to a driving base with large motors attached to Ports B and C. See the building instructions for: _Driving Base with Color Sensor Forward_. Test your program by putting a green or red piece of paper or LEGO brick in front of the color sensor.
+Attach a Color Sensor to Port 3 and attach your EV3 Brick to a driving base with Large Motors attached to Ports B and C. See the building instructions for: _Driving Base with Color Sensor Forward_. Test your program by putting a green or red piece of paper or LEGO brick in front of the Color Sensor.

docs/tutorials/run-motors.md

@@ -1,14 +1,14 @@
 # Run motors
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Use the buttons to start and stop the large and medium motors.
+Use the buttons to start and stop the Large Motor and Medium Motor.
  
 ![Motors in simulator running](/static/tutorials/run-motors/run-motors.gif)
 
 ## Step 1
 
-Open the ``||brick:Brick||`` Toolbox drawer. Drag out **2** ``||brick:on button||`` blocks onto the Workspace (you can place these anywhere on the Workspace).
+Open the ``||brick:Brick||`` Toolbox drawer. Drag out **2** ``||brick:on button||`` blocks anywhere onto the Workspace.
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
@@ -49,9 +49,9 @@ brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 4
 
-The ``||motors:run||`` blocks specify which type of motor to run (Large or Medium), and which port the motor is attached to (Ports A, B, C, or D). The default setting is to run the large motor attached to port A at 50% speed.
+The ``||motors:run||`` blocks specify which type of motor to run (Large Motor or Medium Motor), and which port the motor is attached to (Ports A, B, C, or D). The default setting is to run the Large Motor attached to Port A at 50% speed.
 
-When we press the Down button, we want our motor to run in the reverse direction. In the ``||motors:run||`` block that is in the ``||brick:on button down pressed||`` block, change the speed value from ``50%`` to ``-50%``. 
+When we press the ``down`` button, we want our motor to run in the reverse direction. In the ``||motors:run||`` block that is in the ``||brick:on button down pressed||`` block, change the speed value from ``50%`` to ``-50%``. 
  
 ![Motor speed select field](/static/tutorials/run-motors/run-speed-field.png)
 
@@ -66,8 +66,7 @@ brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 5
 
-Now, let’s add a Medium motor, and tell it how many rotations we want it to run for. 
-Open the ``||brick:Brick||`` Toolbox drawer. Drag out **2** ``|brick:on button||`` blocks. In the ``||brick:on button||`` blocks, use the drop-down menu to select the ``left`` and ``right`` buttons.
+Open the ``||brick:Brick||`` Toolbox drawer and drag out **2** ``|brick:on button||`` blocks. In the ``||brick:on button||`` blocks, use the drop-down menu to select the ``left`` and ``right`` buttons.
 
 ```blocks
 brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
@@ -105,9 +104,11 @@ brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 7
 
-For the ``||motors:run||`` blocks that are in the ``||brick:on button left||`` and ``||brick:on button right||`` blocks, use the drop-down menu to select ``medium motor D``. 
- 
-![Select motor on a port dropdown](/static/tutorials/run-motors/run-motor-dropdown.png)
+For the ``||motors:run||`` blocks that are in the ``||brick:on button left||`` and ``||brick:on button right||`` blocks, use the drop-down menu to select a ``medium motor`` on Port ``D``. 
+
+![Select a motor type dropdown](/static/tutorials/run-motors/run-motor-dropdown.png)
+<br/>
+![Select a motor port dropdown](/static/tutorials/run-motors/motor-port-dropdown.png)
 
 ```blocks
 brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
@@ -145,7 +146,7 @@ brick.buttonRight.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 9
 
-Let’s also change the speed that our Medium motors are running at. In the ``||motors:run medium motor||`` block that is in the ``||brick:on button left||`` block, change the speed from ``50%`` to ``10%``.
+Let’s also change the speed that our Medium Motor is running at. In the ``||motors:run medium motor||`` block that is in the ``||brick:on button left||`` block, change the speed from ``50%`` to ``10%``.
 
 ```blocks
 brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
@@ -203,9 +204,9 @@ brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
 })
 ```
 
-# Step 12
+## Step 12
 
-Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:stop all motors||`` block onto the Workspace, and drop into the ``||brick:on button||`` enter block.
+Open the ``||motors:Motors||`` Toolbox drawer. Drag out a ``||motors:stop all motors||`` block onto the Workspace, and drop it into the ``||brick:on button enter||`` block.
 
 ```blocks
 brick.buttonUp.onEvent(ButtonEvent.Pressed, function () { 
@@ -227,6 +228,6 @@ brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {
 
 ## Step 13
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach a Large motor to Port A, and a Medium motor to Port D. Test your program by pressing the different buttons to see whether the correct motors are running as expected.
+Attach a Large Motor to Port A, and a Medium Motor to Port D. Test your program by pressing the different buttons to see whether the correct motors are running as expected.

docs/tutorials/security-alert.md

@@ -1,14 +1,14 @@
 # Security Alert
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-The Infrared Sensor uses infrared light waves to detect proximity to the robot. Build an security alert using the infrared sensor. 
+The Infrared Sensor uses infrared light waves to detect proximity to the robot. Build an security alert using the Infrared Sensor. 
  
 ![Brick in simulator with infrared sensor](/static/tutorials/security-alert/security-alert.gif)
 
 ## Step 1
 
-Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out an ``||sensors:on infrared||`` block onto the Workspace (you can place this anywhere). Use the second drop-down menu to select ``detected``.
+Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out an ``||sensors:on infrared object||`` block onto the Workspace (you can place this anywhere). Select ``detected`` from the second dropdown menu.
 
 ![Sensor detect method dropdown selections](/static/tutorials/security-alert/detect-method-dropdown.png)
 
@@ -20,7 +20,7 @@ sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
 
 ## Step 2
 
-Open the ``||brick:Brick||`` Toolbox drawer. From the **Screen** section, drag out a ``||brick:show image||`` block onto the Workspace, and drop it into the ``||sensors:on infrared||`` block.
+Open the ``||brick:Brick||`` Toolbox drawer. From the **Screen** section, drag out a ``||brick:show image||`` block onto the Workspace, and drop it into the ``||sensors:on infrared object||`` block.
 
 ```blocks
 sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
@@ -42,7 +42,7 @@ sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
 
 ## Step 4
 
-Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out a ``||brick:set status light||`` block onto the Workspace, and drop it after the ``||brick:show image||`` block. 
+Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out a ``||brick:set status light to||`` block onto the Workspace, and drop it after the ``||brick:show image||`` block. 
 
 ```blocks
 sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
@@ -53,7 +53,7 @@ sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
 
 ## Step 5
 
-In the ``||brick:set status light||`` block, use the drop-down menu to select the ``red flash`` light 
+In the ``||brick:set status light to||`` block, use the drop-down menu to select the ``red flash`` light 
  
 ![Status light selection dropdown list](/static/tutorials/security-alert/set-status-light-dropdown.png)
 
@@ -66,7 +66,7 @@ sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
 
 ## Step 6
 
-Open the ``||loops:Loops||`` Toolbox drawer. Drag a ``||loops:repeat||`` loop onto the Workspace, and drop it after the ``||brick:set status light||`` block. 
+Open the ``||loops:Loops||`` Toolbox drawer. Drag a ``||loops:repeat||`` loop onto the Workspace, and drop it after the ``||brick:set status light to||`` block. 
 
 ```blocks
 sensors.infrared1.onEvent(InfraredSensorEvent.ObjectDetected, function () {
@@ -100,6 +100,6 @@ In the ``||music:play sound effect until done||`` block, use the drop-down menu
 
 ## Step 9
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach an Infrared Sensor to Port 1 of your brick. Test your program by putting an object increasingly closer to the Infrared Sensor – your Intruder Alert should trigger when you get too close! 
+Attach an Infrared Sensor to Port 1 of your Ev3 Brick. Test your program by putting an object increasingly closer to the Infrared Sensor – your Intruder Alert should trigger when you get too close! 

docs/tutorials/touch-sensor-values.md

@@ -1,14 +1,14 @@
 # Using Touch Sensor Values
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Use the Touch sensor value to stop a running motor.
+Use the Touch Sensor value to stop a running motor.
 
 ![Touch sensor and motor attached to brick](/static/tutorials/touch-sensor-values/touch-to-stop.gif)
 
 ## Step 1
 
-Open the ``||brick:Brick||`` Toolbox drawer. Drag an ``||brick:on button||`` block onto the Workspace, and place it anywhere on the Workspace.
+Open the ``||brick:Brick||`` Toolbox drawer. Drag an ``||brick:on button||`` block onto the Workspace, and place it anywhere.
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () {

docs/tutorials/touch-to-run.md

@@ -1,14 +1,14 @@
 # Touch to Run
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Use the Touch sensor to run a motor.
+Use the Touch Sensor to run a motor.
 
 ![Large motor connected to brick](/static/tutorials/touch-to-run/touch-to-run.gif)
 
 ## Step 1
 
-Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **2** ``||sensors:on touch||`` blocks onto the Workspace (you can place these anywhere).
+Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **2** ``||sensors:on touch||`` blocks anywhere onto the Workspace.
 
 ```blocks
 sensors.touch1.onEvent(ButtonEvent.Pressed, function () {
@@ -62,6 +62,6 @@ sensors.touch1.onEvent(ButtonEvent.Released, function () {
 
 ## Step 5
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach a Large motor to Port A, and a Touch sensor to Port 1 on your brick. Test your program by pressing and releasing the touch sensor – does the motor start and stop as expected?
+Attach a Large Motor to Port A, and a Touch Sensor to Port 1 on your EV3 Brick. Test your program by pressing and releasing the touch sensor – does the motor start and stop as expected?

docs/tutorials/wake-up.md

@@ -1,12 +1,12 @@
 # Wake Up!
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
 Show different moods on your @boardname@.
 
 ![Show mood on the screen](/static/tutorials/wake-up/show-mood.gif)
 
-## Step 1
+## Step 1 @fullscreen
 
 Open the ``||brick:Brick||`` Toolbox drawer. Drag out a ``||brick:show mood||`` block onto the Workspace, and place it into the ``||loops:on start||`` block. You should hear and see the block click into place. 
 
@@ -16,7 +16,7 @@ brick.showMood(moods.sleeping)
 
 ## Step 2
 
-Notice your brick is snoring with eyes closed in the simulator! Let’s wake her up. Open the ``||brick:Brick||`` Toolbox drawer again. Drag out **2** more ``||brick:show mood||`` blocks and drop them into the ``||brick:on start||`` block also.
+Notice your EV3 Brick is snoring with eyes closed in the simulator! Let’s wake it up. Open the ``||brick:Brick||`` Toolbox drawer again. Drag out **2** more ``||brick:show mood||`` blocks and drop them into the ``||brick:on start||`` block also.
 
 ```blocks
 brick.showMood(moods.sleeping) 

docs/tutorials/what-animal-am-i.md

@@ -1,6 +1,6 @@
 # What Animal Am I?
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
 Create different animal effects with your @boardname@.
 
@@ -10,27 +10,27 @@ Create different animal effects with your @boardname@.
 
 Open the ``||brick:Brick||`` Toolbox drawer. Drag out a ``||brick:show string||`` block from the **Screen** section onto the Workspace, and drop it into the ``||loops:on start||`` block. You should hear and see the block click into place.
 
-```block
+```blocks
 brick.showString("Hello world", 1)
 ```
 
 ## Step 2
 
-In the ``||brick:show string||`` block, type the text ``"Guess what animal?"`` to replace ``"Hello world"``.
+In the ``||brick:show string||`` block, type the text ``"Guess the animal"`` to replace ``"Hello world"``.
 
 ```blocks
-brick.showString("Guess what animal?", 1)
+brick.showString("Guess the animal", 1)
 ```
 
 ## Step 3
 
-Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out an ``||brick:on button||`` block and put it anywhere in the Workspace.
+Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out an ``||brick:on button||`` block anywhere onto the Workspace.
 
 ```blocks
 brick.buttonEnter.onEvent(ButtonEvent.Pressed, function () { 
      
 }) 
-brick.showString("Guess what animal?", 1)
+brick.showString("Guess the animal", 1)
 ```
 
 ## Step 4
@@ -43,7 +43,7 @@ In the ``||brick:on button||`` block, use the drop-down menu to select the ``lef
 brick.buttonLeft.onEvent(ButtonEvent.Pressed, function () { 
      
 }) 
-brick.showString("Guess what animal?", 1) 
+brick.showString("Guess the animal", 1) 
 ```
 
 ## Step 5
@@ -63,7 +63,7 @@ brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
 brick.buttonDown.onEvent(ButtonEvent.Pressed, function () { 
      
 }) 
-brick.showString("Guess what animal?", 1) 
+brick.showString("Guess the animal", 1) 
 ```
 
 ## Step 6
@@ -83,7 +83,7 @@ brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
 brick.buttonDown.onEvent(ButtonEvent.Pressed, function () { 
     brick.showImage(images.expressionsBigSmile) 
 }) 
-brick.showString("Guess what animal?", 0)
+brick.showString("Guess the animal", 0)
 ```
 
 ## Step 7
@@ -105,7 +105,7 @@ brick.buttonUp.onEvent(ButtonEvent.Pressed, function () {
 brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
     brick.showImage(images.objectsPirate)
 })
-brick.showString("Guess what animal?", 0)
+brick.showString("Guess the animal", 0)
 ```
 
 ## Step 8
@@ -129,7 +129,7 @@ brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
     brick.showImage(images.objectsPirate)
     music.playSoundEffect(sounds.animalsCatPurr)
 })
-brick.showString("Guess what animal?", 0)
+brick.showString("Guess the animal", 0)
 ```
 
 ## Step 9
@@ -155,7 +155,7 @@ brick.buttonDown.onEvent(ButtonEvent.Pressed, function () {
     brick.showImage(images.objectsPirate)
     music.playSoundEffect(sounds.animalsSnakeHiss)
 })
-brick.showString("Guess what animal?", 0)
+brick.showString("Guess the animal", 0)
 ```
 
 ## Step 10

docs/tutorials/what-color.md

@@ -1,8 +1,8 @@
 # What Color is it?
 
-## Introduction @fullscreen
+## Introduction @unplugged
 
-Use the Color sensor to detect different colors.
+Use the Color Sensor to detect different colors.
 
 ![Simulator view with color sensor](/static/tutorials/what-color/color-detector.gif)
 
@@ -24,7 +24,7 @@ brick.showString("What color?", 1)
 
 ## Step 3
 
-Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **3** ``||sensors:on color sensor detected||`` blocks onto the Workspace (you can place these anywhere). 
+Open the ``||sensors:Sensors||`` Toolbox drawer. Drag out **3** ``||sensors:on color sensor detected||`` blocks anywhere onto the Workspace.
 
 ```blocks
 sensors.color3.onColorDetected(ColorSensorColor.Blue, function () {
@@ -57,7 +57,7 @@ brick.showString("What color?", 1)
 
 ## Step 5
 
-Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out a **3** ``||brick:set status light||`` blocks and drop one of them each into the ``||sensors:on color detected||`` blocks.
+Open the ``||brick:Brick||`` Toolbox drawer. From the **Buttons** section, drag out **3** ``||brick:set status light||`` blocks and drop one of them each into the ``||sensors:on color sensor detected||`` blocks.
 
 ```blocks
 sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
@@ -91,7 +91,7 @@ brick.showString("What color?", 1)
 
 ## Step 7
 
-Open the ``||music:Music||`` Toolbox drawer. Drag out **3** ``||music:play sound effect||`` blocks and drop one of them each into the ``||sensors:on color detected||`` blocks after the ``||brick:set status light||`` block.
+Open the ``||music:Music||`` Toolbox drawer. Drag out **3** ``||music:play sound effect||`` blocks and drop one of them each into the ``||sensors:on color sensor detected||`` blocks after the ``||brick:set status light||`` block.
 
 ```blocks
 sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
@@ -111,7 +111,7 @@ brick.showString("What color?", 1)
 
 ## Step 8
 
-In the ``||music::play sound effect||`` blocks, use the drop-down menu to select the ``colors red``, ``colors green``, and ``colors yellow`` sound effects corresponding to the different colors detected. 
+In the ``||music:play sound effect||`` blocks, use the drop-down menu to select the ``colors red``, ``colors green``, and ``colors yellow`` sound effects corresponding to the different colors detected. 
 
 ```blocks
 sensors.color3.onColorDetected(ColorSensorColor.Red, function () {
@@ -131,6 +131,6 @@ brick.showString("What color?", 1)
 
 ## Step 9
 
-Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the brick.
+Now, plug your EV3 Brick into the computer with the USB cable, and click the **Download** button at the bottom of your screen. Follow the directions to save your program to the EV3 Brick.
 
-Attach a Color Sensor to Port 3 of your brick. Test your program by flashing Red, Green and Yellow colored paper or use LEGO bricks in front of the Color Sensor.
+Attach a Color Sensor to Port 3 of your EV3 Brick. Test your program by flashing Red, Green and Yellow colored paper or use LEGO bricks in front of the Color Sensor.

editor/deploy.ts

@@ -60,7 +60,7 @@ const rbfTemplate = `
 4c45474f580000006d000100000000001c000000000000000e000000821b038405018130813e8053
 74617274696e672e2e2e0084006080XX00448581644886488405018130813e80427965210084000a
 `
-export function deployCoreAsync(resp: pxtc.CompileResult, isCli = false) {
+export function deployCoreAsync(resp: pxtc.CompileResult) {
     let w: pxt.editor.Ev3Wrapper
 
     let filename = resp.downloadFileBaseName || "pxt"
@@ -98,11 +98,13 @@ export function deployCoreAsync(resp: pxtc.CompileResult, isCli = false) {
     resp.outfiles[pxtc.BINARY_UF2] = btoa(data)
 
     let saveUF2Async = () => {
-        if (isCli || !pxt.commands.saveOnlyAsync) {
-            return Promise.resolve()
-        } else {
-            return pxt.commands.saveOnlyAsync(resp)
+        if (pxt.commands && pxt.commands.electronDeployAsync) {
+            return pxt.commands.electronDeployAsync(resp);
         }
+        if (pxt.commands && pxt.commands.saveOnlyAsync) {
+            return pxt.commands.saveOnlyAsync(resp);
+        }
+        return Promise.resolve();
     }
 
     if (noHID) return saveUF2Async()
@@ -119,10 +121,7 @@ export function deployCoreAsync(resp: pxtc.CompileResult, isCli = false) {
         .then(() => w.flashAsync(rbfPath, rbfBIN))
         .then(() => w.runAsync(rbfPath))
         .then(() => {
-            if (isCli)
-                return w.disconnectAsync()
-            else
-                return Promise.resolve()
+            return w.disconnectAsync()
             //return Promise.delay(1000).then(() => w.dmesgAsync())
         }).catch(e => {
             // if we failed to initalize, retry

editor/extension.ts

@@ -25,43 +25,55 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
             const saveAs = pxt.BrowserUtils.hasSaveAs();
 
             const htmlBody = `
-            <div class="ui two column grid stackable">
-                <div class="column">
-                    <div class="ui">
-                        <div class="image">
-                            <img class="ui medium rounded image" src="./static/download/connect.svg" style="height:109px;width:261px;margin-bottom:1rem;">
-                        </div>
-                        <div class="content">
-                            <div class="description">
-                                <span class="ui yellow circular label">1</span>
-                                <strong>${lf("Connect EV3 to computer with USB cable")}</strong>
-                                <br/>
-                                ${lf("Use the miniUSB port on top of EV3 brick")}
+            <div class="ui grid stackable">
+                <div class="column five wide" style="background-color: #E2E2E2;">
+                    <div class="ui header">${lf("First time here?")}</div>
+                    <strong style="font-size:small">${lf("You must have version 1.10E or above of the firmware")}</strong>
+                    <div style="justify-content: center;display: flex;padding: 1rem;">
+                        <img class="ui image" src="/static/download/firmware.png" style="height:100px;" />
+                    </div>
+                    <a href="/troubleshoot" target="_blank">${lf("Check your firmware version here and update if needed")}</a>
+                </div>
+                <div class="column eleven wide">
+                    <div class="ui grid">
+                        <div class="row">
+                            <div class="column">
+                                <div class="ui two column grid padded">
+                                    <div class="column">
+                                        <div class="ui">
+                                            <div class="image">
+                                                <img class="ui medium rounded image" src="/static/download/connect.svg" style="height:109px;width:261px;margin-bottom:1rem;" />
+                                            </div>
+                                            <div class="content">
+                                                <div class="description">
+                                                    <span class="ui yellow circular label">1</span>
+                                                    <strong>${lf("Connect the EV3 to your computer with a USB cable")}</strong>
+                                                    <br />
+                                                    <span style="font-size:small">${lf("Use the miniUSB port on the top of the EV3 Brick")}</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="column">
+                                        <div class="ui">
+                                            <div class="image">
+                                                <img class="ui medium rounded image" src="/static/download/transfer.svg" style="height:109px;width:261px;margin-bottom:1rem;" />
+                                            </div>
+                                            <div class="content">
+                                                <div class="description">
+                                                    <span class="ui yellow circular label">2</span>
+                                                    <strong>${lf("Move the .uf2 file to the EV3 Brick")}</strong>
+                                                    <br />
+                                                    <span style="font-size:small">${lf("Locate the downloaded .uf2 file and drag it to the EV3 USB drive")}</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="column">
-                    <div class="ui">
-                        <div class="image">
-                            <img class="ui medium rounded image" src="./static/download/transfer.svg" style="height:109px;width:261px;margin-bottom:1rem;">
-                        </div>
-                        <div class="content">
-                            <div class="description">
-                                <span class="ui blue circular label">2</span>
-                                ${lf("Locate the downloaded .uf2 file and drag it to the EV3 drive")}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="ui one column grid">
-                <div class="column">
-                    <a href="/troubleshoot" target="_blank" class="ui segment container yellow">
-                        <i class="icon exclamation circle large" aria-hidden="true"></i>
-                        ${lf("Something wrong? Click here to troubleshoot..")}
-                    </a>
-                </div>
             </div>`;
 
             return confirmAsync({
@@ -71,6 +83,7 @@ pxt.editor.initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): P
                 hideCancel: true,
                 hideAgree: false,
                 agreeLbl: lf("I got it"),
+                className: 'downloaddialog',
                 buttons: [downloadAgain ? {
                     label: fn,
                     icon: "download",

fieldeditors/field_music.ts

@@ -20,7 +20,7 @@ export class FieldMusic extends pxtblockly.FieldImages implements Blockly.FieldC
     private categoriesCache_: string[];
 
     constructor(text: string, options: FieldMusicOptions, validator?: Function) {
-        super(text, { sort: true, data: options.data }, validator);
+        super(text, { blocksInfo: options.blocksInfo, sort: true, data: options.data }, validator);
 
         this.columns_ = parseInt(options.columns) || 4;
         this.width_ = parseInt(options.width) || 380;
@@ -240,7 +240,7 @@ export class FieldMusic extends pxtblockly.FieldImages implements Blockly.FieldC
         this.stopSounds();
     }
 
-    private createTextNode_(content: string) {
+    protected createTextNode_(content: string) {
         const category = this.parseCategory(content);
         let text = content.substr(content.indexOf(' ') + 1);
         text = text.length > 15 ? text.substr(0, 12) + "..." : text;

fieldeditors/field_ports.ts

@@ -11,7 +11,7 @@ export class FieldPorts extends pxtblockly.FieldImages implements Blockly.FieldC
     public isFieldCustom_ = true;
 
     constructor(text: string, options: FieldPortsOptions, validator?: Function) {
-        super(text, { sort: true, data: options.data }, validator);
+        super(text, { blocksInfo: options.blocksInfo, sort: true, data: options.data }, validator);
 
         this.columns_ = parseInt(options.columns) || 4;
         this.width_ = parseInt(options.width) || 300;

fieldeditors/wrap.ts

@@ -1,285 +0,0 @@
-namespace pxt.editor {
-    import HF2 = pxt.HF2
-    import U = pxt.U
-
-    function log(msg: string) {
-        pxt.log("EWRAP: " + msg)
-    }
-
-    export interface DirEntry {
-        name: string;
-        md5?: string;
-        size?: number;
-    }
-
-    const runTemplate = "C00882010084XX0060640301606400"
-    const usbMagic = 0x3d3f
-
-    export class Ev3Wrapper {
-        msgs = new U.PromiseBuffer<Uint8Array>()
-        private cmdSeq = U.randomUint32() & 0xffff;
-        private lock = new U.PromiseQueue();
-        isStreaming = false;
-        dataDump = false;
-
-        constructor(public io: pxt.HF2.PacketIO) {
-            io.onData = buf => {
-                buf = buf.slice(0, HF2.read16(buf, 0) + 2)
-                if (HF2.read16(buf, 4) == usbMagic) {
-                    let code = HF2.read16(buf, 6)
-                    let payload = buf.slice(8)
-                    if (code == 1) {
-                        let str = U.uint8ArrayToString(payload)
-                        if (Util.isNodeJS)
-                            console.log("SERIAL: " + str.replace(/\n+$/, ""))
-                        else
-                            window.postMessage({
-                                type: 'serial',
-                                id: 'n/a', // TODO?
-                                data: str
-                            }, "*")
-                    } else
-                        console.log("Magic: " + code + ": " + U.toHex(payload))
-                    return
-                }
-                if (this.dataDump)
-                    log("RECV: " + U.toHex(buf))
-                this.msgs.push(buf)
-            }
-        }
-
-        private allocCore(addSize: number, replyType: number) {
-            let len = 5 + addSize
-            let buf = new Uint8Array(len)
-            HF2.write16(buf, 0, len - 2)  // pktLen
-            HF2.write16(buf, 2, this.cmdSeq++) // msgCount
-            buf[4] = replyType
-            return buf
-        }
-
-        private allocSystem(addSize: number, cmd: number, replyType = 1) {
-            let buf = this.allocCore(addSize + 1, replyType)
-            buf[5] = cmd
-            return buf
-        }
-
-        private allocCustom(code: number, addSize = 0) {
-            let buf = this.allocCore(1 + 2 + addSize, 0)
-            HF2.write16(buf, 4, usbMagic)
-            HF2.write16(buf, 6, code)
-            return buf
-        }
-
-        stopAsync() {
-            return this.isVmAsync()
-                .then(vm => {
-                    if (vm) return Promise.resolve();
-                    log(`stopping PXT app`)
-                    let buf = this.allocCustom(2)
-                    return this.justSendAsync(buf)
-                        .then(() => Promise.delay(500))
-                })
-        }
-
-        dmesgAsync() {
-            log(`asking for DMESG buffer over serial`)
-            let buf = this.allocCustom(3)
-            return this.justSendAsync(buf)
-        }
-
-        runAsync(path: string) {
-            let codeHex = runTemplate.replace("XX", U.toHex(U.stringToUint8Array(path)))
-            let code = U.fromHex(codeHex)
-            let pkt = this.allocCore(2 + code.length, 0)
-            HF2.write16(pkt, 5, 0x0800)
-            U.memcpy(pkt, 7, code)
-            log(`run ${path}`)
-            return this.justSendAsync(pkt)
-        }
-
-        justSendAsync(buf: Uint8Array) {
-            return this.lock.enqueue("talk", () => {
-                this.msgs.drain()
-                if (this.dataDump)
-                    log("SEND: " + U.toHex(buf))
-                return this.io.sendPacketAsync(buf)
-            })
-        }
-
-        talkAsync(buf: Uint8Array, altResponse = 0) {
-            return this.lock.enqueue("talk", () => {
-                this.msgs.drain()
-                if (this.dataDump)
-                    log("TALK: " + U.toHex(buf))
-                return this.io.sendPacketAsync(buf)
-                    .then(() => this.msgs.shiftAsync(1000))
-                    .then(resp => {
-                        if (resp[2] != buf[2] || resp[3] != buf[3])
-                            U.userError("msg count de-sync")
-                        if (buf[4] == 1) {
-                            if (altResponse != -1 && resp[5] != buf[5])
-                                U.userError("cmd de-sync")
-                            if (altResponse != -1 && resp[6] != 0 && resp[6] != altResponse)
-                                U.userError("cmd error: " + resp[6])
-                        }
-                        return resp
-                    })
-            })
-        }
-
-        flashAsync(path: string, file: Uint8Array) {
-            log(`write ${file.length} bytes to ${path}`)
-
-            let handle = -1
-
-            let loopAsync = (pos: number): Promise<void> => {
-                if (pos >= file.length) return Promise.resolve()
-                let size = file.length - pos
-                if (size > 1000) size = 1000
-                let upl = this.allocSystem(1 + size, 0x93, 0x1)
-                upl[6] = handle
-                U.memcpy(upl, 6 + 1, file, pos, size)
-                return this.talkAsync(upl, 8) // 8=EOF
-                    .then(() => loopAsync(pos + size))
-            }
-
-            let begin = this.allocSystem(4 + path.length + 1, 0x92)
-            HF2.write32(begin, 6, file.length) // fileSize
-            U.memcpy(begin, 10, U.stringToUint8Array(path))
-            return this.lock.enqueue("file", () =>
-                this.talkAsync(begin)
-                    .then(resp => {
-                        handle = resp[7]
-                        return loopAsync(0)
-                    }))
-        }
-
-        lsAsync(path: string): Promise<DirEntry[]> {
-            let lsReq = this.allocSystem(2 + path.length + 1, 0x99)
-            HF2.write16(lsReq, 6, 1024) // maxRead
-            U.memcpy(lsReq, 8, U.stringToUint8Array(path))
-
-            return this.talkAsync(lsReq, 8)
-                .then(resp =>
-                    U.uint8ArrayToString(resp.slice(12)).split(/\n/).map(s => {
-                        if (!s) return null as DirEntry
-                        let m = /^([A-F0-9]+) ([A-F0-9]+) ([^\/]*)$/.exec(s)
-                        if (m)
-                            return {
-                                md5: m[1],
-                                size: parseInt(m[2], 16),
-                                name: m[3]
-                            }
-                        else
-                            return {
-                                name: s.replace(/\/$/, "")
-                            }
-                    }).filter(v => !!v))
-        }
-
-        rmAsync(path: string): Promise<void> {
-            log(`rm ${path}`)
-            let rmReq = this.allocSystem(path.length + 1, 0x9c)
-            U.memcpy(rmReq, 6, U.stringToUint8Array(path))
-
-            return this.talkAsync(rmReq, 5)
-                .then(resp => { })
-        }
-
-        isVmAsync(): Promise<boolean> {
-            let path = "/no/such/dir"
-            let mkdirReq = this.allocSystem(path.length + 1, 0x9b)
-            U.memcpy(mkdirReq, 6, U.stringToUint8Array(path))
-            return this.talkAsync(mkdirReq, -1)
-                .then(resp => {
-                    let isVM = resp[6] == 0x05
-                    log(`${isVM ? "PXT app" : "VM"} running`)
-                    return isVM
-                })
-        }
-
-        private streamFileOnceAsync(path: string, cb: (d: Uint8Array) => void) {
-            let fileSize = 0
-            let filePtr = 0
-            let handle = -1
-            let resp = (buf: Uint8Array): Promise<void> => {
-                if (buf[6] == 2) {
-                    // handle not ready - file is missing
-                    this.isStreaming = false
-                    return Promise.resolve()
-                }
-
-                if (buf[6] != 0 && buf[6] != 8)
-                    U.userError("bad response when streaming file: " + buf[6] + " " + U.toHex(buf))
-
-                this.isStreaming = true
-                fileSize = HF2.read32(buf, 7)
-                if (handle == -1) {
-                    handle = buf[11]
-                    log(`stream on, handle=${handle}`)
-                }
-                let data = buf.slice(12)
-                filePtr += data.length
-                if (data.length > 0)
-                    cb(data)
-
-                if (buf[6] == 8) {
-                    // end of file
-                    this.isStreaming = false
-                    return this.rmAsync(path)
-                }
-
-                let contFileReq = this.allocSystem(1 + 2, 0x97)
-                HF2.write16(contFileReq, 7, 1000) // maxRead
-                contFileReq[6] = handle
-                return Promise.delay(data.length > 0 ? 0 : 500)
-                    .then(() => this.talkAsync(contFileReq, -1))
-                    .then(resp)
-            }
-
-            let getFileReq = this.allocSystem(2 + path.length + 1, 0x96)
-            HF2.write16(getFileReq, 6, 1000) // maxRead
-            U.memcpy(getFileReq, 8, U.stringToUint8Array(path))
-            return this.talkAsync(getFileReq, -1).then(resp)
-        }
-
-        streamFileAsync(path: string, cb: (d: Uint8Array) => void) {
-            let loop = (): Promise<void> =>
-                this.lock.enqueue("file", () =>
-                    this.streamFileOnceAsync(path, cb))
-                    .then(() => Promise.delay(500))
-                    .then(loop)
-            return loop()
-        }
-
-
-        downloadFileAsync(path: string, cb: (d: Uint8Array) => void) {
-            return this.lock.enqueue("file", () =>
-                    this.streamFileOnceAsync(path, cb))
-        }
-        
-
-        private initAsync() {
-            return Promise.resolve()
-        }
-
-        private resetState() {
-
-        }
-
-        reconnectAsync(first = false): Promise<void> {
-            this.resetState()
-            if (first) return this.initAsync()
-            log(`reconnect`);
-            return this.io.reconnectAsync()
-                .then(() => this.initAsync())
-        }
-
-        disconnectAsync() {
-            log(`disconnect`);
-            return this.io.disconnectAsync()
-        }
-    }
-
-
-}

jenkins.groovy

@@ -24,6 +24,7 @@ def projectName = "pxt-ev3"
                 credentialsBinding {
                     string("PXT_ACCESS_TOKEN", "pxt_access_token")
                     string("PXT_RELEASE_REPO", "pxt_release_repo_ev3")
+                    string("CROWDIN_KEY", "pxt_crowdin_key")
                 }
             }
         }

libs/automation/pxt.json

@@ -1,6 +0,0 @@
-{
-    "additionalFilePath": "../../node_modules/pxt-common-packages/libs/automation",
-    "dependencies": {
-        "ev3": "file:../ev3"
-    }
-}

libs/base/pxt.json

@@ -1,30 +1,3 @@
 {
-    "name": "base",
-    "description": "The base library",
-    "files": [
-        "README.md",
-        "pxt-core.d.ts",
-        "pxt.cpp",
-        "pxtbase.h",
-        "core.cpp",
-        "pxt-helpers.ts",
-        "buffer.cpp",
-        "shims.d.ts",
-        "enums.d.ts",
-        "loops.cpp",
-        "math.ts",
-        "ns.ts",
-        "control.cpp",
-        "control.ts",
-        "eventcontext.ts",
-        "serial.cpp",
-        "serial.ts",
-        "fieldeditors.ts"
-    ],
-    "testFiles": [
-        "test.ts"
-    ],
-    "additionalFilePath": "../../node_modules/pxt-common-packages/libs/base",
-    "public": true,
-    "dependencies": {}
+    "additionalFilePath": "../../node_modules/pxt-common-packages/libs/base"
 }

libs/base/shims.d.ts

@@ -142,23 +142,12 @@ declare namespace control {
     //% blockId="control_device_serial_number" block="device serial number" weight=9
     //% help=control/device-serial-number shim=control::deviceSerialNumber
     function deviceSerialNumber(): int32;
-}
-declare namespace serial {
 
     /**
-     * Write some text to the serial port.
+     *
      */
-    //% help=serial/write-string
-    //% weight=87 blockHidden=true
-    //% blockId=serial_writestring block="serial|write string %text" shim=serial::writeString
-    function writeString(text: string): void;
-
-    /**
-     * Send a buffer across the serial connection.
-     */
-    //% help=serial/write-buffer weight=6 blockHidden=true
-    //% blockId=serial_writebuffer block="serial|write buffer %buffer" shim=serial::writeBuffer
-    function writeBuffer(buffer: Buffer): void;
+    //% shim=control::__log
+    function __log(text: string): void;
 }
 
 // Auto-generated. Do not edit. Really.

libs/chassis/README.md

@@ -1,3 +0,0 @@
-# Chassis
-
-A library to control a chassis.

libs/chassis/chassis.ts

@@ -1,97 +0,0 @@
-/**
- * A differential drive robot
- */
-//% weight=50 color=#cf00cf
-namespace chassis {
-    /**
-     * A differential drive robot
-     */
-    //% fixedInstances
-    export class Chassis {
-        // the motor pair
-        public motors: motors.SynchedMotorPair;
-        // the radius of the wheel (cm)
-        public wheelRadius: number;
-        // the distance between the wheels (cm)
-        public baseLength: number;
-
-        constructor() {
-            this.motors = motors.largeBC;
-            this.wheelRadius = 3;
-            this.baseLength = 12;
-        }
-
-        /**
-         * Makes a differential drive robot move with a given speed (cm/s) and rotation rate (deg/s)
-         * using a unicycle model.
-         * @param speed speed of the center point between motors, eg: 10
-         * @param rotationSpeed rotation of the robot around the center point, eg: 30
-         * @param distance
-         **/
-        //% blockId=motorDrive block="drive %chassis|at %speed|cm/s|turning %rotationSpeed|deg/s"
-        //% inlineInputMode=inline
-        //% weight=95 blockGap=8
-        drive(speed: number, rotationSpeed: number, distance: number = 0) {
-            if (!speed) {
-                this.motors.stop();
-                return;
-            } 
-
-            // speed is expressed in %
-            const R = this.wheelRadius; // cm
-            const L = this.baseLength; // cm
-            const PI = 3.14;
-            const maxw = 170 / 60 * 2 * PI; // rad / s
-            const maxv = maxw * R; // cm / s
-            // speed is cm / s
-            const v = speed; // cm / s
-            const w = rotationSpeed / 360 * 2 * PI; // rad / s
-
-            const vr = (2 * v + w * L) / (2 * R); // rad / s
-            const vl = (2 * v - w * L) / (2 * R); // rad / s
-
-            const sr = vr / maxw * 100; // % 
-            const sl = vl / maxw * 100; // %
-
-            // cm / (cm/s) = s
-            const seconds = distance / speed;
-
-            this.motors.tank(sr, sl, seconds, MoveUnit.Seconds)
-        }
-
-        /**
-         * Sets the wheel radius in centimeters
-         * @param cm 
-         */
-        //% blockId=chassisSetWheelRadius block="set %chassis|wheel radius to %cm|(cm)"
-        setWheelRadius(cm: number) {
-            this.wheelRadius = cm;
-        }
-
-        /**
-         * Sets the base length in centimeters
-         * @param cm 
-         */
-        //% blockId=chassisSetBaseLength block="set %chassis|base length to %cm|(cm)"
-        setBaseLength(cm: number) {
-            this.baseLength = cm;
-        }
-        
-        /**
-         * Sets the motors used by the chassis, default is B+C
-         * @param motors 
-         */
-        //% blockId=chassisSetMotors block="set %chassis|motors to %motors"
-        //% weight=10
-        setMotors(motors: motors.SynchedMotorPair) {
-            this.motors = motors;
-        }
-
-        toString(): string {
-            return `chassis base ${this.baseLength}, wheel ${this.wheelRadius}`;
-        }
-    }
-
-    //% fixedInstance whenUsed
-    export const chassis = new Chassis();
-}

libs/chassis/pxt.json

@@ -1,15 +0,0 @@
-{
-    "name": "chassis",
-    "description": "Chassis robot support",
-    "files": [
-        "README.md",
-        "chassis.ts"
-    ],
-    "testFiles": [
-        "test.ts"
-    ],
-    "public": true,
-    "dependencies": {
-            "core": "file:../core"
-    }
-}

libs/chassis/test.ts

@@ -1 +0,0 @@
-

libs/color-sensor/color.ts

@@ -185,7 +185,7 @@ namespace sensors {
          * @param handler the code to run when detected
          */
         //% help=sensors/color-sensor/on-light-detected
-        //% block="on **color sensor** %this|detected %mode|%condition"
+        //% block="on **color sensor** %this|%mode|%condition"
         //% blockId=colorOnLightDetected
         //% parts="colorsensor"
         //% blockNamespace=sensors
@@ -202,7 +202,7 @@ namespace sensors {
          * @param color the color to detect
          */
         //% help=sensors/color-sensor/pause-until-light-detected
-        //% block="pause until **color sensor** %this|detected %mode|%condition"
+        //% block="pause until **color sensor** %this|%mode|%condition"
         //% blockId=colorPauseUntilLightDetected
         //% parts="colorsensor"
         //% blockNamespace=sensors

libs/core/console.ts

@@ -1,48 +0,0 @@
-/// <reference no-default-lib="true"/>
-
-/**
- * Reading and writing data to the console output.
- */
-//% weight=12 color=#00451A icon="\uf112"
-//% advanced=true
-namespace console {
-    type Listener = (text: string) => void;
-
-    const listeners: Listener[] = [
-        (text: string) => serial.writeLine(text)
-    ];
-
-    /**
-     * Write a line of text to the console output.
-     * @param value to send
-     */
-    //% weight=90
-    //% help=console/log blockGap=8
-    //% blockId=console_log block="console|log %text"
-    export function log(text: string): void {
-        for (let i = 0; i < listeners.length; ++i)
-            listeners[i](text);
-    }
-
-    /**
-     * Write a name:value pair as a line of text to the console output.
-     * @param name name of the value stream, eg: "x"
-     * @param value to write
-     */
-    //% weight=88 blockGap=8
-    //% help=console/log-value
-    //% blockId=console_log_value block="console|log value %name|= %value"
-    export function logValue(name: string, value: number): void {
-        log(`${name}: ${value}`)
-    }
-
-    /**
-     * Adds a listener for the log messages
-     * @param listener 
-     */
-    //%
-    export function addListener(listener: (text: string) => void) {
-        if (!listener) return;
-        listeners.push(listener);
-    }
-}

libs/core/ns.ts

@@ -22,4 +22,9 @@ namespace motors {
     export function __turnRatioPicker(turnratio: number): number {
         return turnratio;
     }
+}
+
+//% icon="\uf112"
+namespace console {
+
 }

libs/core/output.ts

@@ -132,6 +132,7 @@ namespace motors {
         protected _port: Output;
         protected _portName: string;
         protected _brake: boolean;
+        private _pauseOnRun: boolean;
         private _initialized: boolean;
         private _init: () => void;
         private _run: (speed: number) => void;
@@ -142,6 +143,7 @@ namespace motors {
             this._port = port;
             this._portName = outputToName(this._port);
             this._brake = false;
+            this._pauseOnRun = true;
             this._initialized = false;
             this._init = init;
             this._run = run;
@@ -172,6 +174,19 @@ namespace motors {
             this._brake = brake;
         }
 
+        /**
+         * Indicates to pause while a motor moves for a given distance or duration.
+         * @param value true to pause; false to continue the program execution
+         */
+        //% blockId=outputMotorSetPauseMode block="set %motor|pause on run %brake=toggleOnOff"
+        //% motor.fieldEditor="motors"
+        //% weight=60 blockGap=8
+        //% group="Properties"
+        setPauseOnRun(value: boolean) {
+            this.init();
+            this._pauseOnRun = value;
+        }
+
         /** 
          * Inverts the motor polarity
         */
@@ -201,13 +216,22 @@ namespace motors {
             this.settle();
         }
 
-        private settle() {
+        protected settle() {
             // if we've recently completed a motor command with brake
             // allow 500ms for robot to settle
-            if(this._brake)
+            if (this._brake)
                 pause(500);
         }
 
+        protected pauseOnRun(stepsOrTime: number) {
+            if (stepsOrTime && this._pauseOnRun) {
+                // wait till motor is done with this work
+                this.pauseUntilReady();
+                // allow robot to settle
+                this.settle();
+            }
+        }
+
         /**
          * Resets the motor(s).
          */
@@ -269,10 +293,7 @@ namespace motors {
             }
 
             this._move(useSteps, stepsOrTime, speed);
-            // wait till motor is done with this work
-            this.pauseUntilReady();
-            // allow robot to settle
-            this.settle();
+            this.pauseOnRun(stepsOrTime);
         }
 
         /**
@@ -306,12 +327,12 @@ namespace motors {
             (Data8) NO – Port number [0 - 3]  
             (Data8) TYPE – Output device type,  (0x07: Large motor, Medium motor = 0x08) Dispatch status Unchanged 
             Description This function enables specifying the output device type
-            */             
+            */
             for (let i = 0; i < DAL.NUM_OUTPUTS; ++i) {
                 if (this._port & (1 << i)) {
                     const b = mkCmd(i, DAL.opOutputSetType, 1)
                     b.setNumber(NumberFormat.Int8LE, 2, large ? 0x07 : 0x08)
-                    writePWM(b)        
+                    writePWM(b)
                 }
             }
         }
@@ -333,7 +354,7 @@ namespace motors {
             motors.__motorUsed(this._port, this._large);
         }
 
-        private __init() {            
+        private __init() {
             this.setOutputType(this._large);
         }
 
@@ -572,6 +593,8 @@ namespace motors {
                 stepsOrTime: stepsOrTime,
                 useBrake: this._brake
             });
+
+            this.pauseOnRun(stepsOrTime);
         }
 
         /**

libs/core/platform.h

@@ -0,0 +1 @@
+// leave empty

libs/core/pxt.json

@@ -10,7 +10,6 @@
         "linux.cpp",
         "mmap.cpp",
         "control.cpp",
-        "console.ts",
         "timer.ts",
         "serialnumber.cpp",
         "buttons.ts",
@@ -25,7 +24,8 @@
         "enums.d.ts",
         "dal.d.ts",
         "icons.jres",
-        "ns.ts"
+        "ns.ts",
+        "platform.h"
     ],
     "testFiles": [
         "test.ts"

libs/core/pxtcore.h

@@ -1,9 +1,16 @@
 #ifndef __PXTCORE_H
 #define __PXTCORE_H
 
+#include <stdio.h>
+
 namespace pxt {
 void dmesg(const char *fmt, ...);
 #define DMESG pxt::dmesg
 }
 
+static inline void itoa(int v, char *dst) {
+
+    snprintf(dst, 30, "%d", v);
+
+}
 #endif

libs/ev3/startup.ts

@@ -1,4 +1,8 @@
 // This is the last thing executed before user code
 
+// pulse green, play startup sound, turn off light
+brick.setStatusLight(StatusLight.GreenPulse);
 // We pause for 100ms to give time to read sensor values, so they work in on_start block
-pause(100)
+pause(400)
+// and we're ready
+brick.setStatusLight(StatusLight.Off);

libs/music/music.cpp

@@ -164,7 +164,7 @@ void playTone(int frequency, int ms) {
 }
 
 /**
-* Play a tone through the speaker for some amount of time.
+* Stop all sounds.
 */
 //% help=music/stop-all-sounds
 //% blockId=music_stop_all_sounds block="stop all sounds"

libs/music/piano.ts

@@ -1,18 +1,19 @@
 namespace music {
     /**
      * Get the frequency of a note.
-     * @param name the note name, eg: Note.C
+     * @param note the note name, eg: Note.C
      */
     //% weight=1 help=music/note-frequency
     //% blockId=device_note block="%note"
-    //% shim=TD_ID color="#FFFFFF" colorSecondary="#FFFFFF"
+    //% shim=TD_ID
+    //% color="#FFFFFF" colorSecondary="#FFFFFF" colorTertiary="#D67923"
     //% note.fieldEditor="note" note.defl="1046"
-    //% note.fieldOptions.editorColour="#FF1493" note.fieldOptions.decompileLiterals=true
-    //% note.fieldOptions.minNote=52 note.fieldOptions.maxNote=75
+    //% note.fieldOptions.editorColour="#D67923" note.fieldOptions.decompileLiterals=true
+    //% note.fieldOptions.minNote=40 note.fieldOptions.maxNote=75
     //% useEnumVal=1
     //% weight=10 blockGap=8
-    export function noteFrequency(name: Note): number {
+    export function noteFrequency(note: Note): number {
         //TODO fill in actual min/max note values
-        return name;
+        return note;
     }
-}
+}

libs/music/shims.d.ts

@@ -26,7 +26,7 @@ declare namespace music {
     function playTone(frequency: int32, ms: int32): void;
 
     /**
-     * Play a tone through the speaker for some amount of time.
+     * Stop all sounds.
      */
     //% help=music/stop-all-sounds
     //% blockId=music_stop_all_sounds block="stop all sounds"

libs/screen/image.d.ts

@@ -0,0 +1 @@
+// leave empty