bump pxt-calliope-core dependency

Merge branch 'master' of github.com:Microsoft/pxt-calliope
0.4.24
2016-10-08 12:23:29 +02:00 · 2016-10-07 11:39:31 -07:00 · 2016-10-07 18:48:34 +02:00 · 2016-10-03 18:54:07 -07:00 · 2016-10-03 11:15:49 -07:00 · 2016-10-01 15:52:41 -07:00
191 changed files with 6263 additions and 5109 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -9,7 +9,6 @@ script:
  - "(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-v0.json)"
 sudo: false
 notifications:
  email:
--- a/README.md
+++ b/README.md
@ -53,11 +53,6 @@ pxt update

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

-## Universal Windows App
-
-The Windows 10 app is a [Universal Windows Hosted Web App](https://microsoftedge.github.io/WebAppsDocs/en-US/win10/CreateHWA.htm)
-that wraps ``codethemicrobit.com`` and provides additional features.
-
 ### Building

 * Install Visual Studio 2015 Update 2 or higher. Make sure the Windows 10 templates are installed.
--- a/clients/electron/.gitignore
+++ b/clients/electron/.gitignore
@ -0,0 +1,2 @@
+node_modules
+projects
--- a/clients/electron/README.md
+++ b/clients/electron/README.md
@ -0,0 +1,5 @@
+# PXT micro:bit Electron app
+
+A very basic wrapper around the web app. To install, copy the contents of this
+directory to somewhere outside the main `pxt-microbit` repository. Then run `npm
+install && npm start`.
--- a/clients/electron/index.html
+++ b/clients/electron/index.html
@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>code the micro:bit</title>
+  </head>
+  <body>
+    <webview id="webview" style="position:absolute; left:0; top:0; right:0; bottom:0"/>
+    <script>
+      const webview = document.getElementById("webview")
+      const url = `http://localhost:3232/${window.location.hash}`
+      webview.src = url
+    </script>
+  </body>
+</html>
--- a/clients/electron/main.js
+++ b/clients/electron/main.js
@ -1,67 +1,39 @@
-const electron = require('electron')
-// Module to control application life.
-const app = electron.app
-// Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow
-// pxt toolchain
+const {app, BrowserWindow, Menu} = require('electron')
 const pxt = require('pxt-core')
+const path = require('path')

-// Keep a global reference of the window object, if you don't, the window will
-// be closed automatically when the JavaScript object is garbage collected.
-let mainWindow
+let win

-function createWindow() {
-  console.log('starting app...')
-  // Create the browser window.
-  mainWindow = new BrowserWindow({
-    width: 800, height: 600,
-    webPreferences: {
-      nodeIntegration: false,
-    }
+const cliPath = path.join(process.cwd(), "node_modules/pxt-microbit") 
+
+function startServerAndCreateWindow() {
+  pxt.mainCli(cliPath, ["serve", "-no-browser"])
+  createWindow()
+}
+
+function createWindow () {
+  win = new BrowserWindow({
+    width: 800,
+    height: 600,
+    title: "code the micro:bit"
  })
-
-  ts.pxt.Util.debug = true;
-  pxt.mainCli("C:/gh/pxt-microbit/clients/electron/node_modules/pxt-microbit", ["serve", "-just"]);
-  
-  // no menu
-  mainWindow.setMenu(null);
-
-  // and load the index.html of the app.
-  mainWindow.loadURL(`http://localhost:3232/#local_token=08ba9b8f-6ccb-4202-296d-28fac7a553d9`)
-
-  // Open the DevTools.
-  mainWindow.webContents.openDevTools()
-
-  // Emitted when the window is closed.
-  mainWindow.on('closed', function () {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
+  Menu.setApplicationMenu(null)
+  win.loadURL(`file://${__dirname}/index.html#local_token=${pxt.globalConfig.localToken}`)
+  win.on('closed', () => {
+    win = null
  })
 }

-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', startServerAndCreateWindow)

-// Quit when all windows are closed.
-app.on('window-all-closed', function () {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
+app.on('window-all-closed', () => {
  if (process.platform !== 'darwin') {
    app.quit()
  }
 })

-app.on('activate', function () {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
-  if (mainWindow === null) {
+app.on('activate', () => {
+  if (win === null) {
    createWindow()
  }
 })
-
-// In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and require them here.
--- a/clients/electron/package.json
+++ b/clients/electron/package.json
@ -1,19 +1,14 @@
 {
-  "name": "codethemicrobit",
-  "version": "0.1.0",
-  "description": "A Blocks / JavaScript editor for the micro:bit",
-  "main": "main.js",
-  "scripts": {
-    "start": "electron ."
-  },
+  "name"    : "code-the-microbit",
+  "version" : "1.0.0",
+  "description": "Blocks / Javascript editor",
  "author": "Microsoft",
-  "license": "MIT",
-  "devDependencies": {
-    "electron-prebuilt": "^1.2.0"
+  "main"    : "main.js",
+  "scripts": {
+      "start": "node_modules/.bin/electron ."
  },
-  "dependencies": {
-    "typescript": "1.8.7",
-    "pxt-core": "*",
-    "pxt-microbit": "*"
+  "devDependencies": {
+      "electron": "*",
+      "pxt-microbit": "*"
  }
-}
+}
--- a/clients/macuploader/.gitignore
+++ b/clients/macuploader/.gitignore
@ -0,0 +1,137 @@
+
+# Created by https://www.gitignore.io/api/osx,xcode,objective-c,vim
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+
+### Xcode ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+
+### Objective-C ###
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
+
+### Objective-C Patch ###
+*.xcscmblueprint
+
+
+### Vim ###
+# swap
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
--- a/clients/macuploader/Graphics/appicon.sketch
+++ b/clients/macuploader/Graphics/appicon.sketch
--- a/clients/macuploader/Graphics/export.png
+++ b/clients/macuploader/Graphics/export.png
--- a/clients/macuploader/Graphics/menubar.sketch
+++ b/clients/macuploader/Graphics/menubar.sketch
--- a/Uploader.xcodeproj/project.pbxproj
+++ b/Uploader.xcodeproj/project.pbxproj
@ -0,0 +1,307 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040061D895D1F00D931CA /* DirectoryWatcher.m */; };
+		E930400A1D89620900D931CA /* Uploader.m in Sources */ = {isa = PBXBuildFile; fileRef = E93040091D89620900D931CA /* Uploader.m */; };
+		E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE11D8709980071D783 /* AppDelegate.m */; };
+		E9F4FEE51D8709980071D783 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E9F4FEE41D8709980071D783 /* main.m */; };
+		E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE61D8709980071D783 /* Assets.xcassets */; };
+		E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E9F4FEE81D8709980071D783 /* MainMenu.xib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		E93040051D895D1F00D931CA /* DirectoryWatcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirectoryWatcher.h; sourceTree = "<group>"; };
+		E93040061D895D1F00D931CA /* DirectoryWatcher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DirectoryWatcher.m; sourceTree = "<group>"; };
+		E93040081D89620900D931CA /* Uploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Uploader.h; sourceTree = "<group>"; };
+		E93040091D89620900D931CA /* Uploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Uploader.m; sourceTree = "<group>"; };
+		E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Microbit Uploader.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E9F4FEE01D8709980071D783 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
+		E9F4FEE11D8709980071D783 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
+		E9F4FEE41D8709980071D783 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		E9F4FEE61D8709980071D783 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		E9F4FEE91D8709980071D783 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		E9F4FEEB1D8709980071D783 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		E9F4FEDA1D8709980071D783 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		E9F4FED41D8709980071D783 = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDF1D8709980071D783 /* Microbit Uploader */,
+				E9F4FEDE1D8709980071D783 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		E9F4FEDE1D8709980071D783 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		E9F4FEDF1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE01D8709980071D783 /* AppDelegate.h */,
+				E9F4FEE11D8709980071D783 /* AppDelegate.m */,
+				E9F4FEE61D8709980071D783 /* Assets.xcassets */,
+				E9F4FEE81D8709980071D783 /* MainMenu.xib */,
+				E9F4FEEB1D8709980071D783 /* Info.plist */,
+				E9F4FEE31D8709980071D783 /* Supporting Files */,
+				E93040051D895D1F00D931CA /* DirectoryWatcher.h */,
+				E93040061D895D1F00D931CA /* DirectoryWatcher.m */,
+				E93040081D89620900D931CA /* Uploader.h */,
+				E93040091D89620900D931CA /* Uploader.m */,
+			);
+			path = "Microbit Uploader";
+			sourceTree = "<group>";
+		};
+		E9F4FEE31D8709980071D783 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				E9F4FEE41D8709980071D783 /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		E9F4FEDC1D8709980071D783 /* Microbit Uploader */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */;
+			buildPhases = (
+				E9F4FED91D8709980071D783 /* Sources */,
+				E9F4FEDA1D8709980071D783 /* Frameworks */,
+				E9F4FEDB1D8709980071D783 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Microbit Uploader";
+			productName = "Microbit Uploader";
+			productReference = E9F4FEDD1D8709980071D783 /* Microbit Uploader.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E9F4FED51D8709980071D783 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0800;
+				ORGANIZATIONNAME = thomasdenney;
+				TargetAttributes = {
+					E9F4FEDC1D8709980071D783 = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = E9F4FED41D8709980071D783;
+			productRefGroup = E9F4FEDE1D8709980071D783 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				E9F4FEDC1D8709980071D783 /* Microbit Uploader */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		E9F4FEDB1D8709980071D783 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE71D8709980071D783 /* Assets.xcassets in Resources */,
+				E9F4FEEA1D8709980071D783 /* MainMenu.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E9F4FED91D8709980071D783 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				E9F4FEE51D8709980071D783 /* main.m in Sources */,
+				E930400A1D89620900D931CA /* Uploader.m in Sources */,
+				E9F4FEE21D8709980071D783 /* AppDelegate.m in Sources */,
+				E93040071D895D1F00D931CA /* DirectoryWatcher.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		E9F4FEE81D8709980071D783 /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				E9F4FEE91D8709980071D783 /* Base */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		E9F4FEEC1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		E9F4FEED1D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		E9F4FEEF1D8709980071D783 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		E9F4FEF01D8709980071D783 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = "Microbit Uploader/Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.thomasdenney.Microbit-Uploader";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		E9F4FED81D8709980071D783 /* Build configuration list for PBXProject "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEC1D8709980071D783 /* Debug */,
+				E9F4FEED1D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		E9F4FEEE1D8709980071D783 /* Build configuration list for PBXNativeTarget "Microbit Uploader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				E9F4FEEF1D8709980071D783 /* Debug */,
+				E9F4FEF01D8709980071D783 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E9F4FED51D8709980071D783 /* Project object */;
+}
--- a/Uploader.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/Uploader.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Microbit Uploader.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,6 @@
+#import <Cocoa/Cocoa.h>
+
+@interface AppDelegate : NSObject <NSApplicationDelegate>
+
+@end
+
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,130 @@
+#import "AppDelegate.h"
+#import "DirectoryWatcher.h"
+#import "Uploader.h"
+
+@interface AppDelegate ()<DirectoryWatcherDelegate, UploaderDelegate, NSUserNotificationCenterDelegate>
+
+@property DirectoryWatcher * watcher;
+@property Uploader * uploader;
+@property NSStatusItem * menubarItem;
+
+@end
+
+@implementation AppDelegate
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+    // Insert code here to initialize your application
+    self.watcher = [[DirectoryWatcher alloc] initWithPath:[self downloadsDirectory]];
+    self.watcher.delegate = self;
+    [self.watcher startWatching];
+    
+    self.uploader = [[Uploader alloc] init];
+    self.uploader.delegate = self;
+    
+    [NSUserNotificationCenter defaultUserNotificationCenter].delegate = self;
+    
+    [self createMenuBarIcon];
+    [self configureVolumeMountNotifications];
+    [self showActiveMicroBits];
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification {
+    // Insert code here to tear down your application
+    [self.watcher stopWatching];
+}
+
+- (void)dealloc {
+    [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self];
+}
+
+#pragma mark - Directory
+
+- (void)watcher:(DirectoryWatcher *)watcher observedNewFileAtPath:(NSString *)path {
+    NSString * fullPath = [watcher.path stringByAppendingPathComponent:path];
+    if ([self.uploader shouldUploadFileAtPath:fullPath]) {
+        [self.uploader uploadFile:fullPath];
+    }
+}
+
+- (NSString*)downloadsDirectory {
+    NSArray * paths = NSSearchPathForDirectoriesInDomains(NSDownloadsDirectory, NSUserDomainMask, YES);
+    return paths.firstObject;
+}
+
+#pragma mark - Uploader delegate
+
+- (void)uploader:(Uploader *)uploader transferredFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload" withDescription:[NSString stringWithFormat:@"%@ uploaded to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)uploader:(Uploader *)uploader failedToTransferFile:(NSString *)file toMicroBit:(NSString *)microbit {
+    [self showNotification:@"micro:bit upload failed" withDescription:[NSString stringWithFormat:@"Couldn't transfer %@ to %@", file.lastPathComponent, microbit]];
+}
+
+- (void)showNotification:(NSString*)title withDescription:(NSString*)description {
+    NSUserNotification * notification = [NSUserNotification new];
+    notification.title = title;
+    notification.informativeText = description;
+    notification.soundName = NSUserNotificationDefaultSoundName;
+    [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:notification];
+}
+
+#pragma mark - NSUserNotificationCenterDelegate
+
+- (BOOL)userNotificationCenter:(NSUserNotificationCenter *)center shouldPresentNotification:(NSUserNotification *)notification {
+    return YES;
+}
+
+#pragma mark - Volume mount/unmount notification
+
+- (void)configureVolumeMountNotifications {
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidRenameVolumeNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidMountNotification object:nil];
+    [[NSWorkspace sharedWorkspace].notificationCenter addObserver:self selector:@selector(volumeMountNotification:) name:NSWorkspaceDidUnmountNotification object:nil];
+}
+
+- (void)volumeMountNotification:(NSNotification*)sender {
+    //Delay upadting the menu to give the chance for the disk to fully mount or unmount
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self showActiveMicroBits];
+    });
+}
+
+#pragma mark - Menu bar app
+
+- (void)createMenuBarIcon {
+    self.menubarItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength];
+    self.menubarItem.button.image = [NSImage imageNamed:@"menubar"];
+}
+
+- (void)showActiveMicroBits {
+    NSMenu * menu = [NSMenu new];
+    NSString * countString;
+    NSUInteger count = self.uploader.microBitPaths.count;
+    if (count == 0) {
+        countString = @"No connect micro:bits";
+    }
+    else if (count == 1) {
+        countString = @"1 connected micro:bit";
+    }
+    else {
+        countString = [NSString stringWithFormat:@"%lu connected micro:bits", count];
+    }
+    NSMenuItem * microBitCount = [[NSMenuItem alloc] initWithTitle:countString action:nil keyEquivalent:@""];
+    microBitCount.enabled = NO;
+    [menu addItem:microBitCount];
+    
+    NSMenuItem * websiteItem = [[NSMenuItem alloc] initWithTitle:@"Editor" action:@selector(launchEditor:) keyEquivalent:@"e"];
+    [menu addItem:websiteItem];
+    
+    NSMenuItem * quitItem = [[NSMenuItem alloc] initWithTitle:@"Quit" action:@selector(terminate:) keyEquivalent:@"q"];
+    [menu addItem:quitItem];
+    
+    self.menubarItem.menu = menu;
+}
+
+- (void)launchEditor:(id)sender {
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://codethemicrobit.com/"]];
+}
+
+@end
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/Contents.json
@ -0,0 +1,68 @@
+{
+  "images" : [
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_128x128.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_16x16.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_32x32.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_512x512.png
--- a/Uploader/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
+++ b/Uploader/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png
--- a/Uploader/Assets.xcassets/Contents.json
+++ b/Uploader/Assets.xcassets/Contents.json
@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/Uploader/Assets.xcassets/menubar.imageset/Contents.json
+++ b/Uploader/Assets.xcassets/menubar.imageset/Contents.json
@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "filename" : "menubar.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
--- a/Uploader/Assets.xcassets/menubar.imageset/menubar.pdf
+++ b/Uploader/Assets.xcassets/menubar.imageset/menubar.pdf
--- a/Uploader/Base.lproj/MainMenu.xib
+++ b/Uploader/Base.lproj/MainMenu.xib
@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="Voe-Tx-rLC" id="GzC-gU-4Uq"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
+        <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
+    </objects>
+</document>
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,24 @@
+#import <Foundation/Foundation.h>
+
+@class DirectoryWatcher;
+
+@protocol DirectoryWatcherDelegate <NSObject>
+
+- (void)watcher:(DirectoryWatcher*)watcher observedNewFileAtPath:(NSString*)path;
+
+@end
+
+@interface DirectoryWatcher : NSObject
+
+- (instancetype)initWithPath:(NSString*)path;
+
+@property (readonly) NSString * path;
+
+@property id<DirectoryWatcherDelegate> delegate;
+
+- (void)startWatching;
+
+//Automatically called when deallocated
+- (void)stopWatching;
+
+@end
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,75 @@
+#import "DirectoryWatcher.h"
+#import <CoreServices/CoreServices.h>
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]);
+
+@interface DirectoryWatcher ()
+
+@property NSString * path;
+@property NSMutableSet<NSString*>* knownFiles;
+@property FSEventStreamRef stream;
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents;
+
+@end
+
+@implementation DirectoryWatcher
+
+- (instancetype)initWithPath:(NSString *)path {
+    if (!path) {
+        return nil;
+    }
+    
+    self = [super init];
+    if (self) {
+        self.path = path;
+    }
+    return self;
+}
+
+- (void)dealloc {
+    [self stopWatching];
+}
+
+- (void)startWatching {
+    self.knownFiles = [NSMutableSet new];
+    [self rescanPathWithEvents:NO];
+    
+    CFStringRef path = (__bridge CFStringRef)(self.path);
+    CFArrayRef pathsToWatch = CFArrayCreate(NULL, (const void**)&path, 1, NULL);
+    CFAbsoluteTime latency = 1;
+    FSEventStreamContext context = { 0, (__bridge void * _Nullable)(self), NULL, NULL, NULL };
+    self.stream = FSEventStreamCreate(NULL, &callback, &context, pathsToWatch, kFSEventStreamEventIdSinceNow, latency, kFSEventStreamCreateFlagNone);
+    FSEventStreamScheduleWithRunLoop(self.stream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+    FSEventStreamStart(self.stream);
+}
+
+- (void)stopWatching {
+    if (self.stream) {
+        FSEventStreamStop(self.stream);
+        FSEventStreamInvalidate(self.stream);
+        FSEventStreamRelease(self.stream);
+        self.stream = nil;
+    }
+}
+
+- (void)rescanPathWithEvents:(BOOL)sendEvents {
+    NSArray<NSString*>* downloadFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.path error:nil];
+    NSMutableSet<NSString*>* fullSet = [NSMutableSet new];
+    for (NSString * file in downloadFiles) {
+        [fullSet addObject:file];
+        if (![self.knownFiles containsObject:file]) {
+            if (sendEvents) {
+                [self.delegate watcher:self observedNewFileAtPath:file];
+            }
+        }
+    }
+    self.knownFiles = fullSet;
+}
+
+@end
+
+void callback(ConstFSEventStreamRef streamRef, void * info, size_t numEvents, void * eventPaths, const FSEventStreamEventFlags eventFlags[], const FSEventStreamEventId eventIds[]) {
+    DirectoryWatcher * watcher = (__bridge DirectoryWatcher*)info;
+    [watcher rescanPathWithEvents:YES];
+}
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.01</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>2</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Thomas Denney. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,21 @@
+#import <Foundation/Foundation.h>
+
+@class Uploader;
+
+@protocol UploaderDelegate <NSObject>
+
+- (void)uploader:(Uploader*)uploader transferredFile:(NSString*)file toMicroBit:(NSString*)microbit;
+- (void)uploader:(Uploader*)uploader failedToTransferFile:(NSString*)file toMicroBit:(NSString*)microbit;
+
+@end
+
+@interface Uploader : NSObject
+
+@property id<UploaderDelegate> delegate;
+
+- (BOOL)shouldUploadFileAtPath:(NSString*)path;
+- (NSArray<NSString*>*)microBitPaths;
+- (void)uploadFile:(NSString*)file;
+- (void)uploadFile:(NSString*)file toMicroBit:(NSString*)path;
+
+@end
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,74 @@
+#import "Uploader.h"
+
+@interface Uploader ()
+
+@property NSOperationQueue * backgroundCopyQueue;
+
+@end
+
+@implementation Uploader
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        self.backgroundCopyQueue = [NSOperationQueue new];
+    }
+    return self;
+}
+
+- (BOOL)shouldUploadFileAtPath:(NSString *)path {
+    //Whilst Safari is downloading the file it appends .download to the name
+    NSRegularExpression * ignoreDownload = [NSRegularExpression regularExpressionWithPattern:@".download$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([ignoreDownload numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return NO;
+    }
+    
+    //Chrome and Firefox create .hex files
+    NSRegularExpression * hexFiles = [NSRegularExpression regularExpressionWithPattern:@".hex$" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([hexFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)] > 0) {
+        return YES;
+    }
+    
+    //Safari tends to just name files 'Unknown X'
+    NSRegularExpression * unknownFiles = [NSRegularExpression regularExpressionWithPattern:@"^Unknown(( |-)[0-9]+)?" options:NSRegularExpressionCaseInsensitive error:nil];
+    if ([unknownFiles numberOfMatchesInString:path.lastPathComponent options:0 range:NSMakeRange(0, path.lastPathComponent.length)]) {
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (NSArray<NSString*>*)microBitPaths {
+    NSArray<NSURL*>* allVolumes = [[NSFileManager defaultManager] mountedVolumeURLsIncludingResourceValuesForKeys:nil options:NSVolumeEnumerationSkipHiddenVolumes];
+    NSMutableArray<NSString*>* microbitPaths = [NSMutableArray new];
+    NSRegularExpression * microbitRegex = [NSRegularExpression regularExpressionWithPattern:@"^MICROBIT" options:NSRegularExpressionCaseInsensitive error:nil];
+    for (NSURL * volume in allVolumes) {
+        NSString * lastPathComponent = volume.lastPathComponent;
+        if ([microbitRegex numberOfMatchesInString:lastPathComponent options:0 range:NSMakeRange(0, lastPathComponent.length)] > 0) {
+            [microbitPaths addObject:volume.path];
+        }
+    }
+    
+    return microbitPaths;
+}
+
+- (void)uploadFile:(NSString *)file {
+    for (NSString * microbit in [self microBitPaths]) {
+        [self uploadFile:file toMicroBit:microbit];
+    }
+}
+
+- (void)uploadFile:(NSString *)file toMicroBit:(NSString *)path {
+    [self.backgroundCopyQueue addOperationWithBlock:^{
+        NSError * copyError;
+        NSString * destination = [path stringByAppendingPathComponent:file.lastPathComponent];
+        if (![[NSFileManager defaultManager] copyItemAtPath:file toPath:destination error:&copyError]) {
+            [self.delegate uploader:self failedToTransferFile:file toMicroBit:path.lastPathComponent];
+        }
+        else {
+            [self.delegate uploader:self transferredFile:file toMicroBit:path.lastPathComponent];
+        }
+    }];
+}
+
+@end
--- a/clients/macuploader/Microbit
+++ b/clients/macuploader/Microbit
@ -0,0 +1,5 @@
+#import <Cocoa/Cocoa.h>
+
+int main(int argc, const char * argv[]) {
+    return NSApplicationMain(argc, argv);
+}
--- a/clients/macuploader/README.md
+++ b/clients/macuploader/README.md
@ -0,0 +1,40 @@
+# micro:bit uploader for OS X
+
+![](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,
+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).
+
+## Install the built version
+
+1. Download the latest `.zip` release from the `Release` directory
+2. Unzip it
+3. Drag `Microbit Uploader` to your Applications folder and launch it
+
+## Building
+
+To build the project you'll need a copy of OS X 10.11 or higher and Xcode 8 or
+higher (you may be able to build on earlier OSes or versions of Xcode, but this
+remains untested). Once you have a development environment set up, just build
+and run `Microbit Uploader.xcodeproj`.
+
+## Distributing
+
+1. Open the Xcode project
+2. Product > Archive
+3. Export:
+
+    ![Export](Graphics/export.png)
+
+4. You will then have the option of either signing or not-signing the
+   application:
+
+    a) If you have an Apple developer account, select 'Export a Developer
+       ID-signed Application'
+
+    b) If you don't have a developer ID, select 'Export as a macOS App'
+
+5. Zip the produced app and upload to CDN or equivalent
--- a/clients/macuploader/Release/Microbit
+++ b/clients/macuploader/Release/Microbit
--- a/clients/macuploader/Release/Microbit
+++ b/clients/macuploader/Release/Microbit
--- a/cmds/cmds.ts
+++ b/cmds/cmds.ts
@ -28,7 +28,7 @@ export function deployCoreAsync(res: ts.pxtc.CompileResult) {

 function getBitDrivesAsync(): Promise<string[]> {
    if (process.platform == "win32") {
-        let rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
+        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[] = []
@ -42,9 +42,14 @@ function getBitDrivesAsync(): Promise<string[]> {
            })
    }
    else if (process.platform == "darwin") {
-        let rx = new RegExp(pxt.appTarget.compile.deployDrives)
+        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/docfiles/appmeta.html
+++ b/docfiles/appmeta.html
--- a/docfiles/apptracking.html
+++ b/docfiles/apptracking.html
--- a/includes/docs-meta.html
+++ b/includes/docs-meta.html
@ -19,10 +19,3 @@
 <link rel="shortcut icon" href="@appLogo@">
 <meta name="theme-color" content="@accentColor@">

-<style>
-    #root .avatar .avatar-image {
-        background-image: url(https://az851932.vo.msecnd.net/pub/jovrytni/microbit.simplified.svg);
-        background-size: contain;
-        background-repeat: no-repeat;
-    }
-</style>
--- a/docfiles/target.css
+++ b/docfiles/target.css
@ -0,0 +1,5 @@
+#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
@ -0,0 +1,13 @@
+<script type="text/javascript">
+    var appInsights=window.appInsights||function(config){
+    function r(config){t[config]=function(){var i=arguments;t.queue.push(function(){t[config].apply(t,i)})}}var t={config:config},u=document,e=window,o="script",s=u.createElement(o),i,f;for(s.src=config.url||"//az416426.vo.msecnd.net/scripts/a/ai.0.js",u.getElementsByTagName(o)[0].parentNode.appendChild(s),t.cookie=u.cookie,t.queue=[],i=["Event","Exception","Metric","PageView","Trace"];i.length;)r("track"+i.pop());return r("setAuthenticatedUserContext"),r("clearAuthenticatedUserContext"),config.disableExceptionTracking||(i="onerror",r("_"+i),f=e[i],e[i]=function(config,r,u,e,o){var s=f&&f(config,r,u,e,o);return s!==!0&&t["_"+i](config,r,u,e,o),s}),t
+    }({ 
+        instrumentationKey:"e9ae05ca-350b-427a-9775-3ba3f6efabce"
+    });window.appInsights=appInsights;
+</script>
+<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");
+</script>
--- a/docs/about.md
+++ b/docs/about.md
@ -1,3 +1,50 @@
+![](/static/mb/device/pano.jpg)
+
+# About
+
+### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
+
+The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
+The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
+
+The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
+Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
+
+* [Read the docs](/docs)
+
+## [Hardware: The Device](/device)
+
+The BBC micro:bit is packaged with sensors, radio and other goodies. Learn about the [hardware components](/device) of the micro:bit to make the most of it!
+
+## Programming: [Blocks](/blocks) or [JavaScript](/javascript)
+
+You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript) in your web browser via the [micro:bit APIs](/reference):
+
+```block
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+```typescript
+input.onButtonPressed(Button.A, () => {
+    basic.showString("Hi!");
+})
+```
+
+The editor work in [most modern browsers](/browsers), work [offline](/offline) once loaded and do not require any installation. 
+
+## [Compile and Flash: Your Program!](/device/usb)
+
+When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
+
+Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
+program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
+
+## Simulator: Test Your Code
+
+You can run your code using the micro:bit simulator, all within the confines of a web browser. 
+The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
+
 ```sim
 basic.forever(() => {
  basic.showString("Hi!");
@ -20,43 +67,8 @@ input.onButtonPressed(Button.B, () => {
 . # . # .
 . . # . .`);
 });
-``` 
-# About
-
-### @description A Blocks / Javascript code editor for the micro:bit, a pocket-size computer with 5x5 display, sensors and Bluetooth.
-
-The [BBC micro:bit](https://www.microbit.co.uk) is a [pocket-size computer](/device) with a 5x5 display of 25 LEDs, Bluetooth and sensors that can be programmed by anyone.
-The BBC micro:bit was made possible by many [partners](https://www.microbit.co.uk/partners).
-
-The micro:bit provides an easy and fun introduction to programming and making – switch on, program it to do something fun – wear it, customize it.
-Just like Arduino, the micro:bit can be connected to and interact with sensors, displays, and other devices. 
-
-## Hardware: The Device
-
-Learn about the [hardware components](/device) of the micro:bit to make the most of it!
-
-## Programming: Blocks or JavaScript
-
-You can program the micro:bit using [Blocks](/blocks) or [JavaScript](/javascript), via the [micro:bit APIs](/reference):
-
-```blocks
-input.onButtonPressed(Button.A, () => {
-    basic.showString("Hi!");
-})
 ```

-## Compile and Flash: Your Program!
-
-When you have your code ready, you connect your micro:bit to a computer via a USB cable, so it appears as a mounted drive (named MICROBIT). 
-
-Compilation to ARM thumb machine code from [Blocks](/blocks) or [JavaScript](/javascript) happens in the browser. You save the ARM binary 
-program to a file, which you then copy to the micro:bit drive, which flashes the micro:bit device with the new program.
-
-## Simulator: Test Your Code
-
-You can run your code using the micro:bit simulator, all within the confines of a web browser. 
-The simulator has support for the LED screen, buttons, as well as compass, accelerometer, and digital I/O pins.
-
 ## C++ Runtime

 The [C++ micro:bit runtime](http://lancaster-university.github.io/microbit-docs/), created at [Lancaster University](http://www.lancaster.ac.uk/), provides access to the hardware functions of the micro:bit, 
@ -65,6 +77,15 @@ as well as a set of helper functions (such as displaying a number/image/string o
 The [micro:bit library](/reference) mirrors the functions of the C++ library. 
 When code is compiled to ARM machine code, the calls to JavaScript micro:bit functions are replaced with calls to the corresponding C++ functions.

-## Open Source
+## [Command Line Tools](/cli)
+
+Looking to use codethemicrobit.com in your favorite editor? Install the [command line tools](/cli) and get rolling!
+
+## [Packages](/packages)
+
+Create, edit and distribute your own blocks and JavaScript using [packages](/packages). Packages are hosted on GitHub and may be written
+using C++, JavaScript and/or ARM thumb.
+
+## [Open Source](/open-source)

 The code for the micro:bit is [open source](/open-source) on GitHub. Contributors are welcome!
--- a/docs/browsers.md
+++ b/docs/browsers.md
@ -0,0 +1,104 @@
+# Unsupported configuration
+
+[codethemicrobit.com](https://codethemicrobit.com) doesn't currently support
+your browser or operating system. The following configurations are supported:
+
+## Windows
+
+You need one of these browsers running on Windows 7, Windows 8, Windows 8.1, or
+Windows 10:
+
+* Internet Explorer 11
+* Microsoft Edge
+* Google Chrome
+* Mozilla Firefox
+
+## Mac
+
+You need one of these browsers running on OS X 10.9 Mavericks, OS X 10.10
+Yosemite, OS X 10.11 El Capitan, or macOS 10.12 Sierra:
+
+* Safari
+* Google Chrome
+* Mozilla Firefox
+
+## Linux
+
+If you're using a Raspberry Pi, please see [the documentation
+here](/raspberry-pi).
+
+You need to be running a Linux distribution recent enough to run the most recent
+version of one of the following:
+
+* Google Chrome, or Chromium
+* Mozilla Firefox, Iceweasel, or Seamonkey
+
+## How to check your OS or browser
+
+### Windows
+
+* Click on the Start menu
+* Type 'System'
+* Click on the app called 'System'
+* The version of Windows you are using will be displayed:
+
+![](/static/configurations/windows-version.png)
+
+### Mac
+
+* Click on the Apple icon in the top left
+* Click on 'About this Mac'
+* This window will be displayed:
+
+![](/static/configurations/osx-version.png)
+
+### Internet Explorer
+
+* Click on the Settings icon in the top right
+* Click 'About Internet Explorer'
+* This window will be displayed:
+
+![](/static/configurations/ie-version.png)
+
+### Edge
+
+Edge automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Scroll to the bottom
+* Information similar to the following will be displayed:
+
+![](/static/configurations/edge-version.png)
+
+### Google Chrome
+
+Google Chrome automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three dots)
+* Click Help, and About Google Chrome
+* Information similar to the following will be displayed:
+
+![](/static/configurations/chrome-version.png)
+
+### Firefox
+
+Firefox automatically updates, so you should always be using the latest version
+
+* Click on the menu icon in the top right (three horizontal lines)
+* Click the question mark icon (help button)
+* Click 'About Firefox'
+
+![](/static/configurations/firefox-version.png)
+
+### Safari
+
+Safari updates when your operating system updates, so if you are using the
+latest version of OS X then you'll be using the latest version of Safari.
+
+* Click on the Safari menu in the top left
+* Click 'About Safari'
+
+![](/static/configurations/safari-version.png)
+
+IT administrators should check which browser versions are supported
+[here](/browsers/technical).
--- a/docs/browsers/linux.md
+++ b/docs/browsers/linux.md
@ -0,0 +1,16 @@
+# Recommended browser for Linux
+
+As you are using Linux, it is recommended that you use [Mozilla
+Firefox][firefox] or [Google Chrome][chrome].
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers
--- a/docs/browsers/mac.md
+++ b/docs/browsers/mac.md
@ -0,0 +1,16 @@
+# Recommended browser for Mac
+
+As you are using a Mac, it is recommended that you use [Safari][]. Alternatively,
+[Google Chrome][chrome] and [Mozilla Firefox][firefox] are also supported.
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers
--- a/docs/browsers/technical.md
+++ b/docs/browsers/technical.md
@ -0,0 +1,36 @@
+# Technical information about browser support
+
+[codethemicrobit.com][] 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
+[web workers]: http://www.w3.org/TR/workers/
+[typescript]: http://www.typescriptlang.org
+[monaco]: https://microsoft.github.io/monaco-editor/
+[visual studio code]: http://code.visualstudio.com
+
+Most modern browsers automatically update themselves, but in some environments
+such as schools these automatic updates are disabled for security. **We
+strongly recommend that you use the most recent version of any of these
+browsers**, but if you can't then you must use at least:
+
+| Browser           | Minimum version | Release date   | Windows     | Mac        |
+| ----------------- | --------------- | -------------- | ----------- | ---------- |
+| Edge              | 12              | March 2015     | Windows 10+ | N/A        |
+| Internet Explorer | 11              | October 2013   | Windows 7+  | N/A        |
+| Mozilla Firefox   | 31 ESR          | July 2014      | Windows XP+ | OS X 10.6+ |
+| Google Chrome     | 38              | October 2014   | Windows XP+ | OS X 10.6+ |
+| Safari            | 9               | September 2015 | N/A         | OS X 10.9+ |
+| Opera             | 21              | May 2014       | Windows 7+  | OS X 10.9+ |
+
+
+Please see our information for which browsers are recommended for [Windows][],
+[Mac][], [Linux][], or [Raspberry Pi][].
+
+[Windows]: /browsers/windows
+[Mac]: /browsers/mac
+[Linux]: /browsers/linux
+[Raspberry Pi]: /raspberry-pi
--- a/docs/browsers/windows.md
+++ b/docs/browsers/windows.md
@ -0,0 +1,18 @@
+# Recommended browser for Windows
+
+We recommend [Microsoft Edge][edge] if you are running Windows 10, but users on
+Windows 7 or higher can use [Internet Explorer 11][ie] or recent versions of
+[Mozilla Firefox][firefox], [Google Chrome][chrome], or [Opera][opera].
+
+
+Please see [here][technical] for technical information on which browsers are
+supported, or [here][versions] to check which version you are using.
+
+[edge]: https://www.microsoft.com/en-us/windows/microsoft-edge
+[ie]: https://www.microsoft.com/en-us/download/internet-explorer.aspx
+[firefox]: https://www.mozilla.org/en-US/firefox/new/
+[chrome]: https://www.google.com/chrome/
+[opera]: https://www.opera.com
+[safari]: http://www.apple.com/safari/
+[technical]: /browsers/technical
+[versions]: /browsers
--- a/docs/device/usb.md
+++ b/docs/device/usb.md
@ -1,132 +1,31 @@
-# Run Scripts on your micro:bit
+# Uploading programs on your micro:bit

-How to compile, transfer, and run a script on your micro:bit.
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.

-While you're writing and testing your scripts, you'll mostly be running scripts in your browser by clicking the `PLay` button 
-(see [run code in your browser](/device/simulator) for info about this).
+The basic steps are:

-Once your masterpiece is complete, you can compile your script and run it on your micro:bit.
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive

-## Requirements
+![](/static/mb/device/usb-thin.jpg)

-You need the following things to transfer and run a script on your micro:bit:
+## Instructions

-* A-Male to Micro USB cable to connect your computer to your micro:bit. This is the same cable that is commonly used to connect a smart phone to a computer.
-* a PC running Windows 7 of later, or a Mac running OS X 10.6 or later
-* access to the Internet
+Pick the instructions for your operating system and browser:

-## Step 1: Connect your micro:bit to your computer
+* [Windows - Microsoft Edge](/device/usb/windows-edge)
+* [Windows - Internet Explorer](/device/usb/windows-ie)
+* [Windows - Chrome](/device/usb/windows-chrome)
+* [Windows - Firefox](/device/usb/windows-firefox)
+* [Mac - Safari](/device/usb/mac-safari)
+* [Mac - Chrome](/device/usb/mac-chrome)
+* [Mac - Firefox](/device/usb/mac-firefox)

-First, connect the micro:bit:
+### ~hint

-1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
-
-2. Connect the other end of the USB cable to a USB port on your computer.
-
-Your computer should recognise your micro:bit as a new drive. On computers running Windows, MICROBIT appears as a drive under Devices and drives. On a Mac it appears as a new drive under Devices.
-
-Windows
-
-![](/static/mb/device/usb-0.jpg)
-
-Mac (picture bvabdbco)
-WARN: unknown picture: bvabdbco:5x3
-
-## Step 2: Compile your script
-
-Next, compile your script:
-
-1. Sign in to Touch Develop on your computer.
-
-2. Open your script (find the script in **My Scripts** and click `Edit`).
-
-3. Click **Download**. Your script is converted into a hex file that you can transfer and run on your micro:bit.
-
-4. When prompted, choose to save the compiled file on your computer (or anywhere other than the micro:bit). Depending on which browser you are using, the download will adopt the download behaviour of that particular browser.
-
-### Windows
-
-** Chrome**
-
-Your .hex file appears as a download at the bottom of the browser. Open up your windows file explorer. Your micro:bit appears as a drive called MICROBIT.
-
-**Right click** on the download and select **show in folder**. Drag and drop the hex file from the download folder onto the MICROBIT drive.
-
-Alternatively, you can drag and drop the downloaded hex file from the bottom of the browser onto the file explorer and onto the MICROBIT drive.
-
-![](/static/mb/device/usb-1.jpg)
-
-**Firefox**
-
-A dialogue box will appear, asking whether you would like to open or save your hex file. Select **Save**, then **OK** and the file will appear in your downloads in the top right of your browser. Select the **blue arrow**, select the relevant file and drag and drop it onto your Windows Explorer and onto your MICROBIT drive.
-
-![](/static/mb/device/usb-2.jpg)
-
-![](/static/mb/device/usb-3.jpg)
-
-**IE10**
-
-Click on **Download**. You will see a message “Do you want to save this .hex file.” Select **Save**.
-
-### Mac
-
-** Safari**
-
-When you select **Download** in Safari on Mac, your file will be downloaded to your downloads folder. Go to your downloads folder and open the file. In Safari the file will appear as unknown.txt rather than a named .hex file. Drag and drop it onto your MICROBIT drive.
-
-![](/static/mb/device/usb-4.jpg)
-
-**Firefox**
-
-A dialogue box will appear, asking whether you would like to open or save your hex file. Select **Save** and **OK** and the file will then appear in your downloads in the top right of your browser.  Click on **Show in Finder** and the file will appear in your downloads folder. Select the file and drag and drop it onto your MICROBIT drive.
-
-![](/static/mb/device/usb-5.jpg)
-
-![](/static/mb/device/usb-6.jpg)
-
-**Chrome**
-
-When you select **Download** in Chrome, the file will be downloaded to the bottom of the browser in .hex format. Click on the small arrow and select **Show in Finder**. This will show the file in your download folder. Drag and drop the file onto your MICROBIT drive.
-
-![](/static/mb/device/usb-7.jpg)
-
-## Step 3: Transfer the file to your micro:bit
-
-1. The file will transfer onto your micro:bit.
-
-2. If you're using Windows, you can use **Send to** as described below.
-
-3. The LED on the back of your micro:bit flashes during the transfer (which should only take a few seconds).
-
-4. Once transferred, the code will run automatically on your micro:bit. To rerun your program, press the reset button on the back of your micro:bit. The reset button automatically runs the newest file on the micro:bit.
-
-**Send to**: If you're using Windows you use *Send to* in File Explorer:
-
- In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
-
-![](/static/mb/device/usb-8.jpg)
-
-By copying the script onto the 'MICROBIT' drive, you have programmed it into the flash memory on the micro:bit, which means even after you unplug the micro:bit, your script will still run if the micro:bit is powered by battery.
-
-## Troubleshooting
-
-You can’t drag and drop more than one hex file at once onto your micro:bit. If you try to drag and drop a second hex file onto your micro:bit  before the first file has finished downloading, then the second file may fail in different ways.
-
-When the first program has been written to the micro:bit, the drive will disengage. If you drag and drop a second file at this point it may not find the drive and the second write will fail.
-
-The errors may look like this:
-
-**Windows**
-
-![](/static/mb/device/usb-9.jpg)
-
-**Mac**
-
-![](/static/mb/device/usb-10.png)
-
-Or it may appear that there are two hex files on your micro:bit so the micro:bit won’t be able to run multiple files. To rectify this, unplug your micro:bit and plug it in again. Make sure that your micro:bit  appears as MICROBIT and not MAINTENANCE.
-
-### See also
-
-[Run code in a browser](/device/simulator)
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).

+### ~
--- a/docs/device/usb/mac-chrome.md
+++ b/docs/device/usb/mac-chrome.md
@ -0,0 +1,69 @@
+# Uploading from Chrome for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+When you select **Download** in Chrome, the file will appear at the bottom of
+the browser. Click on the small arrow and select **Show in Finder**. This will
+show the file in your download folder. Drag and drop the file onto your
+`MICROBIT` drive.
+
+![](/static/mb/device/usb-osx-chrome.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/mac-firefox.md
+++ b/docs/device/usb/mac-firefox.md
@ -0,0 +1,71 @@
+# Uploading from Firefox for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+A dialogue box will appear, asking whether you would like to open or save your
+hex file. Select **Save file** and click **OK** and the file will then appear in
+your downloads in the top right of your browser. Right click on the file and
+click on **Show in Finder** and the file will appear in your downloads folder.
+Select the file and drag and drop it onto your `MICROBIT` drive.
+
+![](/static/mb/device/usb-osx-firefox-1.jpg)
+
+![](/static/mb/device/usb-osx-firefox-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/mac-safari.md
+++ b/docs/device/usb/mac-safari.md
@ -0,0 +1,68 @@
+# Uploading from Safari for Mac
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-osx-device.png)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+When you select **Download** in Safari a file called `Unknown` will be
+downloaded into your Downloads folder. Open your Downloads folder and drag and
+drop the file onto your `MICROBIT` drive, under Devices:
+
+![](/static/mb/device/usb-osx-dnd.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/troubleshooting.md
+++ b/docs/device/usb/troubleshooting.md
@ -0,0 +1,24 @@
+# Troubleshooting Transfer
+
+You can’t drag and drop more than one hex file at once onto your micro:bit. If
+you try to drag and drop a second hex file onto your micro:bit  before the first
+file has finished downloading, then the second file may fail in different ways.
+
+When the first program has been written to the micro:bit, the drive will
+disengage. If you drag and drop a second file at this point it may not find the
+drive and the second write will fail.
+
+The errors may look like this:
+
+**Windows**
+
+![](/static/mb/device/usb-windows-copy-file-error.jpg)
+
+**Mac**
+
+![](/static/mb/device/usb-osx-copy-file-error.png)
+
+Or it may appear that there are two hex files on your micro:bit so the micro:bit
+won’t be able to run multiple files. To rectify this, unplug your micro:bit and
+plug it in again. Make sure that your micro:bit  appears as `MICROBIT` and not
+`MAINTENANCE`.
--- a/docs/device/usb/windows-chrome.md
+++ b/docs/device/usb/windows-chrome.md
@ -0,0 +1,79 @@
+# Uploading from Chrome for Windows
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+Your `.hex` file appears as a download at the bottom of the browser. Click on
+the arrow next to the name of the file and then click **Show in folder**.
+
+![](/static/mb/device/usb-windows-chrome.png)
+
+Drag and drop the `.hex` file from the download folder onto the `MICROBIT` drive.
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/windows-edge.md
+++ b/docs/device/usb/windows-edge.md
@ -0,0 +1,89 @@
+# Uploading from Edge on Windows
+
+How to compile, transfer, and run a program on your micro:bit on **Microsoft Edge**.
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+A message will appear at the bottom of the browser asking what you want to do
+with the file. Click **Save**:
+
+![](/static/mb/device/usb-windows-edge-1.png)
+
+Then click **Open folder** and drag and drop the file from your Downloads to
+your `MICROBIT` drive.
+
+![](/static/mb/device/usb-windows-edge-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+If you want to save time, you can use the [micro:bit uploader](/uploader) to
+automatically deploy hex files to your micro:bit. It works on Windows and is
+compatible with any browser.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/windows-firefox.md
+++ b/docs/device/usb/windows-firefox.md
@ -0,0 +1,86 @@
+# Uploading from Firefox on Windows
+
+How to compile, transfer, and run a program on your micro:bit on **Firefox for Windows**.
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+A window will appear asking whether you want to save or open the `.hex` file.
+Select **Save File** and then select **OK**.
+
+![](/static/mb/device/usb-windows-firefox-1.png)
+
+The file will then appear in your downloads in the top right of your browser.
+Click the **folder icon** next to the filename to open it in Windows Explorer.
+
+![](/static/mb/device/usb-windows-firefox-2.jpg)
+
+Drag and drop the `.hex` file from the download folder onto the `MICROBIT` drive.
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/device/usb/windows-ie.md
+++ b/docs/device/usb/windows-ie.md
@ -0,0 +1,86 @@
+# Uploading from Internet Explorer on Windows
+
+While you're writing and testing your programs, you'll mostly be [running them
+in the simulator](/device/simulator), but once you've finished your program you
+can **compile** it and run it on your micro:bit.
+
+The basic steps are:
+
+1. Connect your micro:bit to your computer via USB
+2. Click **Download** and download the `.hex` file
+3. Copy the `.hex` file from your computer onto the micro:bit drive
+
+### ~hint
+
+You can use the [micro:bit uploader](/uploader) to automatically deploy ``.hex`` files to your micro:bit!
+![](/static/uploader/tooltip.png)
+
+### ~
+
+## Requirements
+
+You need the following things to transfer and run a script on your micro:bit:
+
+* A-Male to Micro USB cable to connect your computer to your micro:bit. This is
+    the same cable that is commonly used to connect a smart phone to a computer.
+* A PC running Windows 7 or later, or a Mac running OS X 10.6 or later
+
+## Step 1: Connect your micro:bit to your computer
+
+First, connect the micro:bit:
+
+1. Connect the small end of the USB cable to the micro USB port on your micro:bit.
+
+2. Connect the other end of the USB cable to a USB port on your computer.
+
+Your computer should recognise your micro:bit as a new drive. On computers
+running Windows, `MICROBIT` appears as a drive under Devices and drives. On a Mac
+it appears as a new drive under Devices.
+
+![](/static/mb/device/usb-windows-device.jpg)
+
+## Step 2: Download your program
+
+1. Open your project on [codethemicrobit.com](https://codethemicrobit.com)
+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
+   whether you are using a Windows computer or a Mac
+
+A message will appear at the bottom of the browser asking what you want to do
+with the file. Click **Save**:
+
+![](/static/mb/device/usb-windows-ie11-1.png)
+
+Then click **Open folder** and drag and drop the file from your Downloads to
+your `MICROBIT` drive.
+
+![](/static/mb/device/usb-windows-ie11-2.png)
+
+## Step 3: Transfer the file to your micro:bit
+
+* Once you've found the folder containing your `.hex` file, drag and drop it
+    onto your `MICROBIT` drive
+* If you're using Windows, you can use **Send to** as described below 
+* The LED on the back of your micro:bit flashes during the transfer (which 
+    should only take a few seconds).
+* Once transferred, the code will run automatically on your micro:bit. To rerun
+   your program, press the reset button on the back of your micro:bit. The reset 
+   button automatically runs the newest file on the micro:bit.
+
+**Send to**: If you're using Windows you use *Send to* in File Explorer:
+
+In File Explorer, right-click on the hex file (created in Step 2 above), choose **Send to**, and then **MICROBIT**.
+
+![](/static/mb/device/usb-windows-sendto.jpg)
+
+By copying the script onto the `MICROBIT` drive, you have programmed it into the
+flash memory on the micro:bit, which means even after you unplug the micro:bit,
+your program will still run if the micro:bit is powered by battery.
+
+
+### ~hint
+
+Transfer not working? See some [troubleshooting tips](/device/usb/troubleshooting).
+
+### ~
--- a/docs/docs.md
+++ b/docs/docs.md
@ -21,6 +21,7 @@
 ### More questions?

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

--- a/docs/faq.md
+++ b/docs/faq.md
@ -18,7 +18,8 @@ to reopen your latest project. You can also open previous project stored locally

 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** feature. It stores your project in the cloud and creates a URL that you can share with others.
+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.

--- a/docs/lessons/happy-birthday/activity.md
+++ b/docs/lessons/happy-birthday/activity.md
@ -1,13 +1,13 @@
 # happy birthday blocks activity

-Play sounds with music blocks. 
+Play sounds with music blocks.

 Have you ever tried to play a song on an instrument? Let's try coding the song "Happy Birthday" on the micro:bit !

 Let's start by adding the code in the music drawer that includes a single musical chord (or pitched sound) with the `play` block. Then insert the chord "C". Once you are done coding, don't forget to run your code in the simulator or the micro:bit.

 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
 ```

 * click run to see if the code works as expected.
@ -15,12 +15,12 @@ music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
 We want to continue to adding musical chords with the `play` block. So insert the appropriate chord blocks: `D`, `F`, `G` to complete the first part of the song. Modify your code so that your code looks like this.

 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```

@ -29,19 +29,19 @@ basic.pause(100);
 We want to continue to adding musical chords with the `play` block. Then insert the appropriate chords: `B`, `C`, `D`, `E` , `F` to complete the second part of the song. Modify your code so that your code looks like this.

 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```

--- a/docs/lessons/happy-birthday/challenges.md
+++ b/docs/lessons/happy-birthday/challenges.md
@ -8,19 +8,19 @@ Complete the [happy birthday](/lessons/happy-birthday/activity) activity and you


 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);


@ -35,26 +35,26 @@ Let's code the third part of Happy Birthday!
 To do this, you need to add blocks after the last line of the `play` blocks. We want to continue to adding musical chords with the `play` block. Then insert the appropriate chord blocks `G`, `E`, `C`, `B`, `A` to complete the third part of the song. Modify your code so that your code looks like this.

 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
 ```

@ -66,33 +66,33 @@ Finally, we continue to adding the appropriate `play` block and fit the followin


 ```blocks
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.C), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.E), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.D), music.beat(BeatFraction.Quarter));
 basic.pause(100);
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quater));
-music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quater));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.A), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.B), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.G), music.beat(BeatFraction.Quarter));
+music.playTone(music.noteFrequency(Note.F), music.beat(BeatFraction.Quarter));
 ```


--- a/docs/lessons/hero/activity.md
+++ b/docs/lessons/hero/activity.md
@ -44,7 +44,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);

 ```

@ -56,7 +56,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
 }
@ -73,7 +73,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@ -99,7 +99,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@ -127,7 +127,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@ -164,7 +164,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
@ -212,7 +212,7 @@ let hero = game.createSprite(2, 2);
 let food = game.createSprite(4, 4);
 let ghost = game.createSprite(0, 0);
 ghost.change(LedSpriteProperty.Blink, 100);
-food = led.brightness() == 8;
+food.set(LedSpriteProperty.Brightness, 8);
 while (true) {
    basic.pause(400);
    if (ghost.get(LedSpriteProperty.X) < hero.get(LedSpriteProperty.X)) {
--- a/docs/projects/guitar.md
+++ b/docs/projects/guitar.md
@ -0,0 +1,36 @@
+# Guitar
+![guitar icon](/static/mb/projects/guitar.png)
+### @description A beginner-intermediate maker activity, building a guitar with the micro:bit  
+
+### ~avatar avatar
+
+Make a micro:bit guitar with this guided tutorial! 
+
+### ~
+*playing micro:bit guitar*
+https://youtu.be/GYmdTFvxz80
+
+## Duration
+
+5 Activities, approx 30-45 min each based on familiarity with the coding concepts  
+
+## Materials
+* Cardboard large pieces (recycle!)
+* Tape (masking, duct Tape, and/or packing tape)
+* Markers and/or paint
+* Aluminum Foil
+* Scissors that can cut cardboard  
+* 1 micro:bit, battery holder and 2 AAA batteries
+* 4-5 Crocodile clips
+* Headphones
+
+## Activities
+* [Making the Guitar Body](/projects/guitar/making)  
+* [Buttons, Display & Sound](/projects/guitar/displaybuttons)  
+* [Light Sensor Tone control](/projects/guitar/lightsensor)  
+* [Accelerometer Beat control](/projects/guitar/accelerometer)  
+* [Pin Press Switch](/projects/guitar/pinpress)  
+
+### ~button /projects/guitar/making
+Let's get started!
+### ~
--- a/docs/projects/guitar/accelerometer.md
+++ b/docs/projects/guitar/accelerometer.md
@ -0,0 +1,114 @@
+# Accelerometer Beat control
+
+### @description micro:bit guitar: using accelerometer to control tempo
+
+### ~avatar avatar
+
+Use the Accelerometer to control guitar tempo
+* Duration: 30 - 45 minutes
+* Concepts:
+     * Gravity
+     * Acceleration
+     * X, Y, Z coordinates
+     * Tempo
+     * Beat
+     * Mapping
+     * Graphing
+     * Absolute value
+
+### ~  
+
+*accelerometer controlled tempo*  
+https://youtu.be/h_gPkBaVkoo
+TODO: add sound to video
+## Blocks
+
+```cards
+input.acceleration(Dimension.Y)
+music.setTempo(120)
+pins.map(0, 0, 1023,60, 320)
+Math.abs(1)            
+```
+
+## Accelerometer, gravity and tilting!
+
+The micro:bit contains an **accelerometer** sensor that is able to measure forces applied to the board.
+On earth, we are subject to the **gravity force** which pulls us to the ground!
+
+https://youtu.be/0SULoTKmkhI
+
+When the micro:bit is flat on a table, with the screen pointing up, the gravity force is aligned
+with the **Z** axis of the micro:bit. 
+
+![micro:bit x, y, z axis image](/static/mb/projects/guitar/accelleration_axis.png)  
+
+If you tilt it up and down, the force will align with the **Y** axis -- this is how we can detect tilting!!!
+If the force along **Y** grows, the micro:bit is tilting more and more vertically!
+
+## Measuring Acceleration along different coordinates (X, Y, Z axis)  
+
+The acceleration block approximately measures **milli-g**, which is 1/1000 of a **g** or the 
+acceleration of gravity. 
+
+### Step 1: Graphing acceleration 
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.acceleration(Dimension.Y), 1023)
+})
+```
+**Create the code** that measures the change in the Y axis acceleration as a graph on the LEDs  
+  
+**Dowload the code** to the micro:bit 
+  
+**Test the movements that move the graph from 1 to 5 bars on the LEDs** 
+
+### Extra
+
+Try graphing the acceleration along the **X** and **Z** axis. Can you explain the differences?
+
+### ~hint  
+## Mapping  
+**It is common to map one standard to another - such as with temperature**  
+![Fahrenheit to Celsius](/static/mb/projects/guitar/map_analogy.png "Fahrenheit to Celsius")  
+### ~
+
+### Step 2: Mapping acceleration to Beat
+**micro:bit sensors produce signal values between 0 to 1023. The *[map block](/reference/pins/map)* converts the signal to a desired range.**    
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+         music.playTone(Note.C, music.beat(BeatFraction.Quarter));
+})
+```  
+
+**Create the code** that *Maps*  Y axis acceleration as *tempo*  
+  
+**Download the code** to the micro:bit on the guitar  
+  
+**Test the movements that speed and slow the tempo**  
+
+### Step 3: Combine with light sensor tone control  
+**Put it all together!**
+
+```blocks
+basic.forever(() => {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+})
+```  
+**Combine the code above with the light sensor tone control code from the previous activity**
+  
+**Download the code** to the micro:bit on the guitar    
+
+###  Now play the guitar adjusting tone and tempo using the light sensor and accelerometer!
+
+### ~button /projects/guitar/pinpress
+NEXT: Pin Press on/off
+### ~
--- a/docs/projects/guitar/displaybuttons.md
+++ b/docs/projects/guitar/displaybuttons.md
@ -0,0 +1,179 @@
+# Buttons, Display & Sound
+### @description micro:bit guitar: using buttons with display and sound
+
+### ~avatar avatar
+Use Button Events to control LED Display and play Sound  
+* **Concepts:**
+     * Events
+     * Tone/Note
+     * Sequence
+
+### ~
+
+## Duration: 30 - 45 minutes
+
+## Materials
+
+A micro:bit, battery pack and 2 x AAA batteries
+
+![battery pack and micro:bit](/static/mb/projects/guitar/microbit.jpg)
+
+2 to 4 crocodile clips
+
+![crocodile clips](/static/mb/projects/guitar/crocclips.jpg)
+
+Headphones
+
+![earbud headphones](/static/mb/projects/guitar/headphones.jpg)
+
+## Blocks
+
+```cards
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+input.onButtonPressed(Button.A, () => {});
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+music.rest(music.beat(BeatFraction.Whole))
+music.beat(BeatFraction.Quarter)
+```
+
+## Step 1: Make a Smiley 
+Open [codethemicrobit.com](https://codethemicrobit.com) in your web browser   
+```blocks
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `);
+```
+From **Basics**, drag a **show LEDs** block into the coding area  
+  * Create a face with LEDs  
+
+![micro:bit USB connection](/static/mb/projects/guitar/connectmicrobit.jpg)  
+Connect your micro:bit to your computer via USB and click **`Download`**. 
+Follow the instructions to move the code to your micro:bit.  
+
+## Step 2: Add Smiley LED Button Events 
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+})
+```
+
+From **Input**, drag an **on button 'A' pressed** block into the coding area  
+
+* Snap the LED face into the block  
+
+* Create a 'B' button block with a different LED face   
+
+* Download the code to your micro:bit and try the A & B buttons  
+
+
+## Step 3: Add Headphone Speakers using Crocodile clips
+
+![crocodile clips attached to pins 0 and GND](/static/mb/projects/guitar/crocclipintoboard.jpg)  
+
+![crocodile clips attached to headphone jack](/static/mb/projects/guitar/jacktocrocs.jpg)  
+Connect **GND** to the **base of the headphone jack** using a second crocodile clip (usually black)  
+
+Connect **pin 0** to the **tip of the headphone jack** with a crocodile clip  
+
+*attaching batteries and micro:bit*  
+https://youtu.be/zwRTmpKIaVU  
+Attach the micro:bit & battery-pack to the guitar body  
+
+*connecting headphone speaker*  
+https://youtu.be/ewyEW_U5G9M  
+Connect the headphones with crocodile clips    
+  
+### ~hint
+## The micro:bit can play music
+
+The **play tone** block allows a range letter note tones from **C** to **B5**.   
+Songs are played using sequences notes.   Like the beginning of a birthday song (C, C, D, C, F, E).
+```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.D, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.F, music.beat(BeatFraction.Half))
+    music.rest(music.beat(BeatFraction.Whole))
+    music.playTone(Note.E, music.beat(BeatFraction.Whole))
+})
+```
+### ~
+## Step 4: Add Tone Playing Events for Buttons A & B
+```blocks
+input.onButtonPressed(Button.A, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . # # # .
+        . # . # .
+        . # # # .
+        `)
+    music.playTone(Note.A, music.beat(BeatFraction.Whole))
+})
+input.onButtonPressed(Button.B, () => {
+    basic.showLeds(`
+        . # . # .
+        . . . . .
+        . . . . .
+        # . . . #
+        . # # # .
+        `)
+    music.playTone(Note.G, music.beat(BeatFraction.Whole))
+})
+```  
+From **Music**, drag **play tone *C* for *1* beat** block under the **show leds** in **Button A Pressed**  
+
+  * modify **tone** by choosing a note (*letter*) and experiment with high and low pitches  
+  * set **beat** to 1  
+   
+**Repeat** for **Button B** event  
+  
+**Download the code** to the micro:bit  
+
+**Try the A & B buttons** with headphones and power connected
+  
+## Congratulations on completing the basic guitar!   
+**Challenge:** Create Samples of longer music to play for each button instead of the single tone
+  * *Tip*: Search for "ABC music notation" or "Easy Music Notes" + the name of a song
+
+## Extra
+
+* [Smiley Buttons tutorial](/projects/smiley-buttons)
+* [Hack your headphones](/projects/hack-your-headphones)
+
+
+### ~button /projects/guitar/lightsensor
+NEXT: Light Sensor Tone Control
+### ~
--- a/docs/projects/guitar/lightsensor.md
+++ b/docs/projects/guitar/lightsensor.md
@ -0,0 +1,116 @@
+# Light Sensor Tone control
+
+### @description micro:bit guitar: using light sensor to control tone
+
+### ~avatar avatar
+
+Use the Light Sensor to control guitar Tone
+* **Duration:** 30 - 45 minutes
+* **Concepts:**
+     * Inputs
+     * Light Intensity
+     * Tone/Frequency
+     * Ratio Mapping
+     * Forever Loop
+     * Math (multiplication) with code properties  
+* **Resources:**
+     * This guitar is inspired by the [Theremin](https://en.wikipedia.org/wiki/Theremin)
+
+### ~  
+
+*playing tones with light sensor*  
+https://youtu.be/2cKg9pokVC4
+
+## The micro:bit LEDs Light Sensors 
+
+- the micro:bit can detect external light level intensity reaching the LEDs 
+- the light level block reports a reading of values 0 (*dark*) to 255 (*bright*)
+- a **Forever Loop** is required to continually use measure the current light level to control the tone 
+
+## Forever Loop
+
+The forever loop really does run forever.  The forever loop is useful when there is a need to continually check for an event or use a changing value in code.
+
+## Blocks
+
+```cards
+basic.forever(() => {})
+input.lightLevel()
+led.plotBarGraph(0, 255)
+music.playTone(Note.C, music.beat(BeatFraction.Quarter))
+```
+
+## Step 1: Create a light level detector
+```blocks
+basic.forever(() => {
+    led.plotBarGraph(input.lightLevel(), 255)
+})
+```
+**Build the  blocks**
+  * From **Basic** drag a **forever loop** block into the coding area  
+  * From **Led** drag a **plot bar graph** block into the **forever loop**  
+  * From **Input** drag a **light level** block into **plot bar graph *of***  
+  
+**Set the *plot bar graph* value *up to* = *255* **  
+
+## Step 2: Test the light required to move the bar graph height  
+
+*graphing light input*  
+https://youtu.be/pqU7bTcfQ_s  
+Experiment to see the effect on graph height when the **plot bar graph** value ***up to*** is changed  
+
+**255 is the maximum light input reading**, try numbers smaller than 255 
+**Find a value** that allows the graph to show 1 - 5 bars  
+
+### ~hint
+### Frequency  
+**Frequency** measured in Hz  which are cycles per second or vibrations per second  
+  * A healthy human ear can detect frequencies in the range of 20Hz to 20,000Hz.  
+  * The micro:bit + headphones reliably produce detectable output ~50Hz - 6,000Hz.  
+
+**261Hz** represents a C note
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+**play tone** blocks can specify a specific numeric  **Frequency**   
+by replacing the letter note 261Hz represents a **C** note with a **number** block
+```blocks
+music.playTone(261, music.beat(BeatFraction.Half))
+```
+### ~  
+
+## Step 3: Multiply Frequency using Math blocks
+ ```blocks
+input.onButtonPressed(Button.A, () => {
+    music.playTone(261 * 2, music.beat(BeatFraction.Half))
+})
+```  
+create a **play tone** block using a **Math** section, **multiplication** block to set *tone*   
+
+### Next  
+**Add** a **B** button block that multiplies the **261** tone by a number other than 2 to set tone 
+  
+**Download the code to the micro:bit**  
+
+**Test the sound for multiples of the 261Hz *C* frequency**  
+  
+## Step 4: Control the Frequency with the light input
+```blocks
+basic.forever(() => {
+    music.playTone(input.lightLevel() * 25, music.beat(BeatFraction.Quarter))
+})
+```
+**Create a *forever loop* containing a *play tone* block**  
+  
+**Set *tone*, using *Math* multiplication block that multiplies *light level* input by 25**  
+or experiment with multipliers larger and smaller than 25  
+  
+**Test light tone control on the guitar**  
+Cover the LEDs with your hand to vary light detected to control the tone  
+
+## Good work, this guitar is sounding good!
+**Challenge:** Create a variable for the light level multiplier that you can change using buttons (optional)  
+
+### ~button /projects/guitar/accelerometer  
+NEXT: Accelerometer Beat control  
+### ~
--- a/docs/projects/guitar/making.md
+++ b/docs/projects/guitar/making.md
@ -0,0 +1,59 @@
+# Making the Guitar Body
+### @description Maker Project for Guitar Body for micro:bit  
+
+### ~avatar avatar
+
+Make the Guitar Body for your micro:bit Guitar
+
+### ~
+
+## Duration: ~45 minutes
+
+## Materials
+  * Cardboard large pieces (recycle!)
+  * Tape (masking, duct Tape, and/or packing tape)
+  * Scissors that can cut cardboard  
+  * Markers and/or paint  
+
+![Materials: cardboard, tape, scissors, markers](/static/mb/projects/guitar/materials.jpg)
+
+## Step 1: Design the body
+*tracing the guitar design*
+https://youtu.be/xMSrWaOZkFg
+
+* Search for [Guitar Silhouette](https://www.bing.com/images/search?q=Guitar+Silhouettes) design ideas and customize
+the shape of your guitar
+* Trace the design on a flat piece of cardboard (40-80 cm is best)
+
+### ~hint
+
+   * Avoid small details that are difficult to cut into cardboard
+   * Unfolding a box gives longer pieces of cardboard, and creases can be reinforced
+
+### ~
+
+## Step 2: Cut out the body
+*cutting the cardboard*
+https://youtu.be/aUQkrFoEank
+
+
+## Step 3: Personalize the Guitar
+
+Create unique styling using tape, markers, paint and other available materials (*calling all artist!*)  
+
+*decorating the guitar*
+https://youtu.be/zNAZTJeSxY8
+
+Everyone can come up with a unique design!  
+
+![guitar design samples](/static/mb/projects/guitar/otherdesigns.jpg)
+
+## Extra!
+*strengthening the guitar*  
+https://youtu.be/q0GkQdJmxjE
+
+Strengthen the guitar next with an angled cardboard strip (*optional*).  
+  
+### ~button /projects/guitar/displaybuttons
+NEXT: Buttons, Display and Sound
+### ~
--- a/docs/projects/guitar/pinpress.md
+++ b/docs/projects/guitar/pinpress.md
@ -0,0 +1,128 @@
+# Pin Press Switch
+
+### @description micro:bit guitar: use pin press to toggle guitar play on/off
+
+### ~avatar avatar
+Use pin press to switch guitar play on/off
+* **Duration:** approximately 45 minutes
+* **Materials:**
+   * 2-3 Crocodile clips
+* Concepts:
+    * Circuit  
+    * Conductor 
+    * Variable/Global-Variable  
+    * Conditional: **`if`**, **`else`**  
+    * Boolean: **`True`/`False`**
+### ~
+
+## Blocks
+
+```cards
+var on = false
+on;
+if (on) { } else {}
+input.onPinPressed(TouchPin.P1, () => {})
+```
+
+
+
+### ~hint
+## Circuits & Switches
+* **Circuits** need a power supply (battery), a resister (like a LED) & a conductor (metal, water, hand)  
+* **Switches** turn electric power on by closing (completing) a circuit with a conductor so power can flow  
+
+**Metal foil and wires make excellent conductors**  
+
+**In this activity we use YOU to conduct electricity**  
+**to close the circuit that switches the guitar ON and OFF!**  
+### ~
+
+## Step 1: Pin Press Test  
+
+```blocks
+input.onPinPressed(TouchPin.P0, () => {
+    basic.showNumber(0)
+})
+input.onPinPressed(TouchPin.P1, () => {
+    basic.showNumber(1)
+})
+input.onPinPressed(TouchPin.P2, () => {
+    basic.showNumber(2)
+})
+```  
+**Create the pin-press code**  
+
+**Download the code** on the micro:bit 
+
+https://youtu.be/PAIU-vHqyGU  
+
+**Hold the micro:bit touching The GND pin with one hand**  
+**with the other hand alternately touch the 0, 1 and 2 pins**  
+  
+### ~hint
+**The electric signal traveled from pins, between your hands to `GND` and the micro:bit detected the electric signal!**  
+### ~  
+  
+## Step 2: Installing conductive foil on the guitar  
+https://youtu.be/NX0ECcpXFes  
+**Add foil to the guitar body where it is easy to touch while playing**   
+
+**Connect the foil to `GND` using a crocodile clip**  
+
+https://youtu.be/YkymZGNmkrE  
+**Add foil to the guitar neck**  
+  
+**Connect the foil to `pin 1` using a crocodile clip**  
+
+## Step 3: Add a switch to turn the guitar ON and OFF  
+**Using the `on` global variable we can switch the message on the micro:bit**   
+**between ON and OFF**  
+```blocks
+let on = false
+basic.forever(() => {
+    if (on == true) {
+        basic.showString("ON")
+    } else {
+        basic.showString("OFF")
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    if (on == true) {
+        on = false
+    } else {
+        on = true
+    }
+})
+``` 
+**Create the ON/OFF switch code**  
+
+**Download the code on the micro:bit**   
+ 
+**Test by touching `P1` to toggle the LED message between ON and OFF**
+
+*Final code*
+TODO: do we want to use `on = !on;` or be more direct in flipping the switch? `on = true; on = false;`
+```blocks
+var on = false
+basic.forever(() => {
+    if (on) {
+        music.setTempo(pins.map(Math.abs(input.acceleration(Dimension.Y)),
+            0, 1023,
+            60, 320))
+        music.playTone(
+            input.lightLevel() * 25,
+            music.beat(BeatFraction.Quarter)
+        );
+    } else {
+        music.rest(music.beat())
+    }
+})
+input.onPinPressed(TouchPin.P1, () => {
+    on = !on;
+})
+```  
+## Now Play! 
+**Turn the guitar ON and OFF with a pin press on the connected foil**  
+**touching both pieces of foil at the same time to connect the switches**  
+  
+https://youtu.be/GYmdTFvxz80  
--- a/docs/projects/radio-challenges.md
+++ b/docs/projects/radio-challenges.md
@ -58,7 +58,9 @@ After running this simulation several seconds by moving the micro:bit side to si
 ![](/static/mb/acc2.png)

 ### ~
-Finally, you must open the Excel CSV file by clicking on the data.xls file that was downloaded to Downloads Folder. 
+
+Finally, you must open the Excel CSV file by clicking on the `data.csv` file
+that was downloaded to Downloads Folder. 

 ![](/static/mb/data3.png)

@ -93,4 +95,4 @@ NEXT: The Watch

 ```package
 microbit-radio
-```
+```
--- a/docs/raspberry-pi.md
+++ b/docs/raspberry-pi.md
@ -0,0 +1,29 @@
+# Raspberry Pi and Raspbian
+
+It is possible to run the web editor or [command line interface](/cli) from Raspbian on Raspberry Pi 2 or 3.
+
+## Web editor
+
+The web editor requires to install IceWeasel (Firefox) as the built-in browser cannot handle it.
+
+```
+sudo apt-get install iceweasel
+```
+
+Once installed simply navigate to https://codethemicrobit.com or type
+
+```
+firefox https://codethemicrobit.com
+``` 
+
+## Command line
+
+The PXT command line also works on Raspbian and allows to run a local server and/or edit programs from any text editor.
+
+* Node.JS 6.0 needs installed
+
+To install all the tools, 
+
+```
+curl -s https://raw.githubusercontent.com/Microsoft/pxt-rpi/master/install.sh | sh -
+```
--- a/docs/share.md
+++ b/docs/share.md
@ -0,0 +1,85 @@
+# Sharing your project
+
+Once you've made your project, you can save it the cloud, share it, or embed it on another website.
+
+* Click **More...**, then **Embed Project**:
+
+![Asks to embed](/static/embed/publish.png)
+
+* Click **Publish project**. This will make the project publicly available
+* You will then see this information:
+
+![Embedding information](/static/embed/embed-info.png)
+
+## 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:
+
+![Project page](/static/embed/project-page.png)
+
+## Embedding into a blog or web site
+
+Rather than just sharing the link, you can also embed the project so that your visitors can use the simulator, edit blocks or code, or download the project without having to leave your site.
+
+### General instructions
+
+* Copy the HTML for embedding the page from the publish dialog. It will look like the following:
+
+```html
+<div class="ui card sim"><div class="ui content"><div style="position:relative;height:0;padding-bottom:70%;overflow:hidden;"><iframe style="position:absolute;top:0;left:0;width:100%;height:100%;" src="https://codethemicrobit.com/?sandbox=1#pub:httuftrbtg" allowfullscreen="allowfullscreen" frameborder="0"></iframe></div></div></div>
+```
+
+* 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.
+
+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"]
+```
+
+### Blogger
+
+* Create a new post
+* Click the 'HTML' button next to 'Compose' and paste in the HTML
+
+![Blogger](/static/embed/blogger.png)
+
+### Squarespace
+
+[Squarespace][] allows you to embed HTML code inside a blog post or page. In the editor, click to add a new block:
+
+![Squarespace block insertion](/static/embed/squarespace-insert.png)
+
+Scroll to **More** and select **Code**. Paste the embed HTML and click **Apply**:
+
+![Squarespace code insertion](/static/embed/squarespace-code.png)
+
+### Google Sites
+
+Google Sites doesn't currently [support iframes in custom HTML][google-sites-iframes], so you'll have to insert a link to your project's URL instead.
+
+### Office Sway
+
+[Microsoft Office Sway][sway] only allows iframes from [certain websites][sway-restricted], so you'll need to insert a link to your project instead.
+### Embedding in Markdown documents
+
+[Markdown][] is a popular text format supported by many blog editors. As Markdown supports embedded HTML, you should be able to paste the HTML into the document, although some sites may prevent you from doing this.
+
+### ~hint
+
+**Developers:** This page supports OEmbed as well 
+
+### ~
+
+[wordpress.com]: https://wordpress.com
+[wordpress-vip]: https://vip.wordpress.com/documentation/embedding-rich-media-from-around-the-web-with-protected-embeds/#scripts-iframes-and-objects
+[iframe-plugin]: https://wordpress.org/plugins/iframe/
+[squarespace]: https://squarespace.com
+[google-sites-iframes]: https://support.google.com/sites/answer/2500646?hl=en
+[sway]: https://sway.com/my
+[sway-restricted]: https://support.office.com/en-us/article/Embed-content-in-your-Sway-1e1ab12a-f961-4a26-8afc-77a15f892b1d
+[Markdown]: https://daringfireball.net/projects/markdown/
--- a/docs/static/Logo_Calliope_Woman.svg
+++ b/docs/static/Logo_Calliope_Woman.svg
@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 175.49999 172.4"
+   enable-background="new 0 0 841.9 595.3"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Logo_Calliope_Woman.svg"
+   width="175.5"
+   height="172.39999"><metadata
+     id="metadata5011"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs5009" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview5007"
+     showgrid="false"
+     inkscape:zoom="0.34208337"
+     inkscape:cx="420.95001"
+     inkscape:cy="297.64999"
+     inkscape:window-x="-8"
+     inkscape:window-y="156"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Ebene_1" /><g
+     id="g4955"
+     transform="translate(-260.90025,-204.1)"><g
+       id="g4957"><defs
+         id="defs4959"><rect
+           id="SVGID_7_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_1_"><use
+           xlink:href="#SVGID_7_"
+           overflow="visible"
+           id="use4963"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath></g><g
+       id="g4965"><defs
+         id="defs4967"><rect
+           id="SVGID_9_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_2_"><use
+           xlink:href="#SVGID_9_"
+           overflow="visible"
+           id="use4971"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath></g><g
+       id="g4973"><defs
+         id="defs4975"><rect
+           id="SVGID_11_"
+           x="193.10001"
+           y="204.10001"
+           width="318.29999"
+           height="256.29999" /></defs><clipPath
+         id="SVGID_3_"><use
+           xlink:href="#SVGID_11_"
+           overflow="visible"
+           id="use4979"
+           style="overflow:visible"
+           x="0"
+           y="0"
+           width="100%"
+           height="100%" /></clipPath><path
+         clip-path="url(#SVGID_3_)"
+         d="m 436.4,262 -47.9,0 0,-46 c 0,-4.7 3.8,-8.4 8.4,-8.4 l 31,0 c 4.7,0 8.4,3.8 8.4,8.4 l 0,46 z"
+         id="path4981"
+         inkscape:connector-curvature="0"
+         style="fill:#4a5261" /></g><rect
+       x="394.79999"
+       y="218.7"
+       width="35.099998"
+       height="43.200001"
+       id="rect4983"
+       style="fill:#8096a1" /><path
+       d="m 317.6,239.5 0,61 71,0.2 c 0,0 0,-57.3 0,-61 0,-19.5 -16.1,-35.6 -35.6,-35.6 -19.6,0 -35.4,15.8 -35.4,35.4"
+       id="path4985"
+       inkscape:connector-curvature="0"
+       style="fill:#855c33" /><path
+       d="m 412.4,376.5 -114.2,0 c -35.6,0 -50.9,-45.2 -22.6,-66.8 l 63.8,-47.8 96.9,0 0,90.7 c 0.1,13.2 -10.6,23.9 -23.9,23.9"
+       id="path4987"
+       inkscape:connector-curvature="0"
+       style="fill:#26a6ab" /><polygon
+       points="345.7,257.3 334.8,298.8 285.1,302.5 "
+       id="polygon4989"
+       style="fill:#42c9c9" /><polygon
+       points="354,283.8 332.5,283.8 345.7,257.3 "
+       id="polygon4991"
+       style="fill:#f7f5e8" /><polygon
+       points="375.4,283.8 354,283.8 362.2,257.3 "
+       id="polygon4993"
+       style="fill:#f7f5e8" /><polygon
+       points="373.1,298.8 334.8,298.8 332.5,283.8 375.4,283.8 "
+       id="polygon4995"
+       style="fill:#bdd1cf" /><path
+       d="m 400.6,376.5 c -3.5,-26.2 -10.6,-58 -27.3,-77.7 l -0.2,0 -19,0 -19,0 -0.2,0 c -16.7,19.8 -23.8,51.5 -27.3,77.7 l 93,0 z"
+       id="path4997"
+       inkscape:connector-curvature="0"
+       style="fill:#f7f5e8" /><path
+       d="m 357,258 -6.1,0 c -6.4,0 -11.5,-5.2 -11.5,-11.5 l 0,-19.7 29.2,0 0,19.7 c -0.1,6.3 -5.3,11.5 -11.6,11.5"
+       id="path4999"
+       inkscape:connector-curvature="0"
+       style="fill:#ffcc99" /><path
+       d="m 335.8,376.5 0,-77.7 c 12.4,29.1 27.7,64.3 46.5,77.7 l -46.5,0 z"
+       id="path5001"
+       inkscape:connector-curvature="0"
+       style="fill:#bdd1cf" /><polygon
+       points="362.2,257.3 345.7,257.3 354,283.8 "
+       id="polygon5003"
+       style="fill:#ffcc99" /><polygon
+       points="436.4,315.3 394.8,262 436.4,262 "
+       id="polygon5005"
+       style="fill:#42c9c9" /></g></svg>
--- a/docs/static/Logo_Calliope_lang.svg
+++ b/docs/static/Logo_Calliope_lang.svg
@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 841.9 595.3" enable-background="new 0 0 841.9 595.3" xml:space="preserve">
+<path fill="#4A5261" d="M406.9,292.9l0.2,0l5.6,17l-11.1,0.1L406.9,292.9z M402,281.8l-14.3,42.2l-3.5,0.5l0.1,5.8l16.5-0.1
+	l-0.1-5.8l-3.4-0.6l2.1-6.7l15.7-0.1l2.2,6.6l-3.3,0.6l0,5.8l16.5-0.2l0-5.8l-3.5-0.5l-15-41.9L402,281.8z"/>
+<polygon fill="#4A5261" points="454.9,281.9 445.2,282 440,282 440.1,287.9 445.2,288.8 445.6,323.5 440.4,324.6 440.5,330.4 
+	476.9,330.1 476.7,316.5 469.3,316.6 468.9,322.7 455.3,322.8 454.9,288.7 460.1,287.7 460.1,281.8 "/>
+<polygon fill="#4A5261" points="501.6,281.9 491.9,282 486.7,282 486.8,287.9 491.9,288.8 492.2,323.5 487.1,324.6 487.2,330.4 
+	523.6,330.1 523.4,316.5 516,316.6 515.6,322.7 501.9,322.8 501.6,288.7 506.8,287.7 506.8,281.8 "/>
+<polygon fill="#4A5261" points="533.4,282 533.4,287.9 538.6,288.8 538.9,323.5 533.8,324.6 533.8,330.4 553.9,330.2 553.8,324.4 
+	548.6,323.5 548.3,288.7 553.5,287.7 553.4,281.8 "/>
+<polygon fill="#4A5261" points="674.9,282 669.7,282 669.8,287.9 674.9,288.8 675.2,323.5 670.1,324.6 670.2,330.4 708.4,330.1 
+	708.3,316.8 700.9,316.9 700.6,322.7 684.9,322.8 684.8,309 701.2,308.8 701.1,301.4 684.7,301.5 684.6,289.4 700.1,289.2 
+	700.6,295 708.1,294.9 707.9,281.7 "/>
+<g>
+	<g>
+		<defs>
+			<rect id="SVGID_7_" x="133.2" y="204.1" width="234.3" height="188.7"/>
+		</defs>
+		<clipPath id="SVGID_1_">
+			<use xlink:href="#SVGID_7_"  overflow="visible"/>
+		</clipPath>
+	</g>
+	<g>
+		<defs>
+			<rect id="SVGID_9_" x="133.2" y="204.1" width="234.3" height="188.7"/>
+		</defs>
+		<clipPath id="SVGID_2_">
+			<use xlink:href="#SVGID_9_"  overflow="visible"/>
+		</clipPath>
+	</g>
+	<g>
+		<defs>
+			<rect id="SVGID_11_" x="133.2" y="204.1" width="234.3" height="188.7"/>
+		</defs>
+		<clipPath id="SVGID_3_">
+			<use xlink:href="#SVGID_11_"  overflow="visible"/>
+		</clipPath>
+		<path clip-path="url(#SVGID_3_)" fill="#4A5261" d="M312.3,246.7H277v-33.8c0-3.4,2.8-6.2,6.2-6.2h22.9c3.4,0,6.2,2.8,6.2,6.2
+			V246.7z"/>
+	</g>
+	<rect x="281.8" y="214.8" fill="#8096A1" width="25.8" height="31.8"/>
+	<path fill="#855C33" d="M224.9,230.1V275l52.3,0.2c0,0,0-42.2,0-44.9c0-14.4-11.8-26.2-26.2-26.2
+		C236.6,204.1,224.9,215.7,224.9,230.1"/>
+	<path fill="#26A6AB" d="M294.7,331h-84.1c-26.2,0-37.4-33.3-16.6-49.2l47-35.2h71.3v66.8C312.3,323.2,304.4,331,294.7,331"/>
+	<polygon fill="#42C9C9" points="237.6,273.8 201,276.6 245.6,243.3 	"/>
+	<polygon fill="#F7F5E8" points="235.9,262.7 245.6,243.3 251.7,262.7 	"/>
+	<polygon fill="#F7F5E8" points="251.7,262.7 257.7,243.3 267.4,262.7 	"/>
+	<polygon fill="#BDD1CF" points="265.7,273.8 237.6,273.8 235.9,262.7 267.4,262.7 	"/>
+	<path fill="#F7F5E8" d="M286,331c-2.6-19.3-7.8-42.7-20.1-57.2h-0.1h-14h-14h-0.1c-12.3,14.5-17.6,37.9-20.1,57.2H286z"/>
+	<path fill="#FFCC99" d="M253.9,243.8h-4.5c-4.7,0-8.5-3.8-8.5-8.5v-14.5h21.5v14.5C262.4,240,258.6,243.8,253.9,243.8"/>
+	<path fill="#BDD1CF" d="M238.3,331v-57.2c9.1,21.4,20.4,47.3,34.2,57.2H238.3z"/>
+	<polygon fill="#FFCC99" points="245.6,243.3 251.7,262.7 257.7,243.3 	"/>
+	<polygon fill="#42C9C9" points="281.8,246.7 312.3,246.7 312.3,285.9 	"/>
+</g>
+<path fill="#4A5261" d="M373.2,297.5l-7.2,0.1l-1.1-6.4c-1-0.9-2.2-1.7-3.6-2.2c-1.5-0.5-3.2-0.8-5.1-0.8c-4.2,0-7.4,1.6-9.7,4.7
+	c-2.2,3.1-3.3,7.1-3.3,12l0,1.7c0,4.9,1.2,8.9,3.5,12c2.3,3.1,5.5,4.6,9.6,4.5c1.9,0,3.7-0.3,5.2-0.9c1.6-0.6,2.8-1.3,3.7-2.3
+	l0.9-6.5l7.2-0.1l0.1,9.6c-1.9,2.3-4.4,4.1-7.4,5.5c-3,1.4-6.4,2.1-10.1,2.1c-6.5,0.1-11.8-2.1-16-6.6c-4.2-4.5-6.3-10.2-6.4-17.3
+	l0-1.6c-0.1-7,1.9-12.8,6-17.4c4.1-4.6,9.4-6.9,15.9-6.9c3.7,0,7.1,0.6,10.2,2c3,1.3,5.5,3.1,7.5,5.3L373.2,297.5z"/>
+<path fill="#4A5261" d="M598.7,305c0-5-1.1-9.1-3.2-12.2c-2.1-3.1-5.2-4.6-9.3-4.6c-4.1,0-7.1,1.6-9.1,4.7c-2,3.1-2.9,7.2-2.9,12.3
+	l0,0.8c0,5.1,1.1,9.2,3.2,12.3c2.1,3.1,5.1,4.6,9.2,4.6c4.1,0,7.2-1.6,9.2-4.8c2-3.1,3-7.2,3-12.3L598.7,305z M608.4,305.7
+	c0.1,7.1-1.9,13-5.9,17.6c-4,4.7-9.3,7-15.9,7.1c-6.5,0.1-11.8-2.2-15.9-6.8c-4.1-4.6-6.1-10.4-6.2-17.5l0-0.7
+	c-0.1-7,1.9-12.9,5.9-17.6c4-4.7,9.2-7.1,15.8-7.1c6.6-0.1,11.9,2.2,16,6.8c4.1,4.6,6.2,10.4,6.3,17.5L608.4,305.7z"/>
+<path fill="#4A5261" d="M633.9,305.2l8.2-0.1c2.7,0,4.7-0.8,6.1-2.3c1.4-1.5,2-3.4,2-5.7c0-2.3-0.7-4.2-2.1-5.7
+	c-1.4-1.5-3.5-2.2-6.2-2.2l-8.2,0.1L633.9,305.2z M641.9,281.8c5.5,0,9.9,1.3,13.2,4.1c3.2,2.8,4.9,6.5,4.9,11.1
+	c0,4.6-1.5,8.4-4.7,11.2s-7.5,4.3-13.1,4.3l-8.2,0.1l0.1,10.7l5.2,0.9l0,5.8l-20,0.2l-0.1-5.8l5.1-1l-0.3-34.7l-5.2-1l-0.1-5.9
+	l5.2,0L641.9,281.8z"/>
+</svg>
--- a/docs/static/Logo_Calliope_norm.svg
+++ b/docs/static/Logo_Calliope_norm.svg
@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 234.4 188.6"
+   enable-background="new 0 0 595.3 841.9"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Logo_Calliope_norm.svg"
+   width="234.39999"
+   height="188.60001"><metadata
+     id="metadata89"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs87" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview85"
+     showgrid="false"
+     inkscape:zoom="3.1714397"
+     inkscape:cx="73.725892"
+     inkscape:cy="132.25623"
+     inkscape:window-x="-8"
+     inkscape:window-y="156"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Ebene_1" /><g
+     id="g4307"
+     transform="translate(0.15971695,653.11241)"><g
+       transform="translate(-180.35972,-805.91209)"
+       id="g3"><defs
+         id="defs5"><rect
+           height="188.7"
+           width="234.3"
+           y="152.7"
+           x="180.2"
+           id="SVGID_1_" /></defs><clipPath
+         id="SVGID_2_"><use
+           height="100%"
+           width="100%"
+           y="0"
+           x="0"
+           style="overflow:visible"
+           id="use9"
+           overflow="visible"
+           xlink:href="#SVGID_1_" /></clipPath><path
+         style="fill:#4a5261"
+         inkscape:connector-curvature="0"
+         id="path11"
+         d="m 205,320.8 -4.5,0 -0.7,-4 c -0.6,-0.6 -1.4,-1.1 -2.3,-1.4 -0.9,-0.3 -2,-0.5 -3.2,-0.5 -2.6,0 -4.6,1 -6.1,2.9 -1.4,1.9 -2.1,4.4 -2.1,7.5 l 0,1.1 c 0,3.1 0.8,5.6 2.2,7.5 1.4,1.9 3.4,2.9 6,2.8 1.2,0 2.3,-0.2 3.3,-0.5 1,-0.4 1.7,-0.8 2.3,-1.4 l 0.6,-4 4.5,0 0.1,6 c -1.2,1.4 -2.7,2.6 -4.6,3.4 -1.9,0.8 -4,1.3 -6.3,1.3 -4.1,0 -7.4,-1.3 -10,-4.1 -2.6,-2.8 -3.9,-6.4 -4,-10.8 l 0,-1 c 0,-4.4 1.2,-8 3.8,-10.9 2.6,-2.8 5.9,-4.3 10,-4.3 2.3,0 4.5,0.4 6.3,1.2 1.9,0.8 3.5,1.9 4.7,3.3 l 0,5.9 z"
+         clip-path="url(#SVGID_2_)" /></g><path
+       style="fill:#4a5261"
+       inkscape:connector-curvature="0"
+       id="path13"
+       d="m 45.740275,-488.51209 0.1,0 3.5,10.6 -6.9,0.1 3.3,-10.7 z m -3.1,-6.9 -9,26.4 -2.2,0.3 0,3.6 10.3,-0.1 0,-3.6 -2.1,-0.4 1.3,-4.2 9.8,-0.1 1.4,4.1 -2.1,0.4 0,3.6 10.3,-0.1 0,-3.6 -2.2,-0.3 -9.4,-26.2 -6.1,0.2 z" /><polygon
+       style="fill:#4a5261"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon15"
+       points="256.3,335.8 256.1,314.4 259.4,313.8 259.3,310.1 256.1,310.2 250,310.2 246.8,310.3 246.8,313.9 250.1,314.5 250.3,336.2 247,336.9 247.1,340.5 269.8,340.3 269.7,331.8 265.1,331.9 264.9,335.7 " /><polygon
+       style="fill:#4a5261"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon17"
+       points="285.5,335.5 285.3,314.2 288.5,313.5 288.5,309.9 285.3,309.9 279.2,310 276,310 276,313.6 279.2,314.2 279.4,335.9 276.2,336.6 276.3,340.2 299,340 298.9,331.6 294.3,331.6 294,335.4 " /><polygon
+       style="fill:#4a5261"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon19"
+       points="305.1,309.7 305.2,313.4 308.4,314 308.6,335.7 305.4,336.3 305.4,340 317.9,339.9 317.9,336.2 314.7,335.6 314.5,313.9 317.7,313.3 317.7,309.6 " /><g
+       transform="translate(-180.35972,-805.91209)"
+       id="g21"><defs
+         id="defs23"><rect
+           height="188.7"
+           width="234.3"
+           y="152.7"
+           x="180.2"
+           id="SVGID_3_" /></defs><clipPath
+         id="SVGID_4_"><use
+           height="100%"
+           width="100%"
+           y="0"
+           x="0"
+           style="overflow:visible"
+           id="use27"
+           overflow="visible"
+           xlink:href="#SVGID_3_" /></clipPath><path
+         style="fill:#4a5261"
+         inkscape:connector-curvature="0"
+         id="path29"
+         d="m 346,324.2 c 0,-3.1 -0.7,-5.7 -2,-7.6 -1.3,-1.9 -3.3,-2.9 -5.8,-2.9 -2.6,0 -4.4,1 -5.7,3 -1.2,2 -1.8,4.5 -1.8,7.7 l 0,0.5 c 0,3.2 0.7,5.7 2,7.7 1.3,1.9 3.2,2.9 5.7,2.9 2.6,0 4.5,-1 5.7,-3 1.3,-2 1.9,-4.5 1.9,-7.7 l 0,-0.6 z m 6,0.4 c 0,4.4 -1.2,8.1 -3.7,11 -2.5,2.9 -5.8,4.4 -9.9,4.4 -4.1,0 -7.4,-1.4 -9.9,-4.3 -2.5,-2.9 -3.8,-6.5 -3.9,-11 l 0,-0.5 c 0,-4.4 1.2,-8.1 3.7,-11 2.5,-2.9 5.8,-4.4 9.8,-4.5 4.1,0 7.4,1.4 10,4.3 2.6,2.9 3.9,6.5 3.9,10.9 l 0,0.7 z"
+         clip-path="url(#SVGID_4_)" /><path
+         style="fill:#4a5261"
+         inkscape:connector-curvature="0"
+         id="path31"
+         d="m 368,323.8 5.1,0 c 1.7,0 3,-0.5 3.8,-1.4 0.9,-0.9 1.3,-2.1 1.3,-3.5 0,-1.5 -0.5,-2.7 -1.3,-3.6 -0.9,-0.9 -2.2,-1.4 -3.8,-1.4 l -5.1,0 0,9.9 z m 5,-14.7 c 3.5,0 6.2,0.8 8.2,2.6 2,1.8 3,4.1 3.1,7 0,2.9 -1,5.2 -2.9,7 -2,1.8 -4.7,2.7 -8.2,2.7 l -5.1,0 0.1,6.7 3.2,0.6 0,3.6 -12.5,0.1 0,-3.6 3.2,-0.7 -0.2,-21.7 -3.2,-0.6 0,-3.7 3.2,0 11.1,0 z"
+         clip-path="url(#SVGID_4_)" /></g><polygon
+       style="fill:#4a5261"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon33"
+       points="399.8,325.8 410,325.7 410,321 399.8,321.1 399.7,313.5 409.4,313.4 409.7,317 414.3,317 414.2,308.7 393.6,308.9 390.3,308.9 390.4,312.6 393.6,313.2 393.8,334.9 390.6,335.6 390.6,339.2 414.6,339 414.5,330.7 409.9,330.7 409.6,334.4 399.9,334.4 " /><g
+       transform="translate(-180.35972,-805.91209)"
+       id="g35"><defs
+         id="defs37"><rect
+           height="188.7"
+           width="234.3"
+           y="152.7"
+           x="180.2"
+           id="SVGID_5_" /></defs><clipPath
+         id="SVGID_6_"><use
+           height="100%"
+           width="100%"
+           y="0"
+           x="0"
+           style="overflow:visible"
+           id="use41"
+           overflow="visible"
+           xlink:href="#SVGID_5_" /></clipPath><path
+         style="fill:#4a5261"
+         inkscape:connector-curvature="0"
+         id="path43"
+         d="m 359.3,195.4 -35.3,0 0,-33.8 c 0,-3.4 2.8,-6.2 6.2,-6.2 l 22.9,0 c 3.4,0 6.2,2.8 6.2,6.2 l 0,33.8 z"
+         clip-path="url(#SVGID_6_)" /></g><rect
+       style="fill:#8096a1"
+       id="rect45"
+       height="31.799999"
+       width="25.799999"
+       y="-642.41211"
+       x="148.44026" /><g
+       transform="translate(-180.35972,-805.91209)"
+       id="g47"><defs
+         id="defs49"><rect
+           height="188.7"
+           width="234.3"
+           y="152.7"
+           x="180.2"
+           id="SVGID_7_" /></defs><clipPath
+         id="SVGID_8_"><use
+           height="100%"
+           width="100%"
+           y="0"
+           x="0"
+           style="overflow:visible"
+           id="use53"
+           overflow="visible"
+           xlink:href="#SVGID_7_" /></clipPath><path
+         style="fill:#855c33"
+         inkscape:connector-curvature="0"
+         id="path55"
+         d="m 271.9,178.8 0,44.9 52.3,0.2 c 0,0 0,-42.2 0,-44.9 0,-14.4 -11.8,-26.2 -26.2,-26.2 -14.4,-0.1 -26.1,11.6 -26.1,26"
+         clip-path="url(#SVGID_8_)" /><path
+         style="fill:#26a6ab"
+         inkscape:connector-curvature="0"
+         id="path57"
+         d="m 341.7,279.7 -84.1,0 c -26.2,0 -37.4,-33.3 -16.6,-49.2 l 47,-35.2 71.3,0 0,66.8 c 0,9.7 -7.9,17.6 -17.6,17.6"
+         clip-path="url(#SVGID_8_)" /></g><polygon
+       style="fill:#42c9c9"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon59"
+       points="284.6,222.5 248,225.2 292.6,191.9 " /><polygon
+       style="fill:#f7f5e8"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon61"
+       points="282.9,211.4 292.6,191.9 298.7,211.4 " /><polygon
+       style="fill:#f7f5e8"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon63"
+       points="298.7,211.4 304.7,191.9 314.4,211.4 " /><polygon
+       style="fill:#bdd1cf"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon65"
+       points="312.7,222.5 284.6,222.5 282.9,211.4 314.4,211.4 " /><g
+       transform="translate(-180.35972,-805.91209)"
+       id="g67"><defs
+         id="defs69"><rect
+           height="188.7"
+           width="234.3"
+           y="152.7"
+           x="180.2"
+           id="SVGID_9_" /></defs><clipPath
+         id="SVGID_10_"><use
+           height="100%"
+           width="100%"
+           y="0"
+           x="0"
+           style="overflow:visible"
+           id="use73"
+           overflow="visible"
+           xlink:href="#SVGID_9_" /></clipPath><path
+         style="fill:#f7f5e8"
+         inkscape:connector-curvature="0"
+         id="path75"
+         d="m 333,279.7 c -2.6,-19.3 -7.8,-42.7 -20.1,-57.2 l -0.1,0 -14,0 -14,0 -0.1,0 c -12.3,14.5 -17.6,37.9 -20.1,57.2 l 68.4,0 z"
+         clip-path="url(#SVGID_10_)" /><path
+         style="fill:#ffcc99"
+         inkscape:connector-curvature="0"
+         id="path77"
+         d="m 300.9,192.4 -4.5,0 c -4.7,0 -8.5,-3.8 -8.5,-8.5 l 0,-14.5 21.5,0 0,14.5 c 0,4.7 -3.8,8.5 -8.5,8.5"
+         clip-path="url(#SVGID_10_)" /><path
+         style="fill:#bdd1cf"
+         inkscape:connector-curvature="0"
+         id="path79"
+         d="m 285.3,279.7 0,-57.2 c 9.1,21.4 20.4,47.3 34.2,57.2 l -34.2,0 z"
+         clip-path="url(#SVGID_10_)" /></g><polygon
+       style="fill:#ffcc99"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon81"
+       points="292.6,191.9 298.7,211.4 304.7,191.9 " /><polygon
+       style="fill:#42c9c9"
+       transform="translate(-180.35972,-805.91209)"
+       id="polygon83"
+       points="328.8,195.4 359.3,195.4 359.3,234.6 " /></g></svg>
--- a/docs/static/calliope.simplified.svg
+++ b/docs/static/calliope.simplified.svg
@ -0,0 +1,921 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 340.2 311.8"
+   enable-background="new 0 0 340.2 311.8"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="calliope.simplified.svg"><metadata
+     id="metadata945"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs943" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview941"
+     showgrid="false"
+     inkscape:zoom="3.0275819"
+     inkscape:cx="131.29885"
+     inkscape:cy="162.10198"
+     inkscape:window-x="-8"
+     inkscape:window-y="156"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><symbol
+     id="Mini_front"
+     viewBox="-122.3 -112.9 244.6 225.8"><g
+       id="g5"><use
+         xlink:href="#calliope_mini_backside"
+         width="298.9"
+         height="263.3"
+         id="XMLID_3_"
+         x="-150.5"
+         y="-131.7"
+         transform="matrix(0.8169 0 0 0.8169 0.6672 -5.3582)"
+         overflow="visible" /><g
+         id="holes_3_"><g
+           id="g9"><g
+             id="g11"><path
+               d="M-42.4-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S-41.3-78.2-42.4-78.2z M-42.4-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-41.4-80.9-41.9-81.4-42.4-81.4z"
+               id="path13"
+               fill="#EFDA48" /><path
+               d="M-42.4-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-41.4-80.9-41.9-81.4-42.4-81.4z"
+               id="path15" /></g><g
+             id="g17"><path
+               d="M-35.2-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S-34.1-78.2-35.2-78.2z        M-35.2-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-34.2-80.9-34.7-81.4-35.2-81.4z"
+               id="path19"
+               fill="#EFDA48" /><path
+               d="M-35.2-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-34.2-80.9-34.7-81.4-35.2-81.4z"
+               id="path21" /></g><g
+             id="g23"><path
+               d="M-28-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S-26.9-78.2-28-78.2z M-28-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-27-80.9-27.5-81.4-28-81.4z"
+               id="path25"
+               fill="#EFDA48" /><path
+               d="M-28-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-27-80.9-27.5-81.4-28-81.4z"
+               id="path27" /></g><g
+             id="g29"><path
+               d="M-20.9-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S-19.7-78.2-20.9-78.2z        M-20.9-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-19.8-80.9-20.3-81.4-20.9-81.4z"
+               id="path31"
+               fill="#EFDA48" /><path
+               d="M-20.9-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-19.8-80.9-20.3-81.4-20.9-81.4z"
+               id="path33" /></g><g
+             id="g35"><path
+               d="M-13.7-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S-12.5-78.2-13.7-78.2z M-13.7-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-80.9-13.1-81.4-13.7-81.4z"
+               id="path37"
+               fill="#EFDA48" /><path
+               d="M-13.7-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-80.9-13.1-81.4-13.7-81.4z"
+               id="path39" /></g><g
+             id="g41"><path
+               d="M-6.5-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S-5.3-78.2-6.5-78.2z M-6.5-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-80.9-5.9-81.4-6.5-81.4z"
+               id="path43"
+               fill="#EFDA48" /><path
+               d="M-6.5-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-80.9-5.9-81.4-6.5-81.4z"
+               id="path45" /></g><g
+             id="g47"><path
+               d="M0.7-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S1.9-78.2,0.7-78.2z M0.7-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-80.9,1.3-81.4,0.7-81.4z"
+               id="path49"
+               fill="#EFDA48" /><path
+               d="M0.7-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-80.9,1.3-81.4,0.7-81.4z"
+               id="path51" /></g><g
+             id="g53"><path
+               d="M7.9-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S9.1-78.2,7.9-78.2z M7.9-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-80.9,8.5-81.4,7.9-81.4z"
+               id="path55"
+               fill="#EFDA48" /><path
+               d="M7.9-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-80.9,8.5-81.4,7.9-81.4z"
+               id="path57" /></g><g
+             id="g59"><path
+               d="M15.1-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1s2.1,1,2.1,2.1S16.3-78.2,15.1-78.2z M15.1-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-80.9,15.7-81.4,15.1-81.4z"
+               id="path61"
+               fill="#EFDA48" /><path
+               d="M15.1-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-80.9,15.7-81.4,15.1-81.4z"
+               id="path63" /></g><g
+             id="g65"><path
+               d="M22.3-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S23.5-78.2,22.3-78.2z M22.3-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C23.3-80.9,22.9-81.4,22.3-81.4z"
+               id="path67"
+               fill="#EFDA48" /><path
+               d="M22.3-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C23.3-80.9,22.9-81.4,22.3-81.4z"
+               id="path69" /></g><g
+             id="g71"><path
+               d="M29.5-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S30.7-78.2,29.5-78.2z M29.5-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C30.5-80.9,30.1-81.4,29.5-81.4z"
+               id="path73"
+               fill="#EFDA48" /><path
+               d="M29.5-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C30.5-80.9,30.1-81.4,29.5-81.4z"
+               id="path75" /></g><g
+             id="g77"><path
+               d="M36.7-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S37.9-78.2,36.7-78.2z M36.7-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C37.7-80.9,37.3-81.4,36.7-81.4z"
+               id="path79"
+               fill="#EFDA48" /><path
+               d="M36.7-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C37.7-80.9,37.3-81.4,36.7-81.4z"
+               id="path81" /></g><g
+             id="g83"><path
+               d="M43.9-78.2c-1.2,0-2.1-1-2.1-2.1s1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1S45.1-78.2,43.9-78.2z M43.9-81.4       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C44.9-80.9,44.5-81.4,43.9-81.4z"
+               id="path85"
+               fill="#EFDA48" /><path
+               d="M43.9-81.4c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C44.9-80.9,44.5-81.4,43.9-81.4z"
+               id="path87" /></g></g><g
+           id="g89"><g
+             id="g91"><path
+               d="M-42.4-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C-40.3-71.9-41.3-71-42.4-71z        M-42.4-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-41.4-73.7-41.9-74.1-42.4-74.1z"
+               id="path93"
+               fill="#EFDA48" /><path
+               d="M-42.4-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-41.4-73.7-41.9-74.1-42.4-74.1z"
+               id="path95" /></g><g
+             id="g97"><path
+               d="M-35.2-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C-33.1-71.9-34.1-71-35.2-71z        M-35.2-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-34.2-73.7-34.7-74.1-35.2-74.1z"
+               id="path99"
+               fill="#EFDA48" /><path
+               d="M-35.2-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C-34.2-73.7-34.7-74.1-35.2-74.1z"
+               id="path101" /></g><g
+             id="g103"><path
+               d="M-28-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C-25.9-71.9-26.9-71-28-71z        M-28-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-27-73.7-27.5-74.1-28-74.1z"
+               id="path105"
+               fill="#EFDA48" /><path
+               d="M-28-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-27-73.7-27.5-74.1-28-74.1z"
+               id="path107" /></g><g
+             id="g109"><path
+               d="M-20.9-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C-18.7-71.9-19.7-71-20.9-71z        M-20.9-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-19.8-73.7-20.3-74.1-20.9-74.1z"
+               id="path111"
+               fill="#EFDA48" /><path
+               d="M-20.9-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-19.8-73.7-20.3-74.1-20.9-74.1z"
+               id="path113" /></g><g
+             id="g115"><path
+               d="M-13.7-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C-11.5-71.9-12.5-71-13.7-71z        M-13.7-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-73.7-13.1-74.1-13.7-74.1z"
+               id="path117"
+               fill="#EFDA48" /><path
+               d="M-13.7-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-73.7-13.1-74.1-13.7-74.1z"
+               id="path119" /></g><g
+             id="g121"><path
+               d="M-6.5-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C-4.3-71.9-5.3-71-6.5-71z M-6.5-74.1       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-73.7-5.9-74.1-6.5-74.1z"
+               id="path123"
+               fill="#EFDA48" /><path
+               d="M-6.5-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-73.7-5.9-74.1-6.5-74.1z"
+               id="path125" /></g><g
+             id="g127"><path
+               d="M0.7-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C2.9-71.9,1.9-71,0.7-71z M0.7-74.1       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-73.7,1.3-74.1,0.7-74.1z"
+               id="path129"
+               fill="#EFDA48" /><path
+               d="M0.7-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-73.7,1.3-74.1,0.7-74.1z"
+               id="path131" /></g><g
+             id="g133"><path
+               d="M7.9-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C10.1-71.9,9.1-71,7.9-71z M7.9-74.1       c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-73.7,8.5-74.1,7.9-74.1z"
+               id="path135"
+               fill="#EFDA48" /><path
+               d="M7.9-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-73.7,8.5-74.1,7.9-74.1z"
+               id="path137" /></g><g
+             id="g139"><path
+               d="M15.1-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C17.3-71.9,16.3-71,15.1-71z        M15.1-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-73.7,15.7-74.1,15.1-74.1z"
+               id="path141"
+               fill="#EFDA48" /><path
+               d="M15.1-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-73.7,15.7-74.1,15.1-74.1z"
+               id="path143" /></g><g
+             id="g145"><path
+               d="M22.3-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C24.5-71.9,23.5-71,22.3-71z        M22.3-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C23.3-73.7,22.9-74.1,22.3-74.1z"
+               id="path147"
+               fill="#EFDA48" /><path
+               d="M22.3-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C23.3-73.7,22.9-74.1,22.3-74.1z"
+               id="path149" /></g><g
+             id="g151"><path
+               d="M29.5-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C31.7-71.9,30.7-71,29.5-71z        M29.5-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C30.5-73.7,30.1-74.1,29.5-74.1z"
+               id="path153"
+               fill="#EFDA48" /><path
+               d="M29.5-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C30.5-73.7,30.1-74.1,29.5-74.1z"
+               id="path155" /></g><g
+             id="g157"><path
+               d="M36.7-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C38.9-71.9,37.9-71,36.7-71z        M36.7-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C37.7-73.7,37.3-74.1,36.7-74.1z"
+               id="path159"
+               fill="#EFDA48" /><path
+               d="M36.7-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C37.7-73.7,37.3-74.1,36.7-74.1z"
+               id="path161" /></g><g
+             id="g163"><path
+               d="M43.9-71c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1C46-71.9,45.1-71,43.9-71z        M43.9-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C44.9-73.7,44.5-74.1,43.9-74.1z"
+               id="path165"
+               fill="#EFDA48" /><path
+               d="M43.9-74.1c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C44.9-73.7,44.5-74.1,43.9-74.1z"
+               id="path167" /></g></g><g
+           id="g169"><g
+             id="g171"><path
+               d="M-13.7-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C-11.5-58.1-12.5-57.2-13.7-57.2z        M-13.7-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-59.9-13.1-60.3-13.7-60.3z"
+               id="path173"
+               fill="#EFDA48" /><path
+               d="M-13.7-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-12.6-59.9-13.1-60.3-13.7-60.3z"
+               id="path175" /></g><g
+             id="g177"><path
+               d="M-6.5-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C-4.3-58.1-5.3-57.2-6.5-57.2z        M-6.5-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-59.9-5.9-60.3-6.5-60.3z"
+               id="path179"
+               fill="#EFDA48" /><path
+               d="M-6.5-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C-5.4-59.9-5.9-60.3-6.5-60.3z"
+               id="path181" /></g><g
+             id="g183"><path
+               d="M0.7-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C2.9-58.1,1.9-57.2,0.7-57.2z        M0.7-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-59.9,1.3-60.3,0.7-60.3z"
+               id="path185"
+               fill="#EFDA48" /><path
+               d="M0.7-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C1.8-59.9,1.3-60.3,0.7-60.3z"
+               id="path187" /></g><g
+             id="g189"><path
+               d="M7.9-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C10.1-58.1,9.1-57.2,7.9-57.2z        M7.9-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-59.9,8.5-60.3,7.9-60.3z"
+               id="path191"
+               fill="#EFDA48" /><path
+               d="M7.9-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1s1-0.5,1-1C8.9-59.9,8.5-60.3,7.9-60.3z"
+               id="path193" /></g><g
+             id="g195"><path
+               d="M15.1-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C17.3-58.1,16.3-57.2,15.1-57.2z        M15.1-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-59.9,15.7-60.3,15.1-60.3z"
+               id="path197"
+               fill="#EFDA48" /><path
+               d="M15.1-60.3c-0.6,0-1,0.5-1,1c0,0.6,0.5,1,1,1c0.6,0,1-0.5,1-1C16.1-59.9,15.7-60.3,15.1-60.3z"
+               id="path199" /></g></g><g
+           id="g201"><g
+             id="g203"><polygon
+               points="80.6,17.6 77.6,20.5 80.6,23.5 83.5,20.5      "
+               id="polygon205"
+               fill="#EFDA48" /><path
+               d="M79.9,19.8c-0.4,0.4-0.4,1,0,1.4c0.4,0.4,1,0.4,1.4,0s0.4-1,0-1.4C80.9,19.4,80.3,19.4,79.9,19.8z"
+               id="path207" /></g><g
+             id="g209"><path
+               d="M86.3,18.1c-0.8,0.8-2.2,0.8-3,0c-0.8-0.8-0.8-2.2,0-3c0.8-0.8,2.2-0.8,3,0       C87.1,15.9,87.1,17.2,86.3,18.1z M84.1,15.8c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0s0.4-1,0-1.4S84.5,15.4,84.1,15.8z"
+               id="path211"
+               fill="#EFDA48" /><path
+               d="M84.1,15.8c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0s0.4-1,0-1.4S84.5,15.4,84.1,15.8z"
+               id="path213" /></g><g
+             id="g215"><path
+               d="M90.1,14.3c-0.8,0.8-2.2,0.8-3,0c-0.8-0.8-0.8-2.2,0-3s2.2-0.8,3,0C90.9,12.1,90.9,13.5,90.1,14.3z        M87.9,12.1c-0.4,0.4-0.4,1,0,1.4c0.4,0.4,1,0.4,1.4,0s0.4-1,0-1.4C88.9,11.7,88.3,11.7,87.9,12.1z"
+               id="path217"
+               fill="#EFDA48" /><path
+               d="M87.9,12.1c-0.4,0.4-0.4,1,0,1.4c0.4,0.4,1,0.4,1.4,0s0.4-1,0-1.4C88.9,11.7,88.3,11.7,87.9,12.1z"
+               id="path219" /></g><g
+             id="g221"><path
+               d="M94.4,10c-0.8,0.8-2.2,0.8-3,0c-0.8-0.8-0.8-2.2,0-3s2.2-0.8,3,0C95.3,7.8,95.3,9.2,94.4,10z M92.2,7.8       c-0.4,0.4-0.4,1,0,1.4c0.4,0.4,1,0.4,1.4,0s0.4-1,0-1.4C93.2,7.4,92.6,7.4,92.2,7.8z"
+               id="path223"
+               fill="#EFDA48" /><path
+               d="M92.2,7.8c-0.4,0.4-0.4,1,0,1.4c0.4,0.4,1,0.4,1.4,0s0.4-1,0-1.4C93.2,7.4,92.6,7.4,92.2,7.8z"
+               id="path225" /></g></g><g
+           id="g227"><g
+             id="g229"><polygon
+               points="-88,8.6 -91,5.7 -94,8.6 -91,11.6      "
+               id="polygon231"
+               fill="#EFDA48" /><path
+               d="M-90.3,8c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0C-89.9,9-89.9,8.3-90.3,8z"
+               id="path233" /></g><g
+             id="g235"><path
+               d="M-88.5,14.4c-0.8-0.8-0.8-2.2,0-3c0.8-0.8,2.2-0.8,3,0c0.8,0.8,0.8,2.2,0,3       C-86.3,15.2-87.7,15.2-88.5,14.4z M-86.3,12.2c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0       C-85.9,13.2-85.9,12.5-86.3,12.2z"
+               id="path237"
+               fill="#EFDA48" /><path
+               d="M-86.3,12.2c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0C-85.9,13.2-85.9,12.5-86.3,12.2z"
+               id="path239" /></g><g
+             id="g241"><path
+               d="M-84.8,18.2c-0.8-0.8-0.8-2.2,0-3c0.8-0.8,2.2-0.8,3,0c0.8,0.8,0.8,2.2,0,3C-82.6,19-84,19-84.8,18.2z        M-82.6,16c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0C-82.2,17-82.2,16.4-82.6,16z"
+               id="path243"
+               fill="#EFDA48" /><path
+               d="M-82.6,16c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0C-82.2,17-82.2,16.4-82.6,16z"
+               id="path245" /></g><g
+             id="g247"><path
+               d="M-80.5,22.5c-0.8-0.8-0.8-2.2,0-3c0.8-0.8,2.2-0.8,3,0c0.8,0.8,0.8,2.2,0,3       C-78.3,23.3-79.7,23.3-80.5,22.5z M-78.3,20.3c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0       C-77.9,21.3-77.9,20.7-78.3,20.3z"
+               id="path249"
+               fill="#EFDA48" /><path
+               d="M-78.3,20.3c-0.4-0.4-1-0.4-1.4,0c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0C-77.9,21.3-77.9,20.7-78.3,20.3z"
+               id="path251" /></g></g><g
+           id="g253"><path
+             d="M-107.8,8.6c-7.7,0-13.9-6.2-13.9-13.9s6.2-13.9,13.9-13.9s13.9,6.2,13.9,13.9S-100.1,8.6-107.8,8.6z       M-107.8-12c-3.7,0-6.6,3-6.6,6.6s3,6.6,6.6,6.6c3.7,0,6.6-3,6.6-6.6S-104.1-12-107.8-12z"
+             id="path255"
+             fill="#EFDA48" /><path
+             d="M54.8,102.3c-7.7,0-13.9-6.2-13.9-13.9s6.2-13.9,13.9-13.9s13.9,6.2,13.9,13.9S62.4,102.3,54.8,102.3z       M54.8,81.7c-3.7,0-6.6,3-6.6,6.6s3,6.6,6.6,6.6s6.6-3,6.6-6.6S58.4,81.7,54.8,81.7z"
+             id="path257"
+             fill="#EFDA48" /><path
+             d="M108.4,8.6c-7.7,0-13.9-6.2-13.9-13.9s6.2-13.9,13.9-13.9s13.9,6.2,13.9,13.9S116.1,8.6,108.4,8.6z       M108.4-12c-3.7,0-6.6,3-6.6,6.6s3,6.6,6.6,6.6s6.6-3,6.6-6.6S112-12,108.4-12z"
+             id="path259"
+             fill="#EFDA48" /><path
+             d="M54.8-84.2c-7.7,0-13.9-6.2-13.9-13.9S47.1-112,54.8-112s13.9,6.2,13.9,13.9S62.4-84.2,54.8-84.2z       M54.8-104.7c-3.7,0-6.6,3-6.6,6.6s3,6.6,6.6,6.6c3.7,0,6.6-3,6.6-6.6S58.4-104.7,54.8-104.7z"
+             id="path261"
+             fill="#EFDA48" /><path
+             d="M-53.1-85C-60.8-85-67-91.2-67-98.9s6.2-13.9,13.9-13.9s13.9,6.2,13.9,13.9S-45.4-85-53.1-85z       M-53.1-105.5c-3.7,0-6.6,3-6.6,6.6c0,3.7,3,6.6,6.6,6.6s6.6-3,6.6-6.6C-46.5-102.6-49.4-105.5-53.1-105.5z"
+             id="path263"
+             fill="#EFDA48" /><path
+             d="M-53.1,102.3c-7.7,0-13.9-6.2-13.9-13.9s6.2-13.9,13.9-13.9s13.9,6.2,13.9,13.9S-45.4,102.3-53.1,102.3z       M-53.1,81.7c-3.7,0-6.6,3-6.6,6.6s3,6.6,6.6,6.6c3.7,0,6.6-3,6.6-6.6S-49.4,81.7-53.1,81.7z"
+             id="path265"
+             fill="#EFDA48" /></g></g></g><g
+       id="g273"><g
+         id="g275"><polygon
+           points="-20.9,36.6 -23,36.6 -23,42 -20.9,42    "
+           id="polygon277"
+           fill="#FFFFFF" /><polygon
+           points="-9.9,36.6 -12.1,36.6 -12.1,42 -9.9,42    "
+           id="polygon279"
+           fill="#FFFFFF" /><polygon
+           points="1,36.6 -1.1,36.6 -1.1,42 1,42    "
+           id="polygon281"
+           fill="#FFFFFF" /><polygon
+           points="12,36.6 9.8,36.6 9.8,42 12,42    "
+           id="polygon283"
+           fill="#FFFFFF" /><polygon
+           points="22.9,36.6 20.8,36.6 20.8,42 22.9,42    "
+           id="polygon285"
+           fill="#FFFFFF" /></g><g
+         id="g287"><polygon
+           points="-20.9,25.9 -23,25.9 -23,31.3 -20.9,31.3    "
+           id="polygon289"
+           fill="#FFFFFF" /><polygon
+           points="-9.9,25.9 -12.1,25.9 -12.1,31.3 -9.9,31.3    "
+           id="polygon291"
+           fill="#FFFFFF" /><polygon
+           points="1,25.9 -1.1,25.9 -1.1,31.3 1,31.3    "
+           id="polygon293"
+           fill="#FFFFFF" /><polygon
+           points="12,25.9 9.8,25.9 9.8,31.3 12,31.3    "
+           id="polygon295"
+           fill="#FFFFFF" /><polygon
+           points="22.9,25.9 20.8,25.9 20.8,31.3 22.9,31.3    "
+           id="polygon297"
+           fill="#FFFFFF" /></g><g
+         id="g299"><polygon
+           points="-20.9,15.1 -23,15.1 -23,20.6 -20.9,20.6    "
+           id="polygon301"
+           fill="#FFFFFF" /><polygon
+           points="-9.9,15.1 -12.1,15.1 -12.1,20.6 -9.9,20.6    "
+           id="polygon303"
+           fill="#FFFFFF" /><polygon
+           points="1,15.1 -1.1,15.1 -1.1,20.6 1,20.6    "
+           id="polygon305"
+           fill="#FFFFFF" /><polygon
+           points="12,15.1 9.8,15.1 9.8,20.6 12,20.6    "
+           id="polygon307"
+           fill="#FFFFFF" /><polygon
+           points="22.9,15.1 20.8,15.1 20.8,20.6 22.9,20.6    "
+           id="polygon309"
+           fill="#FFFFFF" /></g><g
+         id="g311"><polygon
+           points="-20.9,4.4 -23,4.4 -23,9.9 -20.9,9.9    "
+           id="polygon313"
+           fill="#FFFFFF" /><polygon
+           points="-9.9,4.4 -12.1,4.4 -12.1,9.9 -9.9,9.9    "
+           id="polygon315"
+           fill="#FFFFFF" /><polygon
+           points="1,4.4 -1.1,4.4 -1.1,9.9 1,9.9    "
+           id="polygon317"
+           fill="#FFFFFF" /><polygon
+           points="12,4.4 9.8,4.4 9.8,9.9 12,9.9    "
+           id="polygon319"
+           fill="#FFFFFF" /><polygon
+           points="22.9,4.4 20.8,4.4 20.8,9.9 22.9,9.9    "
+           id="polygon321"
+           fill="#FFFFFF" /></g><g
+         id="g323"><polygon
+           points="-20.9,-6.3 -23,-6.3 -23,-0.9 -20.9,-0.9    "
+           id="polygon325"
+           fill="#FFFFFF" /><polygon
+           points="-9.9,-6.3 -12.1,-6.3 -12.1,-0.9 -9.9,-0.9    "
+           id="polygon327"
+           fill="#FFFFFF" /><polygon
+           points="1,-6.3 -1.1,-6.3 -1.1,-0.9 1,-0.9    "
+           id="polygon329"
+           fill="#FFFFFF" /><polygon
+           points="12,-6.3 9.8,-6.3 9.8,-0.9 12,-0.9    "
+           id="polygon331"
+           fill="#FFFFFF" /><polygon
+           points="22.9,-6.3 20.8,-6.3 20.8,-0.9 22.9,-0.9    "
+           id="polygon333"
+           fill="#FFFFFF" /></g></g><g
+       id="g335"><path
+         d="M-61.4,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-61.4,48.3-61.4,47.4z"
+         id="path337"
+         fill="#EFDA48" /><path
+         d="M-55.9,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-55.9,48.3-55.9,47.4z"
+         id="path339"
+         fill="#EFDA48" /><path
+         d="M-50.4,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-50.4,48.3-50.4,47.4z"
+         id="path341"
+         fill="#EFDA48" /><path
+         d="M-45,47.4c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6C-45.7,49.1-45,48.3-45,47.4z"
+         id="path343"
+         fill="#EFDA48" /><path
+         d="M-39.5,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-39.5,48.3-39.5,47.4z"
+         id="path345"
+         fill="#EFDA48" /><path
+         d="M-34.1,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-34.1,48.3-34.1,47.4z"
+         id="path347"
+         fill="#EFDA48" /></g><g
+       id="g349"><path
+         d="M-39.5,76.6c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-39.5,77.5-39.5,76.6z"
+         id="path351"
+         fill="#EFDA48" /><path
+         d="M-34.1,76.6c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-34.1,77.5-34.1,76.6z"
+         id="path353"
+         fill="#EFDA48" /><path
+         d="M-28.6,76.6c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-28.6,77.5-28.6,76.6z"
+         id="path355"
+         fill="#EFDA48" /><path
+         d="M-23.1,76.6c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-23.1,77.5-23.1,76.6z"
+         id="path357"
+         fill="#EFDA48" /><path
+         d="M-17.7,76.6c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-17.7,77.5-17.7,76.6z"
+         id="path359"
+         fill="#EFDA48" /><path
+         d="M-17.7,68.3c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6S-17.7,69.1-17.7,68.3z"
+         id="path361"
+         fill="#EFDA48" /></g><g
+       id="g363"><path
+         d="M-0.1,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S-0.1,48.3-0.1,47.4z"
+         id="path365"
+         fill="#EFDA48" /><path
+         d="M5.4,47.4c0-0.9-0.7-1.6-1.6-1.6s-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6S5.4,48.3,5.4,47.4z"
+         id="path367"
+         fill="#EFDA48" /></g><path
+       d="M8.8,66.6H-8.8c-0.7,0-1.2,0.5-1.2,1.2v13.5c0,0.7,0.5,1.2,1.2,1.2H8.8c0.7,0,1.2-0.5,1.2-1.2V67.8   C10,67.2,9.4,66.6,8.8,66.6z"
+       id="path369"
+       fill="#BDD1CF" /><g
+       id="g371"><g
+         id="g373"><polygon
+           points="-59.9,36.6 -62,36.6 -62,42 -59.9,42    "
+           id="polygon375"
+           fill="#FFFFFF" /><polygon
+           points="-48.2,36.6 -50.3,36.6 -50.3,42 -48.2,42    "
+           id="polygon377"
+           fill="#FFFFFF" /><polygon
+           points="-59.9,16 -62,16 -62,21.5 -59.9,21.5    "
+           id="polygon379"
+           fill="#FFFFFF" /><polygon
+           points="-48.2,16 -50.3,16 -50.3,21.5 -48.2,21.5    "
+           id="polygon381"
+           fill="#FFFFFF" /></g><path
+         d="M-48.3,21.4h-13.6c-0.6,0-1.1,0.5-1.1,1.1v13.7c0,0.6,0.5,1.1,1.1,1.1h13.6c0.6,0,1.1-0.5,1.1-1.1V22.4    C-47.2,21.8-47.7,21.4-48.3,21.4z"
+         id="path383"
+         fill="#BDD1CF" /><path
+         d="M-50.2,29.3c0-2.7-2.2-4.9-4.9-4.9c-2.7,0-4.9,2.2-4.9,4.9s2.2,4.9,4.9,4.9C-52.4,34.2-50.2,32-50.2,29.3z    "
+         id="path385"
+         fill="#476975" /><path
+         d="M-59.3,35.2c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6C-60,36.8-59.3,36.1-59.3,35.2z"
+         id="path387" /><path
+         d="M-47.6,35.2c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6C-48.4,36.8-47.6,36.1-47.6,35.2z"
+         id="path389" /><path
+         d="M-59.3,23.6c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6C-60,25.2-59.3,24.5-59.3,23.6z"
+         id="path391" /><path
+         d="M-47.6,23.6c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6C-48.4,25.2-47.6,24.5-47.6,23.6z"
+         id="path393" /></g><g
+       id="g395"><path
+         d="M68.7-61.4h-17c-0.8,0-1.5,0.7-1.5,1.5V-39c0,0.8,0.7,1.5,1.5,1.5h17c0.8,0,1.5-0.7,1.5-1.5v-20.9    C70.2-60.7,69.5-61.4,68.7-61.4z"
+         id="path397"
+         fill="#FFFFFF" /><polygon
+         points="54.4,-40.8 44,-40.8 44,-37.5 54.4,-37.5   "
+         id="polygon399"
+         fill="#FFFFFF" /><polygon
+         points="54.4,-61.4 44,-61.4 44,-58 54.4,-58   "
+         id="polygon401"
+         fill="#FFFFFF" /></g><path
+       d="M76.6-2.2c-9.9,0-17.9-8-17.9-17.9S66.7-38,76.6-38s17.9,8,17.9,17.9S86.5-2.2,76.6-2.2z"
+       id="path403" /><g
+       id="g405"><path
+         d="M39.1-57.2c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1C41.3-58.1,40.3-57.2,39.1-57.2z"
+         id="path407"
+         fill="#EFDA48" /></g><g
+       id="g409"><g
+         id="g411"><polygon
+           points="51.6,36.6 49.5,36.6 49.5,42 51.6,42    "
+           id="polygon413"
+           fill="#FFFFFF" /><polygon
+           points="63.3,36.6 61.1,36.6 61.1,42 63.3,42    "
+           id="polygon415"
+           fill="#FFFFFF" /><polygon
+           points="51.6,16 49.5,16 49.5,21.5 51.6,21.5    "
+           id="polygon417"
+           fill="#FFFFFF" /><polygon
+           points="63.3,16 61.1,16 61.1,21.5 63.3,21.5    "
+           id="polygon419"
+           fill="#FFFFFF" /></g><path
+         d="M63.2,21.4H49.6c-0.6,0-1.1,0.5-1.1,1.1v13.7c0,0.6,0.5,1.1,1.1,1.1h13.6c0.6,0,1.1-0.5,1.1-1.1V22.4    C64.3,21.8,63.8,21.4,63.2,21.4z"
+         id="path421"
+         fill="#BDD1CF" /><path
+         d="M61.3,29.3c0-2.7-2.2-4.9-4.9-4.9c-2.7,0-4.9,2.2-4.9,4.9s2.2,4.9,4.9,4.9C59.1,34.2,61.3,32,61.3,29.3z"
+         id="path423"
+         fill="#476975" /><path
+         d="M52.2,35.2c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6C51.5,36.8,52.2,36.1,52.2,35.2z"
+         id="path425" /><path
+         d="M63.8,35.2c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6c0,0.9,0.7,1.6,1.6,1.6C63.1,36.8,63.8,36.1,63.8,35.2z"
+         id="path427" /><path
+         d="M52.2,23.6c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6C51.5,25.2,52.2,24.5,52.2,23.6z"
+         id="path429" /><path
+         d="M63.8,23.6c0-0.9-0.7-1.6-1.6-1.6c-0.9,0-1.6,0.7-1.6,1.6s0.7,1.6,1.6,1.6C63.1,25.2,63.8,24.5,63.8,23.6z"
+         id="path431" /></g><g
+       id="g433"><path
+         d="M37.3,60H23.7c-0.6,0-1.1,0.5-1.1,1.1v13.7c0,0.6,0.5,1.1,1.1,1.1h13.6c0.6,0,1.1-0.5,1.1-1.1V61.1    C38.4,60.5,37.9,60,37.3,60z"
+         id="path435"
+         fill="#BDD1CF" /><path
+         d="M35.5,68c0-2.7-2.2-4.9-4.9-4.9s-4.9,2.2-4.9,4.9s2.2,4.9,4.9,4.9S35.5,70.7,35.5,68z"
+         id="path437"
+         fill="#476975" /></g><polygon
+       points="37.1,-46 25.4,-46 25.4,-25 37.1,-25  "
+       id="polygon439"
+       fill="#F9B233" /><polygon
+       points="-31.8,-47.4 -43.7,-35.5 -31.8,-23.6 -19.9,-35.5  "
+       id="polygon441" /><polygon
+       points="-3.6,-52.5 -3.6,-46.4 2.5,-46.4 2.5,-52.5  "
+       id="polygon443" /><g
+       id="g445"><polygon
+         points="5.3,-35.5 -5.5,-35.5 -5.5,-25 5.3,-25   "
+         id="polygon447"
+         fill="#FFFFFF" /><path
+         d="M4-30.2c0-2.3-1.8-4.1-4.1-4.1s-4.1,1.8-4.1,4.1s1.8,4.1,4.1,4.1S4-28,4-30.2z"
+         id="path449"
+         fill="#BDD1CF" /></g><polygon
+       points="-36.8,-54.6 -43.6,-59 -47.5,-52.9 -40.7,-48.5  "
+       id="polygon451"
+       fill="#FFFFFF" /></symbol><symbol
+     id="calliope_mini_backside"
+     viewBox="-150.5 -131.7 298.9 263.3"><path
+       d="M-77.1,127.5L-77.1,127.5c6.2,4.6,14.6,4.8,20.9,0.5c12.5-8.4,34.7-21,56-21c23.2,0,45.7,13.5,56.4,21   c4.3,3,9.8,3.8,14.7,2l0.6-0.2c7.3-2.6,11.8-9.8,11-17.4c-1.7-15.4-3-41.9,13-62.9c16.8-21.9,31.7-31.2,42.3-34.8   c5.9-2,9.9-7.4,10.4-13.6v0c0.5-8-5.1-13.6-12.3-17c-12-5.7-30.8-15.7-42.8-36.2C78.7-77,80.1-103.4,81.7-114.8   c0.7-5.1-1.6-10.1-5.9-12.8c-4.8-3-11.9-4.6-21.4,1.5c-5.5,3.6-12,8.6-20.8,12c-10.8,4.1-16.9,5.5-20.3,5.8c-2.4,0.2-4.4,1.8-5.2,4   c-1.1,2.9-3.4,6.2-8.2,6.2c-5,0-7.2-3.6-8.2-6.6c-0.8-2.5-3.3-3.4-5.9-3.7c-4.9-0.4-12.5-2.4-20.5-6.1c-7.1-3.3-14-7.9-20.4-12.7   c-5.5-4.1-15-5.5-20.4-1.3l0,0c-5.7,4.4-7.4,11.7-6.5,18.8c1.9,15.3,1.1,43.3-16.7,64.2c-17.6,20.8-28.2,26.2-37.2,29.2   c-3.9,1.3-11.4,5.4-12.3,14.1s3,14.5,10.9,18.4c12.3,6.1,30.5,17.2,42.1,34.1c15.1,22,15.1,48.1,13.1,61.7   C-82.8,117.7-81.7,124.1-77.1,127.5z"
+       id="path454"
+       fill="#034854" /><g
+       id="holes_9_"><g
+         display="none"
+         id="g457"><g
+           display="inline"
+           id="g459"><path
+             d="M-53.5-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-52-89.3-53.5-89.3z M-53.5-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-52.2-92.6-52.8-93.1-53.5-93.1z"
+             id="path461"
+             fill="#EFDA48" /><path
+             d="M-53.5-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-52.2-92.6-52.8-93.1-53.5-93.1z"
+             id="path463" /></g><g
+           display="inline"
+           id="g465"><path
+             d="M-44.7-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-43.2-89.3-44.7-89.3z M-44.7-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-43.4-92.6-44-93.1-44.7-93.1z"
+             id="path467"
+             fill="#EFDA48" /><path
+             d="M-44.7-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-43.4-92.6-44-93.1-44.7-93.1z"
+             id="path469" /></g><g
+           display="inline"
+           id="g471"><path
+             d="M-35.9-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-34.4-89.3-35.9-89.3z M-35.9-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-34.6-92.6-35.2-93.1-35.9-93.1z"
+             id="path473"
+             fill="#EFDA48" /><path
+             d="M-35.9-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-34.6-92.6-35.2-93.1-35.9-93.1z"
+             id="path475" /></g><g
+           display="inline"
+           id="g477"><path
+             d="M-27-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S-25.6-89.3-27-89.3z M-27-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-25.8-92.6-26.4-93.1-27-93.1z"
+             id="path479"
+             fill="#EFDA48" /><path
+             d="M-27-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-25.8-92.6-26.4-93.1-27-93.1z"
+             id="path481" /></g><g
+           display="inline"
+           id="g483"><path
+             d="M-18.2-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S-16.8-89.3-18.2-89.3z       M-18.2-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-17-92.6-17.6-93.1-18.2-93.1z"
+             id="path485"
+             fill="#EFDA48" /><path
+             d="M-18.2-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C-17-92.6-17.6-93.1-18.2-93.1z"
+             id="path487" /></g><g
+           display="inline"
+           id="g489"><path
+             d="M-9.4-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-8-89.3-9.4-89.3z M-9.4-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C-8.2-92.6-8.7-93.1-9.4-93.1z"
+             id="path491"
+             fill="#EFDA48" /><path
+             d="M-9.4-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C-8.2-92.6-8.7-93.1-9.4-93.1z"
+             id="path493" /></g><g
+           display="inline"
+           id="g495"><path
+             d="M-0.6-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6S2-93.3,2-91.9S0.8-89.3-0.6-89.3z M-0.6-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C0.6-92.6,0.1-93.1-0.6-93.1z"
+             id="path497"
+             fill="#EFDA48" /><path
+             d="M-0.6-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C0.6-92.6,0.1-93.1-0.6-93.1z"
+             id="path499" /></g><g
+           display="inline"
+           id="g501"><path
+             d="M8.2-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S9.6-89.3,8.2-89.3z M8.2-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C9.4-92.6,8.9-93.1,8.2-93.1z"
+             id="path503"
+             fill="#EFDA48" /><path
+             d="M8.2-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C9.4-92.6,8.9-93.1,8.2-93.1z"
+             id="path505" /></g><g
+           display="inline"
+           id="g507"><path
+             d="M17-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S18.4-89.3,17-89.3z M17-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C18.2-92.6,17.7-93.1,17-93.1z"
+             id="path509"
+             fill="#EFDA48" /><path
+             d="M17-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C18.2-92.6,17.7-93.1,17-93.1z"
+             id="path511" /></g><g
+           display="inline"
+           id="g513"><path
+             d="M25.8-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S27.2-89.3,25.8-89.3z       M25.8-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C27-92.6,26.5-93.1,25.8-93.1z"
+             id="path515"
+             fill="#EFDA48" /><path
+             d="M25.8-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C27-92.6,26.5-93.1,25.8-93.1z"
+             id="path517" /></g><g
+           display="inline"
+           id="g519"><path
+             d="M34.6-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S36.1-89.3,34.6-89.3z M34.6-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C35.9-92.6,35.3-93.1,34.6-93.1z"
+             id="path521"
+             fill="#EFDA48" /><path
+             d="M34.6-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C35.9-92.6,35.3-93.1,34.6-93.1z"
+             id="path523" /></g><g
+           display="inline"
+           id="g525"><path
+             d="M43.4-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S44.9-89.3,43.4-89.3z M43.4-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C44.7-92.6,44.1-93.1,43.4-93.1z"
+             id="path527"
+             fill="#EFDA48" /><path
+             d="M43.4-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2C44.7-92.6,44.1-93.1,43.4-93.1z"
+             id="path529" /></g><g
+           display="inline"
+           id="g531"><path
+             d="M52.2-89.3c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S53.7-89.3,52.2-89.3z M52.2-93.1      c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C53.5-92.6,52.9-93.1,52.2-93.1z"
+             id="path533"
+             fill="#EFDA48" /><path
+             d="M52.2-93.1c-0.7,0-1.2,0.6-1.2,1.2c0,0.7,0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2C53.5-92.6,52.9-93.1,52.2-93.1z"
+             id="path535" /></g></g><g
+         display="none"
+         id="g537"><g
+           display="inline"
+           id="g539"><path
+             d="M-53.5-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-52-80.4-53.5-80.4z M-53.5-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-52.8-84.3-53.5-84.3z"
+             id="path541"
+             fill="#EFDA48" /><path
+             d="M-53.5-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-52.8-84.3-53.5-84.3z"
+             id="path543" /></g><g
+           display="inline"
+           id="g545"><path
+             d="M-44.7-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-43.2-80.4-44.7-80.4z M-44.7-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-44-84.3-44.7-84.3z"
+             id="path547"
+             fill="#EFDA48" /><path
+             d="M-44.7-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-44-84.3-44.7-84.3z"
+             id="path549" /></g><g
+           display="inline"
+           id="g551"><path
+             d="M-35.9-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-34.4-80.4-35.9-80.4z M-35.9-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-35.2-84.3-35.9-84.3z"
+             id="path553"
+             fill="#EFDA48" /><path
+             d="M-35.9-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-35.2-84.3-35.9-84.3z"
+             id="path555" /></g><g
+           display="inline"
+           id="g557"><path
+             d="M-27-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S-25.6-80.4-27-80.4z M-27-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-26.4-84.3-27-84.3z"
+             id="path559"
+             fill="#EFDA48" /><path
+             d="M-27-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-26.4-84.3-27-84.3z"
+             id="path561" /></g><g
+           display="inline"
+           id="g563"><path
+             d="M-18.2-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S-16.8-80.4-18.2-80.4z       M-18.2-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-17.6-84.3-18.2-84.3z"
+             id="path565"
+             fill="#EFDA48" /><path
+             d="M-18.2-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-17.6-84.3-18.2-84.3z"
+             id="path567" /></g><g
+           display="inline"
+           id="g569"><path
+             d="M-9.4-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-8-80.4-9.4-80.4z M-9.4-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S-8.7-84.3-9.4-84.3z"
+             id="path571"
+             fill="#EFDA48" /><path
+             d="M-9.4-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S-8.7-84.3-9.4-84.3z"
+             id="path573" /></g><g
+           display="inline"
+           id="g575"><path
+             d="M-0.6-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6S2-84.5,2-83.1S0.8-80.4-0.6-80.4z M-0.6-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S0.1-84.3-0.6-84.3z"
+             id="path577"
+             fill="#EFDA48" /><path
+             d="M-0.6-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S0.1-84.3-0.6-84.3z"
+             id="path579" /></g><g
+           display="inline"
+           id="g581"><path
+             d="M8.2-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S9.6-80.4,8.2-80.4z M8.2-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S8.9-84.3,8.2-84.3z"
+             id="path583"
+             fill="#EFDA48" /><path
+             d="M8.2-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S8.9-84.3,8.2-84.3z"
+             id="path585" /></g><g
+           display="inline"
+           id="g587"><path
+             d="M17-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S18.4-80.4,17-80.4z M17-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S17.7-84.3,17-84.3z"
+             id="path589"
+             fill="#EFDA48" /><path
+             d="M17-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S17.7-84.3,17-84.3z"
+             id="path591" /></g><g
+           display="inline"
+           id="g593"><path
+             d="M25.8-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S27.2-80.4,25.8-80.4z       M25.8-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S26.5-84.3,25.8-84.3z"
+             id="path595"
+             fill="#EFDA48" /><path
+             d="M25.8-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S26.5-84.3,25.8-84.3z"
+             id="path597" /></g><g
+           display="inline"
+           id="g599"><path
+             d="M34.6-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S36.1-80.4,34.6-80.4z M34.6-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S35.3-84.3,34.6-84.3z"
+             id="path601"
+             fill="#EFDA48" /><path
+             d="M34.6-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S35.3-84.3,34.6-84.3z"
+             id="path603" /></g><g
+           display="inline"
+           id="g605"><path
+             d="M43.4-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S44.9-80.4,43.4-80.4z M43.4-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S44.1-84.3,43.4-84.3z"
+             id="path607"
+             fill="#EFDA48" /><path
+             d="M43.4-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S44.1-84.3,43.4-84.3z"
+             id="path609" /></g><g
+           display="inline"
+           id="g611"><path
+             d="M52.2-80.4c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S53.7-80.4,52.2-80.4z M52.2-84.3      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S52.9-84.3,52.2-84.3z"
+             id="path613"
+             fill="#EFDA48" /><path
+             d="M52.2-84.3c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S52.9-84.3,52.2-84.3z"
+             id="path615" /></g></g><g
+         display="none"
+         id="g617"><g
+           display="inline"
+           id="g619"><path
+             d="M-18.2-63.5c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6c1.4,0,2.6,1.2,2.6,2.6S-16.8-63.5-18.2-63.5z       M-18.2-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-17.6-67.4-18.2-67.4z"
+             id="path621"
+             fill="#EFDA48" /><path
+             d="M-18.2-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S-17.6-67.4-18.2-67.4z"
+             id="path623" /></g><g
+           display="inline"
+           id="g625"><path
+             d="M-9.4-63.5c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S-8-63.5-9.4-63.5z M-9.4-67.4      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S-8.7-67.4-9.4-67.4z"
+             id="path627"
+             fill="#EFDA48" /><path
+             d="M-9.4-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S-8.7-67.4-9.4-67.4z"
+             id="path629" /></g><g
+           display="inline"
+           id="g631"><path
+             d="M-0.6-63.5c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6S2-67.6,2-66.1S0.8-63.5-0.6-63.5z M-0.6-67.4      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S0.1-67.4-0.6-67.4z"
+             id="path633"
+             fill="#EFDA48" /><path
+             d="M-0.6-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S0.1-67.4-0.6-67.4z"
+             id="path635" /></g><g
+           display="inline"
+           id="g637"><path
+             d="M8.2-63.5c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S9.6-63.5,8.2-63.5z M8.2-67.4      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S8.9-67.4,8.2-67.4z"
+             id="path639"
+             fill="#EFDA48" /><path
+             d="M8.2-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2s1.2-0.6,1.2-1.2S8.9-67.4,8.2-67.4z"
+             id="path641" /></g><g
+           display="inline"
+           id="g643"><path
+             d="M17-63.5c-1.4,0-2.6-1.2-2.6-2.6s1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6S18.4-63.5,17-63.5z M17-67.4      c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S17.7-67.4,17-67.4z"
+             id="path645"
+             fill="#EFDA48" /><path
+             d="M17-67.4c-0.7,0-1.2,0.6-1.2,1.2s0.6,1.2,1.2,1.2c0.7,0,1.2-0.6,1.2-1.2S17.7-67.4,17-67.4z"
+             id="path647" /></g></g><g
+         display="none"
+         id="g649"><g
+           display="inline"
+           id="g651"><polygon
+             points="97.1,28 93.5,31.6 97.1,35.2 100.7,31.6     "
+             id="polygon653"
+             fill="#EFDA48" /><path
+             d="M96.2,30.8c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C97.5,30.3,96.7,30.3,96.2,30.8z"
+             id="path655" /></g><g
+           display="inline"
+           id="g657"><path
+             d="M104.1,28.6c-1,1-2.7,1-3.7,0s-1-2.7,0-3.7c1-1,2.7-1,3.7,0S105.1,27.5,104.1,28.6z M101.4,25.8      c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C102.7,25.3,101.9,25.3,101.4,25.8z"
+             id="path659"
+             fill="#EFDA48" /><path
+             d="M101.4,25.8c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C102.7,25.3,101.9,25.3,101.4,25.8z"
+             id="path661" /></g><g
+           display="inline"
+           id="g663"><path
+             d="M108.8,24c-1,1-2.7,1-3.7,0s-1-2.7,0-3.7c1-1,2.7-1,3.7,0S109.8,23,108.8,24z M106,21.3      c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C107.3,20.8,106.5,20.8,106,21.3z"
+             id="path665"
+             fill="#EFDA48" /><path
+             d="M106,21.3c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C107.3,20.8,106.5,20.8,106,21.3z"
+             id="path667" /></g><g
+           display="inline"
+           id="g669"><path
+             d="M114.1,18.7c-1,1-2.7,1-3.7,0s-1-2.7,0-3.7s2.7-1,3.7,0S115.1,17.7,114.1,18.7z M111.3,16      c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C112.6,15.5,111.8,15.5,111.3,16z"
+             id="path671"
+             fill="#EFDA48" /><path
+             d="M111.3,16c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0c0.5-0.5,0.5-1.3,0-1.8C112.6,15.5,111.8,15.5,111.3,16z"
+             id="path673" /></g></g><g
+         display="none"
+         id="g675"><g
+           display="inline"
+           id="g677"><polygon
+             points="-109.3,17 -112.9,13.4 -116.6,17 -112.9,20.7     "
+             id="polygon679"
+             fill="#EFDA48" /><path
+             d="M-112.1,16.2c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0C-111.6,17.5-111.6,16.7-112.1,16.2z      "
+             id="path681" /></g><g
+           display="inline"
+           id="g683"><path
+             d="M-109.9,24.1c-1-1-1-2.7,0-3.7c1-1,2.7-1,3.7,0s1,2.7,0,3.7S-108.9,25.1-109.9,24.1z M-107.2,21.3      c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0C-106.7,22.6-106.7,21.8-107.2,21.3z"
+             id="path685"
+             fill="#EFDA48" /><path
+             d="M-107.2,21.3c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0C-106.7,22.6-106.7,21.8-107.2,21.3z      "
+             id="path687" /></g><g
+           display="inline"
+           id="g689"><path
+             d="M-105.3,28.7c-1-1-1-2.7,0-3.7s2.7-1,3.7,0s1,2.7,0,3.7S-104.3,29.8-105.3,28.7z M-102.6,26      c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0C-102.1,27.3-102.1,26.5-102.6,26z"
+             id="path691"
+             fill="#EFDA48" /><path
+             d="M-102.6,26c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8c0.5,0.5,1.3,0.5,1.8,0C-102.1,27.3-102.1,26.5-102.6,26z"
+             id="path693" /></g><g
+           display="inline"
+           id="g695"><path
+             d="M-100.1,34c-1-1-1-2.7,0-3.7c1-1,2.7-1,3.7,0c1,1,1,2.7,0,3.7S-99,35-100.1,34z M-97.3,31.3      c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8s1.3,0.5,1.8,0C-96.8,32.6-96.8,31.8-97.3,31.3z"
+             id="path697"
+             fill="#EFDA48" /><path
+             d="M-97.3,31.3c-0.5-0.5-1.3-0.5-1.8,0c-0.5,0.5-0.5,1.3,0,1.8s1.3,0.5,1.8,0C-96.8,32.6-96.8,31.8-97.3,31.3z"
+             id="path699" /></g></g><g
+         id="g701"><path
+           d="M-133.5,17c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S-124.1,17-133.5,17z      M-133.5-8.2c-4.5,0-8.1,3.6-8.1,8.1S-138,8-133.5,8s8.1-3.6,8.1-8.1S-129-8.2-133.5-8.2z"
+           id="path703"
+           fill="#EFDA48" /><path
+           d="M65.5,131.7c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S74.9,131.7,65.5,131.7z      M65.5,106.5c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1C73.6,110.1,70,106.5,65.5,106.5z"
+           id="path705"
+           fill="#EFDA48" /><path
+           d="M131.2,17c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S140.6,17,131.2,17z      M131.2-8.2c-4.5,0-8.1,3.6-8.1,8.1s3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1S135.6-8.2,131.2-8.2z"
+           id="path707"
+           fill="#EFDA48" /><path
+           d="M65.5-96.6c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S74.9-96.6,65.5-96.6z      M65.5-121.7c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1C73.6-118.1,70-121.7,65.5-121.7z"
+           id="path709"
+           fill="#EFDA48" /><path
+           d="M-66.5-97.6c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S-57.1-97.6-66.5-97.6z      M-66.5-122.7c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1c4.5,0,8.1-3.6,8.1-8.1C-58.4-119.1-62-122.7-66.5-122.7z"
+           id="path711"
+           fill="#EFDA48" /><path
+           d="M-66.5,131.7c-9.4,0-17.1-7.6-17.1-17.1s7.6-17.1,17.1-17.1s17.1,7.6,17.1,17.1S-57.1,131.7-66.5,131.7z      M-66.5,106.5c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1C-58.4,110.1-62,106.5-66.5,106.5z"
+           id="path713"
+           fill="#EFDA48" /></g></g><path
+       d="M131.2-8.2c-4.5,0-8.1,3.6-8.1,8.1s3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1S135.6-8.2,131.2-8.2z"
+       id="path715"
+       fill="#FFFFFF" /><path
+       d="M65.5,106.5c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1C73.6,110.1,70,106.5,65.5,106.5   z"
+       id="path717"
+       fill="#FFFFFF" /><path
+       d="M-66.5,106.5c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1c4.5,0,8.1-3.6,8.1-8.1   C-58.4,110.1-62,106.5-66.5,106.5z"
+       id="path719"
+       fill="#FFFFFF" /><path
+       d="M-133.5-8.1c-4.5,0-8.1,3.6-8.1,8.1s3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1S-129-8.1-133.5-8.1z"
+       id="path721"
+       fill="#FFFFFF" /><path
+       d="M-66.5-122.7c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1c4.5,0,8.1-3.6,8.1-8.1   C-58.4-119.1-62-122.7-66.5-122.7z"
+       id="path723"
+       fill="#FFFFFF" /><path
+       d="M65.5-121.7c-4.5,0-8.1,3.6-8.1,8.1c0,4.5,3.6,8.1,8.1,8.1s8.1-3.6,8.1-8.1C73.6-118.1,70-121.7,65.5-121.7   z"
+       id="path725"
+       fill="#FFFFFF" /></symbol><g
+     id="Ebene_2"
+     display="none"><image
+       display="inline"
+       overflow="visible"
+       width="1024"
+       height="898"
+       xlink:href="file:///C:/Users/jhalleux/AppData/Local/Microsoft/Windows/INetCache/Content.Outlook/POK9Z6FJ/../../1607_Juli/Calliope/mini_mit_logo_1024.png"
+       transform="matrix(0.3025 0 0 0.3025 17.8521 265.1405)"
+       id="image728"
+       sodipodi:absref="C:\Users\jhalleux\AppData\Local\Microsoft\Windows\INetCache\Content.Outlook\POK9Z6FJ\..\..\1607_Juli\Calliope\mini_mit_logo_1024.png" /></g><g
+     id="Ebene_1" /><g
+     id="Ebene_3" /><g
+     id="Ebene_4" /><use
+     style="overflow:visible"
+     overflow="visible"
+     transform="matrix(1.3709867,0,0,-1.3709867,170.13972,147.46239)"
+     y="-112.9"
+     x="-122.3"
+     id="XMLID_11_"
+     height="225.8"
+     width="244.60001"
+     xlink:href="#Mini_front" /><g
+     id="Ebene_7"
+     display="none"><polygon
+       display="inline"
+       points="717.6,154.6 604.5,154.6 604.5,54.2 589.7,54.2 589.7,154.6 476.6,154.6    476.6,169.4 589.7,169.4 589.7,221.4 604.5,221.4 604.5,169.4 717.6,169.4  "
+       id="polygon928"
+       fill="#E6007E" /><polygon
+       display="inline"
+       points="1145.9,152.4 1032.8,152.4 1032.8,52 1018,52 1018,152.4 904.9,152.4    904.9,167.2 1018,167.2 1018,219.2 1032.8,219.2 1032.8,167.2 1145.9,167.2  "
+       id="polygon930"
+       fill="#E6007E" /><polygon
+       display="inline"
+       points="1986.9,163.6 1873.8,163.6 1873.8,63.2 1859.1,63.2 1859.1,163.6 1746,163.6    1746,178.4 1859.1,178.4 1859.1,230.5 1873.8,230.5 1873.8,178.4 1986.9,178.4  "
+       id="polygon932"
+       fill="#E6007E" /><polygon
+       display="inline"
+       points="2403,163.6 2289.9,163.6 2289.9,63.2 2275.1,63.2 2275.1,163.6 2162,163.6    2162,178.4 2275.1,178.4 2275.1,230.5 2289.9,230.5 2289.9,178.4 2403,178.4  "
+       id="polygon934"
+       fill="#E6007E" /></g><g
+     id="Ebene_6"
+     display="none"><rect
+       x="1859.1"
+       y="432.2"
+       display="inline"
+       width="14.8"
+       height="167.2"
+       id="rect937"
+       fill="#E6007E" /><rect
+       x="1746"
+       y="532.6"
+       display="inline"
+       width="240.9"
+       height="14.8"
+       id="rect939"
+       fill="#E6007E" /></g></svg>
--- a/docs/static/calliope.svg
+++ b/docs/static/calliope.svg
--- a/docs/static/configurations/chrome-version.png
+++ b/docs/static/configurations/chrome-version.png
--- a/docs/static/configurations/edge-version.png
+++ b/docs/static/configurations/edge-version.png
--- a/docs/static/configurations/firefox-version.png
+++ b/docs/static/configurations/firefox-version.png
--- a/docs/static/configurations/ie-version.png
+++ b/docs/static/configurations/ie-version.png
--- a/docs/static/configurations/osx-version.png
+++ b/docs/static/configurations/osx-version.png
--- a/docs/static/configurations/safari-version.png
+++ b/docs/static/configurations/safari-version.png
--- a/docs/static/configurations/windows-version.png
+++ b/docs/static/configurations/windows-version.png
--- a/docs/static/embed/blogger.png
+++ b/docs/static/embed/blogger.png
--- a/docs/static/embed/embed-info.png
+++ b/docs/static/embed/embed-info.png
--- a/docs/static/embed/project-page.png
+++ b/docs/static/embed/project-page.png
--- a/docs/static/embed/publish.png
+++ b/docs/static/embed/publish.png
--- a/docs/static/embed/squarespace-code.png
+++ b/docs/static/embed/squarespace-code.png
--- a/docs/static/embed/squarespace-insert.png
+++ b/docs/static/embed/squarespace-insert.png
--- a/docs/static/mb/device/pano.jpg
+++ b/docs/static/mb/device/pano.jpg
--- a/docs/static/mb/device/pins-0.png
+++ b/docs/static/mb/device/pins-0.png
--- a/docs/static/mb/device/usb-1.jpg
+++ b/docs/static/mb/device/usb-1.jpg
--- a/docs/static/mb/device/usb-10.png
+++ b/docs/static/mb/device/usb-10.png
--- a/docs/static/mb/device/usb-2.jpg
+++ b/docs/static/mb/device/usb-2.jpg
--- a/docs/static/mb/device/usb-3.jpg
+++ b/docs/static/mb/device/usb-3.jpg
--- a/docs/static/mb/device/usb-4.jpg
+++ b/docs/static/mb/device/usb-4.jpg
--- a/docs/static/mb/device/usb-5.jpg
+++ b/docs/static/mb/device/usb-5.jpg
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias L. Jugel	4c502f0825	bump pxt-calliope-core dependency	2016-10-08 12:23:29 +02:00
Michal Moskal	a2f1cef9ae	Merge branch 'master' of github.com:Microsoft/pxt-calliope	2016-10-07 11:39:31 -07:00
Matthias L. Jugel	e857a94e04	0.4.24	2016-10-07 18:48:34 +02:00
Peli de Halleux	42a93a1682	updated accent color	2016-10-03 18:54:07 -07:00
Michal Moskal	e983c76e2f	Remove unneeded tests	2016-10-03 11:15:49 -07:00
Peli de Halleux	ced4565d5c	0.4.23	2016-10-01 15:52:41 -07:00
Peli de Halleux	2475058b94	0.4.22	2016-10-01 15:45:43 -07:00
Peli de Halleux	c6ee0db81c	Bump pxt-core to 0.4.39	2016-10-01 15:45:41 -07:00
Matthias L. Jugel	1b96e6332a	0.4.21	2016-10-01 21:02:36 +02:00
Matthias L. Jugel	1ceec1d3b4	0.4.20	2016-10-01 20:59:44 +02:00
Matthias L. Jugel	2e9ddb48df	0.4.19	2016-10-01 20:58:45 +02:00
Peli de Halleux	2296220ad7	updated logos	2016-09-29 16:23:37 -07:00
Peli de Halleux	22864bd26a	pointing to cloud compile service	2016-09-29 16:13:33 -07:00
Peli de Halleux	574a9e01d5	updating pinmap	2016-09-29 15:25:57 -07:00
Peli de Halleux	00278036a4	fixing pin mapping	2016-09-29 15:20:45 -07:00
Peli de Halleux	4b583e221b	limited support for RGB led	2016-09-27 13:35:48 -07:00
Peli de Halleux	c88645d0cd	support for AB / Shake buttons	2016-09-27 11:00:21 -07:00
Peli de Halleux	14e8eabd25	updated simulator ratio, domain names	2016-09-27 09:35:52 -07:00
Peli de Halleux	5fab789763	merging microbit	2016-09-26 22:00:04 -07:00
Peli de Halleux	2c39e249f9	New guitar project (#264 )	2016-09-26 21:55:39 -07:00
Peli de Halleux	c486a9db94	0.4.19	2016-09-26 16:31:02 -07:00
Peli de Halleux	816438fa79	Bump pxt-core to 0.4.26	2016-09-26 16:30:58 -07:00
Peli de Halleux	33eca3c507	tweaked colors	2016-09-26 15:10:37 -07:00
Peli de Halleux	9ccfcf19d9	initial round of visual updates	2016-09-26 15:05:06 -07:00
Peli de Halleux	5edd06c9b9	migrating instruction generation logic to pxt	2016-09-26 13:26:43 -07:00
Brahma Giri Abhijith Chatra	a114dc32e7	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-26 10:00:13 -07:00
Abhijith	019bc34d90	Fixing hover text /help window for blocks are not correct	2016-09-26 09:59:52 -07:00
Richard Knoll	0676d780ab	Fixing beat fraction typo (#263 )	2016-09-23 22:27:57 -07:00
Richard Knoll	96e23d99b2	Merge pull request #261 from Microsoft/note_fix Add annotation to Note.C in music enum	2016-09-23 12:56:41 -07:00
Richard Knoll	15b1f95394	Add annotation to Note.C in music enum	2016-09-22 14:36:37 -07:00
Peli de Halleux	552b0d8165	0.4.18	2016-09-22 03:56:03 -07:00
Thomas Denney	faed492a87	Embed docs (#259 ) * Generic instructions for embedding * Wordpress instructions, update Markdown instructions * Blogger instructions * Squarespace instructions * Google sites info * Sway restrictions * Correct order	2016-09-22 03:50:59 -07:00
Thomas Denney	0ce1738653	Remove comment re Safari in private mode	2016-09-22 09:27:46 +01:00
Peli de Halleux	f5cabe6e94	0.4.17	2016-09-21 22:30:10 -07:00
Peli de Halleux	f2e7a640f1	Bump pxt-core to 0.4.25	2016-09-21 22:30:08 -07:00
Peli de Halleux	7fb057af66	0.4.16	2016-09-21 22:14:40 -07:00
Peli de Halleux	c0b9329401	Bump pxt-core to 0.4.24	2016-09-21 22:14:33 -07:00
Brahma Giri Abhijith Chatra	c04ddbb459	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-21 16:34:06 -07:00
Abhijith	4aac4ef92d	Fixing hero lesson	2016-09-21 16:31:03 -07:00
Peli de Halleux	979b2b892a	avoid name collision (embed.md => share.md)	2016-09-21 15:01:43 -07:00
Peli de Halleux	4c3f9910f7	0.4.15	2016-09-21 10:55:54 -07:00
Peli de Halleux	9aef584966	Bump pxt-core to 0.4.21	2016-09-21 10:55:52 -07:00
Peli de Halleux	e62d15ba85	Embed docs (#257 ) * embed docs * adding embed docs	2016-09-21 10:15:59 -07:00
Thomas Denney	adf97d9b5c	Add information about Safari being unsupported in private browsing mode	2016-09-21 11:23:43 +01:00
Peli de Halleux	2bb6c6ae27	0.4.14	2016-09-20 22:56:14 -07:00
Peli de Halleux	0919eff0c5	Bump pxt-core to 0.4.18	2016-09-20 22:56:12 -07:00
Peli de Halleux	e31279938b	0.4.13	2016-09-20 22:13:15 -07:00
Peli de Halleux	2655843b74	Bump pxt-core to 0.4.17	2016-09-20 22:13:08 -07:00
Thomas Denney	527d323ea7	New electron client (#256 )	2016-09-20 22:02:18 -07:00
Thomas Denney	5d40a48477	Merge pull request #255 from Microsoft/browser-versions More detailed information about which browser versions are supported	2016-09-20 11:54:59 +01:00
Peli de Halleux	850fb54f52	missing shims for devices namespace	2016-09-19 09:49:58 -07:00
Thomas Denney	6bb35c1a72	More detailed information about which browser versions are supported	2016-09-19 09:31:03 +01:00
Peli de Halleux	6569231ba6	0.4.12	2016-09-16 00:05:53 -07:00
Peli de Halleux	a3a1c8a480	Bump pxt-core to 0.4.15	2016-09-16 00:05:51 -07:00
Peli de Halleux	c90dfaa6e7	added headphone part	2016-09-15 23:50:52 -07:00
Peli de Halleux	02cd0e1da3	remove "receivednumberat" from blocks	2016-09-15 23:49:50 -07:00
Peli de Halleux	0f9dde0c4e	convert event source/value into TD_ID shims	2016-09-15 23:49:14 -07:00
Peli de Halleux	1e0cd48316	updated docs	2016-09-15 11:04:45 -07:00
Peli de Halleux	d959282c68	0.4.11	2016-09-15 10:50:25 -07:00
Peli de Halleux	d513ad7713	Bump pxt-core to 0.4.13	2016-09-15 10:50:23 -07:00
Peli de Halleux	b7da28285e	adding stubs for bluetooth functions	2016-09-15 09:40:58 -07:00
Peli de Halleux	dbaf406703	splitted usb transfer instructions	2016-09-15 08:35:01 -07:00
Peli de Halleux	2cb467f22b	0.4.10	2016-09-15 07:26:32 -07:00
Peli de Halleux	9585e2276d	Bump pxt-core to 0.4.12	2016-09-15 07:26:29 -07:00
Thomas Denney	a591d9f072	Release build of Mac client	2016-09-15 09:25:33 +01:00
Thomas Denney	471a30ca3d	Minimise memory usage in Mac app directory watcher	2016-09-15 09:24:09 +01:00
Thomas Denney	205b94afe8	Launch editor menu item in Mac app	2016-09-15 09:23:48 +01:00
Thomas Denney	18caf554e9	Use micro:bit image for Mac app icon I’m continuing to use the same menu bar image, as usually these are black and white on OS X, compared to coloured images being common on the Windows task bar.	2016-09-15 09:17:54 +01:00
Thomas Denney	67cdf16fe4	Remove redundant values from MainMenu.xib A small section of this file is still required to build and run the app (it contains metadata that declares that AppDelegate.m is the main implementation, for example).	2016-09-15 08:51:49 +01:00
Peli de Halleux	bdbe8371dd	0.4.9	2016-09-14 22:50:29 -07:00
Peli de Halleux	21a36eb9ee	fixing broken image paths	2016-09-14 22:43:59 -07:00
Peli de Halleux	376b20b035	0.4.8	2016-09-14 22:28:23 -07:00
Peli de Halleux	7ce41b52aa	fixing path in docs	2016-09-14 22:28:05 -07:00
Peli de Halleux	46f7831e7c	0.4.7	2016-09-14 22:21:00 -07:00
Peli de Halleux	dda29a5cb6	Bump pxt-core to 0.4.11	2016-09-14 22:20:58 -07:00
Peli de Halleux	6e4f4595a2	updated usb images	2016-09-14 22:18:01 -07:00
Peli de Halleux	cdbe1e513b	0.4.6	2016-09-14 20:38:49 -07:00
Peli de Halleux	ae15c9a656	Bump pxt-core to 0.4.9	2016-09-14 20:38:47 -07:00
Peli de Halleux	d993ff3a9d	0.4.5	2016-09-14 11:33:54 -07:00
Thomas Denney	13785a2438	OS X uploader (#252 ) * Source for OS X uploader * Readme for OS X uploader * Export image * .gitignore for Xcode project * Remove redundant data * Update readme instructions * List formatting * Remove personal copyright notice added by Xcode * Added release build and updated readme * point to doc cdn	2016-09-14 11:33:11 -07:00
Peli de Halleux	4dfb77fcd7	0.4.4	2016-09-14 08:16:32 -07:00
Peli de Halleux	70deffb665	Bump pxt-core to 0.4.8	2016-09-14 08:16:29 -07:00
Peli de Halleux	41a148de28	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-14 08:14:41 -07:00
Peli de Halleux	886e071d7f	updated about to link to docs	2016-09-14 08:14:04 -07:00
Peli de Halleux	8a58d664c3	adding clear image in stopanimation	2016-09-14 07:54:35 -07:00
Michal Moskal	71d1155f21	Add file forgotten in `50473255a8`	2016-09-14 12:31:52 +03:00
Peli de Halleux	167c1d8fce	loading board definition from pxtarget.json	2016-09-13 15:32:12 -07:00
Peli de Halleux	e59ae37954	moving neopixel state to pxt	2016-09-13 13:09:02 -07:00
Peli de Halleux	72a621ec8b	mvoing edge connector to pxt	2016-09-13 12:48:07 -07:00
Peli de Halleux	d6ff930333	fix capitalized file names	2016-09-13 10:36:25 -07:00
Thomas Denney	54a7ac81ea	Recommended browser documentation (#251 ) * Documentation page for unsupported browsers * Update unsupported documentation with mac info * Blur irrelevant information in version screenshots * Rename to Peli's suggested path * Browser recommendation for each platform	2016-09-13 10:33:06 -07:00
Peli de Halleux	e5d985dbf1	moving boardhost to pxt	2016-09-13 09:59:34 -07:00
Peli de Halleux	9db91d89d6	refactor part global lists	2016-09-13 09:44:58 -07:00
Peli de Halleux	1fa9bf12d5	refactoring dalboard	2016-09-12 21:29:55 -07:00
Peli de Halleux	61bab257eb	0.4.3	2016-09-12 11:45:22 -07:00
Peli de Halleux	2e90b351da	updated other download picture	2016-09-12 11:33:16 -07:00
Peli de Halleux	801bd6c7a0	udpated download pictures	2016-09-12 11:30:12 -07:00
Peli de Halleux	777ba40899	0.4.2	2016-09-12 11:19:41 -07:00
Peli de Halleux	0d11c16ecf	Bump pxt-core to 0.4.3	2016-09-12 11:19:39 -07:00
Peli de Halleux	9c1628b977	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-12 11:11:12 -07:00
Thomas Denney	953b362b34	Download instructions (#250 ) * Images of micro:bit attached t ostuff * Cropped and enhanced USB images * Define paths for USB images * Added new matching criteria for images * Help URL * Add paths for all images * Cropped images so they look better on dialog * Add link to uploader	2016-09-12 11:10:30 -07:00
Peli de Halleux	8b40850a94	tweaks to neopixel rendering	2016-09-11 21:55:54 -07:00
Michal Moskal	fc3a02cc41	0.4.1	2016-09-11 18:07:11 +01:00
Michal Moskal	80f2ff6757	Bump to 0.4 to match pxt-core	2016-09-11 18:07:05 +01:00
Michal Moskal	6f790d167c	0.3.89	2016-09-11 18:06:20 +01:00
Michal Moskal	ac7502074a	Bump pxt-core to 0.4.2	2016-09-11 18:06:20 +01:00
Michal Moskal	50473255a8	Utylize the new target.css file	2016-09-11 17:51:41 +01:00
Peli de Halleux	910772d54e	refacotring various simulator features into pxt	2016-09-09 22:56:26 -07:00
Peli de Halleux	33f12f9ecc	0.3.88	2016-09-09 16:41:31 -07:00
Peli de Halleux	01fa4ef53a	Bump pxt-core to 0.3.102	2016-09-09 16:41:14 -07:00
Peli de Halleux	3858b0a0a0	moving wiring to pxt	2016-09-09 15:01:29 -07:00
Peli de Halleux	da30afb121	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-09 13:43:45 -07:00
Peli de Halleux	086bcf372f	remove dependencies on dal.d.ts	2016-09-09 13:43:41 -07:00
Michal Moskal	236e7337e2	0.3.87	2016-09-09 20:49:21 +01:00
Michal Moskal	4cf223271f	Bump pxt-core to 0.3.100	2016-09-09 20:49:21 +01:00
Michal Moskal	10180f4729	Merge branch 'master' of github.com:Microsoft/pxt-microbit	2016-09-09 20:49:19 +01:00
Michal Moskal	618dd33221	No longer used	2016-09-09 20:33:11 +01:00
Michal Moskal	7356e5e52e	New index.html expansion	2016-09-09 20:26:18 +01:00
Peli de Halleux	a59d148eb5	0.3.86	2016-09-09 12:23:25 -07:00
Peli de Halleux	34ce687bbd	Bump pxt-core to 0.3.98	2016-09-09 12:23:24 -07:00
Michal Moskal	5e241ed566	Use new doc templates	2016-09-09 20:19:52 +01:00
Peli de Halleux	dcb2b21e66	removing dal dependency	2016-09-09 11:36:36 -07:00
Peli de Halleux	95669e174a	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-09 09:59:21 -07:00
Peli de Halleux	aca7d6113d	enable streams in pxtarget	2016-09-09 09:59:07 -07:00
Thomas Denney	ef4b06a087	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-09 15:19:58 +01:00
Michal Moskal	afa69c23c4	0.3.85	2016-09-09 11:35:45 +01:00
Michal Moskal	8229e71d0a	Bump pxt-core to 0.3.97	2016-09-09 11:35:45 +01:00
Michal Moskal	93770e5821	Merge branch 'master' of github.com:Microsoft/pxt-microbit	2016-09-09 10:17:35 +01:00
Michal Moskal	cb8e28beb0	Bump pxt-microbit-core to 0.5.0	2016-09-09 10:17:28 +01:00
Peli de Halleux	8c7e6055ff	enabling parts in target	2016-09-09 01:39:52 -07:00
Peli de Halleux	8450db55ac	0.3.84	2016-09-09 01:25:28 -07:00
Daryl Zuniga	c63e2c85f1	new part definitions (#247 ) * working on new part definitions * draft of new part definitions * updates comments * starting new allocator * starting from the old allocator * alloc internals renaming * alloc minor renaming * alloc internal renaming * progress on new parts definition * progress on new part defs allocator * refactors BBLoc; progress on new allocator * more progress on new allocator * finishing new allocator * deleting old allocator * moves new allocator and part definitions * porting to new part definitions * refactors instructions for new definitions * debugging new allocator * fixes ground and power wire colros * fixing new part definition bugs * fixes wire end offsets; fixes NeoPixel placement * fixes colorGroup issue * fixes led matrix wiring * naming tweaks * fixes instructions regressions * typo	2016-09-09 01:23:39 -07:00
Peli de Halleux	d8fc11a688	0.3.83	2016-09-09 01:20:45 -07:00
Peli de Halleux	847a29848d	Bump pxt-core to 0.3.96	2016-09-09 01:20:43 -07:00
Peli de Halleux	39f4372ee5	0.3.82	2016-09-08 23:39:26 -07:00
Peli de Halleux	a8bbbea8ed	Bump pxt-core to 0.3.95	2016-09-08 23:39:24 -07:00
Peli de Halleux	91a8d05e45	updated loc strings	2016-09-08 23:11:58 -07:00
Peli de Halleux	3ecedd3a32	0.3.81	2016-09-08 01:02:46 -07:00
Peli de Halleux	b6390d77dd	Bump pxt-core to 0.3.94	2016-09-08 01:02:40 -07:00
Peli de Halleux	e8f9e0f023	lighter rendering of breadboard in grayed	2016-09-08 00:54:19 -07:00
Peli de Halleux	2bacb58fdd	simpler instructions	2016-09-08 00:46:43 -07:00
Peli de Halleux	af8babfea2	Merge branch 'master' of https://github.com/Microsoft/pxt-microbit	2016-09-08 00:03:33 -07:00
Peli de Halleux	1ee6274100	added raspberry-pi instructions	2016-09-08 00:00:07 -07:00
darzu	7448db5b98	makes instruction panels inline-block	2016-09-07 15:00:42 -07:00
Peli de Halleux	983645403b	0.3.80	2016-09-07 11:49:41 -07:00
Peli de Halleux	7a9f382bee	Merge pull request #240 from Microsoft/neopixel-improvement improves neopixel simulator	2016-09-07 11:22:40 -07:00
darzu	e59fd8469b	improves neopixel simulator	2016-09-07 10:58:44 -07:00
Michal Moskal	008c886de9	0.3.79	2016-09-07 16:51:08 +01:00
Michal Moskal	c87fa30738	Bump pxt-core to 0.3.93	2016-09-07 16:51:08 +01:00
Michal Moskal	dd9d1299fa	Merge branch 'master' of github.com:Microsoft/pxt-microbit	2016-09-07 16:27:42 +01:00
Michal Moskal	6a7d1bd95c	Support for object literals bump pxt-microbit-core to 0.4.4 see https://github.com/Microsoft/pxt/issues/287	2016-09-07 16:27:28 +01:00
Thomas Denney	dfe270d259	Correct filename of data.csv in radio challenge	2016-09-07 11:32:41 +01:00
Thomas Denney	6deb0683b6	Add GitHub URL property	2016-09-07 10:33:36 +01:00
Sam El-Husseini	0a746f5bbe	0.3.78	2016-09-06 20:41:04 -07:00
Sam El-Husseini	066408c317	Bump pxt-core to 0.3.92	2016-09-06 20:41:02 -07:00
Peli de Halleux	90f7b229d1	0.3.77	2016-09-06 13:41:41 -07:00
Peli de Halleux	c54e0b0e9d	Bump pxt-core to 0.3.90	2016-09-06 13:41:35 -07:00
Peli de Halleux	ea088ac828	renaming docs image files	2016-09-06 13:31:47 -07:00
darzu	29cf4d3e53	uses croc clips in instructions only for micro:bit	2016-09-06 10:52:22 -07:00
Peli de Halleux	6d637eefd7	scaling, cropping,blurring	2016-09-06 10:06:09 -07:00
Peli de Halleux	6310e96ac2	Merge pull request #239 from Microsoft/usb-docs-update .hex file download and USB transfer docs update	2016-09-06 09:10:06 -07:00
Thomas Denney	dbb1e31822	Remove DS_STORE	2016-09-06 10:01:12 +01:00
Thomas Denney	5376bc2dce	Rename images, remove redundant images	2016-09-06 09:57:45 +01:00
Thomas Denney	57bd293df8	Move arrow position on doc image	2016-09-06 09:52:17 +01:00
Thomas Denney	e570d46755	Rewrite instructions on downloading files to make them more clear	2016-09-06 09:49:08 +01:00
Thomas Denney	d37f284fce	Added arrows to images and updated instructions	2016-09-06 09:28:20 +01:00
Thomas Denney	b716226889	Images for Windows	2016-09-06 09:05:33 +01:00
Peli de Halleux	1bd19cc1a0	support list micro:bit on linux	2016-09-06 00:12:57 -07:00
Sam El-Husseini	ac8c9c5e85	Updating editor screenshots in js/cal, fixes #230	2016-09-05 09:04:03 -07:00
Thomas Denney	057260c483	Update OS X Firefox screenshots and instructions	2016-09-05 16:46:56 +01:00
Thomas Denney	568ae32f81	Update screenshot and instructions for OS X Chrome	2016-09-05 16:32:41 +01:00
Thomas Denney	ae605ff829	Update OS X file transfer screenshot	2016-09-05 16:22:06 +01:00
Thomas Denney	f25ddb1085	OS X screenshot	2016-09-05 15:50:27 +01:00
Michal Moskal	f175f973f0	0.3.76	2016-09-05 14:26:24 +01:00
Michal Moskal	c7e5fa490e	Bump pxt-core to 0.3.87	2016-09-05 14:26:24 +01:00
Michal Moskal	61a29f7c67	Always diplay sad face on errors; use nullCheck() function; see https://github.com/Microsoft/pxt/issues/302	2016-09-05 14:26:07 +01:00
Peli de Halleux	50293fc654	don't repace spaces	2016-09-02 21:38:22 -07:00
Peli de Halleux	a9ecadaf09	Merge pull request #238 from Microsoft/power-usage Direct power wires for single usages	2016-09-02 21:13:15 -07:00
darzu	6e56107eb5	Merge branch 'master' into power-usage	2016-09-02 16:12:48 -07:00
darzu	1f077beb65	directly wires power if there is single usage	2016-09-02 16:11:58 -07:00
Peli de Halleux	8fff762156	removed uwp info	2016-09-02 16:08:49 -07:00
Peli de Halleux	cebded2526	Merge pull request #237 from Microsoft/power-usage finer grain power wires based on usage	2016-09-02 16:07:02 -07:00
darzu	13f53d730a	fixes instruction steps for finer power usage	2016-09-02 15:43:26 -07:00
darzu	8adcab1cab	finer grain power wires based on usage	2016-09-02 15:24:16 -07:00