diff --git a/README.md b/README.md
index 3ed7f3ad..8c518526 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 This target allow to program a [BBC micro:bit](https://www.microbit.co.uk/) using 
 PXT ([Microsoft Programming Experience Toolkit](https://github.com/Microsoft/pxt)).
 
-* [Try it live](https://codethemicrobit.com)
+* [Try it live](https://pxt.microbit.org)
 
 [![Build Status](https://travis-ci.org/Microsoft/pxt-microbit.svg?branch=master)](https://travis-ci.org/Microsoft/pxt-microbit)
 
@@ -53,11 +53,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:
diff --git a/clients/chrome/background.ts b/clients/chrome/background.ts
index 8925a363..049889f7 100644
--- 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 });
diff --git a/clients/macuploader/README.md b/clients/macuploader/README.md
index 732d87fd..de3205f4 100644
--- 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
 
diff --git a/docs/about.md b/docs/about.md
index 2562578c..ebf451ff 100644
--- 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)
 
diff --git a/docs/browsers.md b/docs/browsers.md
index e3ae501a..fab7ebb7 100644
--- a/docs/browsers.md
+++ b/docs/browsers.md
@@ -1,6 +1,6 @@
 # Unsupported configuration
 
-[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
+[pxt.microbit.org](https://pxt.microbit.org) doesn't currently support
 your browser or operating system. The following configurations are supported:
 
 ## Windows
diff --git a/docs/browsers/technical.md b/docs/browsers/technical.md
index 5dac2f0f..adc4dbe4 100644
--- 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/
diff --git a/docs/cli.md b/docs/cli.md
index aa3b3544..d27d7810 100644
--- 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
diff --git a/docs/device/serial.md b/docs/device/serial.md
index 1598a260..7daacf8d 100644
--- 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
diff --git a/docs/device/usb/mac-chrome.md b/docs/device/usb/mac-chrome.md
index 349472f3..14e7143a 100644
--- 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
diff --git a/docs/device/usb/mac-firefox.md b/docs/device/usb/mac-firefox.md
index c3b9b1af..79b39a9b 100644
--- 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
diff --git a/docs/device/usb/mac-safari.md b/docs/device/usb/mac-safari.md
index c2a5e12c..104e364a 100644
--- 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
diff --git a/docs/device/usb/windows-chrome.md b/docs/device/usb/windows-chrome.md
index 9964c836..b19e48ae 100644
--- 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
diff --git a/docs/device/usb/windows-edge.md b/docs/device/usb/windows-edge.md
index fb9bbd15..e72eea0c 100644
--- 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
diff --git a/docs/device/usb/windows-firefox.md b/docs/device/usb/windows-firefox.md
index d0371c53..473d6322 100644
--- 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
diff --git a/docs/device/usb/windows-ie.md b/docs/device/usb/windows-ie.md
index 71bffab6..786a998e 100644
--- 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
diff --git a/docs/offline.md b/docs/offline.md
index 402fa521..449b6f20 100644
--- a/docs/offline.md
+++ b/docs/offline.md
@@ -2,7 +2,7 @@
 
 ## Web application
 
-**https://codethemicrobit.com is an HTML5 web application** that automatically gets cached locally by your browser. 
+**https://pxt.microbit.org is an HTML5 web application** that automatically gets cached locally by your browser. 
 Once the web app is loaded and you have compiled at least once, you will have all the code needed to work without an internet connection.
 
 ## Command line interface
diff --git a/docs/projects/guitar/displaybuttons.md b/docs/projects/guitar/displaybuttons.md
index 1cf4d344..1021af19 100644
--- a/docs/projects/guitar/displaybuttons.md
+++ b/docs/projects/guitar/displaybuttons.md
@@ -43,7 +43,7 @@ music.beat(BeatFraction.Quarter)
 ```
 
 ## Step 1: Make a Smiley
-Open [codethemicrobit.com](https://codethemicrobit.com) in your web browser
+Open [pxt.microbit.org](https://pxt.microbit.org) in your web browser
 ```blocks
     basic.showLeds(`
         . # . # .
diff --git a/docs/raspberry-pi.md b/docs/raspberry-pi.md
index 134423b4..6b7a603d 100644
--- a/docs/raspberry-pi.md
+++ b/docs/raspberry-pi.md
@@ -5,7 +5,7 @@ with [Raspbian Jessie with Pixel](https://www.raspberrypi.org/downloads/raspbian
 
 ## Web editor
 
-Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://codethemicrobit.com).
+Starting with **Raspbian Pixel**, Raspbian comes with Chromium. Simply open [](https://pxt.microbit.org).
 
 ## Command line
 
diff --git a/docs/share.md b/docs/share.md
index d7038d9b..7dfb9a04 100644
--- a/docs/share.md
+++ b/docs/share.md
@@ -13,7 +13,7 @@ Once you've made your project, you can save it the cloud, share it, or embed it
 
 ## Sharing the URL
 
-You can share the URL for the project ([https://codethemicrobit.com/httuftrbtg](https://codethemicrobit.com/httuftrbtg) above) with other people, and they will be able to visit that page to see your project, download it, or edit it:
+You can share the URL for the project ([https://pxt.microbit.org/httuftrbtg](https://pxt.microbit.org/httuftrbtg) above) with other people, and they will be able to visit that page to see your project, download it, or edit it:
 
 ![Project page](/static/embed/project-page.png)
 
@@ -36,12 +36,12 @@ Open the HTML editor for your blog or website and paste it with your content
 
 ### Wordpress
 
-[wordpress.com][] blogs do not support embedding content from most websites, so you will need to link to your project instead. Alternatively, if you have a Wordpress VIP account you can follow [these instructions][wordpress-vip] to embed an `iframe` into your blog. The URL that you need to add is like `https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg`, but replace `httuftrbtg` with your project's unique identifier.
+[wordpress.com][] blogs do not support embedding content from most websites, so you will need to link to your project instead. Alternatively, if you have a Wordpress VIP account you can follow [these instructions][wordpress-vip] to embed an `iframe` into your blog. The URL that you need to add is like `https://pxt.microbit.org/?sandbox=1#pub:httuftrbtg`, but replace `httuftrbtg` with your project's unique identifier.
 
 If you self host a Wordpress blog you can install the [iframe-plugin][] and then write the following in your blog-post (again, replacing the `httuftrbtg` with your project's identifier):
 
 ```
-[iframe src="https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg"]
+[iframe src="https://pxt.microbit.org/?sandbox=1#pub:httuftrbtg"]
 ```
 
 ### Blogger
diff --git a/docs/translate.md b/docs/translate.md
index 5d978662..e4addbe2 100644
--- a/docs/translate.md
+++ b/docs/translate.md
@@ -5,13 +5,13 @@ and you can volunteer to translate parts of the web site.
 
 ## Translating the editor interface
 
-The project below contains the resources from https://www.pxt.io and the menu items of https://codethemicrobit.com.
+The project below contains the resources from https://www.pxt.io and the menu items of https://pxt.microbit.org.
 
 * [https://crowdin.com/project/kindscript](https://crowdin.com/project/kindscript)
 
 You will find two files in that project:
 
-* ``string.json``: text contained in the menu items of https://codethemicrobit.com
+* ``string.json``: text contained in the menu items of https://pxt.microbit.org
 * ``website.json``: text contained in the pages served by https://www.pxt.io 
 
 ## Translating the blocks and reference documentation