Merge pull request #4554 from LLK/release/02-14-2019

Update master to 0.1.0-prerelease.20190213213304
Merge pull request #4482 from paulkaplan/hotfix/fix-tests
2019-02-14 13:05:23 -05:00 · 2019-02-04 11:52:28 -05:00
447 changed files with 2423 additions and 22878 deletions
@@ -1,3 +0,0 @@
-last 3 versions
-Safari >= 8
-iOS >= 8
@@ -1,207 +0,0 @@
-version: 2.1
-aliases:
-  - &save_git_cache
-    save_cache:
-      paths:
-        - .git
-      key: v1-git-{{ .Revision }}
-  - &restore_git_cache
-    restore_cache:
-      keys:
-        - v1-git-{{ .Revision }}
-        - v1-git-
-  - &save_build_cache
-    save_cache:
-      paths:
-        - build
-      key: v1-build-{{ .Revision }}
-  - &restore_build_cache
-    restore_cache:
-      keys:
-        - v1-build-{{ .Revision }}
-  - &save_dist_cache
-    save_cache:
-      paths:
-        - dist
-      key: v1-dist-{{ .Revision }}
-  - &restore_dist_cache
-    restore_cache:
-      keys:
-        - v1-dist-{{ .Revision }}
-  - &save_npm_cache
-    save_cache:
-      paths:
-        - node_modules
-      key: v1-npm-{{ checksum "package-lock.json" }}
-  - &restore_npm_cache
-    restore_cache:
-      keys:
-        - v1-npm-{{ checksum "package-lock.json" }}
-        - v1-npm-
-  - &defaults
-    docker:
-      - image: circleci/node:8.16-browsers
-    working_directory: ~/repo
-
-jobs:
-  setup:
-    <<: *defaults
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - run: npm install
-      - *save_git_cache
-      - *save_npm_cache
-  lint:
-    <<: *defaults
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - run:
-          name: Lint
-          command: npm run test:lint -- --quiet --output-file test-results/eslint/results.xml --format junit
-      - store_test_results:
-          path: test-results
-  unit:
-    <<: *defaults
-    environment:
-      JEST_JUNIT_OUTPUT_NAME: results.xml
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - run:
-          name: Unit
-          environment:
-              JEST_JUNIT_OUTPUT_DIR: test-results/unit
-          command: npm run test:unit -- --reporters="default" --reporters="jest-junit" --coverage --coverageReporters=text --coverageReporters=lcov
-      - store_artifacts:
-          path: coverage
-      - store_test_results:
-          path: test-results
-  build:
-    <<: *defaults
-    environment:
-      NODE_ENV: production
-      NODE_OPTIONS: --max-old-space-size=4000
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - run:
-          name: Build
-          command: npm run build
-      - *save_build_cache
-      - *save_dist_cache
-  store_build:
-    <<: *defaults
-    steps:
-      - *restore_build_cache
-      - store_artifacts:
-          path: build
-  store_dist:
-    <<: *defaults
-    steps:
-      - *restore_dist_cache
-      - store_artifacts:
-          path: dist
-  integration:
-    <<: *defaults
-    parallelism: 2
-    environment:
-      JEST_JUNIT_OUTPUT_NAME: results.txt
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - *restore_build_cache
-      - run:
-          name: Integration
-          environment:
-              JEST_JUNIT_OUTPUT_DIR: test-results/integration
-          command: |
-            export TESTFILES=$(circleci tests glob "test/integration/*.test.js" | circleci tests split --split-by=timings)
-            $(npm bin)/jest ${TESTFILES} --reporters="default" --reporters="jest-junit"
-      - store_test_results:
-          path: test-results
-
-  deploy-npm:
-    <<: *defaults
-    environment:
-      NODE_OPTIONS: --max-old-space-size=4000
-    steps:
-      - *restore_git_cache
-      - *restore_dist_cache
-      - checkout
-      - run: |
-          echo export RELEASE_VERSION="0.1.0-prerelease.$(date +'%Y%m%d%H%M%S')" >> $BASH_ENV
-          echo export NPM_TAG=circlelatest >> $BASH_ENV
-          if [ "$CIRCLE_BRANCH" == "master" ]
-            then echo export NPM_TAG=circlestable >> $BASH_ENV
-          fi
-          if [[ "$CIRCLE_BRANCH" == hotfix/* ]] # double brackets are important for matching the wildcard
-            then echo export NPM_TAG=circlehotfix >> $BASH_ENV
-          fi
-      - run: npm version --no-git-tag-version $RELEASE_VERSION
-      - run: |
-          npm set //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          npm publish --tag $NPM_TAG
-      - run: git tag $RELEASE_VERSION
-      - run: git push $CIRCLE_REPOSITORY_URL $RELEASE_VERSION
-
-  deploy-gh-pages:
-    <<: *defaults
-    steps:
-      - *restore_git_cache
-      - checkout
-      - *restore_npm_cache
-      - *restore_build_cache
-      - run: |
-          git config --global user.email $(git log --pretty=format:"%ae" -n1)
-          git config --global user.name $(git log --pretty=format:"%an" -n1)
-      - run: npm run deploy -- -e $CIRCLE_BRANCH
-      
-workflows:
-  version: 2
-  build-test-deploy:
-    jobs:
-      - setup
-      - lint:
-          requires:
-            - setup
-      - unit:
-          requires:
-            - setup
-      - build:
-          requires:
-            - setup
-      - integration:
-          requires:
-            - build
-      - store_build:
-          requires:
-            - build
-      - store_dist:
-          requires:
-            - build
-      # Disable deployment while running in parallel with Travis
-      # - deploy-npm:
-      #     requires:
-      #       - lint
-      #       - unit
-      #       - integration
-      #       - build
-      #     filters:
-      #       branches:
-      #         only:
-      #           - master
-      #           - develop
-      #           - /^hotfix\/.*/
-      # - deploy-gh-pages:
-      #     requires:
-      #       - lint
-      #       - unit
-      #       - integration
-      #       - build
@@ -4,6 +4,7 @@
 # NPM
 /node_modules
 npm-*
+/package-lock.json

 # Testing
 /.nyc_output
@@ -5,9 +5,6 @@
 /node_modules
 npm-*

-# Double copies of all the static assets and tutorial gifs
-/src
-
 # Testing
 /.nyc_output
 /coverage
@@ -1,39 +1,30 @@
 language: node_js
 sudo: required
-dist: xenial
+dist: trusty
 addons:
    chrome: stable
 node_js:
 - 8
 env:
  global:
-  - CHROMEDRIVER_VERSION=LATEST
  - NODE_ENV=production
-  - NODE_OPTIONS=--max-old-space-size=7250
+  - SMOKE_URL=https://llk.github.io/scratch-gui/$TRAVIS_PULL_REQUEST_BRANCH
  - NPM_TAG=latest
  - RELEASE_VERSION="0.1.0-prerelease.$(date +'%Y%m%d%H%M%S')"
-  - SMOKE_URL=https://llk.github.io/scratch-gui/$TRAVIS_PULL_REQUEST_BRANCH
 cache:
  directories:
  - node_modules
-before_install:
-# package-lock.json was introduced in npm@5
- '[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest' # skipped when using node 9
- npm install -g greenkeeper-lockfile
 install:
 - npm --production=false install
 - npm --production=false update
-before_script: greenkeeper-lockfile-update
 script:
 - npm test
 - if [ "$TRAVIS_EVENT_TYPE" == "pull_request" ] && [ "$TRAVIS_BRANCH" == "master" ]; then  npm run test:smoke; fi
-after_script: greenkeeper-lockfile-upload
 before_deploy:
 - >
  if [ -z "$BEFORE_DEPLOY_RAN" ]; then
    npm --no-git-tag-version version $RELEASE_VERSION
    if [ "$TRAVIS_BRANCH" == "master" ]; then export NPM_TAG=stable; fi
-    if [[ "$TRAVIS_BRANCH" == hotfix/* ]]; then export NPM_TAG=hotfix; fi # double brackets are important for matching the wildcard
    git config --global user.email $(git log --pretty=format:"%ae" -n1)
    git config --global user.name $(git log --pretty=format:"%an" -n1)
    export BEFORE_DEPLOY_RAN=true
@@ -45,7 +36,6 @@ deploy:
    - master
    - develop
    - smoke
-    - hotfix/*
    condition: $TRAVIS_EVENT_TYPE != cron
  skip_cleanup: true
  email: $NPM_EMAIL
@@ -57,7 +47,6 @@ deploy:
    - master
    - develop
    - smoke
-    - hotfix/*
    condition: $TRAVIS_EVENT_TYPE != cron
  skip_cleanup: true
  script: if npm info scratch-gui | grep -q $RELEASE_VERSION; then git tag $RELEASE_VERSION && git push https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git $RELEASE_VERSION; fi
@@ -76,8 +65,7 @@ deploy:
 - provider: script
  on:
    all_branches: true
-    condition: $TRAVIS_EVENT_TYPE != cron && ! $TRAVIS_BRANCH =~ ^greenkeeper/
-    tags: false # Don't push tags to gh-pages
+    condition: $TRAVIS_EVENT_TYPE != cron
  skip_cleanup: true
  script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
 - provider: script
@@ -30,38 +30,29 @@ Then go to [http://localhost:8601/](http://localhost:8601/) - the playground out

 ## Developing alongside other Scratch repositories

-### Getting another repo to point to this code
-
-
-If you wish to develop `scratch-gui` alongside other scratch repositories that depend on it, you may wish
-to have the other repositories use your local `scratch-gui` build instead of fetching the current production
-version of the scratch-gui that is found by default using `npm install`.
-
-Here's how to link your local `scratch-gui` code to another project's `node_modules/scratch-gui`.
+### Linking this code to another project's `node_modules/scratch-gui`

 #### Configuration

-1. In your local `scratch-gui` repository's top level:
-    1. Make sure you have run `npm install`
-    2. Build the `dist` directory by running `BUILD_MODE=dist npm run build`
-    3. Establish a link to this repository by running `npm link`
+If you wish to develop scratch-gui alongside other scratch repositories that depend on it, you may wish
+to have the other repositories use your local scratch-gui build instead of fetching the current production
+version of the scratch-gui that is found by default using `npm install`.

-2. From the top level of each repository (such as `scratch-www`) that depends on `scratch-gui`:
-    1. Make sure you have run `npm install`
-    2. Run `npm link scratch-gui`
-    3. Build or run the repositoriy
+To do this:
+1. Make sure you have run `npm install` from this (scratch-gui) repository's top level
+2. Make sure you have run `npm install` from the top level of each repository (such as scratch-www) that depends on scratch-gui
+3. From this (scratch-gui) repository's top level, build the `dist` directory by running `BUILD_MODE=dist npm run build`
+4. From this (scratch-gui) repository's top level, establish a link to this repository by running `npm link`
+5. From the top level of each repository that depends on scratch-gui, run `npm link scratch-gui`
+6. Build or run the repositories that depend on scratch-gui

-#### Using `npm run watch`
-
-Instead of `BUILD_MODE=dist npm run build`, you can use `BUILD_MODE=dist npm run watch` instead. This will watch for changes to your `scratch-gui` code, and automatically rebuild when there are changes. Sometimes this has been unreliable; if you are having problems, try going back to `BUILD_MODE=dist npm run build` until you resolve them.
+Instead of `BUILD_MODE=dist npm run build` you can also use `BUILD_MODE=dist npm run watch`, however this may be unreliable.

 #### Oh no! It didn't work!
-
-If you can't get linking to work right, try:
-* Follow the recipe above step by step and don't change the order. It is especially important to run `npm install` _before_ `npm link`, because installing after the linking will reset the linking.
-* Make sure the repositories are siblings on your machine's file tree, like `.../.../MY_SCRATCH_DEV_DIRECTORY/scratch-gui/` and `.../.../MY_SCRATCH_DEV_DIRECTORY/scratch-www/`.
-* Consistent node.js version: If you have multiple Terminal tabs or windows open for the different Scratch repositories, make sure to use the same node version in all of them.
-* If nothing else works, unlink the repositories by running `npm unlink` in both, and start over.
+* Follow the recipe above step by step and don't change the order. It is especially important to run npm first because installing after the linking will reset the linking.
+* Make sure the repositories are siblings on your machine's file tree.
+* If you have multiple Terminal tabs or windows open for the different Scratch repositories, make sure to use the same node version in all of them.
+* In the worst case unlink the repositories by running `npm unlink` in both, and start over.

 ## Testing
 ### Documentation
@@ -130,66 +121,6 @@ If you want to watch the browser as it runs the test, rather than running headle
 USE_HEADLESS=no $(npm bin)/jest --runInBand test/integration/backpack.test.js
 ```

-## Troubleshooting
-
-### Ignoring optional dependencies
-
-When running `npm install`, you can get warnings about optionsl dependencies:
-
-```
-npm WARN optional Skipping failed optional dependency /chokidar/fsevents:
-npm WARN notsup Not compatible with your operating system or architecture: fsevents@1.2.7
-```
-
-You can suppress them by adding the `no-optional` switch:
-
-```
-npm install --no-optional
-```
-
-Further reading: [Stack Overflow](https://stackoverflow.com/questions/36725181/not-compatible-with-your-operating-system-or-architecture-fsevents1-0-11)
-
-### Resolving dependencies
-
-When installing for the first time, you can get warnings which need to be resolved:
-
-```
-npm WARN eslint-config-scratch@5.0.0 requires a peer of babel-eslint@^8.0.1 but none was installed.
-npm WARN eslint-config-scratch@5.0.0 requires a peer of eslint@^4.0 but none was installed.
-npm WARN scratch-paint@0.2.0-prerelease.20190318170811 requires a peer of react-intl-redux@^0.7 but none was installed.
-npm WARN scratch-paint@0.2.0-prerelease.20190318170811 requires a peer of react-responsive@^4 but none was installed.
-```
-
-You can check which versions are available:
-
-```
-npm view react-intl-redux@0.* version
-```
-
-You will neet do install the required version:
-
-```
-npm install  --no-optional --save-dev react-intl-redux@^0.7
-```
-
-The dependency itself might have more missing dependencies, which will show up like this:
-
-```
-user@machine:~/sources/scratch/scratch-gui (491-translatable-library-objects)$ npm install  --no-optional --save-dev react-intl-redux@^0.7
-scratch-gui@0.1.0 /media/cuideigin/Linux/sources/scratch/scratch-gui
-├── react-intl-redux@0.7.0
-└── UNMET PEER DEPENDENCY react-responsive@5.0.0
-```
-
-You will need to install those as well:
-
-```
-npm install  --no-optional --save-dev react-responsive@^5.0.0
-```
-
-Further reading: [Stack Overflow](https://stackoverflow.com/questions/46602286/npm-requires-a-peer-of-but-all-peers-are-in-package-json-and-node-modules)
-
-
 ## Publishing to GitHub Pages
 You can publish the GUI to github.io so that others on the Internet can view it.
 [Read the wiki for a step-by-step guide.](https://github.com/LLK/scratch-gui/wiki/Publishing-to-GitHub-Pages)
@@ -44,7 +44,7 @@
    "babel-loader": "^8.0.4",
    "base64-loader": "1.0.0",
    "bowser": "1.9.4",
-    "chromedriver": "78.0.1",
+    "chromedriver": "2.44.1",
    "classnames": "2.2.6",
    "computed-style-to-inline-style": "3.0.0",
    "copy-webpack-plugin": "^4.5.1",
@@ -55,10 +55,8 @@
    "es6-object-assign": "1.1.0",
    "eslint": "^5.0.1",
    "eslint-config-scratch": "^5.0.0",
-    "eslint-import-resolver-webpack": "^0.11.1",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^22.14.1",
-    "eslint-plugin-react": "^7.12.4",
+    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-react": "7.11.1",
    "file-loader": "2.0.0",
    "get-float-time-domain-data": "0.1.0",
    "get-user-media-promise": "1.1.4",
@@ -67,7 +65,6 @@
    "immutable": "3.8.2",
    "intl": "1.2.5",
    "jest": "^21.0.0",
-    "jest-junit": "^7.0.0",
    "js-base64": "2.4.9",
    "keymirror": "0.1.1",
    "lodash.bindall": "4.4.0",
@@ -93,8 +90,8 @@
    "react-dom": "16.2.0",
    "react-draggable": "3.0.5",
    "react-ga": "2.5.3",
-    "react-intl": "2.9.0",
-    "react-modal": "3.9.1",
+    "react-intl": "2.4.0",
+    "react-modal": "3.6.1",
    "react-popover": "0.5.10",
    "react-redux": "5.0.7",
    "react-responsive": "5.0.0",
@@ -107,14 +104,14 @@
    "redux-mock-store": "^1.2.3",
    "redux-throttle": "0.1.1",
    "rimraf": "^2.6.1",
-    "scratch-audio": "0.1.0-prerelease.20190925183642",
-    "scratch-l10n": "3.6.20191029224007",
-    "scratch-blocks": "0.1.0-prerelease.1572384380",
-    "scratch-paint": "0.2.0-prerelease.20191104214909",
-    "scratch-render": "0.1.0-prerelease.20191101193213",
-    "scratch-storage": "1.3.2",
-    "scratch-svg-renderer": "0.2.0-prerelease.20191104164753",
-    "scratch-vm": "0.2.0-prerelease.20191017151616",
+    "scratch-audio": "0.1.0-prerelease.20190114210212",
+    "scratch-blocks": "0.1.0-prerelease.1549990124",
+    "scratch-l10n": "3.1.20190213142844",
+    "scratch-paint": "0.2.0-prerelease.20190114205252",
+    "scratch-render": "0.1.0-prerelease.20190213183713",
+    "scratch-storage": "1.2.2",
+    "scratch-svg-renderer": "0.2.0-prerelease.20190125192231",
+    "scratch-vm": "0.2.0-prerelease.20190213190040",
    "selenium-webdriver": "3.6.0",
    "startaudiocontext": "1.2.1",
    "style-loader": "^0.23.0",
@@ -1,4 +1,3 @@
-const path = require('path');
 module.exports = {
    root: true,
    extends: ['scratch', 'scratch/es6', 'scratch/react', 'plugin:import/errors'],
@@ -21,11 +20,6 @@ module.exports = {
    settings: {
        react: {
            version: '16.2' // Prevent 16.3 lifecycle method errors
-        },
-        'import/resolver': {
-            webpack: {
-                config: path.resolve(__dirname, '../webpack.config.js')
-            }
        }
    }
 };
@@ -5,7 +5,7 @@
    color: $ui-white;
    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
    display: flex;
-    justify-content: flex-end;
+    justify-content: end;
    align-items: center;
    font-size: .8125rem;
 }
@@ -24,7 +24,7 @@
    display: flex;
    flex-grow: 1;
    flex-shrink: 1;
-    overflow: visible;
+    overflow-y: auto;
 }

 [dir="ltr"] .detail-area {
@@ -50,16 +50,8 @@ $fade-out-distance: 100px;
    overflow-y: scroll;
    display: flex;
    flex-direction: column;
-}
-
-.list-area:after {
    /* Make sure there is room to scroll beyond the last tile */
-    content: '';
-    display: block;
-    height: 70px;
-    width: 100%;
-    flex-shrink: 0;
-    order: 99999999;
+    padding-bottom: 70px;
 }

 .list-item {
@@ -1,53 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-import Box from '../box/box.jsx';
-import styles from './audio-trimmer.css';
-import SelectionHandle from './selection-handle.jsx';
-import Playhead from './playhead.jsx';
-
-const AudioSelector = props => (
-    <div
-        className={classNames(styles.absolute, styles.selector)}
-        ref={props.containerRef}
-        onMouseDown={props.onNewSelectionMouseDown}
-        onTouchStart={props.onNewSelectionMouseDown}
-    >
-        {props.trimStart === null ? null : (
-            <Box
-                className={classNames(styles.absolute)}
-                style={{
-                    left: `${props.trimStart * 100}%`,
-                    width: `${100 * (props.trimEnd - props.trimStart)}%`
-                }}
-            >
-                <Box className={classNames(styles.absolute, styles.selectionBackground)} />
-                <SelectionHandle
-                    handleStyle={styles.leftHandle}
-                    onMouseDown={props.onTrimStartMouseDown}
-                />
-                <SelectionHandle
-                    handleStyle={styles.rightHandle}
-                    onMouseDown={props.onTrimEndMouseDown}
-                />
-            </Box>
-        )}
-        {props.playhead ? (
-            <Playhead
-                playbackPosition={props.playhead}
-            />
-        ) : null}
-    </div>
-);
-
-AudioSelector.propTypes = {
-    containerRef: PropTypes.func,
-    onNewSelectionMouseDown: PropTypes.func.isRequired,
-    onTrimEndMouseDown: PropTypes.func.isRequired,
-    onTrimStartMouseDown: PropTypes.func.isRequired,
-    playhead: PropTypes.number,
-    trimEnd: PropTypes.number,
-    trimStart: PropTypes.number
-};
-
-export default AudioSelector;
@@ -1,11 +1,10 @@
@import "../../css/colors.css";

 $border-radius: 4px;
-$trim-handle-width: 30px;
-$trim-handle-height: 30px;
-$trim-handle-border: 3px;
+$trim-handle-width: 12px;
+$trim-handle-height: 14px;
 $stripe-size: 10px;
-$hover-scale: 1.25;
+$hover-scale: 2;

 .absolute {
    position: absolute;
@@ -18,10 +17,6 @@ $hover-scale: 1.25;
    transform: translateZ(0);
 }

-.selector {
-    cursor: pointer;
-}
-
 .trim-background {
    cursor: pointer;
    touch-action: none;
@@ -40,11 +35,6 @@ $hover-scale: 1.25;
    );
 }

-.selection-background {
-    background: $motion-primary;
-    opacity: 0.5;
-}
-
 .start-trim-background .trim-background-mask {
    border-top-left-radius: $border-radius;
    border-bottom-left-radius: $border-radius;
@@ -63,10 +53,6 @@ $hover-scale: 1.25;
    border: 1px solid $red-tertiary;
 }

-.selector .trim-line {
-    border: 1px solid $motion-tertiary;
-}
-
 .playhead-container {
    position: absolute;
    top: 0;
@@ -82,50 +68,31 @@ $hover-scale: 1.25;
        so that we can use transform: translateX() using percentages.
    */
    width: 100%;
-    height: 100%;
    border-left: 1px solid $motion-primary;
    border-top: none;
    border-bottom: none;
    border-right: none;
 }

-.right-handle {
-    transform: scaleX(-1);
+.start-trim-line {
+    right: 0;
 }

-.selector .left-handle {
-    left: -1px
-}
-
-.selector .right-handle {
-    right: -1px
-}
-
-.trimmer .left-handle {
-    right: -1px
-}
-
-.trimmer .right-handle {
-    left: -1px
+.end-trim-line {
+    left: 0;
 }

 .trim-handle {
    position: absolute;
+    left: calc(-$trim-handle-width / 2);
    width: $trim-handle-width;
    height: $trim-handle-height;
-    right: 0;
-    user-select: none;
-}
-
-.trimmer .trim-handle {
-    filter: hue-rotate(150deg);
 }

 .trim-handle img {
    position: absolute;
    width: $trim-handle-width;
    height: $trim-handle-height;
-    left: calc($trim-handle-border * 1.5);

    /* Make sure image dragging isn't triggered */
    user-select: none;
@@ -136,13 +103,22 @@ $hover-scale: 1.25;
 }

 .top-trim-handle {
-    top: calc(-$trim-handle-height + $trim-handle-border);
+    top: -$trim-handle-height;
 }

 .bottom-trim-handle {
-    bottom: calc(-$trim-handle-height + $trim-handle-border);
+    bottom: -$trim-handle-height;
 }

 .top-trim-handle img {
-    transform: scaleY(-1);
+    transform: rotate(180deg);
+}
+
+/* Increase handle size when anywhere on draggable area is hovered */
+.trim-background:hover img {
+    transform: scale($hover-scale);
+}
+
+.trim-background:hover .top-trim-handle img {
+    transform: rotate(180deg) scale($hover-scale);
 }
@@ -3,12 +3,11 @@ import React from 'react';
 import classNames from 'classnames';
 import Box from '../box/box.jsx';
 import styles from './audio-trimmer.css';
-import SelectionHandle from './selection-handle.jsx';
-import Playhead from './playhead.jsx';
+import handleIcon from './icon--handle.svg';

 const AudioTrimmer = props => (
    <div
-        className={classNames(styles.absolute, styles.trimmer)}
+        className={styles.absolute}
        ref={props.containerRef}
    >
        {props.trimStart === null ? null : (
@@ -21,16 +20,28 @@ const AudioTrimmer = props => (
                onTouchStart={props.onTrimStartMouseDown}
            >
                <Box className={classNames(styles.absolute, styles.trimBackgroundMask)} />
-                <SelectionHandle
-                    handleStyle={styles.leftHandle}
-                />
+                <Box className={classNames(styles.trimLine, styles.startTrimLine)}>
+                    <Box className={classNames(styles.trimHandle, styles.topTrimHandle, styles.startTrimHandle)}>
+                        <img src={handleIcon} />
+                    </Box>
+                    <Box className={classNames(styles.trimHandle, styles.bottomTrimHandle, styles.startTrimHandle)}>
+                        <img src={handleIcon} />
+                    </Box>
+                </Box>
            </Box>
        )}
+
        {props.playhead ? (
-            <Playhead
-                playbackPosition={props.playhead}
-            />
+            <div className={styles.playheadContainer}>
+                <div
+                    className={classNames(styles.trimLine, styles.playhead)}
+                    style={{
+                        transform: `translateX(${100 * props.playhead}%)`
+                    }}
+                />
+            </div>
        ) : null}
+
        {props.trimEnd === null ? null : (
            <Box
                className={classNames(styles.absolute, styles.trimBackground, styles.endTrimBackground)}
@@ -42,9 +53,14 @@ const AudioTrimmer = props => (
                onTouchStart={props.onTrimEndMouseDown}
            >
                <Box className={classNames(styles.absolute, styles.trimBackgroundMask)} />
-                <SelectionHandle
-                    handleStyle={styles.rightHandle}
-                />
+                <Box className={classNames(styles.trimLine, styles.endTrimLine)}>
+                    <Box className={classNames(styles.trimHandle, styles.topTrimHandle, styles.endTrimHandle)}>
+                        <img src={handleIcon} />
+                    </Box>
+                    <Box className={classNames(styles.trimHandle, styles.bottomTrimHandle, styles.endTrimHandle)}>
+                        <img src={handleIcon} />
+                    </Box>
+                </Box>
            </Box>
        )}
    </div>
@@ -1,16 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="34px" height="34px" viewBox="1 1 33 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>Bottom Left Handle</title>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="8px" height="10px" viewBox="0 0 8 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>handle</title>
    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M17,5 C23.627417,5 29,10.372583 29,17 L29,29 L17,29 C10.372583,29 5,23.627417 5,17 C5,10.372583 10.372583,5 17,5 Z" id="path-1"></path>
-    </defs>
-    <g id="Bottom-Left-Handle" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Bottom-Left" transform="translate(17.000000, 17.000000) scale(1, -1) translate(-17.000000, -17.000000) ">
-            <use stroke="#4D97FF33" stroke-width="8" xlink:href="#path-1"></use>
-            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-            <use stroke="#3D73CC" stroke-width="1" fill="#4D97FF" fill-rule="evenodd" xlink:href="#path-1"></use>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
+        <g id="Desktop---1280x720" transform="translate(-461.000000, -329.000000)" stroke="#E64D00" fill="#FF661A">
+            <g id="Step-5---Confirming-Trim" transform="translate(0.000000, 42.000000)">
+                <g id="Sound-Sketches" transform="translate(427.000000, 167.000000)">
+                    <g id="start-playhead" transform="translate(35.000000, 0.000000)">
+                        <path d="M0,122.213854 C0,121.658366 0.45097518,121.208054 0.990777969,121.208054 L5.00922203,121.208054 C5.55641359,121.208054 6,121.659838 6,122.213854 L6,126.298963 L3,129.208054 L0,126.298963 L0,122.213854 Z" id="handle" transform="translate(3.000000, 125.208054) scale(1, -1) translate(-3.000000, -125.208054) "></path>
+                    </g>
+                </g>
+            </g>
        </g>
    </g>
 </svg>
@@ -1,21 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-import styles from './audio-trimmer.css';
-
-const Playhead = props => (
-    <div className={styles.playheadContainer}>
-        <div
-            className={classNames(styles.playhead)}
-            style={{
-                transform: `translateX(${100 * props.playbackPosition}%)`
-            }}
-        />
-    </div>
-);
-
-Playhead.propTypes = {
-    playbackPosition: PropTypes.number
-};
-
-export default Playhead;
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-import Box from '../box/box.jsx';
-import styles from './audio-trimmer.css';
-import handleIcon from './icon--handle.svg';
-
-const SelectionHandle = props => (
-    <Box
-        className={classNames(styles.trimLine, props.handleStyle)}
-        onMouseDown={props.onMouseDown}
-        onTouchStart={props.onMouseDown}
-    >
-        <Box className={classNames(styles.trimHandle, styles.topTrimHandle)}>
-            <img src={handleIcon} />
-        </Box>
-        <Box className={classNames(styles.trimHandle, styles.bottomTrimHandle)}>
-            <img src={handleIcon} />
-        </Box>
-    </Box>
-);
-
-SelectionHandle.propTypes = {
-    handleStyle: PropTypes.string,
-    onMouseDown: PropTypes.func
-};
-
-export default SelectionHandle;
@@ -2,18 +2,10 @@
@import "../../css/colors.css";
@import "../../css/z-index.css";

-.card-container-overlay {
-    position: fixed;
-    pointer-events: none;
-    z-index: $z-index-card;
-}
-
 .card-container {
    position:absolute;
-    pointer-events: auto;
    z-index: $z-index-card;
    margin: 0.5rem 2rem;
-    min-width: 468px;
 }

 .left-card, .right-card {
@@ -112,38 +104,11 @@
    font-weight: bold;
 }

-.header-buttons-hidden {
-    border-bottom: 0px;
-}
-
-.header-buttons-right {
-    display: flex;
-    flex-direction: row;
-}
-
-.header-buttons img {
-    margin-bottom: 2px;
-}
-
-.shrink-expand-button {
-    cursor: pointer;
-    color: white;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding: 0.75rem;
-}
-
-.shrink-expand-button:hover, .all-button:hover {
-    background-color: $ui-black-transparent;
-}
-
 .remove-button, .all-button {
    cursor: pointer;
    color: white;
    display: flex;
-    flex-direction: column;
+    flex-direction: row;
    justify-content: center;
    align-items: center;
    padding: 0.75rem;
@@ -162,7 +127,6 @@
 }

 .step-body {
-    width: 100%;
    background: $ui-white;
    display: flex;
    flex-direction: column;
@@ -170,19 +134,14 @@
    align-items: center;
    position: relative;
    text-align: center;
-
-    /* Min height prevents layout changing when images change */
-    min-height: 256px;
 }

 .step-video {
-    height: 256px;
+    height: 337px;
 }

 .step-image {
    max-width: 450px;
-    max-height: 200px;
-    object-fit: contain;
    background: #F9F9F9;
    border: 1px solid #ddd;
    border-radius: 0.5rem;
@@ -229,7 +188,7 @@
 }

 .close-icon {
-    height: 1.25rem;
+    height: 1rem;
    margin: .125rem 0; /* To offset the .25rem difference in icon size */
 }

@@ -281,6 +240,14 @@
    margin-right: 0.5rem;
 }

+.video-cover {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+
 .steps-list {
    display: flex;
    flex-direction: row;
@@ -300,7 +267,3 @@
    background: $ui-white;
    box-shadow: 0px 0px 0px 2px $ui-black-transparent;
 }
-
-.hidden {
-    display: none;
-}
@@ -1,14 +1,10 @@
 import PropTypes from 'prop-types';
 import React, {Fragment} from 'react';
-import classNames from 'classnames';
 import {FormattedMessage} from 'react-intl';
 import Draggable from 'react-draggable';

 import styles from './card.css';

-import shrinkIcon from './icon--shrink.svg';
-import expandIcon from './icon--expand.svg';
-
 import rightArrow from './icon--next.svg';
 import leftArrow from './icon--prev.svg';

@@ -16,10 +12,9 @@ import helpIcon from '../../lib/assets/icon--tutorials.svg';
 import closeIcon from './icon--close.svg';

 import {translateVideo} from '../../lib/libraries/decks/translate-video.js';
-import {translateImage} from '../../lib/libraries/decks/translate-image.js';

-const CardHeader = ({onCloseCards, onShrinkExpandCards, onShowAll, totalSteps, step, expanded}) => (
-    <div className={expanded ? styles.headerButtons : classNames(styles.headerButtons, styles.headerButtonsHidden)}>
+const CardHeader = ({onCloseCards, onShowAll, totalSteps, step}) => (
+    <div className={styles.headerButtons}>
        <div
            className={styles.allButton}
            onClick={onShowAll}
@@ -45,107 +40,49 @@ const CardHeader = ({onCloseCards, onShrinkExpandCards, onShowAll, totalSteps, s
                    ))}
            </div>
        ) : null}
-        <div className={styles.headerButtonsRight}>
-            <div
-                className={styles.shrinkExpandButton}
-                onClick={onShrinkExpandCards}
-            >
-                <img
-                    draggable={false}
-                    src={expanded ? shrinkIcon : expandIcon}
-                />
-                {expanded ?
-                    <FormattedMessage
-                        defaultMessage="Shrink"
-                        description="Title for button to shrink how-to card"
-                        id="gui.cards.shrink"
-                    /> :
-                    <FormattedMessage
-                        defaultMessage="Expand"
-                        description="Title for button to expand how-to card"
-                        id="gui.cards.expand"
-                    />
-                }
-            </div>
-            <div
-                className={styles.removeButton}
-                onClick={onCloseCards}
-            >
-                <img
-                    className={styles.closeIcon}
-                    src={closeIcon}
-                />
-                <FormattedMessage
-                    defaultMessage="Close"
-                    description="Title for button to close how-to card"
-                    id="gui.cards.close"
-                />
-            </div>
+        <div
+            className={styles.removeButton}
+            onClick={onCloseCards}
+        >
+            <FormattedMessage
+                defaultMessage="Close"
+                description="Title for button to close how-to card"
+                id="gui.cards.close"
+            />
+            <img
+                className={styles.closeIcon}
+                src={closeIcon}
+            />
        </div>
    </div>
 );

-class VideoStep extends React.Component {
-
-    componentDidMount () {
-        const script = document.createElement('script');
-        script.src = `https://fast.wistia.com/embed/medias/${this.props.video}.jsonp`;
-        script.async = true;
-        script.setAttribute('id', 'wistia-video-content');
-        document.body.appendChild(script);
-
-        const script2 = document.createElement('script');
-        script2.src = 'https://fast.wistia.com/assets/external/E-v1.js';
-        script2.async = true;
-        script2.setAttribute('id', 'wistia-video-api');
-        document.body.appendChild(script2);
-    }
-
-    // We use the Wistia API here to update or pause the video dynamically:
-    // https://wistia.com/support/developers/player-api
-    componentDidUpdate (prevProps) {
-        // Ensure the wistia API is loaded and available
-        if (!(window.Wistia && window.Wistia.api)) return;
-
-        // Get a handle on the currently loaded video
-        const video = window.Wistia.api(prevProps.video);
-
-        // Reset the video source if a new video has been chosen from the library
-        if (prevProps.video !== this.props.video) {
-            video.replaceWith(this.props.video);
-        }
-
-        // Pause the video if the modal is being shrunken
-        if (!this.props.expanded) {
-            video.pause();
-        }
-    }
-
-    componentWillUnmount () {
-        const script = document.getElementById('wistia-video-content');
-        script.parentNode.removeChild(script);
-
-        const script2 = document.getElementById('wistia-video-api');
-        script2.parentNode.removeChild(script2);
-    }
-
-    render () {
-        return (
-            <div className={styles.stepVideo}>
-                <div
-                    className={`wistia_embed wistia_async_${this.props.video}`}
-                    id="video-div"
-                    style={{height: `257px`, width: `466px`}}
-                >
-                    &nbsp;
-                </div>
-            </div>
-        );
-    }
-}
+// Video step needs to know if the card is being dragged to cover the video
+// so that the mouseup is not swallowed by the iframe.
+const VideoStep = ({video, dragging}) => (
+    <div className={styles.stepVideo}>
+        {dragging ? (
+            <div className={styles.videoCover} />
+        ) : null}
+        <iframe
+            allowFullScreen
+            allowTransparency="true"
+            frameBorder="0"
+            height="338"
+            scrolling="no"
+            src={`https://fast.wistia.net/embed/iframe/${video}?seo=false&videoFoam=true`}
+            title="📹"
+            width="600"
+        />
+        <script
+            async
+            src="https://fast.wistia.net/assets/external/E-v1.js"
+        />
+    </div>
+);

 VideoStep.propTypes = {
-    expanded: PropTypes.bool.isRequired,
+    dragging: PropTypes.bool.isRequired,
    video: PropTypes.string.isRequired
 };

@@ -158,7 +95,6 @@ const ImageStep = ({title, image}) => (
            <img
                className={styles.stepImage}
                draggable={false}
-                key={image} /* Use src as key to prevent hanging around on slow connections */
                src={image}
            />
        </div>
@@ -170,13 +106,13 @@ ImageStep.propTypes = {
    title: PropTypes.node.isRequired
 };

-const NextPrevButtons = ({isRtl, onNextStep, onPrevStep, expanded}) => (
+const NextPrevButtons = ({isRtl, onNextStep, onPrevStep}) => (
    <Fragment>
        {onNextStep ? (
            <div>
-                <div className={expanded ? (isRtl ? styles.leftCard : styles.rightCard) : styles.hidden} />
+                <div className={isRtl ? styles.leftCard : styles.rightCard} />
                <div
-                    className={expanded ? (isRtl ? styles.leftButton : styles.rightButton) : styles.hidden}
+                    className={isRtl ? styles.leftButton : styles.rightButton}
                    onClick={onNextStep}
                >
                    <img
@@ -188,9 +124,9 @@ const NextPrevButtons = ({isRtl, onNextStep, onPrevStep, expanded}) => (
        ) : null}
        {onPrevStep ? (
            <div>
-                <div className={expanded ? (isRtl ? styles.rightCard : styles.leftCard) : styles.hidden} />
+                <div className={isRtl ? styles.rightCard : styles.leftCard} />
                <div
-                    className={expanded ? (isRtl ? styles.rightButton : styles.leftButton) : styles.hidden}
+                    className={isRtl ? styles.rightButton : styles.leftButton}
                    onClick={onPrevStep}
                >
                    <img
@@ -204,16 +140,13 @@ const NextPrevButtons = ({isRtl, onNextStep, onPrevStep, expanded}) => (
 );

 NextPrevButtons.propTypes = {
-    expanded: PropTypes.bool.isRequired,
    isRtl: PropTypes.bool,
    onNextStep: PropTypes.func,
    onPrevStep: PropTypes.func
 };
 CardHeader.propTypes = {
-    expanded: PropTypes.bool.isRequired,
    onCloseCards: PropTypes.func.isRequired,
    onShowAll: PropTypes.func.isRequired,
-    onShrinkExpandCards: PropTypes.func.isRequired,
    step: PropTypes.number,
    totalSteps: PropTypes.number
 };
@@ -285,113 +218,78 @@ const Cards = props => {
        locale,
        onActivateDeckFactory,
        onCloseCards,
-        onShrinkExpandCards,
        onDrag,
        onStartDrag,
        onEndDrag,
        onShowAll,
        onNextStep,
        onPrevStep,
-        showVideos,
        step,
-        expanded,
        ...posProps
    } = props;
    let {x, y} = posProps;

    if (activeDeckId === null) return;

-    // Tutorial cards need to calculate their own dragging bounds
-    // to allow for dragging the cards off the left, right and bottom
-    // edges of the workspace.
-    const cardHorizontalDragOffset = 400; // ~80% of card width
-    const cardVerticalDragOffset = expanded ? 257 : 0; // ~80% of card height, if expanded
-    const menuBarHeight = 48; // TODO: get pre-calculated from elsewhere?
-    const wideCardWidth = 500;
-
    if (x === 0 && y === 0) {
        // initialize positions
-        x = isRtl ? (-190 - wideCardWidth - cardHorizontalDragOffset) : 292;
-        x += cardHorizontalDragOffset;
-        // The tallest cards are about 320px high, and the default position is pinned
+        x = isRtl ? -292 : 292;
+        // The tallest cards are about 385px high, and the default position is pinned
        // to near the bottom of the blocks palette to allow room to work above.
-        const tallCardHeight = 320;
+        const tallCardHeight = 385;
        const bottomMargin = 60; // To avoid overlapping the backpack region
-        y = window.innerHeight - tallCardHeight - bottomMargin - menuBarHeight;
+        y = window.innerHeight - tallCardHeight - bottomMargin;
    }

    const steps = content[activeDeckId].steps;

    return (
-        // Custom overlay to act as the bounding parent for the draggable, using values from above
-        <div
-            className={styles.cardContainerOverlay}
-            style={{
-                width: `${window.innerWidth + (2 * cardHorizontalDragOffset)}px`,
-                height: `${window.innerHeight - menuBarHeight + cardVerticalDragOffset}px`,
-                top: `${menuBarHeight}px`,
-                left: `${-cardHorizontalDragOffset}px`
-            }}
+        <Draggable
+            bounds="parent"
+            position={{x: x, y: y}}
+            onDrag={onDrag}
+            onStart={onStartDrag}
+            onStop={onEndDrag}
        >
-            <Draggable
-                bounds="parent"
-                cancel="#video-div" // disable dragging on video div
-                position={{x: x, y: y}}
-                onDrag={onDrag}
-                onStart={onStartDrag}
-                onStop={onEndDrag}
-            >
-                <div className={styles.cardContainer}>
-                    <div className={styles.card}>
-                        <CardHeader
-                            expanded={expanded}
-                            step={step}
-                            totalSteps={steps.length}
-                            onCloseCards={onCloseCards}
-                            onShowAll={onShowAll}
-                            onShrinkExpandCards={onShrinkExpandCards}
-                        />
-                        <div className={expanded ? styles.stepBody : styles.hidden}>
-                            {steps[step].deckIds ? (
-                                <PreviewsStep
-                                    content={content}
-                                    deckIds={steps[step].deckIds}
-                                    onActivateDeckFactory={onActivateDeckFactory}
-                                    onShowAll={onShowAll}
+            <div className={styles.cardContainer}>
+                <div className={styles.card}>
+                    <CardHeader
+                        step={step}
+                        totalSteps={steps.length}
+                        onCloseCards={onCloseCards}
+                        onShowAll={onShowAll}
+                    />
+                    <div className={styles.stepBody}>
+                        {steps[step].deckIds ? (
+                            <PreviewsStep
+                                content={content}
+                                deckIds={steps[step].deckIds}
+                                onActivateDeckFactory={onActivateDeckFactory}
+                                onShowAll={onShowAll}
+                            />
+                        ) : (
+                            steps[step].video ? (
+                                <VideoStep
+                                    dragging={dragging}
+                                    video={translateVideo(steps[step].video, locale)}
                                />
                            ) : (
-                                steps[step].video ? (
-                                    showVideos ? (
-                                        <VideoStep
-                                            dragging={dragging}
-                                            expanded={expanded}
-                                            video={translateVideo(steps[step].video, locale)}
-                                        />
-                                    ) : ( // Else show the deck image and title
-                                        <ImageStep
-                                            image={content[activeDeckId].img}
-                                            title={content[activeDeckId].name}
-                                        />
-                                    )
-                                ) : (
-                                    <ImageStep
-                                        image={translateImage(steps[step].image, locale)}
-                                        title={steps[step].title}
-                                    />
-                                )
-                            )}
-                            {steps[step].trackingPixel && steps[step].trackingPixel}
-                        </div>
-                        <NextPrevButtons
-                            expanded={expanded}
-                            isRtl={isRtl}
-                            onNextStep={step < steps.length - 1 ? onNextStep : null}
-                            onPrevStep={step > 0 ? onPrevStep : null}
-                        />
+                                <ImageStep
+                                    image={steps[step].image}
+                                    title={steps[step].title}
+                                />
+                            )
+                        )}
+                        {steps[step].trackingPixel && steps[step].trackingPixel}
                    </div>
+                    <NextPrevButtons
+                        isRtl={isRtl}
+                        onNextStep={step < steps.length - 1 ? onNextStep : null}
+                        onPrevStep={step > 0 ? onPrevStep : null}
+                    />
                </div>
-            </Draggable>
-        </div>
+            </div>
+        </Draggable>
    );
 };

@@ -410,7 +308,6 @@ Cards.propTypes = {
        })
    }),
    dragging: PropTypes.bool.isRequired,
-    expanded: PropTypes.bool.isRequired,
    isRtl: PropTypes.bool.isRequired,
    locale: PropTypes.string.isRequired,
    onActivateDeckFactory: PropTypes.func.isRequired,
@@ -420,21 +317,10 @@ Cards.propTypes = {
    onNextStep: PropTypes.func.isRequired,
    onPrevStep: PropTypes.func.isRequired,
    onShowAll: PropTypes.func,
-    onShrinkExpandCards: PropTypes.func.isRequired,
    onStartDrag: PropTypes.func,
-    showVideos: PropTypes.bool,
    step: PropTypes.number.isRequired,
    x: PropTypes.number,
    y: PropTypes.number
 };

-Cards.defaultProps = {
-    showVideos: true
-};
-
-export {
-    Cards as default,
-    // Others exported for testability
-    ImageStep,
-    VideoStep
-};
+export default Cards;
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>Extensions/Connection/Close</title>
+    <!-- Generator: Sketch 52.2 (67145) - http://www.bohemiancoding.com/sketch -->
+    <title>General/Check Copy</title>
    <desc>Created with Sketch.</desc>
    <defs>
-        <path d="M15.464935,15.467297 C14.7644059,16.1777705 13.6185877,16.1777705 12.9081142,15.467297 L9.99881899,12.5580018 L7.08841885,15.467297 C6.38236506,16.1733508 5.23765187,16.1733508 4.53159807,15.467297 C4.17912364,15.1148226 4.00012409,14.6485398 4.00012409,14.1888866 C4.00012409,13.7281285 4.17912364,13.2629506 4.53159807,12.9104762 L7.44089328,10.001181 L4.52717833,7.08636112 C4.17359897,6.73278176 3.99459941,6.26760391 4.00012409,5.80242606 C4.00012409,5.34166795 4.17359897,4.88201477 4.52717833,4.52954034 C5.23212719,3.82348655 6.37684038,3.82348655 7.08399911,4.52954034 L9.99881899,7.44325529 L12.9125339,4.52954034 C13.6185877,3.82348655 14.7644059,3.82348655 15.4704597,4.52954034 C16.1765134,5.2344892 16.1765134,6.38030733 15.4704597,7.08636112 L12.5545348,10.001181 L15.4704597,12.914896 C16.1765134,13.6209497 16.1765134,14.7557185 15.464935,15.467297" id="path-1"></path>
+        <path d="M10,7.73577763 L12.2675846,5.46819305 C12.8909754,4.84480221 13.8988379,4.84194841 14.5284447,5.47155526 C15.1536925,6.096803 15.1476685,7.11655392 14.531807,7.73241542 L12.2642224,10 L14.531807,12.2675846 C15.1551978,12.8909754 15.1580516,13.8988379 14.5284447,14.5284447 C13.903197,15.1536925 12.8834461,15.1476685 12.2675846,14.531807 L10,12.2642224 L7.73241542,14.531807 C7.10902458,15.1551978 6.10116212,15.1580516 5.47155526,14.5284447 C4.84630752,13.903197 4.85233155,12.8834461 5.46819305,12.2675846 L7.73577763,10 L5.46819305,7.73241542 C4.84480221,7.10902458 4.84194841,6.10116212 5.47155526,5.47155526 C6.096803,4.84630752 7.11655392,4.85233155 7.73241542,5.46819305 L10,7.73577763 Z" id="path-1"></path>
    </defs>
-    <g id="Extensions/Connection/Close" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="General/Check-Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <mask id="mask-2" fill="white">
            <use xlink:href="#path-1"></use>
        </mask>
-        <use id="close" fill="#FFFFFF" xlink:href="#path-1"></use>
-        <g id="White" mask="url(#mask-2)" fill="#FFFFFF">
+        <use id="close-icon" fill="#FFFFFF" xlink:href="#path-1"></use>
+        <g id="Color/White" mask="url(#mask-2)" fill="#FFFFFF">
            <rect id="Color" x="0" y="0" width="20" height="20"></rect>
        </g>
    </g>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>Tutorials/Expand</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M4.5,2 L15.5,2 C16.8807119,2 18,3.11928813 18,4.5 L18,5.5 C18,5.77614237 17.7761424,6 17.5,6 L2.5,6 C2.22385763,6 2,5.77614237 2,5.5 L2,4.5 C2,3.11928813 3.11928813,2 4.5,2 Z M2.5,7 L17.5,7 C17.7761424,7 18,7.22385763 18,7.5 L18,15.5 C18,16.8807119 16.8807119,18 15.5,18 L4.5,18 C3.11928813,18 2,16.8807119 2,15.5 L2,7.5 C2,7.22385763 2.22385763,7 2.5,7 Z M9.65509466,15.1636146 C9.745416,15.2533569 9.86700241,15.3031495 9.99727357,15.3031495 C10.1275447,15.3031495 10.2491311,15.2533569 10.3394525,15.1636146 L12.1574588,13.3456082 C12.3004676,13.2025994 12.3415754,12.9993764 12.2657286,12.8158388 C12.1898819,12.6334592 12.0109762,12.5153467 11.8100691,12.5153467 L11.1506075,12.5153467 L10.7899012,9.98808625 C10.7464775,9.64474938 10.4703026,9.36567961 10.1124912,9.30951827 C10.0783312,9.30546539 10.0435922,9.30314946 10.0094322,9.30314946 C9.61282891,9.30314946 9.27586085,9.59785176 9.22548933,9.98519134 L8.8740467,12.5153467 L8.18447804,12.5153467 C7.9858869,12.5153467 7.81450796,12.6265114 7.73692425,12.8065751 C7.65876155,12.9866388 7.69639544,13.1962306 7.83708829,13.3456082 L9.65509466,15.1636146 Z" id="path-1"></path>
-    </defs>
-    <g id="Tutorials/Expand" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <g id="Combined-Shape" fill-rule="nonzero"></g>
-        <g id="White" mask="url(#mask-2)" fill="#FFFFFF">
-            <rect id="Color" x="0" y="0" width="20" height="20"></rect>
-        </g>
-    </g>
-</svg>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>Tutorials/Shink</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M2.5,8 C2.22385763,8 2,7.77614237 2,7.5 C2,7.22385763 2.22385763,7 2.5,7 L3.5,7 C3.77614237,7 4,7.22385763 4,7.5 C4,7.77614237 3.77614237,8 3.5,8 L2.5,8 Z M5.5,8 C5.22385763,8 5,7.77614237 5,7.5 C5,7.22385763 5.22385763,7 5.5,7 L6.5,7 C6.77614237,7 7,7.22385763 7,7.5 C7,7.77614237 6.77614237,8 6.5,8 L5.5,8 Z M8.5,8 C8.22385763,8 8,7.77614237 8,7.5 C8,7.22385763 8.22385763,7 8.5,7 L9.5,7 C9.77614237,7 10,7.22385763 10,7.5 C10,7.77614237 9.77614237,8 9.5,8 L8.5,8 Z M11.5,8 C11.2238576,8 11,7.77614237 11,7.5 C11,7.22385763 11.2238576,7 11.5,7 L12.5,7 C12.7761424,7 13,7.22385763 13,7.5 C13,7.77614237 12.7761424,8 12.5,8 L11.5,8 Z M14.5,8 C14.2238576,8 14,7.77614237 14,7.5 C14,7.22385763 14.2238576,7 14.5,7 L15.5,7 C15.7761424,7 16,7.22385763 16,7.5 C16,7.77614237 15.7761424,8 15.5,8 L14.5,8 Z M17,7.5 C17,7.22385763 17.2238576,7 17.5,7 C17.7761424,7 18,7.22385763 18,7.5 L18,8.5 C18,8.77614237 17.7761424,9 17.5,9 C17.2238576,9 17,8.77614237 17,8.5 L17,7.5 Z M17,10.5 C17,10.2238576 17.2238576,10 17.5,10 C17.7761424,10 18,10.2238576 18,10.5 L18,11.5 C18,11.7761424 17.7761424,12 17.5,12 C17.2238576,12 17,11.7761424 17,11.5 L17,10.5 Z M17,13.5 C17,13.2238576 17.2238576,13 17.5,13 C17.7761424,13 18,13.2238576 18,13.5 L18,14.5 C18,14.7761424 17.7761424,15 17.5,15 C17.2238576,15 17,14.7761424 17,14.5 L17,13.5 Z M16.8130884,16.2258789 C16.9469778,15.9843665 17.2513011,15.8971208 17.4928135,16.0310102 C17.7343259,16.1648996 17.8215716,16.4692229 17.6876822,16.7107353 C17.4827416,17.0804113 17.1867239,17.3929429 16.8289716,17.6178178 C16.59518,17.7647739 16.286523,17.6943798 16.1395669,17.4605882 C15.9926108,17.2267966 16.0630049,16.9181396 16.2967965,16.7711835 C16.5118233,16.6360225 16.6900031,16.4479027 16.8130884,16.2258789 Z M14.5614675,17 C14.8376098,17 15.0614675,17.2238576 15.0614675,17.5 C15.0614675,17.7761424 14.8376098,18 14.5614675,18 L13.5614675,18 C13.2853251,18 13.0614675,17.7761424 13.0614675,17.5 C13.0614675,17.2238576 13.2853251,17 13.5614675,17 L14.5614675,17 Z M11.5614675,17 C11.8376098,17 12.0614675,17.2238576 12.0614675,17.5 C12.0614675,17.7761424 11.8376098,18 11.5614675,18 L10.5614675,18 C10.2853251,18 10.0614675,17.7761424 10.0614675,17.5 C10.0614675,17.2238576 10.2853251,17 10.5614675,17 L11.5614675,17 Z M8.56146746,17 C8.83760983,17 9.06146746,17.2238576 9.06146746,17.5 C9.06146746,17.7761424 8.83760983,18 8.56146746,18 L7.56146746,18 C7.28532508,18 7.06146746,17.7761424 7.06146746,17.5 C7.06146746,17.2238576 7.28532508,17 7.56146746,17 L8.56146746,17 Z M5.56146746,17 C5.83760983,17 6.06146746,17.2238576 6.06146746,17.5 C6.06146746,17.7761424 5.83760983,18 5.56146746,18 L4.56146746,18 C4.28532508,18 4.06146746,17.7761424 4.06146746,17.5 C4.06146746,17.2238576 4.28532508,17 4.56146746,17 L5.56146746,17 Z M3.22779886,16.2951753 C3.37445671,16.5291541 3.30366909,16.8377211 3.06969027,16.9843789 C2.83571145,17.1310368 2.52714447,17.0602491 2.38048662,16.8262703 C2.15682122,16.4694332 2.02609629,16.0609535 2.00352115,15.6335963 C1.98895424,15.3578384 2.20069137,15.1224836 2.47644927,15.1079167 C2.75220716,15.0933498 2.98756192,15.3050869 3.00212882,15.5808448 C3.01567642,15.8373067 3.0937811,16.0813625 3.22779886,16.2951753 Z M3,13.6229349 C3,13.8990773 2.77614237,14.1229349 2.5,14.1229349 C2.22385763,14.1229349 2,13.8990773 2,13.6229349 L2,12.6229349 C2,12.3467925 2.22385763,12.1229349 2.5,12.1229349 C2.77614237,12.1229349 3,12.3467925 3,12.6229349 L3,13.6229349 Z M3,10.6229349 C3,10.8990773 2.77614237,11.1229349 2.5,11.1229349 C2.22385763,11.1229349 2,10.8990773 2,10.6229349 L2,9.62293492 C2,9.34679254 2.22385763,9.12293492 2.5,9.12293492 C2.77614237,9.12293492 3,9.34679254 3,9.62293492 L3,10.6229349 Z M3,7.62293492 C3,7.89907729 2.77614237,8.12293492 2.5,8.12293492 C2.22385763,8.12293492 2,7.89907729 2,7.62293492 L2,7.5 C2,7.22385763 2.22385763,7 2.5,7 C2.77614237,7 3,7.22385763 3,7.5 L3,7.62293492 Z M4.5,2 L15.5,2 C16.8807119,2 18,3.11928813 18,4.5 L18,5.5 C18,5.77614237 17.7761424,6 17.5,6 L2.5,6 C2.22385763,6 2,5.77614237 2,5.5 L2,4.5 C2,3.11928813 3.11928813,2 4.5,2 Z M10.3449053,9.44268434 L12.1629117,11.2606907 C12.3036046,11.4100683 12.3412384,11.6196601 12.2630758,11.7997238 C12.185492,11.9797875 12.0141131,12.0909522 11.815522,12.0909522 L11.1259533,12.0909522 L10.7745107,14.6211076 C10.7241392,15.0084472 10.3871711,15.3031495 9.99056779,15.3031495 C9.9564078,15.3031495 9.92166882,15.3008335 9.88750883,15.2967806 C9.52969739,15.2406193 9.25352253,14.9615495 9.21009882,14.6182127 L8.84939246,12.0909522 L8.18993091,12.0909522 C7.98902384,12.0909522 7.81011812,11.9728397 7.73427135,11.7904601 C7.65842459,11.6069225 7.69953238,11.4036995 7.84254116,11.2606907 L9.66054753,9.44268434 C9.75086886,9.35294199 9.87245528,9.30314946 10.0027264,9.30314946 C10.1329976,9.30314946 10.254584,9.35294199 10.3449053,9.44268434 Z" id="path-1"></path>
-    </defs>
-    <g id="Tutorials/Shink" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <g id="Rectangle" fill-rule="nonzero"></g>
-        <g id="White" mask="url(#mask-2)" fill="#FFFFFF">
-            <rect id="Color" x="0" y="0" width="20" height="20"></rect>
-        </g>
-    </g>
-</svg>
@@ -45,8 +45,8 @@ const AutoScanningStep = props => (
                                src={radarIcon}
                            />
                            <img
-                                className={styles.connectionTipIcon}
-                                src={props.connectionTipIconURL}
+                                className={styles.peripheralButtonImage}
+                                src={props.peripheralButtonImage}
                            />
                        </React.Fragment>
                    )}
@@ -142,9 +142,9 @@ const AutoScanningStep = props => (
 );

 AutoScanningStep.propTypes = {
-    connectionTipIconURL: PropTypes.string,
    onRefresh: PropTypes.func,
    onStartScan: PropTypes.func,
+    peripheralButtonImage: PropTypes.string,
    phase: PropTypes.oneOf(Object.keys(PHASES))
 };

@@ -15,7 +15,7 @@ const ConnectedStep = props => (
                <div className={styles.peripheralActivity}>
                    <img
                        className={styles.peripheralActivityIcon}
-                        src={props.connectionIconURL}
+                        src={props.peripheralImage}
                    />
                    <img
                        className={styles.bluetoothConnectedIcon}
@@ -64,9 +64,9 @@ const ConnectedStep = props => (
 );

 ConnectedStep.propTypes = {
-    connectionIconURL: PropTypes.string.isRequired,
    onCancel: PropTypes.func,
-    onDisconnect: PropTypes.func
+    onDisconnect: PropTypes.func,
+    peripheralImage: PropTypes.string.isRequired
 };

 export default ConnectedStep;
@@ -18,7 +18,7 @@ const ConnectingStep = props => (
                <div className={styles.peripheralActivity}>
                    <img
                        className={styles.peripheralActivityIcon}
-                        src={props.connectionIconURL}
+                        src={props.peripheralImage}
                    />
                    <img
                        className={styles.bluetoothConnectingIcon}
@@ -63,8 +63,8 @@ const ConnectingStep = props => (

 ConnectingStep.propTypes = {
    connectingMessage: PropTypes.node.isRequired,
-    connectionIconURL: PropTypes.string.isRequired,
-    onDisconnect: PropTypes.func
+    onDisconnect: PropTypes.func,
+    peripheralImage: PropTypes.string.isRequired
 };

 export default ConnectingStep;
@@ -162,7 +162,7 @@
    height: 80px; */
 }

-.connection-tip-icon {
+.peripheral-button-image {
    position: absolute;
 }

@@ -27,7 +27,7 @@ const ConnectionModalComponent = props => (
        className={styles.modalContent}
        contentLabel={props.name}
        headerClassName={styles.header}
-        headerImage={props.connectionSmallIconURL}
+        headerImage={props.smallPeripheralImage}
        id="connectionModal"
        onHelp={props.onHelp}
        onRequestClose={props.onCancel}
@@ -44,21 +44,17 @@ const ConnectionModalComponent = props => (
 );

 ConnectionModalComponent.propTypes = {
-    connectingMessage: PropTypes.node.isRequired,
-    connectionSmallIconURL: PropTypes.string,
-    connectionTipIconURL: PropTypes.string,
+    connectingMessage: PropTypes.node,
    name: PropTypes.node,
    onCancel: PropTypes.func.isRequired,
    onHelp: PropTypes.func.isRequired,
+    peripheralButtonImage: PropTypes.string,
    phase: PropTypes.oneOf(Object.keys(PHASES)).isRequired,
+    smallPeripheralImage: PropTypes.string,
    title: PropTypes.string.isRequired,
    useAutoScan: PropTypes.bool.isRequired
 };

-ConnectionModalComponent.defaultProps = {
-    connectingMessage: 'Connecting'
-};
-
 export {
    ConnectionModalComponent as default,
    PHASES
@@ -17,7 +17,7 @@ const ErrorStep = props => (
                <div className={styles.peripheralActivity}>
                    <img
                        className={styles.peripheralActivityIcon}
-                        src={props.connectionIconURL}
+                        src={props.peripheralImage}
                    />
                </div>
            </Box>
@@ -70,9 +70,9 @@ const ErrorStep = props => (
 );

 ErrorStep.propTypes = {
-    connectionIconURL: PropTypes.string.isRequired,
    onHelp: PropTypes.func,
-    onScanning: PropTypes.func
+    onScanning: PropTypes.func,
+    peripheralImage: PropTypes.string.isRequired
 };

 export default ErrorStep;
@@ -1,41 +1,34 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg width="52px" height="52px" viewBox="0 0 52 52" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 style="enable-background:new 0 0 52 52;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0FBD8C;}
-	.st1{fill:#FFFFFF;}
-	.st2{fill:#F9A83A;}
-</style>
-<title>Scratch Link</title>
-<desc>Created with Sketch.</desc>
-<g id="_x35_2x52-for-the-dialog">
-	<g id="Group">
-		<path id="bg" class="st0" d="M41.4,5c3.1,0,5.6,2.5,5.6,5.6v30.8c0,3.1-2.5,5.6-5.6,5.6H10.6C7.5,47,5,44.5,5,41.4V10.6
-			C5,7.5,7.5,5,10.6,5H41.4z"/>
-		<path id="scratch-outline-2" class="st1" d="M28.8,28.9c0,2.7-1.1,5.4-3.2,7.2c-1.7,1.5-3.8,2.3-5.9,2.4c-1,0.8-2.2,1.3-3.5,1.4
-			c-0.1,0-0.3,0-0.4,0c-3.3,0-6.1-2.7-6.4-6.2c0,0,0-0.1,0-0.2c0,0,0,0,0-0.1c-0.1-1.5,0-2.7,0-3.4c0-0.7,0.1-2,0.1-2.3v0
-			c0-1,0.3-2,0.7-2.9c-0.1-1-0.1-2.1,0-3.2l0-0.2c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0.1-1,0.3-2.5,1.1-4.2c1.4-2.7,4-4.3,7-4.3h0.1
-			c0.9-0.5,2-0.8,3.1-0.8h0.1c3.5,0.1,6.3,3.1,6.3,6.7c0,0-0.1,4.4-0.3,5.9C28.4,25.9,28.7,27.4,28.8,28.9"/>
-		<path id="scratch-outline-1" class="st2" d="M25.8,29c0,1.8-0.8,3.6-2.2,4.8c-1.2,1.1-2.8,1.7-4.3,1.7c-0.3,0-0.5,0-0.8-0.1
-			c-0.1,0.1-0.1,0.2-0.2,0.2c-0.6,0.7-1.5,1.1-2.4,1.2c-0.1,0-0.1,0-0.2,0c-1.8,0-3.3-1.5-3.4-3.3c0,0,0-0.1,0-0.1l0,0
-			c-0.1-1.3,0-2.4,0-3.1c0-0.8,0.1-2.1,0.1-2.4c0-0.9,0.3-1.7,0.9-2.4c-0.3-1-0.4-2.1-0.2-3.5l0-0.2c0,0,0,0,0,0
-			c0.1-0.8,0.2-2,0.8-3.1c0.9-1.7,2.5-2.7,4.4-2.7c0.1,0,0.2,0,0.3,0c0.2,0,0.4,0,0.6,0.1c0.6-0.6,1.5-0.9,2.4-0.9
-			c1.9,0,3.4,1.6,3.4,3.6c0,0-0.2,5.2-0.2,5.7c0,0.3-0.1,0.5-0.2,0.8C25.3,26.2,25.8,27.5,25.8,29"/>
-		<path id="scratch-fill" class="st1" d="M18.3,25.3c-0.9-0.1-1.4-0.8-1.1-2.7l0-0.2c0.2-1.7,0.4-2,1.1-2c0.2,0,0.5,0.2,0.7,0.4
-			c0.2,0.3,0.8,0.7,1.1,1.4c0.2,0.5,0.3,0.9,0.3,1.3l0,0.5v0c0.1,0.3,0.3,0.6,0.6,0.6c0.4,0.1,0.8-0.2,0.9-0.6
-			c0-0.1,0.2-5.1,0.2-5.2c0-0.4-0.3-0.8-0.8-0.8c-0.4,0-0.8,0.4-0.8,0.8c0,0,0,0.7,0,1.4c-0.6-0.7-1.4-1.3-2.3-1.4
-			c-2.3-0.1-2.6,2.1-2.8,3.4l0,0.2c-0.3,2.5,0.5,4.2,2.4,4.5c2.1,0.3,3.5,0.8,3.5,2.2c0,0.5-0.3,1.1-0.7,1.5c-0.6,0.5-1.3,0.7-2,0.6
-			c-0.2,0-0.4-0.1-0.6-0.2c-0.3-0.2-1-0.6-1.3-1.1c-0.3-0.4-0.4-1.1-0.4-1.5c0-0.2,0-0.3,0-0.3c0-0.4-0.3-0.8-0.8-0.8
-			c-0.4,0-0.8,0.3-0.8,0.8c0,0,0,1.6-0.1,2.5c-0.1,1.5,0,2.8,0,2.9c0,0.4,0.4,0.8,0.8,0.8c0.4,0,0.8-0.4,0.7-0.9c0,0,0-0.6,0-1.5
-			c0.6,0.4,1.3,0.7,2.2,0.9c1.2,0.2,2.3-0.1,3.3-1c0.8-0.7,1.3-1.7,1.3-2.7C23.1,26,19.9,25.5,18.3,25.3"/>
-		<path id="signal" class="st1" d="M37.7,36.9c-0.2,0-0.4-0.1-0.5-0.2c-0.3-0.3-0.3-0.8,0-1.1c2.6-2.6,4-6,4-9.6
-			c0-3.6-1.4-7.1-4-9.7c-0.3-0.3-0.3-0.8,0-1.1c0.3-0.3,0.8-0.3,1,0c2.8,2.9,4.4,6.7,4.4,10.7c0,4-1.6,7.9-4.4,10.7
-			C38.1,36.9,37.9,36.9,37.7,36.9z M35,33.5c-0.2,0-0.4-0.1-0.5-0.2c-0.3-0.3-0.3-0.8,0-1.1c1.7-1.7,2.6-3.9,2.6-6.3
-			c0-2.4-0.9-4.6-2.6-6.3c-0.3-0.3-0.3-0.8,0-1.1c0.3-0.3,0.8-0.3,1,0c1.9,2,3,4.6,3,7.3c0,2.8-1.1,5.4-3,7.3
-			C35.4,33.5,35.2,33.5,35,33.5z M32.3,30.1c-0.2,0-0.4-0.1-0.5-0.2c-0.3-0.3-0.3-0.8,0-1.1c0.8-0.8,1.2-1.8,1.2-2.9
-			c0-1.1-0.4-2.1-1.2-2.9c-0.3-0.3-0.3-0.8,0-1.1c0.3-0.3,0.8-0.3,1,0c1,1,1.6,2.4,1.6,3.9c0,1.5-0.6,2.9-1.6,3.9
-			C32.7,30.1,32.5,30.1,32.3,30.1z"/>
-	</g>
-</g>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="52px" height="52px" viewBox="0 0 52 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 51.1 (57501) - http://www.bohemiancoding.com/sketch -->
+    <title>scratchlink</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <path d="M6.599912,0 L37.399912,0 C41.045312,0 43.999912,2.95504 43.999912,6.6 L43.999912,37.4 C43.999912,41.04496 41.045312,44 37.399912,44 L6.599912,44 C2.954952,44 -8.8e-05,41.04496 -8.8e-05,37.4 L-8.8e-05,6.6 C-8.8e-05,2.95504 2.954952,0 6.599912,0" id="path-1"></path>
+        <filter x="-13.6%" y="-13.6%" width="127.3%" height="127.3%" filterUnits="objectBoundingBox" id="filter-2">
+            <feMorphology radius="2" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+            <feColorMatrix values="0 0 0 0 0.298039216   0 0 0 0 0.592156863   0 0 0 0 1  0 0 0 0.25 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
+        </filter>
+    </defs>
+    <g id="R1_Extension" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="No-Comms-with-Scratch-Link-or-Bluetooth" transform="translate(-506.000000, -262.000000)">
+            <g id="No-connection-v2" transform="translate(-2.000000, 0.000000)">
+                <g id="Modal" transform="translate(407.000000, 187.000000)">
+                    <g id="Scratch-Link" transform="translate(53.000000, 75.000000)">
+                        <g id="scratchlink" transform="translate(52.000000, 4.000000)">
+                            <g id="Fill-1">
+                                <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+                                <use fill="#25AFF4" fill-rule="evenodd" xlink:href="#path-1"></use>
+                            </g>
+                            <path d="M35.854764,19.82882 C36.027684,20.8681 36.062444,21.91574 35.988084,22.9427 L39.440764,24.78542 C39.984604,25.05162 40.240684,25.68522 40.034324,26.25458 L38.559444,30.3237 C38.353084,30.89438 37.748524,31.2169 37.159364,31.07082 L33.333564,30.26386 C32.718004,31.10382 32.018404,31.8835 31.217604,32.56902 L32.519124,36.64606 C32.716684,37.21982 32.448724,37.85034 31.898724,38.10686 L27.975684,39.93638 C27.425684,40.19246 26.770524,39.9927 26.458124,39.47262 L24.171444,35.85494 C23.131724,36.02742 22.084524,36.06218 21.057124,35.98826 L19.215724,39.43918 C18.949084,39.9839 18.314604,40.23998 17.744364,40.0323 L13.669084,38.54906 C13.099284,38.34138 12.777644,37.7377 12.923284,37.14898 L13.730684,33.32186 C12.896444,32.71818 12.116324,32.01858 11.431244,31.21778 L7.354204,32.5193 C6.780004,32.71686 6.149924,32.4489 5.893404,31.8989 L4.063884,27.97542 C3.807364,27.42542 4.007564,26.7707 4.527204,26.45786 L8.133884,24.1769 C7.972404,23.13146 7.920924,22.0781 8.006284,21.04586 L4.556684,19.20446 C4.011524,18.93782 3.755884,18.30202 3.964004,17.73178 L5.449444,13.66838 C5.658004,13.09902 6.262124,12.77826 6.850404,12.92478 L10.666964,13.73614 C11.270204,12.9019 11.981684,12.1165 12.782044,11.43098 L11.480964,7.35394 C11.283404,6.78018 11.551364,6.14966 12.101364,5.89314 L16.024404,4.06362 C16.574404,3.8071 17.229564,4.0073 17.541964,4.52782 L19.828644,8.14506 C20.868364,7.97258 21.927444,7.9321 22.960564,7.9893 L24.796244,4.55466 C25.062884,4.01038 25.697364,3.75474 26.266724,3.96198 L30.325724,5.4395 C30.895524,5.64674 31.217164,6.25086 31.071084,6.83914 L30.263684,10.6667 C31.109804,11.2651 31.883764,11.98186 32.580724,12.77694 L36.646324,11.4807 C37.220084,11.28314 37.850164,11.5511 38.106684,12.1011 L39.936204,16.02458 C40.192724,16.57458 39.992524,17.2293 39.472444,17.54214 L35.854764,19.82882 Z" id="Fill-4" fill-opacity="0.15" fill="#231F20"></path>
+                            <path d="M30.417684,24.430956 C30.445844,26.694756 29.431644,28.874076 27.638204,30.404836 C26.209964,31.635956 24.408604,32.343916 22.535524,32.412996 C21.669604,33.092796 20.619324,33.496276 19.495124,33.567996 C19.375004,33.575476 19.254884,33.580316 19.134764,33.580316 C16.263324,33.580316 13.845964,31.337196 13.626404,28.473236 C13.623764,28.439796 13.621124,28.394036 13.618484,28.335076 C13.615844,28.314836 13.613644,28.294156 13.613644,28.271276 C13.557324,27.065236 13.585484,26.068636 13.621124,25.435036 C13.654564,24.850276 13.674804,23.797356 13.677444,23.552276 L13.677444,23.536876 C13.692844,22.680636 13.904924,21.845516 14.290804,21.096636 C14.180804,20.258876 14.183444,19.361716 14.300924,18.421876 L14.316324,18.276236 C14.318964,18.258196 14.318964,18.237516 14.321164,18.219916 C14.323804,18.204516 14.326444,18.186916 14.329084,18.168876 C14.425884,17.368956 14.594844,16.058196 15.310284,14.714436 C16.500924,12.460756 18.759444,11.116996 21.350164,11.116996 L21.460164,11.116996 C22.275044,10.662476 23.192444,10.419596 24.134924,10.419596 L24.234804,10.419596 C27.234284,10.473276 29.674524,12.951356 29.674524,15.945996 C29.674524,15.979436 29.572004,19.571596 29.457164,20.800516 C30.078004,21.886436 30.404924,23.117996 30.417684,24.430956" id="Fill-6" fill="#FFFFFF"></path>
+                            <path d="M27.86278,24.459116 C27.88302,25.959076 27.19354,27.425596 25.96946,28.470596 C24.92974,29.367316 23.60094,29.863196 22.2343,29.863196 C21.9989,29.860556 21.7613,29.847796 21.52898,29.816996 C21.4753,29.888716 21.41898,29.957796 21.36046,30.023796 C20.83378,30.619116 20.10822,30.971996 19.31622,31.017756 C19.25506,31.023036 19.1961,31.025676 19.13494,31.025676 C17.58922,31.025676 16.28858,29.814356 16.17374,28.271276 C16.1711,28.240476 16.16846,28.209676 16.16846,28.176676 L16.16626,28.153796 C16.11478,27.055116 16.1403,26.150476 16.1711,25.585956 C16.20938,24.931676 16.23006,23.820236 16.23226,23.579996 C16.24502,22.828916 16.53366,22.146916 17.00138,21.628156 C16.76906,20.823396 16.69514,19.857596 16.8377,18.715356 L16.85574,18.549476 C16.85838,18.536716 16.85838,18.523956 16.86102,18.511196 C16.94286,17.841516 17.06518,16.852836 17.56854,15.907716 C18.32006,14.486956 19.69946,13.672076 21.3499,13.672076 C21.4423,13.672076 21.5391,13.674716 21.63854,13.679556 C21.81278,13.689676 21.98878,13.710356 22.15994,13.741156 C22.69674,13.258036 23.40954,12.959276 24.19142,12.974236 C25.80622,13.002396 27.11918,14.336476 27.11918,15.945996 C27.11918,15.981636 26.97618,20.281756 26.9071,20.654876 C26.86618,20.887196 26.79754,21.109396 26.70778,21.319276 C27.45138,22.177276 27.85266,23.248236 27.86278,24.459116" id="Fill-8" fill="#F9A83A"></path>
+                            <path d="M21.41766,21.36794 C20.65162,21.2487 20.24286,20.7361 20.44614,19.15034 L20.46946,18.95894 C20.64018,17.58174 20.78362,17.27506 21.44626,17.3107 C21.6403,17.32302 21.86382,17.44578 22.0869,17.62882 C22.29414,17.86862 22.75394,18.17882 23.0131,18.79306 C23.19922,19.24362 23.26302,19.53754 23.28942,19.85434 L23.33078,20.24242 L23.33078,20.24066 C23.38534,20.50642 23.58906,20.7251 23.87066,20.77218 C24.23278,20.83862 24.58258,20.5975 24.64638,20.2345 C24.6543,20.19138 24.81886,16.01534 24.81886,15.94714 C24.81886,15.5793 24.52362,15.28054 24.15358,15.27438 C23.78354,15.27218 23.4839,15.5727 23.4839,15.93966 C23.4839,15.94802 23.48214,16.52442 23.47026,17.10522 C22.94358,16.53322 22.26994,16.01974 21.5149,15.9753 C19.49574,15.8675 19.2753,17.72386 19.14242,18.79394 L19.12218,18.98358 C18.85026,21.09778 19.55514,22.43186 21.21218,22.69146 C23.0131,22.97394 24.21518,23.38754 24.22618,24.49546 C24.23278,24.92622 24.00618,25.36842 23.61106,25.70766 C23.13454,26.1129 22.49654,26.2955 21.89594,26.19694 C21.70938,26.16834 21.5347,26.1173 21.3675,26.06142 C21.13166,25.9303 20.53678,25.56818 20.23538,25.15106 C19.98106,24.79906 19.89306,24.24554 19.86534,23.89442 C19.86886,23.7369 19.8693,23.6335 19.8693,23.62162 C19.8759,23.25202 19.57934,22.95062 19.2137,22.94182 C18.84234,22.9339 18.5383,23.23222 18.53126,23.60138 C18.53126,23.6137 18.51454,24.92226 18.46658,25.7103 C18.39794,26.97926 18.46658,28.05462 18.46658,28.10126 C18.49386,28.46998 18.8111,28.74806 19.18026,28.72342 C19.54766,28.70362 19.82838,28.38418 19.80286,28.01502 C19.80286,28.0093 19.76986,27.48878 19.77426,26.76806 C20.26398,27.0809 20.90726,27.38494 21.67418,27.51562 C22.67298,27.68326 23.6951,27.39418 24.47522,26.72318 C25.17482,26.12522 25.57522,25.30858 25.56422,24.48182 C25.54002,22.01254 22.75394,21.57914 21.41766,21.36794" id="Fill-10" fill="#FFFFFF"></path>
+                        </g>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -23,7 +23,7 @@ class PeripheralTile extends React.Component {
                <Box className={styles.peripheralTileName}>
                    <img
                        className={styles.peripheralTileImage}
-                        src={this.props.connectionSmallIconURL}
+                        src={this.props.smallPeripheralImage}
                    />
                    <Box className={styles.peripheralTileNameWrapper}>
                        <Box className={styles.peripheralTileNameLabel}>
@@ -77,11 +77,11 @@ class PeripheralTile extends React.Component {
 }

 PeripheralTile.propTypes = {
-    connectionSmallIconURL: PropTypes.string,
    name: PropTypes.string,
    onConnecting: PropTypes.func,
    peripheralId: PropTypes.string,
-    rssi: PropTypes.number
+    rssi: PropTypes.number,
+    smallPeripheralImage: PropTypes.string
 };

 export default PeripheralTile;
@@ -34,11 +34,11 @@ const ScanningStep = props => (
                    <div className={styles.peripheralTilePane}>
                        {props.peripheralList.map(peripheral =>
                            (<PeripheralTile
-                                connectionSmallIconURL={props.connectionSmallIconURL}
                                key={peripheral.peripheralId}
                                name={peripheral.name}
                                peripheralId={peripheral.peripheralId}
                                rssi={peripheral.rssi}
+                                smallPeripheralImage={props.smallPeripheralImage}
                                onConnecting={props.onConnecting}
                            />)
                        )}
@@ -86,7 +86,6 @@ const ScanningStep = props => (
 );

 ScanningStep.propTypes = {
-    connectionSmallIconURL: PropTypes.string,
    onConnecting: PropTypes.func,
    onRefresh: PropTypes.func,
    peripheralList: PropTypes.arrayOf(PropTypes.shape({
@@ -94,7 +93,8 @@ ScanningStep.propTypes = {
        rssi: PropTypes.number,
        peripheralId: PropTypes.string
    })),
-    scanning: PropTypes.bool.isRequired
+    scanning: PropTypes.bool.isRequired,
+    smallPeripheralImage: PropTypes.string
 };

 ScanningStep.defaultProps = {
@@ -33,6 +33,6 @@
    border-top: 1px solid $ui-black-transparent;
 }

-.menu-item-danger:hover {
+.menu-item-bordered:hover {
    background: $error-primary;
 }
@@ -25,17 +25,9 @@ const BorderedMenuItem = props => (
    />
 );

-const DangerousMenuItem = props => (
-    <MenuItem
-        {...props}
-        attributes={{className: classNames(styles.menuItem, styles.menuItemBordered, styles.menuItemDanger)}}
-    />
-);
-

 export {
    BorderedMenuItem,
-    DangerousMenuItem,
    StyledContextMenu as ContextMenu,
    StyledMenuItem as MenuItem
 };
@@ -1,36 +0,0 @@
-@import "../../css/colors.css";
-@import "../../css/units.css";
-
-/* wrapper to allow for touch slop if we decide to add it */
-.delete-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    user-select: none;
-    cursor: pointer;
-    transition: all 0.15s ease-out;
-}
-
-.delete-button-visible {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  overflow: hidden;  /* Mask the icon animation */
-  width: 1.75rem;
-  height: 1.75rem;
-  box-shadow: 0px 0px 0px 2px $motion-transparent;
-  background-color: $motion-primary;
-  color: $ui-white;
-  border-radius: 50%;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  user-select: none;
-  cursor: pointer;
-  transition: all 0.15s ease-out;
-}
-
-.delete-icon {
-    position: relative;
-    margin: 0.25rem;
-    user-select: none;
-    transform-origin: 50%;
-}
@@ -1,39 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-
-import styles from './delete-button.css';
-import deleteIcon from './icon--delete.svg';
-
-const DeleteButton = props => (
-    <div
-        aria-label="Delete"
-        className={classNames(
-            styles.deleteButton,
-            props.className
-        )}
-        role="button"
-        tabIndex={props.tabIndex}
-        onClick={props.onClick}
-    >
-        <div className={styles.deleteButtonVisible}>
-            <img
-                className={styles.deleteIcon}
-                src={deleteIcon}
-            />
-        </div>
-    </div>
-
-);
-
-DeleteButton.propTypes = {
-    className: PropTypes.string,
-    onClick: PropTypes.func.isRequired,
-    tabIndex: PropTypes.number
-};
-
-DeleteButton.defaultProps = {
-    tabIndex: 0
-};
-
-export default DeleteButton;
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.1 (78136) - https://sketchapp.com -->
-    <title>Sound/General/Delete</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M4.54751641,6.99994966 L15.4523042,6.99994966 C15.7284466,6.99994966 15.9523042,7.22380729 15.9523042,7.49994966 C15.9523042,7.51506367 15.9516189,7.5301699 15.9502504,7.54522183 L15.1651793,16.1801783 C15.0715275,17.2102489 14.207924,17.9989808 13.1736049,17.9990897 L6.82662224,17.9997575 C5.79213514,17.9998663 4.92828345,17.2110677 4.83462539,16.180829 L4.04956981,7.54521753 C4.02456905,7.27020922 4.22724022,7.02700381 4.50224854,7.00200306 C4.51729904,7.00063483 4.53240384,6.99994966 4.54751641,6.99994966 Z M7.33333333,4 L7.88603796,2.34188612 C7.95409498,2.13771505 8.14516441,2 8.36037961,2 L11.6396204,2 C11.8548356,2 12.045905,2.13771505 12.113962,2.34188612 L12.6666667,4 L16.5,4 C16.7761424,4 17,4.22385763 17,4.5 L17,5.5 C17,5.77614237 16.7761424,6 16.5,6 L3.5,6 C3.22385763,6 3,5.77614237 3,5.5 L3,4.5 C3,4.22385763 3.22385763,4 3.5,4 L7.33333333,4 Z M8.38742589,4 L11.6125741,4 L11.2792408,3 L8.72075922,3 L8.38742589,4 Z M10,11.7204812 L11.5952436,10.1252376 C11.7905057,9.92997548 12.1070882,9.92997548 12.3023504,10.1252376 L12.3747624,10.1976496 C12.5700245,10.3929118 12.5700245,10.7094943 12.3747624,10.9047564 L10.7795188,12.5 L12.3747624,14.0952436 C12.5700245,14.2905057 12.5700245,14.6070882 12.3747624,14.8023504 L12.3023504,14.8747624 C12.1070882,15.0700245 11.7905057,15.0700245 11.5952436,14.8747624 L10,13.2795188 L8.40475641,14.8747624 C8.20949427,15.0700245 7.89291178,15.0700245 7.69764963,14.8747624 L7.62523762,14.8023504 C7.42997548,14.6070882 7.42997548,14.2905057 7.62523762,14.0952436 L9.22048121,12.5 L7.62523762,10.9047564 C7.42997548,10.7094943 7.42997548,10.3929118 7.62523762,10.1976496 L7.69764963,10.1252376 C7.89291178,9.92997548 8.20949427,9.92997548 8.40475641,10.1252376 L10,11.7204812 Z" id="path-1"></path>
-    </defs>
-    <g id="Sound/General/Delete" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <g id="Trash-Can"></g>
-        <g id="White" mask="url(#mask-2)" fill="#FFFFFF">
-            <rect id="Color" x="0" y="0" width="20" height="20"></rect>
-        </g>
-    </g>
-</svg>
@@ -66,10 +66,8 @@ const GUIComponent = props => {
        backpackVisible,
        blocksTabVisible,
        cardsVisible,
-        canChangeLanguage,
        canCreateNew,
        canEditTitle,
-        canManageFiles,
        canRemix,
        canSave,
        canCreateCopy,
@@ -87,19 +85,18 @@ const GUIComponent = props => {
        isRtl,
        isShared,
        loading,
-        logo,
        renderLogin,
        onClickAccountNav,
        onCloseAccountNav,
        onLogOut,
        onOpenRegistration,
        onToggleLoginOpen,
+        onUpdateProjectTitle,
        onActivateCostumesTab,
        onActivateSoundsTab,
        onActivateTab,
        onClickLogo,
        onExtensionButtonClick,
-        onProjectTelemetryEvent,
        onRequestCloseBackdropLibrary,
        onRequestCloseCostumeLibrary,
        onRequestCloseTelemetryModal,
@@ -204,18 +201,15 @@ const GUIComponent = props => {
                    authorId={authorId}
                    authorThumbnailUrl={authorThumbnailUrl}
                    authorUsername={authorUsername}
-                    canChangeLanguage={canChangeLanguage}
                    canCreateCopy={canCreateCopy}
                    canCreateNew={canCreateNew}
                    canEditTitle={canEditTitle}
-                    canManageFiles={canManageFiles}
                    canRemix={canRemix}
                    canSave={canSave}
                    canShare={canShare}
                    className={styles.menuBarPosition}
                    enableCommunity={enableCommunity}
                    isShared={isShared}
-                    logo={logo}
                    renderLogin={renderLogin}
                    showComingSoon={showComingSoon}
                    onClickAccountNav={onClickAccountNav}
@@ -223,10 +217,10 @@ const GUIComponent = props => {
                    onCloseAccountNav={onCloseAccountNav}
                    onLogOut={onLogOut}
                    onOpenRegistration={onOpenRegistration}
-                    onProjectTelemetryEvent={onProjectTelemetryEvent}
                    onSeeCommunity={onSeeCommunity}
                    onShare={onShare}
                    onToggleLoginOpen={onToggleLoginOpen}
+                    onUpdateProjectTitle={onUpdateProjectTitle}
                />
                <Box className={styles.bodyWrapper}>
                    <Box className={styles.flexWrapper}>
@@ -363,11 +357,9 @@ GUIComponent.propTypes = {
    backpackVisible: PropTypes.bool,
    basePath: PropTypes.string,
    blocksTabVisible: PropTypes.bool,
-    canChangeLanguage: PropTypes.bool,
    canCreateCopy: PropTypes.bool,
    canCreateNew: PropTypes.bool,
    canEditTitle: PropTypes.bool,
-    canManageFiles: PropTypes.bool,
    canRemix: PropTypes.bool,
    canSave: PropTypes.bool,
    canShare: PropTypes.bool,
@@ -384,7 +376,6 @@ GUIComponent.propTypes = {
    isRtl: PropTypes.bool,
    isShared: PropTypes.bool,
    loading: PropTypes.bool,
-    logo: PropTypes.string,
    onActivateCostumesTab: PropTypes.func,
    onActivateSoundsTab: PropTypes.func,
    onActivateTab: PropTypes.func,
@@ -404,6 +395,7 @@ GUIComponent.propTypes = {
    onTelemetryModalOptIn: PropTypes.func,
    onTelemetryModalOptOut: PropTypes.func,
    onToggleLoginOpen: PropTypes.func,
+    onUpdateProjectTitle: PropTypes.func,
    renderLogin: PropTypes.func,
    showComingSoon: PropTypes.bool,
    soundsTabVisible: PropTypes.bool,
@@ -417,10 +409,8 @@ GUIComponent.defaultProps = {
    backpackHost: null,
    backpackVisible: false,
    basePath: './',
-    canChangeLanguage: true,
    canCreateNew: false,
    canEditTitle: false,
-    canManageFiles: true,
    canRemix: false,
    canSave: false,
    canCreateCopy: false,
@@ -430,6 +420,7 @@ GUIComponent.defaultProps = {
    isCreating: false,
    isShared: false,
    loading: false,
+    onUpdateProjectTitle: () => {},
    showComingSoon: false,
    stageSizeMode: STAGE_SIZE_MODES.large
 };
@@ -8,7 +8,6 @@
    font-size: 0.75rem;
    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
    color: $motion-primary;
-    border-radius: 0.5rem;
 }

 .container + .container {
@@ -17,14 +16,4 @@

 .title {
    margin-top: 0.5rem;
-    text-align: center;
-}
-
-.disabled {
-    opacity: 0.5;
-    pointer-events: none;
-}
-
-.container:active {
-    background-color: $motion-light-transparent;
 }
@@ -5,19 +5,14 @@ import styles from './icon-button.css';

 const IconButton = ({
    img,
-    disabled,
    className,
    title,
    onClick
 }) => (
    <div
-        className={classNames(
-            styles.container,
-            className,
-            disabled ? styles.disabled : null
-        )}
+        className={classNames(styles.container, className)}
        role="button"
-        onClick={disabled ? null : onClick}
+        onClick={onClick}
    >
        <img
            className={styles.icon}
@@ -32,7 +27,6 @@ const IconButton = ({

 IconButton.propTypes = {
    className: PropTypes.string,
-    disabled: PropTypes.bool,
    img: PropTypes.string,
    onClick: PropTypes.func.isRequired,
    title: PropTypes.node.isRequired
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
-    <title>Sound/General/Library Tile Icon/RTL</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/General/Library-Tile-Icon/RTL" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M40.7941213,60.3333334 C39.5757531,60.3333334 38.3858512,59.7627412 37.7254274,58.7262523 C34.4973213,53.700852 34.4973213,47.4609802 37.7254274,42.43558 C38.7160634,40.8860816 40.8909074,40.373072 42.5989001,41.2839258 C44.2898131,42.2052491 44.8534507,44.2101744 43.8514282,45.7701424 C41.9441696,48.7382694 41.9441696,52.423563 43.8514282,55.3969245 C44.8534507,56.951658 44.2898131,58.956583 42.5989001,59.8779064 C42.0295692,60.1867593 41.4033053,60.3333334 40.7941213,60.3333334 Z M30.014623,64.6666666 C28.9761967,64.6666666 27.9668853,64.1309203 27.3991478,63.1577291 C22.8669507,55.401691 22.8669507,45.7582521 27.3991478,38.002214 C28.2531806,36.5473425 30.1068197,36.0705772 31.5528528,36.9208906 C32.9940332,37.7859493 33.4744267,39.6733502 32.6203939,41.1331368 C29.2188198,46.957538 29.2188198,54.202405 32.6203939,60.0317213 C33.4744267,61.491508 32.9940332,63.3739938 31.5528528,64.2390524 C31.0724594,64.5290438 30.5338363,64.6666666 30.014623,64.6666666 Z M48.8695653,34.1786293 C48.8695653,30.5538239 53.3068341,28.6536838 56.0736627,31.1003021 L62.1037975,36.4397458 C64.2189991,38.3098044 66.9754844,39.3476118 69.8405742,39.3476118 L70.8283578,39.3476118 C73.6831043,39.3476118 76,41.5936876 76,44.3611739 L76,54.689112 C76,57.4616116 73.6831043,59.7026738 70.8283578,59.7026738 L69.7836861,59.7026738 C66.9185963,59.7026738 64.1621111,60.7404813 62.0469094,62.6105398 L56.0736627,67.899848 C53.3068341,70.3464662 48.8695653,68.4463264 48.8695653,64.8165072 L48.8695653,34.1786293 Z" id="Shape" fill="#575E75" fill-rule="nonzero"></path>
-    </g>
-</svg>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
-    <title>Sound/General/Library Tile Icon/LTR</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/General/Library-Tile-Icon/LTR" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M59.2058787,60.3333334 C58.5966947,60.3333334 57.9704308,60.1867593 57.4010999,59.8779064 C55.7101869,58.956583 55.1465493,56.951658 56.1485718,55.3969245 C58.0558304,52.423563 58.0558304,48.7382694 56.1485718,45.7701424 C55.1465493,44.2101744 55.7101869,42.2052491 57.4010999,41.2839258 C59.1090926,40.373072 61.2839366,40.8860816 62.2745726,42.43558 C65.5026787,47.4609802 65.5026787,53.700852 62.2745726,58.7262523 C61.6141488,59.7627412 60.4242469,60.3333334 59.2058787,60.3333334 Z M69.985377,64.6666666 C69.4661637,64.6666666 68.9275406,64.5290438 68.4471472,64.2390524 C67.0059668,63.3739938 66.5255733,61.491508 67.3796061,60.0317213 C70.7811802,54.202405 70.7811802,46.957538 67.3796061,41.1331368 C66.5255733,39.6733502 67.0059668,37.7859493 68.4471472,36.9208906 C69.8931803,36.0705772 71.7468194,36.5473425 72.6008522,38.002214 C77.1330493,45.7582521 77.1330493,55.401691 72.6008522,63.1577291 C72.0331147,64.1309203 71.0238033,64.6666666 69.985377,64.6666666 Z M51.1304347,34.1786293 L51.1304347,64.8165072 C51.1304347,68.4463264 46.6931659,70.3464662 43.9263373,67.899848 L37.9530906,62.6105398 C35.8378889,60.7404813 33.0814037,59.7026738 30.2163139,59.7026738 L29.1716422,59.7026738 C26.3168957,59.7026738 24,57.4616116 24,54.689112 L24,44.3611739 C24,41.5936876 26.3168957,39.3476118 29.1716422,39.3476118 L30.1594258,39.3476118 C33.0245156,39.3476118 35.7810009,38.3098044 37.8962025,36.4397458 L43.9263373,31.1003021 C46.6931659,28.6536838 51.1304347,30.5538239 51.1304347,34.1786293 Z" id="Combined-Shape" fill="#575E75" fill-rule="nonzero"></path>
-    </g>
-</svg>
@@ -7,7 +7,6 @@
    align-items: center;
    justify-content: flex-start;
    flex-basis: 160px;
-    position: relative;
    height: 160px;
    max-width: 160px;
    margin: $space;
@@ -139,9 +138,7 @@
 .featured-description {
    display: block;
    font-weight: normal;
-    line-height: 1.375rem;
-    padding-top: .3125rem;
-    padding-bottom: .25rem;
+    line-height: 2;
 }

 .featured-extension-metadata {
@@ -181,10 +178,6 @@
    font-weight: bold;
 }

-.featured-extension-metadata-detail img{
-    margin-right: 0.25rem;
-}
-
 .coming-soon-text {
    position: absolute;
    background-color: $data-primary;
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import React from 'react';

 import Box from '../box/box.jsx';
-import PlayButton from '../../containers/play-button.jsx';
 import styles from './library-item.css';
 import classNames from 'classnames';

@@ -73,12 +72,12 @@ class LibraryItemComponent extends React.PureComponent {
                                    <div
                                        className={styles.featuredExtensionMetadataDetail}
                                    >
-                                        {this.props.bluetoothRequired ? (
-                                            <img src={bluetoothIconURL} />
-                                        ) : null}
-                                        {this.props.internetConnectionRequired ? (
-                                            <img src={internetConnectionIconURL} />
-                                        ) : null}
+                                        <img
+                                            src={this.props.bluetoothRequired ?
+                                                bluetoothIconURL :
+                                                internetConnectionIconURL
+                                            }
+                                        />
                                    </div>
                                </div>
                            ) : null}
@@ -107,9 +106,8 @@ class LibraryItemComponent extends React.PureComponent {
        ) : (
            <Box
                className={classNames(
-                    styles.libraryItem, {
-                        [styles.hidden]: this.props.hidden
-                    }
+                    styles.libraryItem,
+                    this.props.hidden ? styles.hidden : null
                )}
                role="button"
                tabIndex="0"
@@ -117,16 +115,12 @@ class LibraryItemComponent extends React.PureComponent {
                onClick={this.props.onClick}
                onFocus={this.props.onFocus}
                onKeyPress={this.props.onKeyPress}
-                onMouseEnter={this.props.showPlayButton ? null : this.props.onMouseEnter}
-                onMouseLeave={this.props.showPlayButton ? null : this.props.onMouseLeave}
+                onMouseEnter={this.props.onMouseEnter}
+                onMouseLeave={this.props.onMouseLeave}
            >
                {/* Layers of wrapping is to prevent layout thrashing on animation */}
                <Box className={styles.libraryItemImageContainerWrapper}>
-                    <Box
-                        className={styles.libraryItemImageContainer}
-                        onMouseEnter={this.props.showPlayButton ? this.props.onMouseEnter : null}
-                        onMouseLeave={this.props.showPlayButton ? this.props.onMouseLeave : null}
-                    >
+                    <Box className={styles.libraryItemImageContainer}>
                        <img
                            className={styles.libraryItemImage}
                            src={this.props.iconURL}
@@ -134,13 +128,6 @@ class LibraryItemComponent extends React.PureComponent {
                    </Box>
                </Box>
                <span className={styles.libraryItemName}>{this.props.name}</span>
-                {this.props.showPlayButton ? (
-                    <PlayButton
-                        isPlaying={this.props.isPlaying}
-                        onPlay={this.props.onPlay}
-                        onStop={this.props.onStop}
-                    />
-                ) : null}
            </Box>
        );
    }
@@ -162,7 +149,6 @@ LibraryItemComponent.propTypes = {
    iconURL: PropTypes.string,
    insetIconURL: PropTypes.string,
    internetConnectionRequired: PropTypes.bool,
-    isPlaying: PropTypes.bool,
    name: PropTypes.oneOfType([
        PropTypes.string,
        PropTypes.node
@@ -172,15 +158,11 @@ LibraryItemComponent.propTypes = {
    onFocus: PropTypes.func.isRequired,
    onKeyPress: PropTypes.func.isRequired,
    onMouseEnter: PropTypes.func.isRequired,
-    onMouseLeave: PropTypes.func.isRequired,
-    onPlay: PropTypes.func.isRequired,
-    onStop: PropTypes.func.isRequired,
-    showPlayButton: PropTypes.bool
+    onMouseLeave: PropTypes.func.isRequired
 };

 LibraryItemComponent.defaultProps = {
-    disabled: false,
-    showPlayButton: false
+    disabled: false
 };

 export default LibraryItemComponent;
@@ -12,7 +12,6 @@
    overflow-y: auto;
    height: auto;
    padding: 0.5rem;
-    height: calc(100% - $library-header-height);
 }

 .library-scroll-grid.withFilterBar {
@@ -60,11 +59,3 @@
    height: $library-filter-bar-height;
    overflow: hidden;
 }
-
-.spinner-wrapper {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
@@ -9,7 +9,7 @@ import Modal from '../../containers/modal.jsx';
 import Divider from '../divider/divider.jsx';
 import Filter from '../filter/filter.jsx';
 import TagButton from '../../containers/tag-button.jsx';
-import Spinner from '../spinner/spinner.jsx';
+import analytics from '../../lib/analytics';

 import styles from './library.css';

@@ -38,25 +38,16 @@ class LibraryComponent extends React.Component {
            'handleFilterClear',
            'handleMouseEnter',
            'handleMouseLeave',
-            'handlePlayingEnd',
            'handleSelect',
            'handleTagClick',
            'setFilteredDataRef'
        ]);
        this.state = {
-            playingItem: null,
+            selectedItem: null,
            filterQuery: '',
-            selectedTag: ALL_TAG.tag,
-            loaded: false
+            selectedTag: ALL_TAG.tag
        };
    }
-    componentDidMount () {
-        // Allow the spinner to display before loading the content
-        setTimeout(() => {
-            this.setState({loaded: true});
-        });
-        if (this.props.setStopHandler) this.props.setStopHandler(this.handlePlayingEnd);
-    }
    componentDidUpdate (prevProps, prevState) {
        if (prevState.filterQuery !== this.state.filterQuery ||
            prevState.selectedTag !== this.state.selectedTag) {
@@ -69,60 +60,25 @@ class LibraryComponent extends React.Component {
    }
    handleClose () {
        this.props.onRequestClose();
+        analytics.pageview(`/${this.props.id}/search?q=${this.state.filterQuery}`);
    }
    handleTagClick (tag) {
-        if (this.state.playingItem === null) {
-            this.setState({
-                filterQuery: '',
-                selectedTag: tag.toLowerCase()
-            });
-        } else {
-            this.props.onItemMouseLeave(this.getFilteredData()[[this.state.playingItem]]);
-            this.setState({
-                filterQuery: '',
-                playingItem: null,
-                selectedTag: tag.toLowerCase()
-            });
-        }
+        this.setState({
+            filterQuery: '',
+            selectedTag: tag.toLowerCase()
+        });
    }
    handleMouseEnter (id) {
-        // don't restart if mouse over already playing item
-        if (this.props.onItemMouseEnter && this.state.playingItem !== id) {
-            this.props.onItemMouseEnter(this.getFilteredData()[id]);
-            this.setState({
-                playingItem: id
-            });
-        }
+        if (this.props.onItemMouseEnter) this.props.onItemMouseEnter(this.getFilteredData()[id]);
    }
    handleMouseLeave (id) {
-        if (this.props.onItemMouseLeave) {
-            this.props.onItemMouseLeave(this.getFilteredData()[id]);
-            this.setState({
-                playingItem: null
-            });
-        }
-    }
-    handlePlayingEnd () {
-        if (this.state.playingItem !== null) {
-            this.setState({
-                playingItem: null
-            });
-        }
+        if (this.props.onItemMouseLeave) this.props.onItemMouseLeave(this.getFilteredData()[id]);
    }
    handleFilterChange (event) {
-        if (this.state.playingItem === null) {
-            this.setState({
-                filterQuery: event.target.value,
-                selectedTag: ALL_TAG.tag
-            });
-        } else {
-            this.props.onItemMouseLeave(this.getFilteredData()[[this.state.playingItem]]);
-            this.setState({
-                filterQuery: event.target.value,
-                playingItem: null,
-                selectedTag: ALL_TAG.tag
-            });
-        }
+        this.setState({
+            filterQuery: event.target.value,
+            selectedTag: ALL_TAG.tag
+        });
    }
    handleFilterClear () {
        this.setState({filterQuery: ''});
@@ -208,7 +164,7 @@ class LibraryComponent extends React.Component {
                    })}
                    ref={this.setFilteredDataRef}
                >
-                    {this.state.loaded ? this.getFilteredData().map((dataItem, index) => (
+                    {this.getFilteredData().map((dataItem, index) => (
                        <LibraryItem
                            bluetoothRequired={dataItem.bluetoothRequired}
                            collaborator={dataItem.collaborator}
@@ -223,22 +179,13 @@ class LibraryComponent extends React.Component {
                            id={index}
                            insetIconURL={dataItem.insetIconURL}
                            internetConnectionRequired={dataItem.internetConnectionRequired}
-                            isPlaying={this.state.playingItem === index}
-                            key={typeof dataItem.name === 'string' ? dataItem.name : dataItem.rawURL}
+                            key={`item_${index}`}
                            name={dataItem.name}
-                            showPlayButton={this.props.showPlayButton}
                            onMouseEnter={this.handleMouseEnter}
                            onMouseLeave={this.handleMouseLeave}
                            onSelect={this.handleSelect}
                        />
-                    )) : (
-                        <div className={styles.spinnerWrapper}>
-                            <Spinner
-                                large
-                                level="primary"
-                            />
-                        </div>
-                    )}
+                    ))}
                </div>
            </Modal>
        );
@@ -267,15 +214,12 @@ LibraryComponent.propTypes = {
    onItemMouseLeave: PropTypes.func,
    onItemSelected: PropTypes.func,
    onRequestClose: PropTypes.func,
-    setStopHandler: PropTypes.func,
-    showPlayButton: PropTypes.bool,
    tags: PropTypes.arrayOf(PropTypes.shape(TagButton.propTypes)),
    title: PropTypes.string.isRequired
 };

 LibraryComponent.defaultProps = {
-    filterable: true,
-    showPlayButton: false
+    filterable: true
 };

 export default injectIntl(LibraryComponent);
@@ -91,8 +91,7 @@ LoupeComponent.propTypes = {
        color: PropTypes.shape({
            r: PropTypes.number,
            g: PropTypes.number,
-            b: PropTypes.number,
-            a: PropTypes.number
+            b: PropTypes.number
        }),
        data: PropTypes.instanceOf(Uint8Array),
        width: PropTypes.number,
@@ -5,7 +5,7 @@
    color: $ui-white;
    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
    display: flex;
-    justify-content: flex-start;
+    justify-content: start;
    align-items: center;
    cursor: default;
 }
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.1 (47250) - http://www.bohemiancoding.com/sketch -->
+    <title>Feedback</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Feedback" fill="#4C97FF">
+            <path d="M12.3811686,14.2770244 C12.3811686,14.3987659 12.3515563,14.506558 12.306433,14.6257633 L11.4998525,16.6002595 C11.2770558,16.478518 10.93299,16.3846755 10.4704753,16.3846755 C10.0234717,16.3846755 9.6949171,16.478518 9.47071028,16.58631 L8.66412979,14.6257633 C8.60490535,14.506558 8.59080429,14.3848164 8.59080429,14.2643429 C8.60490535,14.2503934 8.60490535,14.2237624 8.60490535,14.2098129 L8.60490535,14.1705005 C8.60490535,13.9828155 8.67964095,13.7938625 8.813601,13.6188589 C9.1576668,13.1775457 9.79926492,12.9086997 10.4859864,12.9086997 C11.1727079,12.9086997 11.8143061,13.1775457 12.1428607,13.6188589 C12.2472085,13.7684996 12.3360452,13.9409669 12.3670675,14.103289 C12.3811686,14.1565509 12.3811686,14.2098129 12.3811686,14.2643429 L12.3811686,14.2770244 Z M8.60490535,5.94153049 C8.60490535,5.50782611 8.89115681,5.12865181 9.33393002,4.89024122 C9.59056927,4.7520138 9.91771381,4.9143359 9.91771381,5.18445004 L9.91771381,11.6621167 C9.91771381,11.8168299 9.80490535,11.9550573 9.63851287,11.9918334 C9.46789007,12.0311458 9.3029077,12.0831396 9.14638596,12.1452786 C8.89115681,12.2467299 8.60490535,12.0844078 8.60490535,11.8345839 L8.60490535,5.94153049 Z M12.3670675,5.94153049 L12.3670675,11.8333158 C12.3670675,12.0780671 12.0892767,12.2505343 11.8410981,12.1516193 C11.6775258,12.0844078 11.5054929,12.032414 11.3278196,11.9931016 C11.1529665,11.9550573 11.0373378,11.8054166 11.0373378,11.6443627 L11.0373378,5.18191375 C11.0373378,4.9143359 11.3630722,4.75074565 11.6211216,4.88770493 C12.0709453,5.12611553 12.3670675,5.50528983 12.3670675,5.94153049 Z M10.4859864,1.48528137 C8.82911216,1.48528137 7.48528137,2.53149809 7.48528137,3.82119796 L7.48528137,14.2237624 C7.48528137,14.4786589 7.5148936,14.7335553 7.62065153,14.9757703 L9.1576668,18.7066425 C9.3522614,19.177123 9.87400053,19.4852814 10.4859864,19.4852814 C11.0979723,19.4852814 11.6197115,19.177123 11.8143061,18.7066425 L13.3513213,14.9757703 C13.4556692,14.7335553 13.4852814,14.4786589 13.4852814,14.2237624 L13.4852814,3.82119796 C13.4852814,2.53149809 12.1428607,1.48528137 10.4859864,1.48528137 Z" id="feedback" transform="translate(10.485281, 10.485281) rotate(45.000000) translate(-10.485281, -10.485281) "></path>
+        </g>
+    </g>
+</svg>
@@ -1,14 +1,11 @@
 import classNames from 'classnames';
 import {connect} from 'react-redux';
-import {compose} from 'redux';
 import {defineMessages, FormattedMessage, injectIntl, intlShape} from 'react-intl';
 import PropTypes from 'prop-types';
 import bindAll from 'lodash.bindall';
 import bowser from 'bowser';
 import React from 'react';

-import VM from 'scratch-vm';
-
 import Box from '../box/box.jsx';
 import Button from '../button/button.jsx';
 import CommunityButton from './community-button.jsx';
@@ -28,7 +25,6 @@ import LoginDropdown from './login-dropdown.jsx';
 import SB3Downloader from '../../containers/sb3-downloader.jsx';
 import DeletionRestorer from '../../containers/deletion-restorer.jsx';
 import TurboMode from '../../containers/turbo-mode.jsx';
-import MenuBarHOC from '../../containers/menu-bar-hoc.jsx';

 import {openTipsLibrary} from '../../reducers/modals';
 import {setPlayer} from '../../reducers/mode';
@@ -59,12 +55,11 @@ import {
    loginMenuOpen
 } from '../../reducers/menus';

-import collectMetadata from '../../lib/collect-metadata';
-
 import styles from './menu-bar.css';

 import helpIcon from '../../lib/assets/icon--tutorials.svg';
 import mystuffIcon from './icon--mystuff.png';
+import feedbackIcon from './icon--feedback.svg';
 import profileIcon from './icon--profile.png';
 import remixIcon from './icon--remix.svg';
 import dropdownCaret from './dropdown-caret.svg';
@@ -151,10 +146,10 @@ class MenuBar extends React.Component {
            'handleClickSaveAsCopy',
            'handleClickSeeCommunity',
            'handleClickShare',
+            'handleCloseFileMenuAndThen',
            'handleKeyPress',
            'handleLanguageMouseUp',
            'handleRestoreOption',
-            'getSaveToComputerHandler',
            'restoreOptionMessage'
        ]);
    }
@@ -165,14 +160,17 @@ class MenuBar extends React.Component {
        document.removeEventListener('keydown', this.handleKeyPress);
    }
    handleClickNew () {
+        let readyToReplaceProject = true;
        // if the project is dirty, and user owns the project, we will autosave.
        // but if they are not logged in and can't save, user should consider
        // downloading or logging in first.
        // Note that if user is logged in and editing someone else's project,
        // they'll lose their work.
-        const readyToReplaceProject = this.props.confirmReadyToReplaceProject(
-            this.props.intl.formatMessage(sharedMessages.replaceProjectWarning)
-        );
+        if (this.props.projectChanged && !this.props.canCreateNew) {
+            readyToReplaceProject = confirm( // eslint-disable-line no-alert
+                this.props.intl.formatMessage(sharedMessages.replaceProjectWarning)
+            );
+        }
        this.props.onRequestCloseFile();
        if (readyToReplaceProject) {
            this.props.onClickNew(this.props.canSave && this.props.canCreateNew);
@@ -192,8 +190,8 @@ class MenuBar extends React.Component {
        this.props.onRequestCloseFile();
    }
    handleClickSeeCommunity (waitForUpdate) {
-        if (this.props.shouldSaveBeforeTransition()) {
-            this.props.autoUpdateProject(); // save before transitioning to project page
+        if (this.props.canSave) { // save before transitioning to project page
+            this.props.autoUpdateProject();
            waitForUpdate(true); // queue the transition to project page
        } else {
            waitForUpdate(false); // immediately transition to project page
@@ -218,6 +216,12 @@ class MenuBar extends React.Component {
            this.props.onRequestCloseEdit();
        };
    }
+    handleCloseFileMenuAndThen (fn) {
+        return () => {
+            this.props.onRequestCloseFile();
+            fn();
+        };
+    }
    handleKeyPress (event) {
        const modifier = bowser.mac ? event.metaKey : event.ctrlKey;
        if (modifier && event.key === 's') {
@@ -225,16 +229,6 @@ class MenuBar extends React.Component {
            event.preventDefault();
        }
    }
-    getSaveToComputerHandler (downloadProjectCallback) {
-        return () => {
-            this.props.onRequestCloseFile();
-            downloadProjectCallback();
-            if (this.props.onProjectTelemetryEvent) {
-                const metadata = collectMetadata(this.props.vm, this.props.projectTitle, this.props.locale);
-                this.props.onProjectTelemetryEvent('projectDidSave', metadata);
-            }
-        };
-    }
    handleLanguageMouseUp (e) {
        if (!this.props.languageMenuOpen) {
            this.props.onClickLanguage(e);
@@ -327,11 +321,11 @@ class MenuBar extends React.Component {
                                    [styles.clickable]: typeof this.props.onClickLogo !== 'undefined'
                                })}
                                draggable={false}
-                                src={this.props.logo}
+                                src={scratchLogo}
                                onClick={this.props.onClickLogo}
                            />
                        </div>
-                        {(this.props.canChangeLanguage) && (<div
+                        <div
                            className={classNames(styles.menuBarItem, styles.hoverable, styles.languageMenu)}
                        >
                            <div>
@@ -345,85 +339,84 @@ class MenuBar extends React.Component {
                                />
                            </div>
                            <LanguageSelector label={this.props.intl.formatMessage(ariaMessages.language)} />
-                        </div>)}
-                        {(this.props.canManageFiles) && (
-                            <div
-                                className={classNames(styles.menuBarItem, styles.hoverable, {
-                                    [styles.active]: this.props.fileMenuOpen
-                                })}
-                                onMouseUp={this.props.onClickFile}
+                        </div>
+                        <div
+                            className={classNames(styles.menuBarItem, styles.hoverable, {
+                                [styles.active]: this.props.fileMenuOpen
+                            })}
+                            onMouseUp={this.props.onClickFile}
+                        >
+                            <FormattedMessage
+                                defaultMessage="File"
+                                description="Text for file dropdown menu"
+                                id="gui.menuBar.file"
+                            />
+                            <MenuBarMenu
+                                className={classNames(styles.menuBarMenu)}
+                                open={this.props.fileMenuOpen}
+                                place={this.props.isRtl ? 'left' : 'right'}
+                                onRequestClose={this.props.onRequestCloseFile}
                            >
-                                <FormattedMessage
-                                    defaultMessage="File"
-                                    description="Text for file dropdown menu"
-                                    id="gui.menuBar.file"
-                                />
-                                <MenuBarMenu
-                                    className={classNames(styles.menuBarMenu)}
-                                    open={this.props.fileMenuOpen}
-                                    place={this.props.isRtl ? 'left' : 'right'}
-                                    onRequestClose={this.props.onRequestCloseFile}
-                                >
+                                <MenuSection>
+                                    <MenuItem
+                                        isRtl={this.props.isRtl}
+                                        onClick={this.handleClickNew}
+                                    >
+                                        {newProjectMessage}
+                                    </MenuItem>
+                                </MenuSection>
+                                {(this.props.canSave || this.props.canCreateCopy || this.props.canRemix) && (
                                    <MenuSection>
-                                        <MenuItem
-                                            isRtl={this.props.isRtl}
-                                            onClick={this.handleClickNew}
-                                        >
-                                            {newProjectMessage}
-                                        </MenuItem>
+                                        {this.props.canSave ? (
+                                            <MenuItem onClick={this.handleClickSave}>
+                                                {saveNowMessage}
+                                            </MenuItem>
+                                        ) : []}
+                                        {this.props.canCreateCopy ? (
+                                            <MenuItem onClick={this.handleClickSaveAsCopy}>
+                                                {createCopyMessage}
+                                            </MenuItem>
+                                        ) : []}
+                                        {this.props.canRemix ? (
+                                            <MenuItem onClick={this.handleClickRemix}>
+                                                {remixMessage}
+                                            </MenuItem>
+                                        ) : []}
                                    </MenuSection>
-                                    {(this.props.canSave || this.props.canCreateCopy || this.props.canRemix) && (
-                                        <MenuSection>
-                                            {this.props.canSave && (
-                                                <MenuItem onClick={this.handleClickSave}>
-                                                    {saveNowMessage}
-                                                </MenuItem>
-                                            )}
-                                            {this.props.canCreateCopy && (
-                                                <MenuItem onClick={this.handleClickSaveAsCopy}>
-                                                    {createCopyMessage}
-                                                </MenuItem>
-                                            )}
-                                            {this.props.canRemix && (
-                                                <MenuItem onClick={this.handleClickRemix}>
-                                                    {remixMessage}
-                                                </MenuItem>
-                                            )}
-                                        </MenuSection>
-                                    )}
-                                    <MenuSection>
-                                        <SBFileUploader
-                                            canSave={this.props.canSave}
-                                            userOwnsProject={this.props.userOwnsProject}
-                                        >
-                                            {(className, renderFileInput, handleLoadProject) => (
-                                                <MenuItem
-                                                    className={className}
-                                                    onClick={handleLoadProject}
-                                                >
-                                                    {/* eslint-disable max-len */}
-                                                    {this.props.intl.formatMessage(sharedMessages.loadFromComputerTitle)}
-                                                    {/* eslint-enable max-len */}
-                                                    {renderFileInput()}
-                                                </MenuItem>
-                                            )}
-                                        </SBFileUploader>
-                                        <SB3Downloader>{(className, downloadProjectCallback) => (
+                                )}
+                                <MenuSection>
+                                    <SBFileUploader onUpdateProjectTitle={this.props.onUpdateProjectTitle}>
+                                        {(className, renderFileInput, loadProject) => (
                                            <MenuItem
                                                className={className}
-                                                onClick={this.getSaveToComputerHandler(downloadProjectCallback)}
+                                                onClick={loadProject}
                                            >
                                                <FormattedMessage
-                                                    defaultMessage="Save to your computer"
-                                                    description="Menu bar item for downloading a project to your computer" // eslint-disable-line max-len
-                                                    id="gui.menuBar.downloadToComputer"
+                                                    defaultMessage="Load from your computer"
+                                                    description={
+                                                        'Menu bar item for uploading a project from your computer'
+                                                    }
+                                                    id="gui.menuBar.uploadFromComputer"
                                                />
+                                                {renderFileInput()}
                                            </MenuItem>
-                                        )}</SB3Downloader>
-                                    </MenuSection>
-                                </MenuBarMenu>
-                            </div>
-                        )}
+                                        )}
+                                    </SBFileUploader>
+                                    <SB3Downloader>{(className, downloadProject) => (
+                                        <MenuItem
+                                            className={className}
+                                            onClick={this.handleCloseFileMenuAndThen(downloadProject)}
+                                        >
+                                            <FormattedMessage
+                                                defaultMessage="Save to your computer"
+                                                description="Menu bar item for downloading a project to your computer"
+                                                id="gui.menuBar.downloadToComputer"
+                                            />
+                                        </MenuItem>
+                                    )}</SB3Downloader>
+                                </MenuSection>
+                            </MenuBarMenu>
+                        </div>
                        <div
                            className={classNames(styles.menuBarItem, styles.hoverable, {
                                [styles.active]: this.props.editMenuOpen
@@ -494,6 +487,7 @@ class MenuBar extends React.Component {
                            >
                                <ProjectTitleInput
                                    className={classNames(styles.titleFieldGrowable)}
+                                    onUpdateProjectTitle={this.props.onUpdateProjectTitle}
                                />
                            </MenuBarItemTooltip>
                        </div>
@@ -644,6 +638,25 @@ class MenuBar extends React.Component {
                    ) : (
                        // ******** no login session is available, so don't show login stuff
                        <React.Fragment>
+                            <div className={classNames(styles.menuBarItem, styles.feedbackButtonWrapper)}>
+                                <a
+                                    className={styles.feedbackLink}
+                                    href="https://scratch.mit.edu/discuss/topic/312261/"
+                                    rel="noopener noreferrer"
+                                    target="_blank"
+                                >
+                                    <Button
+                                        className={styles.feedbackButton}
+                                        iconSrc={feedbackIcon}
+                                    >
+                                        <FormattedMessage
+                                            defaultMessage="Give Feedback"
+                                            description="Label for feedback form modal button"
+                                            id="gui.menuBar.giveFeedback"
+                                        />
+                                    </Button>
+                                </a>
+                            </div>
                            {this.props.showComingSoon ? (
                                <React.Fragment>
                                    <MenuBarItemTooltip id="mystuff">
@@ -700,16 +713,13 @@ MenuBar.propTypes = {
    authorThumbnailUrl: PropTypes.string,
    authorUsername: PropTypes.oneOfType([PropTypes.string, PropTypes.bool]),
    autoUpdateProject: PropTypes.func,
-    canChangeLanguage: PropTypes.bool,
    canCreateCopy: PropTypes.bool,
    canCreateNew: PropTypes.bool,
    canEditTitle: PropTypes.bool,
-    canManageFiles: PropTypes.bool,
    canRemix: PropTypes.bool,
    canSave: PropTypes.bool,
    canShare: PropTypes.bool,
    className: PropTypes.string,
-    confirmReadyToReplaceProject: PropTypes.func,
    editMenuOpen: PropTypes.bool,
    enableCommunity: PropTypes.bool,
    fileMenuOpen: PropTypes.bool,
@@ -719,9 +729,7 @@ MenuBar.propTypes = {
    isShowingProject: PropTypes.bool,
    isUpdating: PropTypes.bool,
    languageMenuOpen: PropTypes.bool,
-    locale: PropTypes.string.isRequired,
    loginMenuOpen: PropTypes.bool,
-    logo: PropTypes.string,
    onClickAccount: PropTypes.func,
    onClickEdit: PropTypes.func,
    onClickFile: PropTypes.func,
@@ -735,7 +743,6 @@ MenuBar.propTypes = {
    onLogOut: PropTypes.func,
    onOpenRegistration: PropTypes.func,
    onOpenTipLibrary: PropTypes.func,
-    onProjectTelemetryEvent: PropTypes.func,
    onRequestCloseAccount: PropTypes.func,
    onRequestCloseEdit: PropTypes.func,
    onRequestCloseFile: PropTypes.func,
@@ -744,22 +751,20 @@ MenuBar.propTypes = {
    onSeeCommunity: PropTypes.func,
    onShare: PropTypes.func,
    onToggleLoginOpen: PropTypes.func,
+    onUpdateProjectTitle: PropTypes.func,
+    projectChanged: PropTypes.bool,
    projectTitle: PropTypes.string,
    renderLogin: PropTypes.func,
    sessionExists: PropTypes.bool,
-    shouldSaveBeforeTransition: PropTypes.func,
    showComingSoon: PropTypes.bool,
-    userOwnsProject: PropTypes.bool,
-    username: PropTypes.string,
-    vm: PropTypes.instanceOf(VM).isRequired
+    username: PropTypes.string
 };

 MenuBar.defaultProps = {
-    logo: scratchLogo,
    onShare: () => {}
 };

-const mapStateToProps = (state, ownProps) => {
+const mapStateToProps = state => {
    const loadingState = state.scratchGui.projectState.loadingState;
    const user = state.session && state.session.session && state.session.session.user;
    return {
@@ -770,14 +775,11 @@ const mapStateToProps = (state, ownProps) => {
        isUpdating: getIsUpdating(loadingState),
        isShowingProject: getIsShowingProject(loadingState),
        languageMenuOpen: languageMenuOpen(state),
-        locale: state.locales.locale,
        loginMenuOpen: loginMenuOpen(state),
+        projectChanged: state.scratchGui.projectChanged,
        projectTitle: state.scratchGui.projectTitle,
        sessionExists: state.session && typeof state.session.session !== 'undefined',
-        username: user ? user.username : null,
-        userOwnsProject: ownProps.authorUsername && user &&
-            (ownProps.authorUsername === user.username),
-        vm: state.scratchGui.vm
+        username: user ? user.username : null
    };
 };

@@ -801,11 +803,7 @@ const mapDispatchToProps = dispatch => ({
    onSeeCommunity: () => dispatch(setPlayer(true))
 });

-export default compose(
-    injectIntl,
-    MenuBarHOC,
-    connect(
-        mapStateToProps,
-        mapDispatchToProps
-    )
-)(MenuBar);
+export default injectIntl(connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(MenuBar));
@@ -1,9 +1,9 @@
 import classNames from 'classnames';
 import {connect} from 'react-redux';
 import PropTypes from 'prop-types';
+import bindAll from 'lodash.bindall';
 import React from 'react';
 import {defineMessages, intlShape, injectIntl} from 'react-intl';
-import {setProjectTitle} from '../../reducers/project-title';

 import BufferedInputHOC from '../forms/buffered-input-hoc.jsx';
 import Input from '../forms/input.jsx';
@@ -19,27 +19,39 @@ const messages = defineMessages({
    }
 });

-const ProjectTitleInput = ({
-    className,
-    intl,
-    onSubmit,
-    projectTitle
-}) => (
-    <BufferedInput
-        className={classNames(styles.titleField, className)}
-        maxLength="100"
-        placeholder={intl.formatMessage(messages.projectTitlePlaceholder)}
-        tabIndex="0"
-        type="text"
-        value={projectTitle}
-        onSubmit={onSubmit}
-    />
-);
+class ProjectTitleInput extends React.Component {
+    constructor (props) {
+        super(props);
+        bindAll(this, [
+            'handleUpdateProjectTitle'
+        ]);
+    }
+    // call onUpdateProjectTitle if it is defined (only defined when gui
+    // is used within scratch-www)
+    handleUpdateProjectTitle (newTitle) {
+        if (this.props.onUpdateProjectTitle) {
+            this.props.onUpdateProjectTitle(newTitle);
+        }
+    }
+    render () {
+        return (
+            <BufferedInput
+                className={classNames(styles.titleField, this.props.className)}
+                maxLength="100"
+                placeholder={this.props.intl.formatMessage(messages.projectTitlePlaceholder)}
+                tabIndex="0"
+                type="text"
+                value={this.props.projectTitle}
+                onSubmit={this.handleUpdateProjectTitle}
+            />
+        );
+    }
+}

 ProjectTitleInput.propTypes = {
    className: PropTypes.string,
    intl: intlShape.isRequired,
-    onSubmit: PropTypes.func,
+    onUpdateProjectTitle: PropTypes.func,
    projectTitle: PropTypes.string
 };

@@ -47,9 +59,7 @@ const mapStateToProps = state => ({
    projectTitle: state.scratchGui.projectTitle
 });

-const mapDispatchToProps = dispatch => ({
-    onSubmit: title => dispatch(setProjectTitle(title))
-});
+const mapDispatchToProps = () => ({});

 export default injectIntl(connect(
    mapStateToProps,
@@ -37,10 +37,6 @@
    background-color: $ui-black-transparent;
 }

-.menu-item.hoverable {
-    cursor: pointer;
-}
-
 .menu-section {
    border-top: 1px solid $ui-black-transparent;
 }
@@ -39,11 +39,7 @@ const MenuItem = ({
    onClick
 }) => (
    <li
-        className={classNames(
-            styles.menuItem,
-            styles.hoverable,
-            className
-        )}
+        className={classNames(styles.menuItem, className)}
        onClick={onClick}
    >
        {children}
@@ -58,7 +54,7 @@ MenuItem.propTypes = {


 const addDividerClassToFirstChild = (child, id) => (
-    child && React.cloneElement(child, {
+    React.cloneElement(child, {
        className: classNames(
            child.className,
            {[styles.menuSection]: id === 0}
@@ -43,7 +43,6 @@
    margin: 0 5px;
    border-radius: calc($space / 2);
    padding: 0 2px;
-    white-space: pre-wrap;
    transform: translateZ(0); /* Fixes flickering in Safari */
 }

@@ -54,7 +53,6 @@
    text-align: center;
    color: white;
    font-size: 1rem;
-    white-space: pre-wrap;
    transform: translateZ(0); /* Fixes flickering in Safari */
 }

@@ -151,7 +149,7 @@
    overflow: hidden; /* Don't let long values escape container */
    text-overflow: ellipsis;
    user-select: text; /* Allow selecting list values for 2.0 compatibility, only relevant in player */
-    white-space: pre;
+    white-space: nowrap;
 }

 .list-input {
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import Draggable from 'react-draggable';
 import {FormattedMessage} from 'react-intl';
 import {ContextMenuTrigger} from 'react-contextmenu';
-import {BorderedMenuItem, ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
+import {ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
 import Box from '../box/box.jsx';
 import DefaultMonitor from './default-monitor.jsx';
 import LargeMonitor from './large-monitor.jsx';
@@ -84,14 +84,6 @@ const MonitorComponent = props => (
                            id="gui.monitor.contextMenu.slider"
                        />
                    </MenuItem>}
-                {props.onSliderPromptOpen && props.mode === 'slider' &&
-                    <BorderedMenuItem onClick={props.onSliderPromptOpen}>
-                        <FormattedMessage
-                            defaultMessage="change slider range"
-                            description="Menu item to change the slider range"
-                            id="gui.monitor.contextMenu.sliderRange"
-                        />
-                    </BorderedMenuItem>}
                {props.onImport &&
                    <MenuItem onClick={props.onImport}>
                        <FormattedMessage
@@ -130,8 +122,7 @@ MonitorComponent.propTypes = {
    onNextMode: PropTypes.func.isRequired,
    onSetModeToDefault: PropTypes.func,
    onSetModeToLarge: PropTypes.func,
-    onSetModeToSlider: PropTypes.func,
-    onSliderPromptOpen: PropTypes.func
+    onSetModeToSlider: PropTypes.func
 };

 MonitorComponent.defaultProps = {
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="49px" height="52px" viewBox="-5 0 49 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
-    <title>play</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M17.2214651,8.34499443 C19.7766419,4.08636653 23.9234057,4.09303946 26.4745787,8.34499443 L40.1520974,31.140859 C42.7072741,35.3994869 40.7489672,38.8517869 35.7726637,38.8517869 L7.92338006,38.8517869 C2.9495089,38.8517869 0.992773429,35.392814 3.54394641,31.140859 L17.2214651,8.34499443 Z" id="path-1"></path>
-        <filter x="-16.7%" y="-19.3%" width="133.5%" height="138.6%" filterUnits="objectBoundingBox" id="filter-2">
-            <feMorphology radius="2.5" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
-            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-            <feComposite in="shadowOffsetOuter1" in2="SourceAlpha" operator="out" result="shadowOffsetOuter1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0.298039216   0 0 0 0 0.592156863   0 0 0 0 1  0 0 0 0.1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop---1280x720" transform="translate(-623.000000, -347.000000)">
-            <g id="Step-3---Altering-Suggested-Trim" transform="translate(0.000000, 42.000000)">
-                <g id="Play-/-Record-/-Stop" transform="translate(623.000000, 307.000000)">
-                    <g id="play" transform="translate(21.849131, 22.002656) rotate(90.000000) translate(-21.849131, -22.002656) ">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-                        <use stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="52px" height="52px" viewBox="0 0 52 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
-    <title>stop-playback</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="44" height="44" rx="4"></rect>
-        <filter x="-13.6%" y="-13.6%" width="127.3%" height="127.3%" filterUnits="objectBoundingBox" id="filter-2">
-            <feMorphology radius="2" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
-            <feOffset dx="0" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-            <feComposite in="shadowOffsetOuter1" in2="SourceAlpha" operator="out" result="shadowOffsetOuter1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0.298039216   0 0 0 0 0.592156863   0 0 0 0 1  0 0 0 0.1 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
-        </filter>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop---1280x720" transform="translate(-619.000000, -345.000000)">
-            <g id="Step-4---Playing-Trim" transform="translate(0.000000, 42.000000)">
-                <g id="Play-/-Record-/-Stop" transform="translate(623.000000, 307.000000)">
-                    <g id="stop-playback">
-                        <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
-                        <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        <rect stroke="#FFFFFF" stroke-width="1" x="0.5" y="0.5" width="43" height="43" rx="4"></rect>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
@@ -1,42 +0,0 @@
-
-@import "../../css/colors.css";
-@import "../../css/units.css";
-
-.play-button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    overflow: hidden;  /* Mask the icon animation */
-    width: 2.5rem;
-    height: 2.5rem;
-    background-color: $sound-primary;
-    color: $ui-white;
-    border-radius: 50%;
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-    user-select: none;
-    cursor: pointer;
-    transition: all 0.15s ease-out;
-}
-
-.play-button {
-    position: absolute;
-    top: .5rem;
-    z-index: auto;
-}
-
-.play-button:focus {
-    outline: none;
-}
-
-.play-icon {
-  width: 50%;
-}
-
-[dir="ltr"] .play-button {
-    right: .5rem;
-}
-
-[dir="rtl"] .play-button {
-    left: .5rem;
-}
@@ -1,73 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import classNames from 'classnames';
-
-import {defineMessages, injectIntl, intlShape} from 'react-intl';
-
-import styles from './play-button.css';
-
-import playIcon from './icon--play.svg';
-import stopIcon from './icon--stop.svg';
-
-const messages = defineMessages({
-    play: {
-        id: 'gui.playButton.play',
-        description: 'Title of the button to start playing the sound',
-        defaultMessage: 'Play'
-    },
-    stop: {
-        id: 'gui.playButton.stop',
-        description: 'Title of the button to stop the sound',
-        defaultMessage: 'Stop'
-    }
-});
-
-const PlayButtonComponent = ({
-    className,
-    intl,
-    isPlaying,
-    onClick,
-    onMouseDown,
-    onMouseEnter,
-    onMouseLeave,
-    setButtonRef,
-    ...props
-}) => {
-    const label = isPlaying ?
-        intl.formatMessage(messages.stop) :
-        intl.formatMessage(messages.play);
-
-    return (
-        <div
-            aria-label={label}
-            className={classNames(styles.playButton, className, {
-                [styles.playing]: isPlaying
-            })}
-            onClick={onClick}
-            onMouseDown={onMouseDown}
-            onMouseEnter={onMouseEnter}
-            onMouseLeave={onMouseLeave}
-            ref={setButtonRef}
-            {...props}
-        >
-            <img
-                className={styles.playIcon}
-                draggable={false}
-                src={isPlaying ? stopIcon : playIcon}
-            />
-        </div>
-    );
-};
-
-PlayButtonComponent.propTypes = {
-    className: PropTypes.string,
-    intl: intlShape,
-    isPlaying: PropTypes.bool.isRequired,
-    onClick: PropTypes.func.isRequired,
-    onMouseDown: PropTypes.func.isRequired,
-    onMouseEnter: PropTypes.func.isRequired,
-    onMouseLeave: PropTypes.func.isRequired,
-    setButtonRef: PropTypes.func.isRequired
-};
-
-export default injectIntl(PlayButtonComponent);
@@ -20,10 +20,8 @@
    border: 1px solid $ui-black-transparent;
    border-radius: 5px;
    padding: 3px;
-    /* Force these to be on their own render layer because they update often */
-    transform: translateZ(0);
-}

+}
 .meter-container {
    margin-right: 5px;
    height: 180px;
@@ -1,55 +0,0 @@
-@import "../../css/colors.css";
-@import "../../css/units.css";
-
-.modal-content {
-    width: 360px;
-}
-
-.body {
-    background: $ui-white;
-    padding: 1.5rem 2.25rem;
-}
-
-.label {
-    font-weight: 500;
-    margin: 0 0 0.75rem;
-}
-
-.min-input, .max-input {
-    margin-bottom: 1.5rem;
-    width: 100%;
-    border: 1px solid $ui-black-transparent;
-    border-radius: 5px;
-    padding: 0 1rem;
-    height: 3rem;
-    color: $text-primary-transparent;
-    font-size: .875rem;
-}
-
-.button-row {
-    font-weight: bolder;
-    text-align: right;
-}
-
-.button-row button {
-    padding: 0.75rem 1rem;
-    border-radius: 0.25rem;
-    background: white;
-    border: 1px solid $ui-black-transparent;
-    font-weight: 600;
-    font-size: 0.85rem;
-}
-
-.button-row button.ok-button {
-    background: $motion-primary;
-    border: $motion-primary;
-    color: white;
-}
-
-[dir="ltr"] .button-row button + button {
-    margin-left: 0.5rem;
-}
-
-[dir="rtl"] .button-row button + button {
-    margin-right: 0.5rem;
-}
@@ -1,102 +0,0 @@
-import {defineMessages, FormattedMessage, intlShape, injectIntl} from 'react-intl';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-import Box from '../box/box.jsx';
-import Modal from '../../containers/modal.jsx';
-
-import styles from './slider-prompt.css';
-
-
-const messages = defineMessages({
-    minValue: {
-        defaultMessage: 'Minimum value',
-        description: 'Label of slider modal',
-        id: 'gui.sliderModal.min'
-    },
-    maxValue: {
-        defaultMessage: 'Maximum value',
-        description: 'Label of slider modal',
-        id: 'gui.sliderModal.max'
-    },
-    title: {
-        defaultMessage: 'Change slider range',
-        description: 'Title of slider modal',
-        id: 'gui.sliderModal.title'
-    }
-});
-
-const SliderPromptComponent = props => (
-    <Modal
-        className={styles.modalContent}
-        contentLabel={props.intl.formatMessage(messages.title)}
-        id="sliderPrompt"
-        onRequestClose={props.onCancel}
-    >
-        <Box className={styles.body}>
-            <Box className={styles.label}>
-                {props.intl.formatMessage(messages.minValue)}
-            </Box>
-            <Box>
-                <input
-                    className={styles.minInput}
-                    name={props.intl.formatMessage(messages.minValue)}
-                    pattern="-?[0-9]*(\.[0-9]+)?"
-                    type="text"
-                    value={props.minValue}
-                    onChange={props.onChangeMin}
-                    onKeyPress={props.onKeyPress}
-                />
-            </Box>
-            <Box className={styles.label}>
-                {props.intl.formatMessage(messages.maxValue)}
-            </Box>
-            <Box>
-                <input
-                    className={styles.maxInput}
-                    name={props.intl.formatMessage(messages.maxValue)}
-                    pattern="-?[0-9]*(\.[0-9]+)?"
-                    type="text"
-                    value={props.maxValue}
-                    onChange={props.onChangeMax}
-                    onKeyPress={props.onKeyPress}
-                />
-            </Box>
-            <Box className={styles.buttonRow}>
-                <button
-                    className={styles.cancelButton}
-                    onClick={props.onCancel}
-                >
-                    <FormattedMessage
-                        defaultMessage="Cancel"
-                        description="Button in prompt for cancelling the dialog"
-                        id="gui.sliderPrompt.cancel"
-                    />
-                </button>
-                <button
-                    className={styles.okButton}
-                    onClick={props.onOk}
-                >
-                    <FormattedMessage
-                        defaultMessage="OK"
-                        description="Button in prompt for confirming the dialog"
-                        id="gui.sliderPrompt.ok"
-                    />
-                </button>
-            </Box>
-        </Box>
-    </Modal>
-);
-
-SliderPromptComponent.propTypes = {
-    intl: intlShape,
-    maxValue: PropTypes.string,
-    minValue: PropTypes.string,
-    onCancel: PropTypes.func.isRequired,
-    onChangeMax: PropTypes.func.isRequired,
-    onChangeMin: PropTypes.func.isRequired,
-    onKeyPress: PropTypes.func.isRequired,
-    onOk: PropTypes.func.isRequired
-};
-
-export default injectIntl(SliderPromptComponent);
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.1 (81669) - https://sketch.com -->
-    <title>Sound/General/Copy to New</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/General/Copy-to-New" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M15,11.0967026 L15,4 C15,3.44771525 14.5522847,3 14,3 L4,3 C3.44771525,3 3,3.44771525 3,4 L3,12 L12.6616037,12 L11.5236347,13.0430331 C11.1882084,13.3580017 11,13.7827132 11,14.2302292 C11,14.6767472 11.187801,15.1005394 11.5128606,15.4074032 L12.1595777,16 L4,16 C2.8954305,16 2,15.1045695 2,14 L2,4 C2,2.8954305 2.8954305,2 4,2 L14,2 C15.1045695,2 16,2.8954305 16,4 L16,12.0333493 C15.8307357,11.617882 15.4895036,11.283542 15.0505738,11.115203 C15.0337809,11.1087625 15.0169209,11.1025961 15,11.0967026 Z M10.3153901,9.43844107 C10.240142,9.43844107 10.1627842,9.41684419 10.0924589,9.37133647 C9.88359282,9.23558464 9.81397079,8.94017013 9.93774329,8.71108891 C10.173333,8.27298072 10.173333,7.72997337 9.93774329,7.2926365 C9.81397079,7.06278396 9.88359282,6.76736945 10.0924589,6.63161762 C10.3034348,6.49740842 10.5720773,6.57299751 10.6944433,6.80130741 C11.0931877,7.54177197 11.0931877,8.46118212 10.6944433,9.20164668 C10.612866,9.35436749 10.4658862,9.43844107 10.3153901,9.43844107 Z M11.6283181,10.2119951 C11.5530701,10.2119951 11.475009,10.1903983 11.405387,10.1448905 C11.1965209,10.0091387 11.1268989,9.7137242 11.2506714,9.48464298 C11.7436516,8.56986072 11.7436516,7.4329391 11.2506714,6.51892817 C11.1268989,6.28984695 11.1965209,5.99366112 11.405387,5.85790929 C11.6149563,5.7244714 11.8835989,5.79928918 12.0073714,6.02759908 C12.6642095,7.2447377 12.6642095,8.75806213 12.0073714,9.97520074 C11.9250908,10.1279216 11.7788142,10.2119951 11.6283181,10.2119951 Z M9.1892643,5.64286604 L9.1892643,10.3563857 C9.1892643,10.9148194 8.58587338,11.2071486 8.20963312,10.8307458 L7.39737611,10.0170061 C7.10974571,9.72930481 6.73491195,9.56964214 6.34530989,9.56964214 L6.20325282,9.56964214 C5.81505726,9.56964214 5.5,9.22486333 5.5,8.79832489 L5.5,7.20941137 C5.5,6.78364425 5.81505726,6.43809412 6.20325282,6.43809412 L6.33757411,6.43809412 C6.72717617,6.43809412 7.10200993,6.27843145 7.38964033,5.99073012 L8.20963312,5.16927725 C8.58587338,4.79287444 9.1892643,5.08520367 9.1892643,5.64286604 Z M13.937674,12.1868928 C14.1369962,12.0038895 14.4343459,11.9498886 14.6924846,12.0488903 C14.9506233,12.1478921 15.1172698,12.3758962 15.1172698,12.6339008 L15.1172698,13.2759122 C15.2675784,13.3119129 15.44076,13.3599137 15.6237444,13.428915 C15.9439671,13.545917 16.2968655,13.7259203 16.6236234,13.9686246 C16.7053128,14.0319257 16.7837347,14.0949268 16.8621566,14.1639281 C16.9307757,14.2239291 17.0418734,14.325931 17.0908871,14.385932 C17.2215902,14.5209344 17.3555609,14.6949375 17.4699262,14.8569404 C17.6921215,15.1989465 17.8456977,15.5679531 17.9273871,15.9186594 C18.005809,16.2699656 18.0123442,16.6029716 17.9862036,16.8789765 C17.9567954,17.1579815 17.8979789,17.3709853 17.8424301,17.5389883 C17.8162895,17.6229898 17.7934164,17.6589904 17.7803461,17.6979911 L17.7574731,17.7519921 C17.6921215,17.9109949 17.5156723,18.0159968 17.3196176,17.9979965 C17.0876195,17.9769961 16.9177054,17.7849927 16.9405785,17.5719889 L16.9471136,17.5149878 C16.9503812,17.4819873 16.9634515,17.4159861 16.960184,17.3649852 C16.960184,17.2629833 16.9569164,17.0889802 16.920973,16.8999769 C16.8817621,16.7079734 16.8098753,16.4919696 16.6922425,16.2849659 C16.5746097,16.0809623 16.4144984,15.8889588 16.2282464,15.730256 C16.1269515,15.6519546 16.0387269,15.5859534 15.921094,15.5139521 C15.8492073,15.4686513 15.8328694,15.4719514 15.774053,15.4389508 C15.7217718,15.4149504 15.6694905,15.39365 15.6172092,15.3729496 C15.4374924,15.3069485 15.2675784,15.2679478 15.1172698,15.2529475 L15.1172698,15.8259577 C15.1172698,16.0839623 14.9506233,16.3119664 14.6924846,16.4109681 C14.4343459,16.5099699 14.1369962,16.4559689 13.937674,16.2729657 L12.1993223,14.6802373 C12.0718867,14.5599351 12,14.3979322 12,14.2302292 C12,14.0619262 12.0718867,13.8999234 12.1993223,13.7802212 L13.937674,12.1868928 Z" id="Copy-to-New" fill="#4D97FF" fill-rule="nonzero"></path>
-    </g>
-</svg>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.1 (81669) - https://sketch.com -->
-    <title>Sound/General/Copy</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/General/Copy" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Secondary-Color" opacity="0.25" transform="translate(2.000000, 4.000000)" fill="#4D97FF">
-            <rect id="selection" x="0" y="0" width="16" height="12"></rect>
-        </g>
-        <g id="Primary-Color" transform="translate(0.000000, 2.000000)" fill="#4D97FF" fill-rule="nonzero">
-            <path d="M1.5,3.93699126 C0.637386394,3.71496986 0,2.93191971 0,2 C0,0.8954305 0.8954305,0 2,0 C3.1045695,0 4,0.8954305 4,2 C4,2.93191971 3.36261361,3.71496986 2.5,3.93699126 L2.5,12.0630087 C3.36261361,12.2850301 4,13.0680803 4,14 C4,15.1045695 3.1045695,16 2,16 C0.8954305,16 0,15.1045695 0,14 C0,13.0680803 0.637386394,12.2850301 1.5,12.0630087 L1.5,3.93699126 Z M17.5,12.0630087 L17.5,3.93699126 C16.6373864,3.71496986 16,2.93191971 16,2 C16,0.8954305 16.8954305,0 18,0 C19.1045695,0 20,0.8954305 20,2 C20,2.93191971 19.3626136,3.71496986 18.5,3.93699126 L18.5,12.0630087 C19.3626136,12.2850301 20,13.0680803 20,14 C20,15.1045695 19.1045695,16 18,16 C16.8954305,16 16,15.1045695 16,14 C16,13.0680803 16.6373864,12.2850301 17.5,12.0630087 Z M11,7 L12,7 C12.5522847,7 13,7.44771525 13,8 C13,8.55228475 12.5522847,9 12,9 L11,9 L11,10 C11,10.5522847 10.5522847,11 10,11 C9.44771525,11 9,10.5522847 9,10 L9,9 L8,9 C7.44771525,9 7,8.55228475 7,8 C7,7.44771525 7.44771525,7 8,7 L9,7 L9,6 C9,5.44771525 9.44771525,5 10,5 C10.5522847,5 11,5.44771525 11,6 L11,7 Z" id="handles-and-plus"></path>
-        </g>
-    </g>
-</svg>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>Sound/General/Trim</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M6.54210671,14.8773591 C6.54210671,15.6756813 5.89668548,16.3230878 5.11194905,16.3230878 C4.31632862,16.3230878 3.6709074,15.6756813 3.6709074,14.8773591 C3.6709074,14.086692 4.31632862,13.440379 5.11194905,13.440379 C5.89668548,13.440379 6.54210671,14.086692 6.54210671,14.8773591 L6.54210671,14.8773591 Z M8.63401159,13.5836396 C8.82992359,13.3878866 8.82992359,13.0685577 8.63401159,12.8706175 L7.10916313,11.338495 C6.91216272,11.1405548 6.59434991,11.1405548 6.3984379,11.338495 L5.87709428,11.861232 C5.63546947,11.7912421 5.37425346,11.7595279 5.11194905,11.7595279 C3.39010019,11.7595279 2.00021333,13.1571387 2.00021333,14.8872014 C2.00021333,16.8414505 3.794985,18.3779474 5.83246988,17.9230131 C7.36929074,17.5796252 8.34776238,16.1568618 8.19973997,14.5820892 C8.18450237,14.4213311 8.15620397,14.2638539 8.11266797,14.1074702 L8.63401159,13.5836396 Z M6.54210671,5.11617453 C6.54210671,5.91559037 5.89668548,6.5629969 5.11194905,6.5629969 C4.31632862,6.5629969 3.6709074,5.91559037 3.6709074,5.11617453 C3.6709074,4.32660102 4.31632862,3.68028808 5.11194905,3.68028808 C5.89668548,3.68028808 6.54210671,4.32660102 6.54210671,5.11617453 M18.0021973,16.1706411 L17.9368933,16.235163 C16.926858,17.2500165 15.2877276,17.2500165 14.2766039,16.235163 L7.87898848,9.80702856 C7.70919807,9.6353346 7.70919807,9.3586558 7.87898848,9.18805543 L9.15785853,7.90199109 C9.32764893,7.73139072 9.60301414,7.73139072 9.77280455,7.90199109 L18.0021973,16.1706411 Z M18.0021973,3.82934469 L12.4045559,9.45368895 L10.5107398,7.54865148 L14.2766039,3.76482275 C15.2877276,2.74996927 16.926858,2.74996927 17.9368933,3.76482275 L18.0021973,3.82934469 Z M8.63401159,6.41864274 C8.82992359,6.61548933 8.82992359,6.93591182 8.63401159,7.1327584 L7.10916313,8.66488096 C6.91216272,8.86282113 6.59434991,8.86282113 6.3984379,8.66488096 L5.87709428,8.14214392 C5.63546947,8.21213382 5.37425346,8.2427544 5.11194905,8.2427544 C3.39010019,8.2427544 2.00021333,6.84623726 2.00021333,5.11617453 C2.00021333,3.16192542 3.794985,1.62542849 5.83246988,2.0814564 C7.36929074,2.42375074 8.34776238,3.84651408 8.19973997,5.42128673 C8.18450237,5.58313837 8.15620397,5.73842845 8.11266797,5.89590571 L8.63401159,6.41864274 Z M10.3929749,10.0447755 C10.3929749,10.2744298 10.2079469,10.4614341 9.97829448,10.4614341 C9.74973047,10.4614341 9.56361406,10.2744298 9.56361406,10.0447755 C9.56361406,9.81402755 9.74973047,9.62811689 9.97829448,9.62811689 C10.2079469,9.62811689 10.3929749,9.81402755 10.3929749,10.0447755 Z" id="path-1"></path>
-    </defs>
-    <g id="Sound/General/Trim" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <mask id="mask-2" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <use id="Mask" fill="#575E75" xlink:href="#path-1"></use>
-        <g id="Blue/1_Blue" mask="url(#mask-2)" fill="#4D97FF">
-            <rect id="Primary-Blue" x="0" y="0" width="20" height="20"></rect>
-        </g>
-    </g>
-</svg>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
-    <title>Sound/Effects/Fade-in</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/Effects/Fade-in" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M2,10.25 C1.86192881,10.25 1.75,10.1380712 1.75,10 C1.75,9.86192881 1.86192881,9.75 2,9.75 L7,9.75 C7.35324851,9.75 7.58270077,9.50876428 7.90437981,8.88536107 L8.04612021,8.6082292 C8.35582235,8.01071273 8.58718112,7.75 9,7.75 C9.3879427,7.75 9.64783618,7.89521764 10.0567568,8.24762061 L10.1299543,8.31093199 C10.5105228,8.64016497 10.7058526,8.75 11,8.75 C11.1999644,8.75 11.402585,8.39321162 11.7655628,7.41317141 C12.2359183,6.14321162 12.4592237,5.75 13,5.75 C13.4020616,5.75 13.6314717,5.8897049 13.9133418,6.21140451 C13.9679067,6.27426342 13.9973758,6.30824799 14.0201857,6.33390904 C14.2852046,6.63205537 14.5123572,6.75 15,6.75 C15.3765436,6.75 15.6926018,6.13162529 16.2628292,4.42094306 C16.9426018,2.38162529 17.2654325,1.75 18,1.75 C18.1380712,1.75 18.25,1.86192881 18.25,2 L18.25,18 C18.25,18.1380712 18.1380712,18.25 18,18.25 C17.2654325,18.25 16.9426018,17.6183747 16.2628292,15.5790569 C15.6926018,13.8683747 15.3765436,13.25 15,13.25 C14.5123572,13.25 14.2852046,13.3679446 14.0201857,13.666091 C13.9973758,13.691752 13.9679067,13.7257366 13.9133418,13.7885955 C13.6314717,14.1102951 13.4020616,14.25 13,14.25 C12.4592237,14.25 12.2359183,13.8567884 11.7655628,12.5868286 C11.402585,11.6067884 11.1999644,11.25 11,11.25 C10.7058526,11.25 10.5105228,11.359835 10.1299543,11.689068 L10.0567568,11.7523794 C9.64783618,12.1047824 9.3879427,12.25 9,12.25 C8.58718112,12.25 8.35582235,11.9892873 8.04612021,11.3917708 L7.90437981,11.1146389 C7.58270078,10.4912357 7.35324851,10.25 7.00000001,10.25 L2,10.25 Z" id="Path" fill="#CF63CF" fill-rule="nonzero"></path>
-    </g>
-</svg>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.2 (81672) - https://sketch.com -->
-    <title>Sound/Effects/Fade-out</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/Effects/Fade-out" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M13,10.25 C12.6467515,10.25 12.4172992,10.4912357 12.0956202,11.1146389 L11.9538798,11.3917708 C11.6441776,11.9892873 11.4128189,12.25 11,12.25 C10.6120573,12.25 10.3521638,12.1047824 9.94324322,11.7523794 L9.8700457,11.689068 C9.48947724,11.359835 9.29414743,11.25 9,11.25 C8.80003561,11.25 8.59741505,11.6067884 8.23443719,12.5868286 C7.76408171,13.8567884 7.54077635,14.25 7,14.25 C6.59793845,14.25 6.3685283,14.1102951 6.08665816,13.7885955 C6.03209329,13.7257366 6.00262416,13.691752 5.97981434,13.666091 C5.71479538,13.3679446 5.48764275,13.25 5,13.25 C4.62345642,13.25 4.30739824,13.8683747 3.73717082,15.5790569 C3.05739824,17.6183747 2.73456753,18.25 2,18.25 C1.86192881,18.25 1.75,18.1380712 1.75,18 L1.75,2 C1.75,1.86192881 1.86192881,1.75 2,1.75 C2.73456753,1.75 3.05739824,2.38162529 3.73717082,4.42094306 C4.30739824,6.13162529 4.62345642,6.75 5,6.75 C5.48764275,6.75 5.71479538,6.63205537 5.97981434,6.33390904 C6.00262416,6.30824799 6.03209329,6.27426342 6.08665816,6.21140451 C6.3685283,5.8897049 6.59793845,5.75 7,5.75 C7.54077635,5.75 7.76408171,6.14321162 8.23443719,7.41317141 C8.59741505,8.39321162 8.80003561,8.75 9,8.75 C9.29414743,8.75 9.48947724,8.64016497 9.8700457,8.31093199 L9.94324322,8.24762061 C10.3521638,7.89521764 10.6120573,7.75 11,7.75 C11.4128189,7.75 11.6441776,8.01071273 11.9538798,8.6082292 L12.0956202,8.88536107 C12.4172992,9.50876428 12.6467515,9.75 13,9.75 L18,9.75 C18.1380712,9.75 18.25,9.86192881 18.25,10 C18.25,10.1380712 18.1380712,10.25 18,10.25 L12.9999998,10.25 L13,10.25 Z" id="Path" fill="#CF63CF" fill-rule="nonzero"></path>
-    </g>
-</svg>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 48.2 (47327) - http://www.bohemiancoding.com/sketch -->
+    <title>icon--lounder</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="lounder">
+            <g id="louder" transform="translate(2.000000, 3.000000)">
+                <path d="M7.54011246,2.3873625 L7.54011246,11.8531125 C7.54011246,12.2457375 7.22294659,12.5629875 6.83155041,12.5629875 L5.50777655,12.5629875 C5.2018577,12.5629875 4.9296799,12.3661125 4.83408026,12.0736125 C4.29422346,10.4266125 2.75788098,9.3128625 1.02471572,9.3128625 L0.709799251,9.3128625 C0.319527773,9.3128625 0.0001125,8.9933625 0.0001125,8.6029875 L0.0001125,5.6374875 C0.0001125,5.2471125 0.319527773,4.9276125 0.709799251,4.9276125 L1.02471572,4.9276125 C2.75788098,4.9276125 4.29422346,3.8138625 4.83408026,2.1668625 C4.9296799,1.8743625 5.2018577,1.6774875 5.50777655,1.6774875 L6.83155041,1.6774875 C7.22294659,1.6774875 7.54011246,1.9947375 7.54011246,2.3873625" id="Fill-1" fill="#CF63CF"></path>
+                <path d="M9.25,5.8645125 C9.9385,6.5541375 9.9385,7.6858875 9.25,8.3755125" id="Stroke-3" stroke="#CF63CF" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M10.75,3.3541875 C12.829,5.4331875 12.829,8.8081875 10.75,10.8860625" id="Stroke-5" stroke="#CF63CF" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"></path>
+                <path d="M12.5,0.8438625 C15.968375,4.3111125 15.968375,9.9293625 12.5,13.3966125" id="Stroke-7" stroke="#CF63CF" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"></path>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55.2 (78181) - https://sketchapp.com -->
-    <title>Sound/Effects/Mute</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/Effects/Mute" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path fill="#CF63CF" d="M13.4541749,5.04815243 L15.6281168,2.87421054 C15.92101,2.58131732 16.3958837,2.58131732 16.688777,2.87421054 C16.9816702,3.16710376 16.9816702,3.64197749 16.688777,3.93487071 L4.53033009,16.0933176 C4.23743687,16.3862108 3.76256313,16.3862108 3.46966991,16.0933176 C3.1767767,15.8004244 3.1767767,15.3255506 3.46966991,15.0326574 L6.31214932,12.190178 C6.1241191,12.0621379 6,11.8463331 6,11.6029875 L6,8.6374875 C6,8.2471125 6.31941527,7.9276125 6.70968675,7.9276125 L7.02460322,7.9276125 C8.75776848,7.9276125 10.294111,6.8138625 10.8339678,5.1668625 C10.9295674,4.8743625 11.2017452,4.6774875 11.5076641,4.6774875 L12.8314379,4.6774875 C13.1002844,4.6774875 13.3341075,4.82717208 13.4541749,5.04815243 Z M13.54,9.08364771 L13.54,14.8531125 C13.54,15.2457375 13.2228341,15.5629875 12.8314379,15.5629875 L11.5076641,15.5629875 C11.2017452,15.5629875 10.9295674,15.3661125 10.8339678,15.0736125 C10.5773785,14.2908077 10.0956813,13.628465 9.47473531,13.1489124 L13.54,9.08364771 Z" id="path-1"></path>
-    </g>
-</svg>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 56.1 (81669) - https://sketch.com -->
-    <title>Sound/General/Paste</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Sound/General/Paste" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M2.39776184,8.69699508 C2.82037272,8.57348907 3.12697047,8.23068036 3.44607843,7.63235294 C3.50283588,7.52593273 3.70653958,7.12084014 3.75472041,7.03050109 C4.03665487,6.50187397 4.27845388,6.25 4.66666667,6.25 C5.08719776,6.25 5.31070056,6.3254322 5.67812087,6.53210612 C5.97736723,6.7004322 6.1242348,6.75 6.44444444,6.75 C6.611898,6.75 6.70455317,6.61444047 6.85968251,6.13575567 C6.89349476,6.03068757 6.91177802,5.97409653 6.92949584,5.92094306 C7.19192893,5.1336438 7.51873661,4.75 8.22222222,4.75 C8.89163675,4.75 9.21925695,5.04485818 9.76356813,5.86132495 C10.2192569,6.54485818 10.4471923,6.75 10.8888889,6.75 C11.3661624,6.75 11.5487705,6.64281697 11.7364319,6.36132495 C11.7692531,6.31129826 11.7692531,6.31129826 11.8038172,6.25761214 C12.0332099,5.90369189 12.2433073,5.75 12.6666667,5.75 C13.1851992,5.75 13.4061497,6.04828312 13.7840084,6.89846538 C14.0728163,7.54828312 14.2222362,7.75 14.4444444,7.75 C14.7687569,7.75 14.9402848,7.69488783 15.2489243,7.52961059 L15.2905031,7.50732887 C15.6361057,7.32238348 15.857036,7.25 16.2222222,7.25 C16.6365912,7.25 16.8489777,7.46586974 17.1158999,7.96477614 C17.1606386,8.04903257 17.1606386,8.04903257 17.2045543,8.13123692 C17.3511621,8.40280419 17.4762139,8.57093888 17.631381,8.6621791 C17.7227849,8.5624959 17.8540941,8.5 18,8.5 C18.2761424,8.5 18.5,8.72385763 18.5,9 C18.5,9.27614237 18.2761424,9.5 18,9.5 C17.8540941,9.5 17.7227849,9.4375041 17.631381,9.3378209 C17.4762139,9.42906112 17.3511621,9.59719581 17.2045543,9.86876308 C17.1606386,9.95096743 17.1606386,9.95096743 17.1158999,10.0352239 C16.8489777,10.5341303 16.6365912,10.75 16.2222222,10.75 C15.857036,10.75 15.6361057,10.6776165 15.2905031,10.4926711 L15.2489243,10.4703894 C14.9402848,10.3051122 14.7687569,10.25 14.4444444,10.25 C14.2222362,10.25 14.0728163,10.4517169 13.7840084,11.1015346 C13.4061497,11.9517169 13.1851992,12.25 12.6666667,12.25 C12.2433073,12.25 12.0332099,12.0963081 11.8038172,11.7423879 C11.7692531,11.6887017 11.7692531,11.6887017 11.7364319,11.638675 C11.5487705,11.357183 11.3661624,11.25 10.8888889,11.25 C10.4471923,11.25 10.2192569,11.4551418 9.76356813,12.138675 C9.21925695,12.9551418 8.89163675,13.25 8.22222222,13.25 C7.51873661,13.25 7.19192893,12.8663562 6.92949584,12.0790569 C6.91177802,12.0259035 6.89349476,11.9693124 6.85968251,11.8642443 C6.70455317,11.3855595 6.611898,11.25 6.44444444,11.25 C6.1242348,11.25 5.97736723,11.2995678 5.67812087,11.4678939 C5.31070056,11.6745678 5.08719776,11.75 4.66666667,11.75 C4.2576716,11.75 4.07414298,11.4976192 3.8822771,10.9321841 L3.78515608,10.639352 C3.74630783,10.5239258 3.71290663,10.4315854 3.67737933,10.3436452 C3.42795496,9.72624902 3.07265238,9.37546644 2.4155666,9.27813036 C2.32583908,9.41193093 2.17320436,9.5 2,9.5 C1.72385763,9.5 1.5,9.27614237 1.5,9 C1.5,8.72385763 1.72385763,8.5 2,8.5 C2.16222865,8.5 2.306412,8.5772611 2.39776184,8.69699508 Z M9,15 L9.7763932,13.4472136 C9.80058413,13.3988317 9.83981475,13.3596011 9.8881966,13.3354102 C10.0116912,13.2736629 10.1618595,13.323719 10.2236068,13.4472136 L11,15 L12,15 C12.2761424,15 12.5,15.2238576 12.5,15.5 C12.5,15.6081851 12.4649111,15.7134519 12.4,15.8 L10.4,18.4666667 C10.2343146,18.6875806 9.9209139,18.7323521 9.7,18.5666667 C9.66209717,18.5382395 9.62842712,18.5045695 9.6,18.4666667 L7.6,15.8 C7.43431458,15.5790861 7.4790861,15.2656854 7.7,15.1 C7.78654809,15.0350889 7.89181489,15 8,15 L9,15 L9,15 Z M2,3.5 C1.72385763,3.5 1.5,3.27614237 1.5,3 C1.5,2.72385763 1.72385763,2.5 2,2.5 C2.27614237,2.5 2.5,2.72385763 2.5,3 C2.5,3.27614237 2.27614237,3.5 2,3.5 Z M4,3.5 C3.72385763,3.5 3.5,3.27614237 3.5,3 C3.5,2.72385763 3.72385763,2.5 4,2.5 C4.27614237,2.5 4.5,2.72385763 4.5,3 C4.5,3.27614237 4.27614237,3.5 4,3.5 Z M6,3.5 C5.72385763,3.5 5.5,3.27614237 5.5,3 C5.5,2.72385763 5.72385763,2.5 6,2.5 C6.27614237,2.5 6.5,2.72385763 6.5,3 C6.5,3.27614237 6.27614237,3.5 6,3.5 Z M8,3.5 C7.72385763,3.5 7.5,3.27614237 7.5,3 C7.5,2.72385763 7.72385763,2.5 8,2.5 C8.27614237,2.5 8.5,2.72385763 8.5,3 C8.5,3.27614237 8.27614237,3.5 8,3.5 Z M10,3.5 C9.72385763,3.5 9.5,3.27614237 9.5,3 C9.5,2.72385763 9.72385763,2.5 10,2.5 C10.2761424,2.5 10.5,2.72385763 10.5,3 C10.5,3.27614237 10.2761424,3.5 10,3.5 Z M12,3.5 C11.7238576,3.5 11.5,3.27614237 11.5,3 C11.5,2.72385763 11.7238576,2.5 12,2.5 C12.2761424,2.5 12.5,2.72385763 12.5,3 C12.5,3.27614237 12.2761424,3.5 12,3.5 Z M14,3.5 C13.7238576,3.5 13.5,3.27614237 13.5,3 C13.5,2.72385763 13.7238576,2.5 14,2.5 C14.2761424,2.5 14.5,2.72385763 14.5,3 C14.5,3.27614237 14.2761424,3.5 14,3.5 Z M16,3.5 C15.7238576,3.5 15.5,3.27614237 15.5,3 C15.5,2.72385763 15.7238576,2.5 16,2.5 C16.2761424,2.5 16.5,2.72385763 16.5,3 C16.5,3.27614237 16.2761424,3.5 16,3.5 Z M18,3.5 C17.7238576,3.5 17.5,3.27614237 17.5,3 C17.5,2.72385763 17.7238576,2.5 18,2.5 C18.2761424,2.5 18.5,2.72385763 18.5,3 C18.5,3.27614237 18.2761424,3.5 18,3.5 Z M18,5.5 C17.7238576,5.5 17.5,5.27614237 17.5,5 C17.5,4.72385763 17.7238576,4.5 18,4.5 C18.2761424,4.5 18.5,4.72385763 18.5,5 C18.5,Line truncated
-    </g>
-</svg>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="49px" height="52px" viewBox="-5 0 49 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
-    <title>play</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M17.2214651,8.34499443 C19.7766419,4.08636653 23.9234057,4.09303946 26.4745787,8.34499443 L40.1520974,31.140859 C42.7072741,35.3994869 40.7489672,38.8517869 35.7726637,38.8517869 L7.92338006,38.8517869 C2.9495089,38.8517869 0.992773429,35.392814 3.54394641,31.140859 L17.2214651,8.34499443 Z" id="path-1"></path>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop---1280x720" transform="translate(-623.000000, -347.000000)">
-            <g id="Step-3---Altering-Suggested-Trim" transform="translate(0.000000, 42.000000)">
-                <g id="Play-/-Record-/-Stop" transform="translate(623.000000, 307.000000)">
-                    <g id="play" transform="translate(21.849131, 22.002656) rotate(90.000000) translate(-21.849131, -22.002656) ">
-                        <use stroke="#FFFFFF" stroke-width="1" fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="52px" height="52px" viewBox="0 0 52 52" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
-    <title>stop-playback</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="44" height="44" rx="4"></rect>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop---1280x720" transform="translate(-619.000000, -345.000000)">
-            <g id="Step-4---Playing-Trim" transform="translate(0.000000, 42.000000)">
-                <g id="Play-/-Record-/-Stop" transform="translate(623.000000, 307.000000)">
-                    <g id="stop-playback">
-                        <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-1"></use>
-                        <rect stroke="#FFFFFF" stroke-width="1" x="0.5" y="0.5" width="43" height="43" rx="4"></rect>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
@@ -63,9 +63,7 @@
    background: hsla(300, 53%, 60%, 0.15);
    border: 1px solid $ui-black-transparent;
    border-radius: 5px;
-
-    margin-top: 20px;
-    margin-bottom: 20px;
+    padding: 3px;
 }

 $border-radius: 0.25rem;
@@ -95,9 +93,9 @@ $border-radius: 0.25rem;
    height: 3rem;
    width: 3rem;
    outline: none;
-    background: $motion-primary;
+    background: white;
    border-radius: 100%;
-    border: 4px solid $ui-white-dim;
+    border: 1px solid $ui-black-transparent;
    cursor: pointer;
    padding: 0.75rem;
    user-select: none;
@@ -120,7 +118,6 @@ $border-radius: 0.25rem;
    color: $text-primary;
    font-size: 0.625rem;
    user-select: none;
-
 }

 [dir="ltr"] .trim-button {
@@ -133,6 +130,7 @@ $border-radius: 0.25rem;

 .trim-button > img {
    width: 1.25rem;
+    margin-bottom: -0.375rem;
 }

 .effect-button {
@@ -140,7 +138,6 @@ $border-radius: 0.25rem;
    color: $text-primary;
    font-size: 0.625rem;
    user-select: none;
-    padding: 0.25rem 0;
 }

 .effect-button + .effect-button {
@@ -153,25 +150,12 @@ $border-radius: 0.25rem;
    margin-bottom: -0.375rem;
 }

-.tool-button {
-    flex-basis: 60px;
-    color: $text-primary;
-    font-size: 0.625rem;
-    user-select: none;
-    padding: 0.25rem 0;
+/* mirror the louder/softer speaker icons when rtl */
+[dir="rtl"] .effect-button:nth-of-type(6) img {
+    transform: scaleX(-1);
 }

-.tool-button + .tool-button {
-    margin: 0;
-}
-
-.tool-button img {
-    width: 4rem;
-    height: 1.5rem;
-    margin-bottom: -0.375rem;
-}
-
-[dir="rtl"] .flip-in-rtl img {
+[dir="rtl"] .effect-button:nth-of-type(7) img {
    transform: scaleX(-1);
 }

@@ -183,10 +167,6 @@ $border-radius: 0.25rem;
    margin-right: 1rem;
 }

-.button-group {
-    display: flex;
-}
-
 .button-group .button {
    border-radius: 0;
 }
@@ -8,29 +8,24 @@ import Label from '../forms/label.jsx';
 import Input from '../forms/input.jsx';

 import BufferedInputHOC from '../forms/buffered-input-hoc.jsx';
-import AudioSelector from '../../containers/audio-selector.jsx';
+import AudioTrimmer from '../../containers/audio-trimmer.jsx';
 import IconButton from '../icon-button/icon-button.jsx';

 import styles from './sound-editor.css';

-import playIcon from './icon--play.svg';
-import stopIcon from './icon--stop.svg';
+import playIcon from '../record-modal/icon--play.svg';
+import stopIcon from '../record-modal/icon--stop-playback.svg';
+import trimIcon from './icon--trim.svg';
+import trimConfirmIcon from './icon--trim-confirm.svg';
 import redoIcon from './icon--redo.svg';
 import undoIcon from './icon--undo.svg';
+import echoIcon from './icon--echo.svg';
 import fasterIcon from './icon--faster.svg';
 import slowerIcon from './icon--slower.svg';
 import louderIcon from './icon--louder.svg';
 import softerIcon from './icon--softer.svg';
 import robotIcon from './icon--robot.svg';
 import reverseIcon from './icon--reverse.svg';
-import fadeOutIcon from './icon--fade-out.svg';
-import fadeInIcon from './icon--fade-in.svg';
-import muteIcon from './icon--mute.svg';
-
-import deleteIcon from './icon--delete.svg';
-import copyIcon from './icon--copy.svg';
-import pasteIcon from './icon--paste.svg';
-import copyToNewIcon from './icon--copy-to-new.svg';

 const BufferedInput = BufferedInputHOC(Input);

@@ -50,25 +45,10 @@ const messages = defineMessages({
        description: 'Title of the button to stop the sound',
        defaultMessage: 'Stop'
    },
-    copy: {
-        id: 'gui.soundEditor.copy',
-        description: 'Title of the button to copy the sound',
-        defaultMessage: 'Copy'
-    },
-    paste: {
-        id: 'gui.soundEditor.paste',
-        description: 'Title of the button to paste the sound',
-        defaultMessage: 'Paste'
-    },
-    copyToNew: {
-        id: 'gui.soundEditor.copyToNew',
-        description: 'Title of the button to copy the selection into a new sound',
-        defaultMessage: 'Copy to New'
-    },
-    delete: {
-        id: 'gui.soundEditor.delete',
-        description: 'Title of the button to delete the sound',
-        defaultMessage: 'Delete'
+    trim: {
+        id: 'gui.soundEditor.trim',
+        description: 'Title of the button to start trimminging the sound',
+        defaultMessage: 'Trim'
    },
    save: {
        id: 'gui.soundEditor.save',
@@ -119,30 +99,11 @@ const messages = defineMessages({
        id: 'gui.soundEditor.reverse',
        description: 'Title of the button to apply the reverse effect',
        defaultMessage: 'Reverse'
-    },
-    fadeOut: {
-        id: 'gui.soundEditor.fadeOut',
-        description: 'Title of the button to apply the fade out effect',
-        defaultMessage: 'Fade out'
-    },
-    fadeIn: {
-        id: 'gui.soundEditor.fadeIn',
-        description: 'Title of the button to apply the fade in effect',
-        defaultMessage: 'Fade in'
-    },
-    mute: {
-        id: 'gui.soundEditor.mute',
-        description: 'Title of the button to apply the mute effect',
-        defaultMessage: 'Mute'
    }
 });

 const SoundEditor = props => (
-    <div
-        className={styles.editorContainer}
-        ref={props.setRef}
-        onMouseDown={props.onContainerClick}
-    >
+    <div className={styles.editorContainer}>
        <div className={styles.row}>
            <div className={styles.inputGroup}>
                <Label text={props.intl.formatMessage(messages.sound)}>
@@ -180,33 +141,17 @@ const SoundEditor = props => (
                    </button>
                </div>
            </div>
-            <div className={styles.inputGroup}>
-                <IconButton
-                    className={styles.toolButton}
-                    img={copyIcon}
-                    title={props.intl.formatMessage(messages.copy)}
-                    onClick={props.onCopy}
-                />
-                <IconButton
-                    className={styles.toolButton}
-                    disabled={props.canPaste === false}
-                    img={pasteIcon}
-                    title={props.intl.formatMessage(messages.paste)}
-                    onClick={props.onPaste}
-                />
-                <IconButton
-                    className={classNames(styles.toolButton, styles.flipInRtl)}
-                    img={copyToNewIcon}
-                    title={props.intl.formatMessage(messages.copyToNew)}
-                    onClick={props.onCopyToNew}
-                />
-            </div>
            <IconButton
-                className={styles.toolButton}
-                disabled={props.trimStart === null}
-                img={deleteIcon}
-                title={props.intl.formatMessage(messages.delete)}
-                onClick={props.onDelete}
+                className={classNames(styles.trimButton, {
+                    [styles.trimButtonActive]: props.trimStart !== null
+                })}
+                img={props.trimStart === null ? trimIcon : trimConfirmIcon}
+                title={props.trimStart === null ? (
+                    <FormattedMessage {...messages.trim} />
+                ) : (
+                    <FormattedMessage {...messages.save} />
+                )}
+                onClick={props.onActivateTrim}
            />
        </div>
        <div className={styles.row}>
@@ -216,13 +161,12 @@ const SoundEditor = props => (
                    height={160}
                    width={600}
                />
-                <AudioSelector
+                <AudioTrimmer
                    playhead={props.playhead}
                    trimEnd={props.trimEnd}
                    trimStart={props.trimStart}
-                    onPlay={props.onPlay}
-                    onSetTrim={props.onSetTrim}
-                    onStop={props.onStop}
+                    onSetTrimEnd={props.onSetTrimEnd}
+                    onSetTrimStart={props.onSetTrimStart}
                />
            </div>
        </div>
@@ -264,42 +208,11 @@ const SoundEditor = props => (
                title={<FormattedMessage {...messages.slower} />}
                onClick={props.onSlower}
            />
-            <IconButton
-                disabled={props.tooLoud}
-                className={classNames(styles.effectButton, styles.flipInRtl)}
-                img={louderIcon}
-                title={<FormattedMessage {...messages.louder} />}
-                onClick={props.onLouder}
-            />
-            <IconButton
-                className={classNames(styles.effectButton, styles.flipInRtl)}
-                img={softerIcon}
-                title={<FormattedMessage {...messages.softer} />}
-                onClick={props.onSofter}
-            />
-            <IconButton
-                className={classNames(styles.effectButton, styles.flipInRtl)}
-                img={muteIcon}
-                title={<FormattedMessage {...messages.mute} />}
-                onClick={props.onMute}
-            />
            <IconButton
                className={styles.effectButton}
-                img={fadeInIcon}
-                title={<FormattedMessage {...messages.fadeIn} />}
-                onClick={props.onFadeIn}
-            />
-            <IconButton
-                className={styles.effectButton}
-                img={fadeOutIcon}
-                title={<FormattedMessage {...messages.fadeOut} />}
-                onClick={props.onFadeOut}
-            />
-            <IconButton
-                className={styles.effectButton}
-                img={reverseIcon}
-                title={<FormattedMessage {...messages.reverse} />}
-                onClick={props.onReverse}
+                img={echoIcon}
+                title={<FormattedMessage {...messages.echo} />}
+                onClick={props.onEcho}
            />
            <IconButton
                className={styles.effectButton}
@@ -307,41 +220,50 @@ const SoundEditor = props => (
                title={<FormattedMessage {...messages.robot} />}
                onClick={props.onRobot}
            />
+            <IconButton
+                className={styles.effectButton}
+                img={louderIcon}
+                title={<FormattedMessage {...messages.louder} />}
+                onClick={props.onLouder}
+            />
+            <IconButton
+                className={styles.effectButton}
+                img={softerIcon}
+                title={<FormattedMessage {...messages.softer} />}
+                onClick={props.onSofter}
+            />
+            <IconButton
+                className={styles.effectButton}
+                img={reverseIcon}
+                title={<FormattedMessage {...messages.reverse} />}
+                onClick={props.onReverse}
+            />
        </div>
    </div>
 );

 SoundEditor.propTypes = {
-    canPaste: PropTypes.bool.isRequired,
    canRedo: PropTypes.bool.isRequired,
    canUndo: PropTypes.bool.isRequired,
    chunkLevels: PropTypes.arrayOf(PropTypes.number).isRequired,
    intl: intlShape,
    name: PropTypes.string.isRequired,
+    onActivateTrim: PropTypes.func,
    onChangeName: PropTypes.func.isRequired,
-    onContainerClick: PropTypes.func.isRequired,
-    onCopy: PropTypes.func.isRequired,
-    onCopyToNew: PropTypes.func.isRequired,
-    onDelete: PropTypes.func,
    onEcho: PropTypes.func.isRequired,
-    onFadeIn: PropTypes.func.isRequired,
-    onFadeOut: PropTypes.func.isRequired,
    onFaster: PropTypes.func.isRequired,
    onLouder: PropTypes.func.isRequired,
-    onMute: PropTypes.func.isRequired,
-    onPaste: PropTypes.func.isRequired,
    onPlay: PropTypes.func.isRequired,
    onRedo: PropTypes.func.isRequired,
    onReverse: PropTypes.func.isRequired,
    onRobot: PropTypes.func.isRequired,
-    onSetTrim: PropTypes.func,
+    onSetTrimEnd: PropTypes.func,
+    onSetTrimStart: PropTypes.func,
    onSlower: PropTypes.func.isRequired,
    onSofter: PropTypes.func.isRequired,
    onStop: PropTypes.func.isRequired,
    onUndo: PropTypes.func.isRequired,
    playhead: PropTypes.number,
-    setRef: PropTypes.func,
-    tooLoud: PropTypes.bool.isRequired,
    trimEnd: PropTypes.number,
    trimStart: PropTypes.number
 };
@@ -39,16 +39,6 @@
    height: .5rem;
 }

-.large {
-    width: 2.5rem;
-    height: 2.5rem;
-}
-
-.large::before, .large::after {
-    width: 2.5rem;
-    height: 2.5rem;
-}
-
@keyframes spin {
  0% {
    transform: rotate(0deg);
@@ -81,10 +71,3 @@
 .spinner.info::after {
    border-top-color: $ui-white;
 }
-
-.spinner.primary {
-    border-color: $motion-transparent;
-}
-.spinner.primary::after {
-    border-top-color: $motion-primary;
-}
@@ -8,8 +8,7 @@ const SpinnerComponent = function (props) {
    const {
        className,
        level,
-        small,
-        large
+        small
    } = props;
    return (
        <div
@@ -17,24 +16,18 @@ const SpinnerComponent = function (props) {
                className,
                styles.spinner,
                styles[level],
-                {
-                    [styles.small]: small,
-                    [styles.large]: large
-                }
+                {[styles.small]: small}
            )}
        />
    );
 };
 SpinnerComponent.propTypes = {
    className: PropTypes.string,
-    large: PropTypes.bool,
    level: PropTypes.string,
    small: PropTypes.bool
 };
 SpinnerComponent.defaultProps = {
    className: '',
-    large: false,
-    level: 'info',
-    small: false
+    level: 'info'
 };
 export default SpinnerComponent;
@@ -20,6 +20,7 @@
    cursor: pointer;

    user-select: none;
+    touch-action: none;
 }

 .sprite-selector-item.is-selected {
@@ -94,16 +95,16 @@

 .delete-button {
    position: absolute;
-    top: -.625rem;
+    top: 0.125rem;
    z-index: auto;
 }

 [dir="ltr"] .delete-button {
-    right: -.625rem;
+    right: 0.125rem;
 }

 [dir="rtl"] .delete-button {
-    left: -.625rem;
+    left: 0.125rem;
 }

 .number {
@@ -2,10 +2,10 @@ import classNames from 'classnames';
 import PropTypes from 'prop-types';
 import React from 'react';

-import DeleteButton from '../delete-button/delete-button.jsx';
+import CloseButton from '../close-button/close-button.jsx';
 import styles from './sprite-selector-item.css';
 import {ContextMenuTrigger} from 'react-contextmenu';
-import {DangerousMenuItem, ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
+import {BorderedMenuItem, ContextMenu, MenuItem} from '../context-menu/context-menu.jsx';
 import {FormattedMessage} from 'react-intl';

 // react-contextmenu requires unique id to match trigger and context menu
@@ -23,9 +23,8 @@ const SpriteSelectorItem = props => (
            onMouseDown: props.onMouseDown,
            onTouchStart: props.onMouseDown
        }}
-        disable={props.preventContextMenu}
+        disable={props.dragging}
        id={`${props.name}-${contextMenuId}`}
-        ref={props.componentRef}
    >
        {typeof props.number === 'undefined' ? null : (
            <div className={styles.number}>{props.number}</div>
@@ -48,8 +47,9 @@ const SpriteSelectorItem = props => (
            ) : null}
        </div>
        {(props.selected && props.onDeleteButtonClick) ? (
-            <DeleteButton
+            <CloseButton
                className={styles.deleteButton}
+                size={CloseButton.SIZE_SMALL}
                onClick={props.onDeleteButtonClick}
            />
        ) : null }
@@ -74,13 +74,13 @@ const SpriteSelectorItem = props => (
                    </MenuItem>
                ) : null }
                {props.onDeleteButtonClick ? (
-                    <DangerousMenuItem onClick={props.onDeleteButtonClick}>
+                    <BorderedMenuItem onClick={props.onDeleteButtonClick}>
                        <FormattedMessage
                            defaultMessage="delete"
                            description="Menu item to delete in the right click menu"
                            id="gui.spriteSelectorItem.contextMenuDelete"
                        />
-                    </DangerousMenuItem>
+                    </BorderedMenuItem>
                ) : null }
            </ContextMenu>
        ) : null}
@@ -89,9 +89,9 @@ const SpriteSelectorItem = props => (

 SpriteSelectorItem.propTypes = {
    className: PropTypes.string,
-    componentRef: PropTypes.func,
    costumeURL: PropTypes.string,
    details: PropTypes.string,
+    dragging: PropTypes.bool,
    name: PropTypes.string.isRequired,
    number: PropTypes.number,
    onClick: PropTypes.func,
@@ -101,7 +101,6 @@ SpriteSelectorItem.propTypes = {
    onMouseDown: PropTypes.func,
    onMouseEnter: PropTypes.func,
    onMouseLeave: PropTypes.func,
-    preventContextMenu: PropTypes.bool,
    selected: PropTypes.bool.isRequired
 };

@@ -110,8 +110,7 @@ SpriteList.propTypes = {
    editingTarget: PropTypes.string,
    hoveredTarget: PropTypes.shape({
        hoveredSprite: PropTypes.string,
-        receivedBlocks: PropTypes.bool,
-        sprite: PropTypes.string
+        receivedBlocks: PropTypes.bool
    }),
    items: PropTypes.arrayOf(PropTypes.shape({
        costume: PropTypes.shape({
@@ -68,8 +68,6 @@
    padding-left: calc($space / 2);
    padding-right: calc($space / 2);
    padding-bottom: $space;
-
-    overflow-x: hidden;
 }

 .add-button {
@@ -19,21 +19,17 @@ class Waveform extends React.PureComponent {
        // composite time when animating the playhead
        const takeEveryN = Math.ceil(data.length / width);

-        const filteredData = takeEveryN === 1 ? data.slice(0) :
+        const filteredData = takeEveryN === 1 ? data :
            data.filter((_, i) => i % takeEveryN === 0);

-        // Need at least two points to render waveform.
-        if (filteredData.length === 1) {
-            filteredData.push(filteredData[0]);
-        }
+        const cappedData = [0, ...filteredData, 0];

-        const maxIndex = filteredData.length - 1;
        const points = [
-            ...filteredData.map((v, i) =>
-                [width * (i / maxIndex), height * v / 2]
+            ...cappedData.map((v, i) =>
+                [width * i / cappedData.length, height * v / 2]
            ),
-            ...filteredData.reverse().map((v, i) =>
-                [width * (1 - (i / maxIndex)), -height * v / 2]
+            ...cappedData.reverse().map((v, i) =>
+                [width * (cappedData.length - i - 1) / cappedData.length, -height * v / 2]
            )
        ];
        const pathComponents = points.map(([x, y], i) => {
@@ -44,8 +40,15 @@ class Waveform extends React.PureComponent {
        return (
            <svg
                className={styles.container}
-                viewBox={`0 0 ${width} ${height}`}
+                viewBox={`-1 0 ${width} ${height}`}
            >
+                <line
+                    className={styles.baseline}
+                    x1={-1}
+                    x2={width}
+                    y1={height / 2}
+                    y2={height / 2}
+                />
                <g transform={`scale(1, -1) translate(0, -${height / 2})`}>
                    <path
                        className={styles.waveformPath}
@@ -1,156 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import bindAll from 'lodash.bindall';
-import AudioSelectorComponent from '../components/audio-trimmer/audio-selector.jsx';
-import {getEventXY} from '../lib/touch-utils';
-import DragRecognizer from '../lib/drag-recognizer';
-
-const MIN_LENGTH = 0.01;
-const MIN_DURATION = 500;
-
-class AudioSelector extends React.Component {
-    constructor (props) {
-        super(props);
-        bindAll(this, [
-            'handleNewSelectionMouseDown',
-            'handleTrimStartMouseDown',
-            'handleTrimEndMouseDown',
-            'handleTrimStartMouseMove',
-            'handleTrimEndMouseMove',
-            'handleTrimStartMouseUp',
-            'handleTrimEndMouseUp',
-            'storeRef'
-        ]);
-
-        this.state = {
-            trimStart: props.trimStart,
-            trimEnd: props.trimEnd
-        };
-
-        this.clickStartTime = 0;
-
-        this.trimStartDragRecognizer = new DragRecognizer({
-            onDrag: this.handleTrimStartMouseMove,
-            onDragEnd: this.handleTrimStartMouseUp,
-            touchDragAngle: 90,
-            distanceThreshold: 0
-        });
-        this.trimEndDragRecognizer = new DragRecognizer({
-            onDrag: this.handleTrimEndMouseMove,
-            onDragEnd: this.handleTrimEndMouseUp,
-            touchDragAngle: 90,
-            distanceThreshold: 0
-        });
-    }
-    componentWillReceiveProps (newProps) {
-        const {trimStart, trimEnd} = this.props;
-        if (newProps.trimStart === trimStart && newProps.trimEnd === trimEnd) return;
-        this.setState({
-            trimStart: newProps.trimStart,
-            trimEnd: newProps.trimEnd
-        });
-    }
-    clearSelection () {
-        this.props.onSetTrim(null, null);
-    }
-    handleNewSelectionMouseDown (e) {
-        const {width, left} = this.containerElement.getBoundingClientRect();
-        this.initialTrimEnd = (getEventXY(e).x - left) / width;
-        this.initialTrimStart = this.initialTrimEnd;
-        this.props.onSetTrim(this.initialTrimStart, this.initialTrimEnd);
-
-        this.clickStartTime = Date.now();
-
-        this.containerSize = width;
-        this.trimEndDragRecognizer.start(e);
-
-        e.preventDefault();
-    }
-    handleTrimStartMouseMove (currentOffset, initialOffset) {
-        const dx = (currentOffset.x - initialOffset.x) / this.containerSize;
-        const newTrim = Math.max(0, Math.min(1, this.initialTrimStart + dx));
-        if (newTrim > this.initialTrimEnd) {
-            this.setState({
-                trimStart: this.initialTrimEnd,
-                trimEnd: newTrim
-            });
-        } else {
-            this.setState({
-                trimStart: newTrim,
-                trimEnd: this.initialTrimEnd
-            });
-        }
-    }
-    handleTrimEndMouseMove (currentOffset, initialOffset) {
-        const dx = (currentOffset.x - initialOffset.x) / this.containerSize;
-        const newTrim = Math.min(1, Math.max(0, this.initialTrimEnd + dx));
-        if (newTrim < this.initialTrimStart) {
-            this.setState({
-                trimStart: newTrim,
-                trimEnd: this.initialTrimStart
-            });
-        } else {
-            this.setState({
-                trimStart: this.initialTrimStart,
-                trimEnd: newTrim
-            });
-        }
-    }
-    handleTrimStartMouseUp () {
-        this.props.onSetTrim(this.state.trimStart, this.state.trimEnd);
-    }
-    handleTrimEndMouseUp () {
-        // If the selection was made quickly (tooFast) and is small (tooShort),
-        // deselect instead. This allows click-to-deselect even if you drag
-        // a little bit by accident. It also allows very quickly making a
-        // selection, as long as it is above a minimum length.
-        const tooFast = (Date.now() - this.clickStartTime) < MIN_DURATION;
-        const tooShort = (this.state.trimEnd - this.state.trimStart) < MIN_LENGTH;
-        if (tooFast && tooShort) {
-            this.clearSelection();
-        } else {
-            this.props.onSetTrim(this.state.trimStart, this.state.trimEnd);
-        }
-    }
-    handleTrimStartMouseDown (e) {
-        this.containerSize = this.containerElement.getBoundingClientRect().width;
-        this.trimStartDragRecognizer.start(e);
-        this.initialTrimStart = this.props.trimStart;
-        this.initialTrimEnd = this.props.trimEnd;
-        e.stopPropagation();
-        e.preventDefault();
-    }
-    handleTrimEndMouseDown (e) {
-        this.containerSize = this.containerElement.getBoundingClientRect().width;
-        this.trimEndDragRecognizer.start(e);
-        this.initialTrimEnd = this.props.trimEnd;
-        this.initialTrimStart = this.props.trimStart;
-        e.stopPropagation();
-        e.preventDefault();
-    }
-    storeRef (el) {
-        this.containerElement = el;
-    }
-    render () {
-        return (
-            <AudioSelectorComponent
-                containerRef={this.storeRef}
-                playhead={this.props.playhead}
-                trimEnd={this.state.trimEnd}
-                trimStart={this.state.trimStart}
-                onNewSelectionMouseDown={this.handleNewSelectionMouseDown}
-                onTrimEndMouseDown={this.handleTrimEndMouseDown}
-                onTrimStartMouseDown={this.handleTrimStartMouseDown}
-            />
-        );
-    }
-}
-
-AudioSelector.propTypes = {
-    onSetTrim: PropTypes.func,
-    playhead: PropTypes.number,
-    trimEnd: PropTypes.number,
-    trimStart: PropTypes.number
-};
-
-export default AudioSelector;
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import bindAll from 'lodash.bindall';
 import AudioTrimmerComponent from '../components/audio-trimmer/audio-trimmer.jsx';
-import DragRecognizer from '../lib/drag-recognizer';
+import {getEventXY} from '../lib/touch-utils';

 const MIN_LENGTH = 0.01; // Used to stop sounds being trimmed smaller than 1%

@@ -14,43 +14,52 @@ class AudioTrimmer extends React.Component {
            'handleTrimEndMouseDown',
            'handleTrimStartMouseMove',
            'handleTrimEndMouseMove',
+            'handleTrimStartMouseUp',
+            'handleTrimEndMouseUp',
            'storeRef'
        ]);
-        this.trimStartDragRecognizer = new DragRecognizer({
-            onDrag: this.handleTrimStartMouseMove,
-            touchDragAngle: 90,
-            distanceThreshold: 0
-        });
-        this.trimEndDragRecognizer = new DragRecognizer({
-            onDrag: this.handleTrimEndMouseMove,
-            touchDragAngle: 90,
-            distanceThreshold: 0
-        });
-
    }
-    handleTrimStartMouseMove (currentOffset, initialOffset) {
-        const dx = (currentOffset.x - initialOffset.x) / this.containerSize;
+    handleTrimStartMouseMove (e) {
+        const containerSize = this.containerElement.getBoundingClientRect().width;
+        const dx = (getEventXY(e).x - this.initialX) / containerSize;
        const newTrim = Math.max(0, Math.min(this.props.trimEnd - MIN_LENGTH, this.initialTrim + dx));
        this.props.onSetTrimStart(newTrim);
+        e.preventDefault();
    }
-    handleTrimEndMouseMove (currentOffset, initialOffset) {
-        const dx = (currentOffset.x - initialOffset.x) / this.containerSize;
+    handleTrimEndMouseMove (e) {
+        const containerSize = this.containerElement.getBoundingClientRect().width;
+        const dx = (getEventXY(e).x - this.initialX) / containerSize;
        const newTrim = Math.min(1, Math.max(this.props.trimStart + MIN_LENGTH, this.initialTrim + dx));
        this.props.onSetTrimEnd(newTrim);
+        e.preventDefault();
+    }
+    handleTrimStartMouseUp () {
+        window.removeEventListener('mousemove', this.handleTrimStartMouseMove);
+        window.removeEventListener('mouseup', this.handleTrimStartMouseUp);
+        window.removeEventListener('touchmove', this.handleTrimStartMouseMove);
+        window.removeEventListener('touchend', this.handleTrimStartMouseUp);
+    }
+    handleTrimEndMouseUp () {
+        window.removeEventListener('mousemove', this.handleTrimEndMouseMove);
+        window.removeEventListener('mouseup', this.handleTrimEndMouseUp);
+        window.removeEventListener('touchmove', this.handleTrimEndMouseMove);
+        window.removeEventListener('touchend', this.handleTrimEndMouseUp);
    }
    handleTrimStartMouseDown (e) {
-        this.containerSize = this.containerElement.getBoundingClientRect().width;
-        this.trimStartDragRecognizer.start(e);
+        this.initialX = getEventXY(e).x;
        this.initialTrim = this.props.trimStart;
-        e.stopPropagation();
-        e.preventDefault();
+        window.addEventListener('mousemove', this.handleTrimStartMouseMove);
+        window.addEventListener('mouseup', this.handleTrimStartMouseUp);
+        window.addEventListener('touchmove', this.handleTrimStartMouseMove);
+        window.addEventListener('touchend', this.handleTrimStartMouseUp);
    }
    handleTrimEndMouseDown (e) {
-        this.containerSize = this.containerElement.getBoundingClientRect().width;
-        this.trimEndDragRecognizer.start(e);
+        this.initialX = getEventXY(e).x;
        this.initialTrim = this.props.trimEnd;
-        e.stopPropagation();
-        e.preventDefault();
+        window.addEventListener('mousemove', this.handleTrimEndMouseMove);
+        window.addEventListener('mouseup', this.handleTrimEndMouseUp);
+        window.addEventListener('touchmove', this.handleTrimEndMouseMove);
+        window.addEventListener('touchend', this.handleTrimEndMouseUp);
    }
    storeRef (el) {
        this.containerElement = el;
@@ -67,7 +67,7 @@ class AutoScanningStep extends React.Component {
    render () {
        return (
            <ScanningStepComponent
-                connectionTipIconURL={this.props.connectionTipIconURL}
+                peripheralButtonImage={this.props.peripheralButtonImage}
                phase={this.state.phase}
                title={this.props.extensionId}
                onRefresh={this.handleRefresh}
@@ -78,9 +78,9 @@ class AutoScanningStep extends React.Component {
 }

 AutoScanningStep.propTypes = {
-    connectionTipIconURL: PropTypes.string,
    extensionId: PropTypes.string.isRequired,
    onConnecting: PropTypes.func.isRequired,
+    peripheralButtonImage: PropTypes.string,
    vm: PropTypes.instanceOf(VM).isRequired
 };

@@ -2,8 +2,10 @@ import bindAll from 'lodash.bindall';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
+import {connect} from 'react-redux';
 import VM from 'scratch-vm';

+import analytics from '../lib/analytics';
 import backdropLibraryContent from '../lib/libraries/backdrops.json';
 import backdropTags from '../lib/libraries/backdrop-tags';
 import LibraryComponent from '../components/library/library.jsx';
@@ -32,8 +34,13 @@ class BackdropLibrary extends React.Component {
            bitmapResolution: item.info.length > 2 ? item.info[2] : 1,
            skinId: null
        };
-        // Do not switch to stage, just add the backdrop
+        this.props.vm.setEditingTarget(this.props.stageID);
        this.props.vm.addBackdrop(item.md5, vmBackdrop);
+        analytics.event({
+            category: 'library',
+            action: 'Select Backdrop',
+            label: item.name
+        });
    }
    render () {
        return (
@@ -52,7 +59,17 @@ class BackdropLibrary extends React.Component {
 BackdropLibrary.propTypes = {
    intl: intlShape.isRequired,
    onRequestClose: PropTypes.func,
+    stageID: PropTypes.string.isRequired,
    vm: PropTypes.instanceOf(VM).isRequired
 };

-export default injectIntl(BackdropLibrary);
+const mapStateToProps = state => ({
+    stageID: state.scratchGui.targets.stage.id
+});
+
+const mapDispatchToProps = () => ({});
+
+export default injectIntl(connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(BackdropLibrary));
@@ -83,15 +83,12 @@ class Backpack extends React.Component {
    }
    handleDrop (dragInfo) {
        let payloader = null;
-        let presaveAsset = null;
        switch (dragInfo.dragType) {
        case DragConstants.COSTUME:
            payloader = costumePayload;
-            presaveAsset = dragInfo.payload.asset;
            break;
        case DragConstants.SOUND:
            payloader = soundPayload;
-            presaveAsset = dragInfo.payload.asset;
            break;
        case DragConstants.SPRITE:
            payloader = spritePayload;
@@ -105,19 +102,6 @@ class Backpack extends React.Component {
        // Creating the payload is async, so set loading before starting
        this.setState({loading: true}, () => {
            payloader(dragInfo.payload, this.props.vm)
-                .then(payload => {
-                    // Force the asset to save to the asset server before storing in backpack
-                    // Ensures any asset present in the backpack is also on the asset server
-                    if (presaveAsset && !presaveAsset.clean) {
-                        return storage.store(
-                            presaveAsset.assetType,
-                            presaveAsset.dataFormat,
-                            presaveAsset.data,
-                            presaveAsset.assetId
-                        ).then(() => payload);
-                    }
-                    return payload;
-                })
                .then(payload => saveBackpackObject({
                    host: this.props.host,
                    token: this.props.token,
@@ -17,7 +17,6 @@ import errorBoundaryHOC from '../lib/error-boundary-hoc.jsx';
 import {STAGE_DISPLAY_SIZES} from '../lib/layout-constants';
 import DropAreaHOC from '../lib/drop-area-hoc.jsx';
 import DragConstants from '../lib/drag-constants';
-import defineDynamicBlock from '../lib/define-dynamic-block';

 import {connect} from 'react-redux';
 import {updateToolbox} from '../reducers/toolbox';
@@ -97,21 +96,6 @@ class Blocks extends React.Component {
        );
        this.workspace = this.ScratchBlocks.inject(this.blocks, workspaceConfig);

-        // Register buttons under new callback keys for creating variables,
-        // lists, and procedures from extensions.
-
-        const toolboxWorkspace = this.workspace.getFlyout().getWorkspace();
-
-        const varListButtonCallback = type =>
-            (() => this.ScratchBlocks.Variables.createVariable(this.workspace, null, type));
-        const procButtonCallback = () => {
-            this.ScratchBlocks.Procedures.createProcedureDefCallback_(this.workspace);
-        };
-
-        toolboxWorkspace.registerButtonCallback('MAKE_A_VARIABLE', varListButtonCallback(''));
-        toolboxWorkspace.registerButtonCallback('MAKE_A_LIST', varListButtonCallback('list'));
-        toolboxWorkspace.registerButtonCallback('MAKE_A_PROCEDURE', procButtonCallback);
-
        // Store the xml of the toolbox that is actually rendered.
        // This is used in componentDidUpdate instead of prevProps, because
        // the xml can change while e.g. on the costumes tab.
@@ -178,7 +162,6 @@ class Blocks extends React.Component {
                this.setLocale();
            } else {
                this.props.vm.refreshWorkspace();
-                this.requestToolboxUpdate();
            }

            window.dispatchEvent(new Event('resize'));
@@ -340,9 +323,9 @@ class Blocks extends React.Component {
            const targetSounds = target.getSounds();
            const dynamicBlocksXML = this.props.vm.runtime.getBlocksXML();
            return makeToolboxXML(target.isStage, target.id, dynamicBlocksXML,
-                targetCostumes[targetCostumes.length - 1].name,
-                stageCostumes[stageCostumes.length - 1].name,
-                targetSounds.length > 0 ? targetSounds[targetSounds.length - 1].name : ''
+                targetCostumes[0].name,
+                stageCostumes[0].name,
+                targetSounds.length > 0 ? targetSounds[0].name : ''
            );
        } catch {
            return null;
@@ -394,50 +377,20 @@ class Blocks extends React.Component {
        // workspace to be 'undone' here.
        this.workspace.clearUndo();
    }
-    handleExtensionAdded (categoryInfo) {
-        const defineBlocks = blockInfoArray => {
-            if (blockInfoArray && blockInfoArray.length > 0) {
-                const staticBlocksJson = [];
-                const dynamicBlocksInfo = [];
-                blockInfoArray.forEach(blockInfo => {
-                    if (blockInfo.info && blockInfo.info.isDynamic) {
-                        dynamicBlocksInfo.push(blockInfo);
-                    } else if (blockInfo.json) {
-                        staticBlocksJson.push(blockInfo.json);
-                    }
-                    // otherwise it's a non-block entry such as '---'
-                });
+    handleExtensionAdded (blocksInfo) {
+        // select JSON from each block info object then reject the pseudo-blocks which don't have JSON, like separators
+        // this actually defines blocks and MUST run regardless of the UI state
+        this.ScratchBlocks.defineBlocksWithJsonArray(blocksInfo.map(blockInfo => blockInfo.json).filter(x => x));

-                this.ScratchBlocks.defineBlocksWithJsonArray(staticBlocksJson);
-                dynamicBlocksInfo.forEach(blockInfo => {
-                    // This is creating the block factory / constructor -- NOT a specific instance of the block.
-                    // The factory should only know static info about the block: the category info and the opcode.
-                    // Anything else will be picked up from the XML attached to the block instance.
-                    const extendedOpcode = `${categoryInfo.id}_${blockInfo.info.opcode}`;
-                    const blockDefinition =
-                        defineDynamicBlock(this.ScratchBlocks, categoryInfo, blockInfo, extendedOpcode);
-                    this.ScratchBlocks.Blocks[extendedOpcode] = blockDefinition;
-                });
-            }
-        };
-
-        // scratch-blocks implements a menu or custom field as a special kind of block ("shadow" block)
-        // these actually define blocks and MUST run regardless of the UI state
-        defineBlocks(
-            Object.getOwnPropertyNames(categoryInfo.customFieldTypes)
-                .map(fieldTypeName => categoryInfo.customFieldTypes[fieldTypeName].scratchBlocksDefinition));
-        defineBlocks(categoryInfo.menus);
-        defineBlocks(categoryInfo.blocks);
-
-        // Update the toolbox with new blocks if possible
+        // Update the toolbox with new blocks
        const toolboxXML = this.getToolboxXML();
        if (toolboxXML) {
            this.props.updateToolboxState(toolboxXML);
        }
    }
-    handleBlocksInfoUpdate (categoryInfo) {
+    handleBlocksInfoUpdate (blocksInfo) {
        // @todo Later we should replace this to avoid all the warnings from redefining blocks.
-        this.handleExtensionAdded(categoryInfo);
+        this.handleExtensionAdded(blocksInfo);
    }
    handleCategorySelected (categoryId) {
        const extension = extensionData.find(ext => ext.extensionId === categoryId);
@@ -1,11 +1,8 @@
 import {connect} from 'react-redux';
-import PropTypes from 'prop-types';
-import React from 'react';

 import {
    activateDeck,
    closeCards,
-    shrinkExpandCards,
    nextStep,
    prevStep,
    dragCard,
@@ -18,43 +15,17 @@ import {
 } from '../reducers/modals';

 import CardsComponent from '../components/cards/cards.jsx';
-import {loadImageData} from '../lib/libraries/decks/translate-image.js';
-import {notScratchDesktop} from '../lib/isScratchDesktop';
-
-class Cards extends React.Component {
-    componentDidMount () {
-        if (this.props.locale !== 'en') {
-            loadImageData(this.props.locale);
-        }
-    }
-    componentDidUpdate (prevProps) {
-        if (this.props.locale !== prevProps.locale) {
-            loadImageData(this.props.locale);
-        }
-    }
-    render () {
-        return (
-            <CardsComponent {...this.props} />
-        );
-    }
-}
-
-Cards.propTypes = {
-    locale: PropTypes.string.isRequired
-};

 const mapStateToProps = state => ({
    visible: state.scratchGui.cards.visible,
    content: state.scratchGui.cards.content,
    activeDeckId: state.scratchGui.cards.activeDeckId,
    step: state.scratchGui.cards.step,
-    expanded: state.scratchGui.cards.expanded,
    x: state.scratchGui.cards.x,
    y: state.scratchGui.cards.y,
    isRtl: state.locales.isRtl,
    locale: state.locales.locale,
-    dragging: state.scratchGui.cards.dragging,
-    showVideos: notScratchDesktop()
+    dragging: state.scratchGui.cards.dragging
 });

 const mapDispatchToProps = dispatch => ({
@@ -64,7 +35,6 @@ const mapDispatchToProps = dispatch => ({
        dispatch(closeCards());
    },
    onCloseCards: () => dispatch(closeCards()),
-    onShrinkExpandCards: () => dispatch(shrinkExpandCards()),
    onNextStep: () => dispatch(nextStep()),
    onPrevStep: () => dispatch(prevStep()),
    onDrag: (e_, data) => dispatch(dragCard(data.x, data.y)),
@@ -75,4 +45,4 @@ const mapDispatchToProps = dispatch => ({
 export default connect(
    mapStateToProps,
    mapDispatchToProps
-)(Cards);
+)(CardsComponent);
@@ -107,15 +107,15 @@ class ConnectionModal extends React.Component {
    render () {
        return (
            <ConnectionModalComponent
-                connectingMessage={this.state.extension && this.state.extension.connectingMessage}
-                connectionIconURL={this.state.extension && this.state.extension.connectionIconURL}
-                connectionSmallIconURL={this.state.extension && this.state.extension.connectionSmallIconURL}
-                connectionTipIconURL={this.state.extension && this.state.extension.connectionTipIconURL}
+                connectingMessage={this.state.extension.connectingMessage}
                extensionId={this.props.extensionId}
-                name={this.state.extension && this.state.extension.name}
+                name={this.state.extension.name}
+                peripheralButtonImage={this.state.extension.peripheralButtonImage}
+                peripheralImage={this.state.extension.peripheralImage}
                phase={this.state.phase}
+                smallPeripheralImage={this.state.extension.smallPeripheralImage}
                title={this.props.extensionId}
-                useAutoScan={this.state.extension && this.state.extension.useAutoScan}
+                useAutoScan={this.state.extension.useAutoScan}
                vm={this.props.vm}
                onCancel={this.handleCancel}
                onConnected={this.handleConnected}
@@ -4,6 +4,7 @@ import React from 'react';
 import VM from 'scratch-vm';
 import {connect} from 'react-redux';

+import analytics from '../lib/analytics';
 import ControlsComponent from '../components/controls/controls.jsx';

 class Controls extends React.Component {
@@ -23,11 +24,19 @@ class Controls extends React.Component {
                this.props.vm.start();
            }
            this.props.vm.greenFlag();
+            analytics.event({
+                category: 'general',
+                action: 'Green Flag'
+            });
        }
    }
    handleStopAllClick (e) {
        e.preventDefault();
        this.props.vm.stopAll();
+        analytics.event({
+            category: 'general',
+            action: 'Stop Button'
+        });
    }
    render () {
        const {
@@ -4,6 +4,7 @@ import React from 'react';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
 import VM from 'scratch-vm';

+import analytics from '../lib/analytics';
 import costumeLibraryContent from '../lib/libraries/costumes.json';
 import spriteTags from '../lib/libraries/sprite-tags';
 import LibraryComponent from '../components/library/library.jsx';
@@ -37,6 +38,11 @@ class CostumeLibrary extends React.PureComponent {
            skinId: null
        };
        this.props.vm.addCostumeFromLibrary(item.md5, vmCostume);
+        analytics.event({
+            category: 'library',
+            action: 'Select Costume',
+            label: item.name
+        });
    }
    render () {
        return (
@@ -6,6 +6,7 @@ import {defineMessages, injectIntl, intlShape} from 'react-intl';

 import extensionLibraryContent from '../lib/libraries/extensions/index.jsx';

+import analytics from '../lib/analytics';
 import LibraryComponent from '../components/library/library.jsx';
 import extensionIcon from '../components/action-menu/icon--sprite.svg';

@@ -45,6 +46,18 @@ class ExtensionLibrary extends React.PureComponent {
                });
            }
        }
+        let gaLabel = '';
+        if (typeof (item.name) === 'string') {
+            gaLabel = item.name;
+        } else {
+            // Name is localized, get the default message for the gaLabel
+            gaLabel = item.name.props.defaultMessage;
+        }
+        analytics.event({
+            category: 'library',
+            action: 'Select Extension',
+            label: gaLabel
+        });
    }
    render () {
        const extensionLibraryThumbnailData = extensionLibraryContent.map(extension => ({
@@ -4,13 +4,14 @@ import {compose} from 'redux';
 import {connect} from 'react-redux';
 import ReactModal from 'react-modal';
 import VM from 'scratch-vm';
-import {injectIntl, intlShape} from 'react-intl';
+import {defineMessages, injectIntl, intlShape} from 'react-intl';

 import ErrorBoundaryHOC from '../lib/error-boundary-hoc.jsx';
 import {
    getIsError,
    getIsShowingProject
 } from '../reducers/project-state';
+import {setProjectTitle} from '../reducers/project-title';
 import {
    activateTab,
    BLOCKS_TAB_INDEX,
@@ -28,7 +29,6 @@ import {
 import FontLoaderHOC from '../lib/font-loader-hoc.jsx';
 import LocalizationHOC from '../lib/localization-hoc.jsx';
 import ProjectFetcherHOC from '../lib/project-fetcher-hoc.jsx';
-import TitledHOC from '../lib/titled-hoc.jsx';
 import ProjectSaverHOC from '../lib/project-saver-hoc.jsx';
 import QueryParserHOC from '../lib/query-parser-hoc.jsx';
 import storage from '../lib/storage';
@@ -39,22 +39,42 @@ import cloudManagerHOC from '../lib/cloud-manager-hoc.jsx';
 import GUIComponent from '../components/gui/gui.jsx';
 import {setIsScratchDesktop} from '../lib/isScratchDesktop.js';

+const messages = defineMessages({
+    defaultProjectTitle: {
+        id: 'gui.gui.defaultProjectTitle',
+        description: 'Default title for project',
+        defaultMessage: 'Scratch Project'
+    }
+});
+
 class GUI extends React.Component {
    componentDidMount () {
        setIsScratchDesktop(this.props.isScratchDesktop);
+        this.setReduxTitle(this.props.projectTitle);
        this.props.onStorageInit(storage);
-        this.props.onVmInit(this.props.vm);
    }
    componentDidUpdate (prevProps) {
        if (this.props.projectId !== prevProps.projectId && this.props.projectId !== null) {
            this.props.onUpdateProjectId(this.props.projectId);
        }
+        if (this.props.projectTitle !== prevProps.projectTitle) {
+            this.setReduxTitle(this.props.projectTitle);
+        }
        if (this.props.isShowingProject && !prevProps.isShowingProject) {
            // this only notifies container when a project changes from not yet loaded to loaded
            // At this time the project view in www doesn't need to know when a project is unloaded
            this.props.onProjectLoaded();
        }
    }
+    setReduxTitle (newTitle) {
+        if (newTitle === null || typeof newTitle === 'undefined') {
+            this.props.onUpdateReduxProjectTitle(
+                this.props.intl.formatMessage(messages.defaultProjectTitle)
+            );
+        } else {
+            this.props.onUpdateReduxProjectTitle(newTitle);
+        }
+    }
    render () {
        if (this.props.isError) {
            throw new Error(
@@ -71,9 +91,10 @@ class GUI extends React.Component {
            onProjectLoaded,
            onStorageInit,
            onUpdateProjectId,
-            onVmInit,
+            onUpdateReduxProjectTitle,
            projectHost,
            projectId,
+            projectTitle,
            /* eslint-enable no-unused-vars */
            children,
            fetchingProject,
@@ -108,9 +129,11 @@ GUI.propTypes = {
    onSeeCommunity: PropTypes.func,
    onStorageInit: PropTypes.func,
    onUpdateProjectId: PropTypes.func,
-    onVmInit: PropTypes.func,
+    onUpdateProjectTitle: PropTypes.func,
+    onUpdateReduxProjectTitle: PropTypes.func,
    projectHost: PropTypes.string,
    projectId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    projectTitle: PropTypes.string,
    telemetryModalVisible: PropTypes.bool,
    vm: PropTypes.instanceOf(VM).isRequired
 };
@@ -119,8 +142,7 @@ GUI.defaultProps = {
    isScratchDesktop: false,
    onStorageInit: storageInstance => storageInstance.addOfficialScratchWebStores(),
    onProjectLoaded: () => {},
-    onUpdateProjectId: () => {},
-    onVmInit: (/* vm */) => {}
+    onUpdateProjectId: () => {}
 };

 const mapStateToProps = state => {
@@ -160,7 +182,8 @@ const mapDispatchToProps = dispatch => ({
    onActivateSoundsTab: () => dispatch(activateTab(SOUNDS_TAB_INDEX)),
    onRequestCloseBackdropLibrary: () => dispatch(closeBackdropLibrary()),
    onRequestCloseCostumeLibrary: () => dispatch(closeCostumeLibrary()),
-    onRequestCloseTelemetryModal: () => dispatch(closeTelemetryModal())
+    onRequestCloseTelemetryModal: () => dispatch(closeTelemetryModal()),
+    onUpdateReduxProjectTitle: title => dispatch(setProjectTitle(title))
 });

 const ConnectedGUI = injectIntl(connect(
@@ -177,7 +200,6 @@ const WrappedGui = compose(
    FontLoaderHOC,
    QueryParserHOC,
    ProjectFetcherHOC,
-    TitledHOC,
    ProjectSaverHOC,
    vmListenerHOC,
    vmManagerHOC,
@@ -15,8 +15,6 @@ class LibraryItem extends React.PureComponent {
            'handleKeyPress',
            'handleMouseEnter',
            'handleMouseLeave',
-            'handlePlay',
-            'handleStop',
            'rotateIcon',
            'startRotatingIcons',
            'stopRotatingIcons'
@@ -39,9 +37,7 @@ class LibraryItem extends React.PureComponent {
        e.preventDefault();
    }
    handleFocus (id) {
-        if (!this.props.showPlayButton) {
-            this.handleMouseEnter(id);
-        }
+        this.handleMouseEnter(id);
    }
    handleKeyPress (e) {
        if (e.key === ' ' || e.key === 'Enter') {
@@ -50,33 +46,21 @@ class LibraryItem extends React.PureComponent {
        }
    }
    handleMouseEnter () {
-        // only show hover effects on the item if not showing a play button
-        if (!this.props.showPlayButton) {
-            this.props.onMouseEnter(this.props.id);
-            if (this.props.icons && this.props.icons.length) {
-                this.stopRotatingIcons();
-                this.setState({
-                    isRotatingIcon: true
-                }, this.startRotatingIcons);
-            }
+        this.props.onMouseEnter(this.props.id);
+        if (this.props.icons && this.props.icons.length) {
+            this.stopRotatingIcons();
+            this.setState({
+                isRotatingIcon: true
+            }, this.startRotatingIcons);
        }
    }
    handleMouseLeave () {
-        // only show hover effects on the item if not showing a play button
-        if (!this.props.showPlayButton) {
-            this.props.onMouseLeave(this.props.id);
-            if (this.props.icons && this.props.icons.length) {
-                this.setState({
-                    isRotatingIcon: false
-                }, this.stopRotatingIcons);
-            }
-        }
-    }
-    handlePlay () {
-        this.props.onMouseEnter(this.props.id);
-    }
-    handleStop () {
        this.props.onMouseLeave(this.props.id);
+        if (this.props.icons && this.props.icons.length) {
+            this.setState({
+                isRotatingIcon: false
+            }, this.stopRotatingIcons);
+        }
    }
    startRotatingIcons () {
        this.rotateIcon();
@@ -120,17 +104,13 @@ class LibraryItem extends React.PureComponent {
                id={this.props.id}
                insetIconURL={this.props.insetIconURL}
                internetConnectionRequired={this.props.internetConnectionRequired}
-                isPlaying={this.props.isPlaying}
                name={this.props.name}
-                showPlayButton={this.props.showPlayButton}
                onBlur={this.handleBlur}
                onClick={this.handleClick}
                onFocus={this.handleFocus}
                onKeyPress={this.handleKeyPress}
                onMouseEnter={this.handleMouseEnter}
                onMouseLeave={this.handleMouseLeave}
-                onPlay={this.handlePlay}
-                onStop={this.handleStop}
            />
        );
    }
@@ -157,15 +137,13 @@ LibraryItem.propTypes = {
    id: PropTypes.number.isRequired,
    insetIconURL: PropTypes.string,
    internetConnectionRequired: PropTypes.bool,
-    isPlaying: PropTypes.bool,
    name: PropTypes.oneOfType([
        PropTypes.string,
        PropTypes.node
    ]),
    onMouseEnter: PropTypes.func.isRequired,
    onMouseLeave: PropTypes.func.isRequired,
-    onSelect: PropTypes.func.isRequired,
-    showPlayButton: PropTypes.bool
+    onSelect: PropTypes.func.isRequired
 };

 export default injectIntl(LibraryItem);
@@ -1,66 +0,0 @@
-import {connect} from 'react-redux';
-import PropTypes from 'prop-types';
-import bindAll from 'lodash.bindall';
-import React from 'react';
-
-const MenuBarHOC = function (WrappedComponent) {
-    class MenuBarContainer extends React.PureComponent {
-        constructor (props) {
-            super(props);
-
-            bindAll(this, [
-                'confirmReadyToReplaceProject',
-                'shouldSaveBeforeTransition'
-            ]);
-        }
-        confirmReadyToReplaceProject (message) {
-            let readyToReplaceProject = true;
-            if (this.props.projectChanged && !this.props.canCreateNew) {
-                readyToReplaceProject = this.props.confirmWithMessage(message);
-            }
-            return readyToReplaceProject;
-        }
-        shouldSaveBeforeTransition () {
-            return (this.props.canSave && this.props.projectChanged);
-        }
-        render () {
-            const {
-                /* eslint-disable no-unused-vars */
-                projectChanged,
-                /* eslint-enable no-unused-vars */
-                ...props
-            } = this.props;
-            return (<WrappedComponent
-                confirmReadyToReplaceProject={this.confirmReadyToReplaceProject}
-                shouldSaveBeforeTransition={this.shouldSaveBeforeTransition}
-                {...props}
-            />);
-        }
-    }
-
-    MenuBarContainer.propTypes = {
-        canCreateNew: PropTypes.bool,
-        canSave: PropTypes.bool,
-        confirmWithMessage: PropTypes.func,
-        projectChanged: PropTypes.bool
-    };
-    MenuBarContainer.defaultProps = {
-        // default to using standard js confirm
-        confirmWithMessage: message => (confirm(message)) // eslint-disable-line no-alert
-    };
-    const mapStateToProps = state => ({
-        projectChanged: state.scratchGui.projectChanged
-    });
-    const mapDispatchToProps = () => ({});
-    // Allow incoming props to override redux-provided props. Used to mock in tests.
-    const mergeProps = (stateProps, dispatchProps, ownProps) => Object.assign(
-        {}, stateProps, dispatchProps, ownProps
-    );
-    return connect(
-        mapStateToProps,
-        mapDispatchToProps,
-        mergeProps
-    )(MenuBarContainer);
-};
-
-export default MenuBarHOC;
@@ -9,7 +9,6 @@ import {addMonitorRect, getInitialPosition, resizeMonitorRect, removeMonitorRect
 import {getVariable, setVariableValue} from '../lib/variable-utils';
 import importCSV from '../lib/import-csv';
 import downloadBlob from '../lib/download-blob';
-import SliderPrompt from './slider-prompt.jsx';

 import {connect} from 'react-redux';
 import {Map} from 'immutable';
@@ -43,16 +42,10 @@ class Monitor extends React.Component {
            'handleSetModeToDefault',
            'handleSetModeToLarge',
            'handleSetModeToSlider',
-            'handleSliderPromptClose',
-            'handleSliderPromptOk',
-            'handleSliderPromptOpen',
            'handleImport',
            'handleExport',
            'setElement'
        ]);
-        this.state = {
-            sliderPrompt: false
-        };
    }
    componentDidMount () {
        let rect;
@@ -142,23 +135,6 @@ class Monitor extends React.Component {
            mode: 'slider'
        }));
    }
-    handleSliderPromptClose () {
-        this.setState({sliderPrompt: false});
-    }
-    handleSliderPromptOpen () {
-        this.setState({sliderPrompt: true});
-    }
-    handleSliderPromptOk (min, max, isDiscrete) {
-        const realMin = Math.min(min, max);
-        const realMax = Math.max(min, max);
-        this.props.vm.runtime.requestUpdateMonitor(Map({
-            id: this.props.id,
-            sliderMin: realMin,
-            sliderMax: realMax,
-            isDiscrete: isDiscrete
-        }));
-        this.handleSliderPromptClose();
-    }
    setElement (monitorElt) {
        this.element = monitorElt;
    }
@@ -188,35 +164,25 @@ class Monitor extends React.Component {
        const showSliderOption = availableModes(this.props.opcode).indexOf('slider') !== -1;
        const isList = this.props.mode === 'list';
        return (
-            <React.Fragment>
-                {this.state.sliderPrompt && <SliderPrompt
-                    isDiscrete={this.props.isDiscrete}
-                    maxValue={parseFloat(this.props.max)}
-                    minValue={parseFloat(this.props.min)}
-                    onCancel={this.handleSliderPromptClose}
-                    onOk={this.handleSliderPromptOk}
-                />}
-                <MonitorComponent
-                    componentRef={this.setElement}
-                    {...monitorProps}
-                    draggable={this.props.draggable}
-                    height={this.props.height}
-                    isDiscrete={this.props.isDiscrete}
-                    max={this.props.max}
-                    min={this.props.min}
-                    mode={this.props.mode}
-                    targetId={this.props.targetId}
-                    width={this.props.width}
-                    onDragEnd={this.handleDragEnd}
-                    onExport={isList ? this.handleExport : null}
-                    onImport={isList ? this.handleImport : null}
-                    onNextMode={this.handleNextMode}
-                    onSetModeToDefault={isList ? null : this.handleSetModeToDefault}
-                    onSetModeToLarge={isList ? null : this.handleSetModeToLarge}
-                    onSetModeToSlider={showSliderOption ? this.handleSetModeToSlider : null}
-                    onSliderPromptOpen={this.handleSliderPromptOpen}
-                />
-            </React.Fragment>
+            <MonitorComponent
+                componentRef={this.setElement}
+                {...monitorProps}
+                draggable={this.props.draggable}
+                height={this.props.height}
+                isDiscrete={this.props.isDiscrete}
+                max={this.props.max}
+                min={this.props.min}
+                mode={this.props.mode}
+                targetId={this.props.targetId}
+                width={this.props.width}
+                onDragEnd={this.handleDragEnd}
+                onExport={isList ? this.handleExport : null}
+                onImport={isList ? this.handleImport : null}
+                onNextMode={this.handleNextMode}
+                onSetModeToDefault={isList ? null : this.handleSetModeToDefault}
+                onSetModeToLarge={isList ? null : this.handleSetModeToLarge}
+                onSetModeToSlider={showSliderOption ? this.handleSetModeToSlider : null}
+            />
        );
    }
 }
@@ -1,115 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import bindAll from 'lodash.bindall';
-
-import PlayButtonComponent from '../components/play-button/play-button.jsx';
-
-class PlayButton extends React.Component {
-    constructor (props) {
-        super(props);
-        bindAll(this, [
-            'handleClick',
-            'handleMouseDown',
-            'handleMouseEnter',
-            'handleMouseLeave',
-            'handleTouchStart',
-            'setButtonRef'
-        ]);
-        this.state = {
-            touchStarted: false
-        };
-    }
-    getDerivedStateFromProps (props, state) {
-        // if touchStarted is true and it's not playing, the sound must have ended.
-        // reset the touchStarted state to allow the sound to be replayed
-        if (state.touchStarted && !props.isPlaying) {
-            return {
-                touchStarted: false
-            };
-        }
-        return null; // nothing changed
-    }
-    componentDidMount () {
-        // Touch start
-        this.buttonRef.addEventListener('touchstart', this.handleTouchStart);
-    }
-    componentWillUnmount () {
-        this.buttonRef.removeEventListener('touchstart', this.handleTouchStart);
-    }
-    handleClick (e) {
-        //  stop the click from propagating out of the button
-        e.stopPropagation();
-    }
-    handleMouseDown (e) {
-        // prevent default (focus) on mouseDown
-        e.preventDefault();
-        if (this.props.isPlaying) {
-            // stop sound and reset touch state
-            this.props.onStop();
-            if (this.state.touchstarted) this.setState({touchStarted: false});
-        } else {
-            this.props.onPlay();
-            if (this.state.touchstarted) {
-                // started on touch, but now clicked mouse
-                this.setState({touchStarted: false});
-            }
-        }
-    }
-    handleTouchStart (e) {
-        if (this.props.isPlaying) {
-            // If playing, stop sound, and reset touch state
-            e.preventDefault();
-            this.setState({touchStarted: false});
-            this.props.onStop();
-        } else {
-            // otherwise start playing, and set touch state
-            e.preventDefault();
-            this.setState({touchStarted: true});
-            this.props.onPlay();
-        }
-    }
-    handleMouseEnter (e) {
-        // start the sound if it's not already playing
-        e.preventDefault();
-        if (!this.props.isPlaying) {
-            this.props.onPlay();
-        }
-    }
-    handleMouseLeave () {
-        // stop the sound unless it was started by touch
-        if (this.props.isPlaying && !this.state.touchstarted) {
-            this.props.onStop();
-        }
-    }
-    setButtonRef (ref) {
-        this.buttonRef = ref;
-    }
-    render () {
-        const {
-            className,
-            isPlaying,
-            onPlay, // eslint-disable-line no-unused-vars
-            onStop // eslint-disable-line no-unused-vars
-        } = this.props;
-        return (
-            <PlayButtonComponent
-                className={className}
-                isPlaying={isPlaying}
-                onClick={this.handleClick}
-                onMouseDown={this.handleMouseDown}
-                onMouseEnter={this.handleMouseEnter}
-                onMouseLeave={this.handleMouseLeave}
-                setButtonRef={this.setButtonRef}
-            />
-        );
-    }
-}
-
-PlayButton.propTypes = {
-    className: PropTypes.string,
-    isPlaying: PropTypes.bool.isRequired,
-    onPlay: PropTypes.func.isRequired,
-    onStop: PropTypes.func.isRequired
-};
-
-export default PlayButton;
@@ -2,8 +2,8 @@ import bindAll from 'lodash.bindall';
 import PropTypes from 'prop-types';
 import React from 'react';
 import VM from 'scratch-vm';
+import WavEncoder from 'wav-encoder';
 import {connect} from 'react-redux';
-import {encodeAndAddSoundToVM} from '../lib/audio/audio-util.js';

 import RecordModalComponent from '../components/record-modal/record-modal.jsx';

@@ -71,12 +71,39 @@ class RecordModal extends React.Component {
            const startIndex = Math.floor(this.state.trimStart * sampleCount);
            const endIndex = Math.floor(this.state.trimEnd * sampleCount);
            const clippedSamples = this.state.samples.slice(startIndex, endIndex);
+            WavEncoder.encode({
+                sampleRate: this.state.sampleRate,
+                channelData: [clippedSamples]
+            }).then(wavBuffer => {
+                const vmSound = {
+                    format: '',
+                    dataFormat: 'wav',
+                    rate: this.state.sampleRate,
+                    sampleCount: clippedSamples.length
+                };

-            encodeAndAddSoundToVM(this.props.vm, clippedSamples, this.state.sampleRate, 'recording1',
-                () => {
+                // Create an asset from the encoded .wav and get resulting md5
+                const storage = this.props.vm.runtime.storage;
+                vmSound.asset = storage.createAsset(
+                    storage.AssetType.Sound,
+                    storage.DataFormat.WAV,
+                    new Uint8Array(wavBuffer),
+                    null,
+                    true // generate md5
+                );
+                vmSound.assetId = vmSound.asset.assetId;
+
+                // update vmSound object with md5 property
+                vmSound.md5 = `${vmSound.assetId}.${vmSound.dataFormat}`;
+                // The VM will update the sound name to a fresh name
+                // if the following is already taken
+                vmSound.name = 'recording1';
+
+                this.props.vm.addSound(vmSound).then(() => {
                    this.props.onClose();
                    this.props.onNewSound();
                });
+            });
        });
    }
    handleCancel () {
@@ -44,10 +44,10 @@ class RecordingStep extends React.Component {
        alert(this.props.intl.formatMessage(messages.alertMsg)); // eslint-disable-line no-alert
    }
    handleLevelUpdate (level) {
-        this.setState({
-            level: level,
-            levels: this.props.recording ? (this.state.levels || []).concat([level]) : this.state.levels
-        });
+        this.setState({level});
+        if (this.props.recording) {
+            this.setState({levels: (this.state.levels || []).concat([level])});
+        }
    }
    handleRecord () {
        this.audioRecorder.startRecording();
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import {connect} from 'react-redux';
 import {defineMessages, injectIntl, intlShape} from 'react-intl';
-import {setProjectTitle} from '../reducers/project-title';

+import analytics from '../lib/analytics';
 import log from '../lib/log';
 import sharedMessages from '../lib/shared-messages';

@@ -27,14 +27,13 @@ import {
 /**
 * SBFileUploader component passes a file input, load handler and props to its child.
 * It expects this child to be a function with the signature
- *     function (renderFileInput, handleLoadProject) {}
+ *     function (renderFileInput, loadProject) {}
 * The component can then be used to attach project loading functionality
 * to any other component:
 *
- * <SBFileUploader>{(className, renderFileInput, handleLoadProject) => (
+ * <SBFileUploader>{(renderFileInput, loadProject) => (
 *     <MyCoolComponent
- *         className={className}
- *         onClick={handleLoadProject}
+ *         onClick={loadProject}
 *     >
 *         {renderFileInput()}
 *     </MyCoolComponent>
@@ -96,28 +95,21 @@ class SBFileUploader extends React.Component {
            intl,
            isShowingWithoutId,
            loadingState,
-            projectChanged,
-            userOwnsProject
+            projectChanged
        } = this.props;

        const thisFileInput = e.target;
        if (thisFileInput.files) { // Don't attempt to load if no file was selected
            this.fileToUpload = thisFileInput.files[0];

-            // If user owns the project, or user has changed the project,
-            // we must confirm with the user that they really intend to replace it.
-            // (If they don't own the project and haven't changed it, no need to confirm.)
-            let uploadAllowed = true;
-            if (userOwnsProject || (projectChanged && isShowingWithoutId)) {
-                uploadAllowed = confirm( // eslint-disable-line no-alert
-                    intl.formatMessage(sharedMessages.replaceProjectWarning)
-                );
-            }
-            if (uploadAllowed) {
-                this.props.requestProjectUpload(loadingState);
-            } else {
-                this.props.closeFileMenu();
-            }
+            // Allow upload to continue only after confirmation if the project
+            // has changed and is not showing with ID. If it has an ID, this operation
+            // does not currently overwrite that project, so it is safe to do without confirmation.
+            const uploadAllowed = (isShowingWithoutId && projectChanged) ?
+                confirm(intl.formatMessage(sharedMessages.replaceProjectWarning)) : // eslint-disable-line no-alert
+                true;
+
+            if (uploadAllowed) this.props.requestProjectUpload(loadingState);
        }
    }
    // called when file upload raw data is available in the reader
@@ -127,12 +119,23 @@ class SBFileUploader extends React.Component {
            const filename = this.fileToUpload && this.fileToUpload.name;
            this.props.vm.loadProject(this.reader.result)
                .then(() => {
+                    analytics.event({
+                        category: 'project',
+                        action: 'Import Project File',
+                        nonInteraction: true
+                    });
+                    // Remove the hash if any (without triggering a hash change event or a reload)
+                    try { // Can fail e.g. when GUI is loaded from static file (integration tests)
+                        history.replaceState({}, document.title, '.');
+                    } catch {
+                        // No fallback, just do not trigger promise catch below
+                    }
                    this.props.onLoadingFinished(this.props.loadingState, true);
                    // Reset the file input after project is loaded
                    // This is necessary in case the user wants to reload a project
                    if (filename) {
                        const uploadedProjectTitle = this.getProjectTitleFromFilename(filename);
-                        this.props.onReceivedProjectTitle(uploadedProjectTitle);
+                        this.props.onUpdateProjectTitle(uploadedProjectTitle);
                    }
                    this.resetFileInput();
                })
@@ -173,17 +176,15 @@ SBFileUploader.propTypes = {
    canSave: PropTypes.bool, // eslint-disable-line react/no-unused-prop-types
    children: PropTypes.func,
    className: PropTypes.string,
-    closeFileMenu: PropTypes.func,
    intl: intlShape.isRequired,
    isLoadingUpload: PropTypes.bool,
    isShowingWithoutId: PropTypes.bool,
    loadingState: PropTypes.oneOf(LoadingStates),
    onLoadingFinished: PropTypes.func,
    onLoadingStarted: PropTypes.func,
+    onUpdateProjectTitle: PropTypes.func,
    projectChanged: PropTypes.bool,
    requestProjectUpload: PropTypes.func,
-    onReceivedProjectTitle: PropTypes.func,
-    userOwnsProject: PropTypes.bool,
    vm: PropTypes.shape({
        loadProject: PropTypes.func
    })
@@ -203,15 +204,13 @@ const mapStateToProps = state => {
 };

 const mapDispatchToProps = (dispatch, ownProps) => ({
-    closeFileMenu: () => dispatch(closeFileMenu()),
    onLoadingFinished: (loadingState, success) => {
        dispatch(onLoadedProject(loadingState, ownProps.canSave, success));
        dispatch(closeLoadingProject());
        dispatch(closeFileMenu());
    },
    requestProjectUpload: loadingState => dispatch(requestProjectUpload(loadingState)),
-    onLoadingStarted: () => dispatch(openLoadingProject()),
-    onReceivedProjectTitle: title => dispatch(setProjectTitle(title))
+    onLoadingStarted: () => dispatch(openLoadingProject())
 });

 // Allow incoming props to override redux-provided props. Used to mock in tests.
Author	SHA1	Message	Date
Paul Kaplan	791ad4e0a9	Merge pull request #4554 from LLK/release/02-14-2019 Update master to 0.1.0-prerelease.20190213213304	2019-02-14 13:05:23 -05:00
Paul Kaplan	1d2bf1d31c	Merge pull request #4482 from paulkaplan/hotfix/fix-tests Remove beforeunload callback that was breaking tests	2019-02-04 11:52:28 -05:00