bump to version 1.0.0

removed r03 route
adding r03 path
2017-02-28 13:44:30 +01:00 · 2017-02-27 14:07:46 -08:00 · 2017-02-27 13:52:10 -08:00 · 2017-02-24 22:35:41 +01:00 · 2017-02-24 22:22:46 +01:00 · 2017-02-24 17:52:16 +01:00
744 changed files with 38937 additions and 4520 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,6 +16,7 @@ clients/win10/*.opendb
 clients/**/bin/**
 clients/**/obj/**
 clients/electron/projects
+hexcache

 *.user
 *.sw?
@ -24,3 +25,9 @@ clients/electron/projects
 *.db
 *.suo
 *.log
+
+.DS_Store
+.idea
+*.iml
+.vscode/.BROWSE.VC.DB-shm
+.vscode/.BROWSE.VC.DB-wal
--- a/.travis.yml
+++ b/.travis.yml
@ -3,17 +3,11 @@ node_js:
  - "5.7.0"
 script:
  - "node node_modules/pxt-core/built/pxt.js travis"  
-  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js run)"
-  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js run)"
-  - "(cd libs/lang-test0; node ../../node_modules/pxt-core/built/pxt.js test)"
-  - "(cd libs/lang-test1; node ../../node_modules/pxt-core/built/pxt.js test)"
  - "node node_modules/pxt-core/built/pxt.js testdir tests"
-  - "node node_modules/pxt-core/built/pxt.js uploaddoc"
-  - "(cd libs/hello; node ../../node_modules/pxt-core/built/pxt.js testconv https://az851932.vo.msecnd.net/files/td-converter-tests-v1.json)"
 sudo: false
 notifications:
  email:
-    - touchdevelop-build@microsoft.com
+    - kindscript@microsoft.com
 cache:
  directories:
    - node_modules
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -16,5 +16,6 @@
        "**/pxt_modules/**": true
    },    
    "tslint.enable": true,
-    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
+    "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
+    "typescript.tsdk": "./node_modules/typescript/lib"
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,26 @@
+# Contributing Code
+
+PXT accepts bug fix pull requests. For a bug fix PR to be accepted, it must first have a tracking issue that has been marked approved. Your PR should link to the bug you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
+
+PXT also accepts new feature pull requests. For a feature-level PR to be accepted, it first needs to have design discussion. Design discussion can take one of two forms a) a feature request in the issue tracker that has been marked as approved or b) the PR must be accompanied by a full design spec and this spec is later approved in the open design discussion. Features are evaluated against their complexity, impact on other features, roadmap alignment, and maintainability.
+
+These two blogs posts on contributing code to open source projects are a good reference: [Open Source Contribution Etiquette](http://tirania.org/blog/archive/2010/Dec-31.html) by Miguel de Icaza and [Don't "Push" Your Pull Requests](https://www.igvita.com/2011/12/19/dont-push-your-pull-requests/) by Ilya Grigorik.
+
+## Security
+
+If you believe you have found a security issue in PXT, please share it with us privately following the guidance at the Microsoft [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094). Reporting it via this channel helps minimize risk to projects built with PXT.
+
+## Legal
+
+You will need to complete a Contributor License Agreement (CLA) before your pull request can be accepted. This agreement testifies that you are granting us permission to use the source code you are submitting, and that this work is being submitted under appropriate license that we can use it.
+
+You can complete the CLA by going through the steps at https://cla.microsoft.com. Once we have received the signed CLA, we'll review the request. You will only need to do this once.
+
+## Housekeeping
+
+Your pull request should:
+* Include a description of what your change intends to do
+* Be a child commit of a reasonably recent commit in the master branch
+* Pass all unit tests
+* Have a clear commit message
+* Include adequate tests
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -0,0 +1,25 @@
+PXT - Programming Experience Toolkit
+
+The MIT License (MIT)
+
+Copyright (c) Microsoft Corporation
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/README.md
+++ b/README.md
@ -1,11 +1,11 @@
-# micro:bit target for PXT
+# Calliope target for PXT

-This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
+This target allow to program a [Calliope](http://calliope.cc/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).

-* [Try it live](https://codethemicrobit.com)
+[![Build Status](https://travis-ci.org/Microsoft/pxt-calliope.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-calliope)

-[![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
+![](http://calliope.cc/content/1-ueber-mini/mini_board.png)

 ## Local server

@ -15,11 +15,11 @@ The local server allows to run the editor and the documentation from your comput

 The following commands are a 1-time setup after synching the repo on your machine.

-* if not yet installed, install [Node.js 4.4.5 or higher](https://nodejs.org/en/download/)
+* See requirements for [pxt](https://github.com/Microsoft/pxt)
 * [clone this repo](https://help.github.com/articles/cloning-a-repository/) to your computer and go in the project folder
 ```
-git clone https://github.com/microsoft/pxt-microbit
-cd pxt-microbit
+git clone https://github.com/microsoft/pxt-calliope
+cd pxt-calliope
 ```
 * install the PXT command line (add ``sudo`` for Mac/Linux shells).
 ```
@ -32,14 +32,15 @@ npm install

 ### Running

-Run this command to open a local web server (add ``sudo`` for Mac/Linux shells)
+Run this command to open a local web server (add ``sudo`` for Mac/Linux shells).
 ```
 pxt serve
 ```
 If the local server opens in the wrong browser, make sure to copy the URL containing the local token. 
 Otherwise, the editor will not be able to load the projects.

-If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells):
+If you need modify the `.cpp` files, turn on yotta compilation with the ``-yt`` flag (add ``sudo`` for Mac/Linux shells). On Windows, you must be running
+from the ``Run Yotta`` command prompt.
 ```
 pxt serve -yt
 ```
@ -53,11 +54,6 @@ pxt update

 More instructions at https://github.com/Microsoft/pxt#running-a-target-from-localhost 

-### Building
-
-* Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
-* open the ``win10/app.sln`` solution and launch the ``codethemicrobit`` project.
-
 ## Testing

 The build automatically runs the following:
@ -66,7 +62,6 @@ The build automatically runs the following:
 * `pxt run` in `libs/lang-test*` - this will run the test in command line runner; 
  there is a number of asserts in both of these
 * `pxt testdir` in `tests` - this makes sure all the files compile and generates .hex files
-* run the TD->TS converter on a number of test scripts from `microbit.co.uk` and make sure the results compile

 To test something on the device:

--- a/clients/chrome/background.js
+++ b/clients/chrome/background.js
@ -1,4 +1,3 @@
-///<reference path='typings/browser.d.ts'/>
 var connections = [];
 // A list of "ports", i.e. connected clients (such as web pages). Multiple web
 // pages can connect to our service: they all receive the same data.
@ -41,7 +40,7 @@ function findNewDevices() {
 function main() {
    // Register new clients in the [ports] global variable.
    chrome.runtime.onConnectExternal.addListener(function (port) {
-        if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
+        if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit|pxt.microbit.org)$/.test(port.name)) {
            ports.push(port);
            port.onDisconnect.addListener(function () {
                ports = ports.filter(function (x) { return x != port; });
--- a/clients/chrome/background.ts
+++ b/clients/chrome/background.ts
@ -61,7 +61,7 @@ function findNewDevices() {
 function main() {
  // Register new clients in the [ports] global variable.
  chrome.runtime.onConnectExternal.addListener(function (port) {
-    if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit)$/.test(port.name)) {
+    if (/^(micro:bit|touchdevelop|yelm|pxt|codemicrobit|codethemicrobit|pxt.microbit.org)$/.test(port.name)) {
      ports.push(port);
      port.onDisconnect.addListener(function () {
        ports = ports.filter(function (x) { return x != port });
--- a/clients/chrome/logo128.png
+++ b/clients/chrome/logo128.png
--- a/clients/chrome/logo48.png
+++ b/clients/chrome/logo48.png
--- a/clients/chrome/manifest.json
+++ b/clients/chrome/manifest.json
@ -6,13 +6,13 @@
  },

  "manifest_version": 2,
-  "name": "code the micro:bit",
-  "version": "0.6.0",
+  "name": "pxt.microbit.org",
+  "version": "0.7.0",
  "author": "Microsoft Corporation",
-  "short_name": "code the micro:bit",
+  "short_name": "pxt.microbit.org",

-  "description": "Extension for https://codethemicrobit.com.",
-  "homepage_url": "https://codethemicrobit.com",
+  "description": "Extension for https://pxt.microbit.org.",
+  "homepage_url": "https://pxt.microbit.org",
  "offline_enabled": "true",
  "icons": {
    "48": "logo48.png",
@ -25,6 +25,6 @@
  ],

  "externally_connectable": {
-    "matches": [ "*://localhost/*", "https://codethemicrobit.com/*", "https://*.codethemicrobit.com/*" ]
+    "matches": [ "*://localhost/*", "https://pxt.microbit.org/*", "https://*.microbit.org/*" ]
  }
 }
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -124,7 +124,7 @@
 }

 - (void)launchEditor:(id)sender {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://pxt.microbit.org/"]];
 }

@end
--- a/clients/macuploader/README.md
+++ b/clients/macuploader/README.md
@ -3,10 +3,10 @@
 ![](Microbit Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png)

 This project is a clone of the [Windows
-uploader](https://codethemicrobit.com/uploader), but for OS X. Once launched,
+uploader](https://pxt.microbit.org/uploader), but for OS X. Once launched,
 the app runs in your menu bar and will automatically deploy any HEX files to
 your `micro:bit`. Like the Windows version, it is compatible with any browser
-that can run [codethemicrobit.com](http://codethemicrobit.com).
+that can run [pxt.microbit.org](http://pxt.microbit.org).

 ## Install the built version

--- a/clients/win10/app.sln
+++ b/clients/win10/app.sln
@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "m.pxt.io", "app\m.pxt.io.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.ps1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/cs-CZ/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/de-DE/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/en-US/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/es-ES/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/fr-FR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/it-IT/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ja-JP/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ko-KR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pl-PL/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/pt-BR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/ru-RU/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/tr-TR/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-CN/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
+++ b/clients/win10/app/AppPackages/latest/Add-AppDevPackage.resources/zh-TW/Add-AppDevPackage.psd1
--- a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle
+++ b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.appxbundle
--- a/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer
+++ b/clients/win10/app/AppPackages/latest/m.pxt.io_0.1.4.0_AnyCPU_Debug.cer
--- a/clients/win10/app/BundleArtifacts/neutral.txt
+++ b/clients/win10/app/BundleArtifacts/neutral.txt
@ -1 +0,0 @@
-MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx
--- a/clients/win10/app/codethemicrobitapp.jsproj
+++ b/clients/win10/app/codethemicrobitapp.jsproj
@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>39122940-ab16-4cd4-a0ce-79a3eb863ecf</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
-  <PropertyGroup>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <PackageCertificateKeyFile>pxtwinapp_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>neutral</AppxBundlePlatforms>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-    <Content Include="msapp-error.js" />
-    <Content Include="msapp-error.css" />
-    <Content Include="msapp-error.html" />
-    <Content Include="images\LockScreenLogo.scale-200.png" />
-    <Content Include="images\SplashScreen.scale-200.png" />
-    <Content Include="images\Square150x150Logo.scale-200.png" />
-    <Content Include="images\Square44x44Logo.scale-200.png" />
-    <Content Include="images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="images\StoreLogo.png" />
-    <Content Include="images\Wide310x150Logo.scale-200.png" />
-    <None Include="pxtwinapp_TemporaryKey.pfx" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
-  <!-- To modify your build process, add your task inside one of the targets below then uncomment
-       that target and the DisableFastUpToDateCheck PropertyGroup. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  <PropertyGroup>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-  </PropertyGroup>
-  -->
-</Project>
--- a/clients/win10/app/codethemicrobitapp.sln
+++ b/clients/win10/app/codethemicrobitapp.sln
@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{262852C6-CD72-467D-83FE-5EEB1973A190}") = "codethemicrobitapp", "codethemicrobitapp.jsproj", "{39122940-AB16-4CD4-A0CE-79A3EB863ECF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.ActiveCfg = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Build.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|ARM.Deploy.0 = Debug|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.ActiveCfg = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Build.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x64.Deploy.0 = Debug|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.ActiveCfg = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Build.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Debug|x86.Deploy.0 = Debug|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.ActiveCfg = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Build.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|ARM.Deploy.0 = Release|ARM
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.ActiveCfg = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Build.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x64.Deploy.0 = Release|x64
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.ActiveCfg = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Build.0 = Release|x86
-		{39122940-AB16-4CD4-A0CE-79A3EB863ECF}.Release|x86.Deploy.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/clients/win10/app/images/LockScreenLogo.scale-200.png
+++ b/clients/win10/app/images/LockScreenLogo.scale-200.png
--- a/clients/win10/app/images/SplashScreen.scale-200.png
+++ b/clients/win10/app/images/SplashScreen.scale-200.png
--- a/clients/win10/app/images/Square150x150Logo.scale-200.png
+++ b/clients/win10/app/images/Square150x150Logo.scale-200.png
--- a/clients/win10/app/images/Square44x44Logo.scale-200.png
+++ b/clients/win10/app/images/Square44x44Logo.scale-200.png
--- a/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png
+++ b/clients/win10/app/images/Square44x44Logo.targetsize-24_altform-unplated.png
--- a/clients/win10/app/images/StoreLogo.png
+++ b/clients/win10/app/images/StoreLogo.png
--- a/clients/win10/app/images/Wide310x150Logo.scale-200.png
+++ b/clients/win10/app/images/Wide310x150Logo.scale-200.png
--- a/clients/win10/app/msapp-error.css
+++ b/clients/win10/app/msapp-error.css
@ -1,17 +0,0 @@
-body {
-  margin: 10px;
-} 
-
-.tip {
-  font-size: 90%;
-  padding-left: 20px;
-}
-
-.paramName {
-  font-size: 100%;
-  color: black;
-} 
-
-.paramValue {
-  color: black;
-}
--- a/clients/win10/app/msapp-error.html
+++ b/clients/win10/app/msapp-error.html
@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Navigation Error</title>
-  <link href="msapp-error.css" rel="stylesheet" type="text/css"/>
-  <script src="msapp-error.js" type="text/javascript"></script>
-</head>
-<body>
-  <h1>Navigation Error</h1>
-  <div id="failureUrl" class="param"> 
-    <span>-</span><span class="paramName">failureUrl</span><span>=</span> 
-    <span id="failureUrlValue" class="paramValue"></span> 
-    <span class="tip">(indicates the url where the error occurred)</span><br/> 
-  </div><br/> 
-  <div id="httpStatus" class="param"> 
-    <span>-</span><span class="paramName">httpStatus</span><span>=</span> 
-    <span id="httpStatusValue" class="paramValue"></span> 
-    <span class="tip">(available when the error has an http status code)</span><br/> 
-  </div><br/> 
-  <div id="failureName"> 
-    <span>-</span><span class="paramName">failureName</span><span>=</span> 
-    <span id="failureNameValue" class="paramValue"></span> 
-    <span class="tip">(available only when the error does not have a http status code)</span><br/> 
-  </div> 
-</body>
-</html>
--- a/clients/win10/app/msapp-error.js
+++ b/clients/win10/app/msapp-error.js
@ -1,22 +0,0 @@
-(function () { 
-  var validParameterNames = [ "httpStatus", "failureName", "failureUrl" ]; 
-  
-  function parseQueryParameters() { 
-    var query = location.search.slice(1); 
-    return query.split("&").reduce(function (queryParameters, rawPair) {
-                                   var pair = rawPair.split("=").map(decodeURIComponent);
-                                   queryParameters[pair[0]] = pair[1];
-                                   return queryParameters;
-    }, {});
-  }
- 
-  function initialize() {
-    var queryParameters = parseQueryParameters();
-    validParameterNames.forEach(function (parameterName) {
-                               var parameterValue = queryParameters[parameterName] || "N/A"; 
-                               document.getElementById(parameterName + "Value").textContent = parameterValue;
-    });
-  }
-  
-  document.addEventListener("DOMContentLoaded", initialize);
-}());
--- a/clients/win10/app/package.appxmanifest
+++ b/clients/win10/app/package.appxmanifest
@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="39122940-ab16-4cd4-a0ce-79a3eb863ecf" Version="0.1.5.0" Publisher="CN=jhalleux" />
-  <mp:PhoneIdentity PhoneProductId="39122940-ab16-4cd4-a0ce-79a3eb863ecf" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>codethemicrobit</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>images\storelogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" StartPage="https://codethemicrobit.com">
-      <uap:ApplicationContentUriRules>
-        <uap:Rule Match="https://m.pxt.io/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-        <uap:Rule Match="https://codethemicrobit.com/" Type="include" WindowsRuntimeAccess="all" />
-      </uap:ApplicationContentUriRules>
-      <uap:VisualElements DisplayName="code the micro:bit" Description="A code editor for the BBC micro:bit with Blocks or Javascript." BackgroundColor="white" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="code the micro:bit">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="images\splashscreen.png" />
-      </uap:VisualElements>
-      <Extensions>
-        <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="microbithex">
-            <uap:DisplayName>BBC micro:bit binary file</uap:DisplayName>
-            <uap:SupportedFileTypes>
-              <uap:FileType ContentType="application/x-microbit-hex">.hex</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-      </Extensions>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <uap:Capability Name="removableStorage" />
-    <DeviceCapability Name="bluetooth" />
-    <DeviceCapability Name="serialcommunication">
-      <Device Id="any">
-        <Function Type="name:serialPort" />
-      </Device>
-    </DeviceCapability>
-  </Capabilities>
-</Package>
--- a/clients/win10/app/pxtwinapp_TemporaryKey.pfx
+++ b/clients/win10/app/pxtwinapp_TemporaryKey.pfx
--- a/clients/win10/store/desktopblocks1366x768.png
+++ b/clients/win10/store/desktopblocks1366x768.png
--- a/clients/win10/store/desktopjavascript1366x768.png
+++ b/clients/win10/store/desktopjavascript1366x768.png
--- a/clients/win10/store/mobileblocks480x800.png
+++ b/clients/win10/store/mobileblocks480x800.png
--- a/clients/winuploader/Microbit.Uploader/MainForm.cs
+++ b/clients/winuploader/Microbit.Uploader/MainForm.cs
@ -32,7 +32,7 @@ namespace Microsoft.MicroBit
        private void openEditor()
        {
            // lanch editor
-            try { Process.Start("https://codethemicrobit.com#uploader"); } catch (Exception) { }
+            try { Process.Start("https://pxt.microbit.org#uploader"); } catch (Exception) { }
        }

        private void initializeFileWatch()
@ -236,7 +236,7 @@ namespace Microsoft.MicroBit
        {
            try
            {
-                Process.Start("https://codethemicrobit.com/uploader");
+                Process.Start("https://pxt.microbit.org/uploader");
            }
            catch (IOException) { }
        }
--- a/cmds/cmds.ts
+++ b/cmds/cmds.ts
@ -1,59 +0,0 @@
-/// <reference path="../node_modules/pxt-core/built/pxt.d.ts"/>
-
-import * as fs from "fs";
-import * as path from "path";
-import * as child_process from "child_process";
-
-let writeFileAsync: any = Promise.promisify(fs.writeFile)
-let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
-let readDirAsync = Promise.promisify(fs.readdir)
-
-
-export function deployCoreAsync(res: ts.pxtc.CompileResult) {
-    return getBitDrivesAsync()
-        .then(drives => {
-            if (drives.length == 0) {
-                let msg = "cannot find any drives to deploy to";
-                console.log(msg);
-                return Promise.reject(new Error(msg));
-            }
-
-            console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "))
-
-            return Promise.map(drives, d =>
-                writeFileAsync(d + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
-                    .then(() => {
-                        console.log("wrote hex file to " + d)
-                    }))
-        })
-        .then(() => { })
-}
-
-function getBitDrivesAsync(): Promise<string[]> {
-    if (process.platform == "win32") {
-        const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
-        return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
-            .then(buf => {
-                let res: string[] = []
-                buf.toString("utf8").split(/\n/).forEach(ln => {
-                    let m = rx.exec(ln)
-                    if (m) {
-                        res.push(m[1] + "/")
-                    }
-                })
-                return res
-            })
-    }
-    else if (process.platform == "darwin") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        return readDirAsync("/Volumes")
-            .then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
-    } else if (process.platform == "linux") {
-        const rx = new RegExp(pxt.appTarget.compile.deployDrives)
-        const user = process.env["USER"]
-        return readDirAsync(`/media/${user}`)
-            .then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
-    } else {
-        return Promise.resolve([])
-    }
-}
--- a/cmds/pxtrequire.ts
+++ b/cmds/pxtrequire.ts
@ -0,0 +1,7 @@
+/// <reference path="../node_modules/pxt-core/typings/globals/node/index.d.ts"/>
+/// <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"), "..", "..");
--- a/docfiles/appmeta.html
+++ b/docfiles/appmeta.html
@ -1,16 +0,0 @@
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:site" content="@codethemicrobit" />
-    <meta name="twitter:title" content="code the micro:bit" />
-    <meta name="twitter:description" content="Blocks+JavaScript for programming your micro:bit" />
-    <meta name="twitter:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
-
-    <meta property="og:title" content="micro:bit editor" />
-    <meta property="og:description" content="Blocks+JavaScript for programming your micro:bit" />
-    <meta property="og:site_name" content="code the micro:bit" />
-    <meta property="og:image" content="https://az851932.vo.msecnd.net/pub/drbwxcth" />
-    <!--
-    Canonical URL needs to wait until main release is updated.
-    <meta property="og:url" content="https://codethemicrobit.com" />
-    <meta property="og:type" content="website" />
-    <meta property="fb:app_id" content="" />
-    -->
--- a/docfiles/apptracking.html
+++ b/docfiles/apptracking.html
@ -1,6 +0,0 @@
-<script type="text/javascript">
-    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
-    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
-    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (pxtConfig) mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });
-</script>
--- a/docfiles/meta.html
+++ b/docfiles/meta.html
@ -1,21 +0,0 @@
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:site" content="@codethemicrobit" />
-<meta name="twitter:title" content="@name@" />
-<meta name="twitter:description" content="@description@" />
-<meta name="twitter:image" content="@cardLogo@" />
-
-<meta property="og:title" content="@name@" />
-<meta property="og:site_name" content="code the micro:bit" />
-<meta property="og:description" content="@description@" />
-<meta property="og:image" content="@cardLogo@" />
-<!--
-    <meta property="og:type" content="website" />
-    <meta property="fb:app_id" content="" />
-    -->
-
-<link rel="apple-touch-icon" href="@appLogo@">
-<link rel="icon" type="image/png" href="@appLogo@">
-<link rel="mask-icon" href="https://az851932.vo.msecnd.net/pub/zwxazere/safari-pinned-tab.svg" color="#000000">
-<link rel="shortcut icon" href="@appLogo@">
-<meta name="theme-color" content="@accentColor@">
-
--- a/docfiles/target.css
+++ b/docfiles/target.css
@ -1,5 +0,0 @@
-#root .avatar .avatar-image {
-    background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
-    background-size: contain;
-    background-repeat: no-repeat;
-}
--- a/docfiles/tracking.html
+++ b/docfiles/tracking.html
@ -1,6 +0,0 @@
-<script type="text/javascript">
-    (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable time_event track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config reset people.set people.set_once people.increment people.append people.union people.track_charge people.clear_charges people.delete_user".split(" ");
-    for(g=0;g<i.length;g++)f(c,i[g]);b._i.push([a,e,d])};b.__SV=1.2;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src="undefined"!==typeof MIXPANEL_CUSTOM_LIB_URL?MIXPANEL_CUSTOM_LIB_URL:"file:"===e.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f)}})(document,window.mixpanel||[]);
-    mixpanel.init("762fef19c053a0ea4cec43d2fecae76e", { disable_persistence: true });
-    if (pxtConfig) mixpanel.register({ target: pxtConfig.targetId, version: pxtConfig.targetVersion });    
-</script>
--- a/docs/_locales/pl/_theme.json
+++ b/docs/_locales/pl/_theme.json
@ -1,22 +0,0 @@
-{
-    "name": "koduj z micro:bit",
-    "title": "koduj z micro:bit",
-    "docMenu": [
-        {
-            "name": "O nas",
-            "path": "/about"
-        },
-        {
-            "name": "Lekcje",
-            "path": "/lessons"
-        },
-        {
-            "name": "Instrukcja obsługi",
-            "path": "/reference"
-        },
-        {
-            "name": "Urządzenie",
-            "path": "/device"
-        }
-    ]
-}
--- a/docs/_locales/pl/docs.md
+++ b/docs/_locales/pl/docs.md
@ -1,7 +0,0 @@
-# Dokumentacja
-
-Witamy na stronach dokumentacji!
-
-* Przeglądnij [instrukcje obsługi](/reference)
-* Dowiedz się więcej o [urządzeniu](/device)
-* Wystartuj z [lekcjami](/lessons)
--- a/docs/about.md
+++ b/docs/about.md
@ -79,7 +79,7 @@ When code is compiled to ARM machine code, the calls to JavaScript micro:bit fun

 ## [Command Line Tools](/cli)

-Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
+Looking to use pxt.microbit.org in your favorite editor? Install the [command line tools](/cli) and get rolling!

 ## [Packages](/packages)

--- a/docs/beta-ref.json
+++ b/docs/beta-ref.json
@ -0,0 +1,3 @@
+{
+    "appref": "v"
+}
--- a/docs/browsers.md
+++ b/docs/browsers.md
@ -1,7 +1,6 @@
 # Unsupported configuration

-[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
-your browser or operating system. The following configurations are supported:
+Your browser is currently not supported. The following configurations are supported:

 ## Windows

--- a/docs/browsers/technical.md
+++ b/docs/browsers/technical.md
@ -1,12 +1,12 @@
 # Technical information about browser support

-[codethemicrobit.com][] requires that you use a recent version of a modern
+[pxt.microbit.org][] requires that you use a recent version of a modern
 browser, such as Microsoft Edge, Google Chrome, Mozilla Firefox, Safari, Opera,
 or IE11.  This is because the editor uses modern web technologies such as [web
 workers][] to enable compiling [TypeScript][] in the browser, or the using the
 same [Monaco][] editor that powers [Visual Studio Code][].

-[codethemicrobit.com]: https://codethemicrobit.com
+[pxt.microbit.org]: https://pxt.microbit.org
 [web workers]: http://www.w3.org/TR/workers/
 [typescript]: http://www.typescriptlang.org
 [monaco]: https://microsoft.github.io/monaco-editor/
--- a/docs/cli.md
+++ b/docs/cli.md
@ -6,7 +6,7 @@ basic.forever(() => {
 })
 ```

-It is possible to use the codethemicrobit tools from a command line interface (CLI). The PXT CLI allows to 
+It is possible to use the tools from a command line interface (CLI). The PXT CLI allows to 
 * edit, compile or deploy JavaScript programs
 * can easily be integrated in most IDEs. It comes with built-in support for [Visual Studio Code](/code)!
 * run a local web server for the web editor
--- a/docs/device/crocodile-clips.md
+++ b/docs/device/crocodile-clips.md
@ -1,11 +1,40 @@
 # crocodile clips

-The large holes at the bottom of the board are designed to attach alligator/crocodile clips.
-Register an event that will execute whenever the user attaches one side of the crocodile clip to the `GND` pin, then connects and disconnects the unattached side of the crocodile clip to pin `0`, `1`, or `2`.
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.

-### Example: on pin pressed with random numbers
+# ~hint

-This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit
+**No crocodile clips!?!?!** Use wires or Aluminium foil! [Read more...](/device/foil-circuits)
+
+# ~
+
+
+## Connecting Crocodile Clips
+
+The hole for ``P0`` and ``GND`` allow to grab the board on the side which makes for a great grip.
+
+![](/static/mb/device/croc-clips/crocclipsclamped.jpg)
+
+Pass one jaw in the hole and grab the side of the board with the other jaw.
+
+![](/static/mb/device/croc-clips/sideclamp.jpg)
+
+For the center holes, ``P1`` and ``P2``, you can also grab the bottom of the board but they are a bit harder to grip.
+
+You can also grip the board between the jaws. In which case, you will want to make sure to avoid overlapping the jaws 
+with the other pins as it will create short-circuit in the board.
+
+![](/static/mb/device/croc-clips/badclamp.jpg)
+
+Adding a little tape helps keeping the crocodile clips in place.
+
+![](/static/mb/device/croc-clips/frontclamp.jpg)
+
+## Example: on pin pressed with random numbers
+
+This example displays a random number every time the crocodile clip holds  `GND` then connects and disconnects the `P0` pin. 
+Each time the crocodile clip is firmly connected and disconnected from pin `P0`, the micro:bit will return a random Number between 0 and the parameter limit.

 ```blocks
 input.onPinPressed(TouchPin.P0, () => {
@ -13,11 +42,6 @@ input.onPinPressed(TouchPin.P0, () => {
 })
 ```

-### Connecting Crocodile Clips
-
-![](/static/mb/crocodile-clips-2.jpg)
-
-### See also
-
-[micro:bit pins](/device/pins), [pin is pressed](/reference/input/pin-is-pressed), [analog read pin](/reference/pins/analog-read-pin), [analog write pin](/reference/pins/analog-write-pin), [digital read pin](/reference/pins/digital-read-pin), [digital write pin](/reference/pins/digital-write-pin)
+## See also

+[micro:bit pins](/device/pins)
--- a/docs/device/error-codes.md
+++ b/docs/device/error-codes.md
@ -1,7 +1,5 @@
 # Error codes

-The micro:bit error codes
-
 Your micro:bit may encounter a situation that prevents it from running your code. When this happens, a frowny face will appear on your micro:bit screen (see picture) followed by an error number.

 Below is a list of error numbers and what they mean:
--- a/docs/device/foil-circuits.md
+++ b/docs/device/foil-circuits.md
@ -0,0 +1,52 @@
+# foil circuits
+
+The large holes at the bottom of the board are designed to attach alligator/crocodile clips 
+to create electrical circuit with other components.
+
+If you do not have crocodile clips at hand, dyou can use wires or even Aluminium foil to acheive the same result.
+We will show you how to connect the micro:bit to headphones using Alumunium foil and tape.
+
+https://youtu.be/mhXYyPuvpz0
+
+### Materials
+
+* micro:bit and battery pack (you can also power it via USB)
+* a small piece of cardboard
+* Aluminium foil
+* tape
+
+### Assembly instructions
+
+Tape the micro:bit and battery pack to the card board. Make sure to remove the batteries while you are building your circuit.
+
+![](/static/mb/device/croc-clips/microbitattached.jpg)
+
+Cut the thinest strip of foil possible and roll it into a cable. You can also try to fold, whatever works for you.
+Build two of those wires.
+
+![](/static/mb/device/croc-clips/foilcut.jpg)
+
+Place the foil wire on the ``GND`` pin and attach with a piece of tape. Press hard to get the best connection between
+the foil and the pin board. Make sure the foil is not overlapping with the other pins!
+
+![](/static/mb/device/croc-clips/groundconnected.jpg)
+
+Place the second wire on the ``P0`` pin the same way. Make sure the wire does not overlap with the other pins!
+
+![](/static/mb/device/croc-clips/microbitconnect.jpg)
+
+Tape the headphone jack connector to the cardboard and roll the wire coming from ``GND`` around the metal base. 
+Make sure the wire does not touch the other metal rings on the jack.
+
+![](/static/mb/device/croc-clips/jackground.jpg)
+
+Tape the second wire on the head of the jack connector.
+
+![](/static/mb/device/croc-clips/jackconnect.jpg)
+
+![](/static/mb/device/croc-clips/foilcircuit.jpg)
+
+
+## See also
+
+[micro:bit pins](/device/pins)
--- a/docs/device/screen.md
+++ b/docs/device/screen.md
@ -91,3 +91,10 @@ basic.showString("d", 150)

 You will not see the LED at position `0,0` lit up because the `show string` function overwrites the whole display buffer.

+
+### Pins: P3, P4, P6, P7, P9, P10
+
+These pins are coupled to the LED matrix display, and also it’s associated ambient light sensing mode.
+To disable the display driver feature (which will automatically disable the light sensing feature) use the function [led.enable](/reference/led/enable). 
+
+More information at http://tech.microbit.org/hardware/edgeconnector_ds/ .
--- a/docs/device/serial.md
+++ b/docs/device/serial.md
@ -29,7 +29,7 @@ Unfortunately, using the serial library requires quite a bit of a setup.
 If you are using the Google Chrome browser, you can use our extension to get serial data streaming in the editor.

 * Install the [Extension for BBC micro:bit](https://chrome.google.com/webstore/detail/extension-for-bbc-microbi/cihhkhnngbjlhahcfmhekmbnnjcjdbge?hl=en-US) on the Chrome Web Store.
-* Restart Chrome and open the [web editor](https://codethemicrobit.com)
+* Restart Chrome and open the [web editor](https://pxt.microbit.org)
 * The serial data will show below the simulator

 ### Windows
--- a/docs/device/usb/mac-chrome.md
+++ b/docs/device/usb/mac-chrome.md
@ -34,7 +34,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/mac-firefox.md
+++ b/docs/device/usb/mac-firefox.md
@ -34,7 +34,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/mac-safari.md
+++ b/docs/device/usb/mac-safari.md
@ -34,7 +34,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/windows-chrome.md
+++ b/docs/device/usb/windows-chrome.md
@ -41,7 +41,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/windows-edge.md
+++ b/docs/device/usb/windows-edge.md
@ -43,7 +43,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/windows-firefox.md
+++ b/docs/device/usb/windows-firefox.md
@ -43,7 +43,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/device/usb/windows-ie.md
+++ b/docs/device/usb/windows-ie.md
@ -41,7 +41,7 @@ it appears as a new drive under Devices.

 ## Step 2: Download your program

-1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+1. Open your project on [pxt.microbit.org](https://pxt.microbit.org)
 2. Click **Download**
 3. When prompted, choose to **save** the compiled file onto your computer. The
   prompt will be different depending on which browser you are using, or
--- a/docs/docs.md
+++ b/docs/docs.md
@ -5,27 +5,27 @@
 ### Things to do

 * **[Getting Started](/getting-started)**
-* [Ten projects](/projects)
+* [Projects](/projects)
+* [Lessons](/lessons)

-### Micro:bit reference
+### @boardname@ reference

-* [The micro:bit APIs](/reference)
-* [The micro:bit device](/device)
+* [The @boardname@ APIs](/reference)
+* [The @boardname@ device](/device)

 ### Language and data reference

 * [Blocks language](/blocks)
 * [JavaScript language](/javascript)
-* [Streaming data](/streaming)

 ### More questions?

 * [Frequently Asked Question](/faq)
-* [Embedding project](/share)
 * [Help Translate](/translate)
-* [Release notes](/release-notes)
+* [Embedding project](/share)

 ### Developers

 * [Command Line Interface](/cli)
 * Learn about [packages](/packages)
+
--- a/docs/faq.md
+++ b/docs/faq.md
@ -2,33 +2,13 @@

 ### @description Frequently asked questions and answers from our users.

-### Where can I get a BBC micro:bit?
+## Which web sites do I need to unblock for pxt.microbit.org?

-More information at [http://uk.farnell.com/bbc-microbit](http://uk.farnell.com/bbc-microbit).
+This is the list of domains that need to be unblocked to allow the web editor to load:

-### How do I send feedback?
+* https://pxt.microbit.org
+* https://www.pxt.io
+* https://trg-microbit.userpxt.io
+* https://pxt.azureedge.net

-Find the small bubble icon on the bottom of the editor and
-post your feedback from there!
-
-### How do I save my code?
-
-The web editor automatically saves your code in the browser cache. Simply reopen the browser and navigate to the web editor 
-to reopen your latest project. You can also open previous project stored locally through **More -> Open Project**.
-
-The project source is also stored in each compiled ``.hex`` file. Drag and drop the ``.hex`` file into the web editor to load the project.
-
-To share your project with others, you can use the [Embed Project...](/share). 
-It stores your project in the cloud and creates a URL that you can share with others.
-
-If you are using [Visual Studio Code](/code), all your programs are stored as files on your computer and you can use your favorite source control system as needed.
-
-## Is the web site available in other languages?
-
-You can [help us translate](/translate) the web site, documentation and blocks via our crowd-source translations! 
-
-## Troubleshooting
-
-### My micro:bit does not show up as a drive when I connect it to my computer.
-
-A common cause for this is a broken cable. Pick another USB cable and try it. Otherwise, try another computer as well.
+Can't find your question? Please search for solutions or open a ticket at [support.microbit.org](https://support.microbit.org)!
--- a/docs/favicon.ico
+++ b/docs/favicon.ico
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@ -1,6 +1,6 @@
 # Getting started

-### @description An activity for beginners to get started with the micro:bit
+### @description An activity for beginners to get started with the @boardname@

 ## ~avatar

@ -35,7 +35,7 @@ When this program runs, you will see a smiley face, then a blank
 screen, then a smiley again -- it never stops! (That's because of the
 ``forever`` block.)

-Click **Download** to move your program to the BBC micro:bit! 
+Click **Download** to move your program to the @boardname@! 
 Make sure to follow the instructions.

 ### ~button /getting-started/screen
--- a/docs/getting-started/buttons.md
+++ b/docs/getting-started/buttons.md
@ -18,11 +18,11 @@ input.onButtonPressed(Button.A, () => {
 #### ~hint

 The ``showString`` block can show letters, numbers, and punctuation
-on the micro:bit screen.
+on the @boardname@ screen.

 #### ~

-Now try to unscramble these blocks in the editor so that the micro:bit
+Now try to unscramble these blocks in the editor so that the @boardname@
 shows **BANANA** when you press button `B`.

 ```shuffle
@ -37,7 +37,7 @@ You can find the letter `B` by clicking the letter `A` on the

 #### ~

-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 #### Your turn!

@ -48,9 +48,9 @@ name_ instead of **BANANA** when you press `B`?
 ### Pins

 You can also use the pins as buttons.  (The pins are the holes in the
-metal stripe at the bottom of the micro:bit board.)  For example, hold
+metal stripe at the bottom of the @boardname@ board.)  For example, hold
 the ``GND`` button with one hand and touch the ``0`` pin (called
-``P0``) with your other hand to tell the micro:bit you're pressing it.
+``P0``) with your other hand to tell the @boardname@ you're pressing it.

 Unscramble the blocks in the editor to show a heart when you touch
 pin ``P0``.
@ -65,7 +65,7 @@ input.onPinPressed(TouchPin.P0, () => {
 . . # . .`);
 });
 ```
-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 ## ~hint

--- a/docs/getting-started/coin-flipper.md
+++ b/docs/getting-started/coin-flipper.md
@ -4,7 +4,7 @@

 Are you trying to choose whether to play soccer or go to the movies
 instead, or which toppings to have on your pizza?  Build a coin
-flipping machine with the BBC micro:bit to choose for you!
+flipping machine with the @boardname@ to choose for you!

 ### ~

@ -50,7 +50,7 @@ input.onButtonPressed(Button.AB, () => {
 ```

 These blocks mean that if you press button `A`, you will add `1` to
-your score, and if you press `A` and `B` together, the micro:bit will
+your score, and if you press `A` and `B` together, the @boardname@ will
 show your score.

 When you're done, your coin flipping program should look like this:
--- a/docs/getting-started/rock-paper-scissors.md
+++ b/docs/getting-started/rock-paper-scissors.md
@ -2,8 +2,8 @@

 ### ~avatar avatar

-Build a Rock Paper Scissors game with the BBC micro:bit!  You can play
-the game with a friend who has it on a micro:bit.  You can also play
+Build a Rock Paper Scissors game with the @boardname@!  You can play
+the game with a friend who has it on a @boardname@.  You can also play
 it with friends who are just using their hands.  (The game is built
 like a coin flipper, but with three choices instead of two.)

@ -11,9 +11,9 @@ like a coin flipper, but with three choices instead of two.)

 ## Step 1: Getting started

-We want the micro:bit to choose rock, paper, or scissors when you
+We want the @boardname@ to choose rock, paper, or scissors when you
 shake it.  Try creating an ``on shake`` block so when you shake the
-micro:bit, it will run part of a program.
+@boardname@, it will run part of a program.

 Clear up the blocks and add the blocks below.

@ -23,7 +23,7 @@ input.onGesture(Gesture.Shake, () => {
 })
 ```

-Next, when you shake the micro:bit, it should pick a random number from `0` to `2`
+Next, when you shake the @boardname@, it should pick a random number from `0` to `2`
 and store it in the variable `item`.

 Add a ``set`` block with a variable. Then add a ``pick random`` block,
@ -75,7 +75,7 @@ input.onGesture(Gesture.Shake, () => {

 ## Step 3: A random rock

-Now we are going to add a new picture for the micro:bit to show
+Now we are going to add a new picture for the @boardname@ to show
 when another random number comes up.

 Make the ``else if`` part check if the variable `item` is `1`.
@ -152,7 +152,7 @@ That's why you can use an ``else`` instead of an ``else if``.

 Your game is ready!

-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 Have fun!

@ -160,7 +160,7 @@ Have fun!

 Here is a way you can make your Rock Paper Scissors game better.
 When button ``A`` is pressed, 
-the micro:bit will add `1` to your score.
+the @boardname@ will add `1` to your score.

 Open the ``Game`` drawer, and then add the block ``change score by 1`` to your program,
 like this:
@ -174,7 +174,7 @@ input.onButtonPressed(Button.A, () => {

 ## Step 6: Prove you're the greatest!

-After your micro:bit can add `1` to the score, show how many wins you have.
+After your @boardname@ can add `1` to the score, show how many wins you have.

 ```blocks
 input.onButtonPressed(Button.A, () => {
@ -185,7 +185,7 @@ input.onButtonPressed(Button.A, () => {
 ```
 ## Step 7: Staying honest

-Success! Your micro:bit can track wins!
+Success! Your @boardname@ can track wins!
 But what about losses? 
 Use the ``Game`` drawer to subtract `1` from your score when you press button `B`. 

@ -198,7 +198,7 @@ input.onButtonPressed(Button.B, () => {
    basic.showNumber(game.score())
 })
 ```
-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 ### ~button /projects
 NEXT: PROJECTS!
--- a/docs/getting-started/screen.md
+++ b/docs/getting-started/screen.md
@ -2,7 +2,7 @@

 ### ~avatar avatar

-There are 25 bright LEDs on the micro:bit screen. Let's use them to create some cool animations!
+There are 25 bright LEDs on the @boardname@ screen. Let's use them to create some cool animations!

 ### ~

@ -12,7 +12,7 @@ Draw an unhappy face instead of the blank screen.  Click on the dots
 in the second ``show leds`` block until it matches the blocks below.
 Now you have an **animation** (cartoon) that shows a happy face,
 then an unhappy one, then a happy one again, forever (or until
-you turn off your micro:bit)!
+you turn off your @boardname@)!

 ```blocks
 basic.forever(() => {
@ -32,7 +32,7 @@ basic.forever(() => {
        `)
 });
 ```
-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 ### Your turn!

@ -85,7 +85,7 @@ basic.forever(() => {
        `)
 });
 ```
-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 #### ~hint

--- a/docs/getting-started/shake.md
+++ b/docs/getting-started/shake.md
@ -1,11 +1,11 @@
 # Shake

-You can find when someone is shaking the BBC micro:bit by checking its
-**accelerometer** (it finds whether the micro:bit is speeding up or
+You can find when someone is shaking the @boardname@ by checking its
+**accelerometer** (it finds whether the @boardname@ is speeding up or
 slowing down).

 Unscramble these blocks in the editor to show a frownie when someone
-shakes the micro:bit. (Ouch!)
+shakes the @boardname@. (Ouch!)

 ```shuffle
 input.onGesture(Gesture.Shake, () => {
@ -17,7 +17,7 @@ input.onGesture(Gesture.Shake, () => {
 # . . . #`);
 });
 ```
-Click **Download** to move your program to the BBC micro:bit!
+Click **Download** to move your program to the @boardname@!

 ### ~button /getting-started/coin-flipper
 NEXT: COIN FLIPPER GAME
--- a/docs/index-ref.json
+++ b/docs/index-ref.json
@ -0,0 +1,3 @@
+{
+    "appref": "v0.8.21"
+}
--- a/docs/javascript.md
+++ b/docs/javascript.md
@ -1,6 +1,7 @@
 # JavaScript

-Visit the cards below to starting programming JavaScript and TypeScript with the micro:bit:
+Visit the cards below to starting programming JavaScript 
+with the @boardname@:

 ```codecard
 [{
--- a/docs/js/call.md
+++ b/docs/js/call.md
@ -1,8 +1,8 @@
 # Call a function

-The simplest way to get started in JavaScript with your micro:bit is to
-call one of the micro:bit's built-in JavaScript functions. Just like Blocks
-are organized into categories/drawers, the micro:bit functions are organized by
+The simplest way to get started in JavaScript with your @boardname@ is to
+call one of the @boardname@'s built-in JavaScript functions. Just like Blocks
+are organized into categories/drawers, the @boardname@ functions are organized by
 namespaces, with names corresponding to the drawer names.  The `basic` namespace 
 contains a number of helpful functions, such as:

--- a/docs/js/classes.md
+++ b/docs/js/classes.md
@ -35,7 +35,7 @@ This calls into the constructor we defined earlier, creating a new object with t
 # Inheritance

 ### ~hint
-### Inheritance is not supported yet for the micro:bit. Coming soon...
+### Inheritance is not supported yet for the @boardname@. Coming soon...
 ### ~

 In TypeScript, we can use common object-oriented patterns.
--- a/docs/js/faq.md
+++ b/docs/js/faq.md
@ -1,8 +1,8 @@
 # Frequently asked questions

-# What is the language supported for the micro:bit?
+# What is the language supported for the @boardname@?

-For the micro:bit, we support a "static" subset of TypeScript (itself a superset of JavaScript):
+For the @boardname@, we support a "static" subset of TypeScript (itself a superset of JavaScript):

 ## Supported language features

--- a/docs/js/functions.md
+++ b/docs/js/functions.md
@ -13,7 +13,7 @@ basic.showNumber(add(1, 2))
 ```

 ### ~ hint
-For the micro:bit, you must specify a [type](/js/types) for each function parameter. 
+For the @boardname@, you must specify a [type](/js/types) for each function parameter. 
 ### ~ 

 Functions can refer to variables outside of the function body.
--- a/docs/js/operators.md
+++ b/docs/js/operators.md
@ -1,9 +1,9 @@
 ## Operators

-The following JavaScript operators are supported for the micro:bit.
+The following JavaScript operators are supported for the @boardname@.

 ### ~hint
-Note that for the micro:bit all arithmetic is performed on integers, rather than floating point.
+Note that for the @boardname@ all arithmetic is performed on integers, rather than floating point.
 This also is true when simulating in the browser.
 ### ~

--- a/docs/js/sequence.md
+++ b/docs/js/sequence.md
@ -41,14 +41,14 @@ In JavaScript, there is the concept of an *empty statement*, which is whitespace
 a semicolon in the context where a statement is expected.
 So, the following code is an infinite loop
 followed by a call to `showNumber` that will never execute:
-```typescript
-while(true) ;  
+```typescript-ignore
+while(true) ;
 basic.showNumber(1);
 ```


 ### ~hint
-For the micro:bit, we don't allow a program to contain an empty statement, such as shown above. 
+For the @boardname@, we don't allow a program to contain an empty statement, such as shown above. 
 If you really want an empty statement, you need to use curly braces to delimit an empty statement block:
 ```typescript
 while(true) { } 
--- a/docs/js/statements.md
+++ b/docs/js/statements.md
@ -1,6 +1,6 @@
 # Statements

-The following JavaScript statements are supported for the micro:bit:
+The following JavaScript statements are supported for the @boardname@:

 ## Variable declarations
 * `const` statement - [read more](http://devdocs.io/javascript/statements/const)
--- a/docs/js/types.md
+++ b/docs/js/types.md
@ -15,7 +15,7 @@ let isDone: boolean = false;

 ### ~ hint 
 In JavaScript, `numbers` are floating point values.
-However, for the micro:bit, `numbers` are integer values.
+However, for the @boardname@, `numbers` are integer values.
 ### ~

 Integer values can be specified via decimal, hexadecimal and octal notation:
@ -51,6 +51,8 @@ I'll be ${ age + 1 } years old next month.`
 This is equivalent to declaring `sentence` like so:

 ```ts
+let fullName: string = `Bob Bobbington`;
+let age: number = 37;
 let sentence: string = "Hello, my name is " + fullName + ".\n\n" +
    "I'll be " + (age + 1) + " years old next month."
 ```
@ -72,7 +74,7 @@ let list: Array<number> = [1, 2, 3];
 ```

 ### ~hint
-For the micro:bit, all elements of an array must have the same type.
+For the @boardname@, all elements of an array must have the same type.
 ### ~


@ -82,7 +84,7 @@ A helpful addition to the standard set of datatypes from JavaScript is the `enum
 As in languages like C#, an enum is a way of giving more friendly names to sets of numeric values.

 ```ts
-enum Color {Red, Green, Blue};
+enum Color {Red, Green, Blue}
 let c: Color = Color.Green;
 ```

@ -91,20 +93,20 @@ You can change this by manually setting the value of one of its members.
 For example, we can start the previous example at `1` instead of `0`:

 ```ts
-enum Color {Red = 1, Green, Blue};
+enum Color {Red = 1, Green, Blue}
 let c: Color = Color.Green;
 ```

 Or, even manually set all the values in the enum:

 ```ts
-enum Color {Red = 1, Green = 2, Blue = 4};
+enum Color {Red = 1, Green = 2, Blue = 4}
 let c: Color = Color.Green;
 ```

 # Any

-The TypeScript type `any` is not supported in the micro:bit.
+The TypeScript type `any` is not supported in the @boardname@.


 # Void
--- a/docs/lessons.md
+++ b/docs/lessons.md
@ -28,7 +28,7 @@

 ## Intermediate

-* [Magic 8](/lessons/magic-8), a fortune teller game with the BBC micro:bit
+* [Magic 8](/lessons/magic-8), a fortune teller game with the @boardname@
 * [Guess the Number](/lessons/guess-the-number),  guess a random number with pick number
 * [Counter](/lessons/counter), display a number with a variable
 * [Love Meter](/lessons/love-meter), create a love meter with on pin pressed
@ -40,7 +40,7 @@
 * [Temperature](/lessons/temperature), get the ambient temperature (degree Celsius °C)
 * [Digi Yoyo](/lessons/digi-yoyo), create a counter with a while loop
 * [Rotation Animation](/lessons/rotation-animation), control an animation with a boolean variable
-* [Compass](/lessons/compass), displays the direction the BBC micro:bit is pointing with compass
+* [Compass](/lessons/compass), displays the direction the @boardname@ is pointing with compass
 * [Zoomer](/lessons/zoomer), measure the force with acceleration
 * [Glowing Pendulum](/lessons/glowing-pendulum), construct a pendulum that glows using acceleration
 * [Classic Beatbox](/lessons/classic-beatbox), make a beatbox music player with variables
@ -60,7 +60,7 @@
 * [Prank WiFi](/lessons/prank-wifi), create fake WiFi to trick your friends
 * [Speed Button](/lessons/speed-button), code a speed game with running time
 * [Headbands](/lessons/headbands), create a charades game with a collection of strings that hold the words
-* [Hero](/lessons/hero), reconstruct the classic arcade game pac man with the BBC micro:bit
+* [Hero](/lessons/hero), reconstruct the classic arcade game pac man with the @boardname@
 * [Catch the Egg](/lessons/catch-the-egg-game), catch falling eggs in a basket with an acceleration controller
 ### ~

--- a/docs/lessons/answering-machine.md
+++ b/docs/lessons/answering-machine.md
@ -1,6 +1,6 @@
 # answering machine blocks lesson

-Create an answering machine on the BBC micro:bit
+Create an answering machine on the @boardname@

 ## Topic

--- a/docs/lessons/answering-machine/activity.md
+++ b/docs/lessons/answering-machine/activity.md
@ -1,6 +1,6 @@
 # answering machine blocks activity

-Learn to create an answering machine on the micro:bit 
+Learn to create an answering machine on the @boardname@ 

 ### ~avatar avatar

--- a/docs/lessons/answering-machine/challenges.md
+++ b/docs/lessons/answering-machine/challenges.md
@ -12,7 +12,7 @@ basic.showString("ASK ME A QUESTION")

 ### Challenge 1

-Now we need to reply after someone asks micro:bit a  yes or no question. We want to respond `YES` when button `A` is pressed. Add a condition for button `A` and inside it show the string `YES`.
+Now we need to reply after someone asks @boardname@ a  yes or no question. We want to respond `YES` when button `A` is pressed. Add a condition for button `A` and inside it show the string `YES`.

 ```blocks
 basic.showString("ASK ME A QUESTION")
@ -25,7 +25,7 @@ input.onButtonPressed(Button.A, () => {

 ### Challenge 2

-What if micro:bit's answer to the question is no? Let's have `NO` be displayed when button `B` is pressed. Add a condition for button `B` and inside it show the string `NO`.
+What if @boardname@'s answer to the question is no? Let's have `NO` be displayed when button `B` is pressed. Add a condition for button `B` and inside it show the string `NO`.

 ```blocks
 basic.showString("ASK ME A QUESTION")
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`MainPackage=C:\gh\pxt-microbit\win10\app\bin\Debug\m.pxt.io_0.1.4.0_AnyCPU_Debug.appx`