diff --git a/README.md b/README.md
index 5cd20fec6e..10fef7360e 100644
--- a/README.md
+++ b/README.md
@@ -1,28 +1,27 @@
 Riot
 ====
 
-Riot (formerly known as Vector) is a Matrix web client built using the Matrix
-React SDK (https://github.com/matrix-org/matrix-react-sdk).
+Riot (formerly known as Vector) is a Matrix web client built using the [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk).
 
 Getting Started
 ===============
 
-The easiest way to test Riot is to just use the hosted copy at
-https://riot.im/app.  The develop branch is continuously deployed by Jenkins at
-https://riot.im/develop for those who like living dangerously.
+The easiest way to test Riot is to just use the hosted copy at https://riot.im/app.
+The `develop` branch is continuously deployed by Jenkins at https://riot.im/develop
+for those who like living dangerously.
 
 To host your own copy of Riot, the quickest bet is to use a pre-built
 released version of Riot:
 
 1. Download the latest version from https://github.com/vector-im/riot-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the riot-x.x.x directory to an appropriate name
+1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
    as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!
 
 Releases are signed by PGP, and can be checked against the public key
-at https://riot.im/packages/keys/riot.asc
+at https://riot.im/packages/keys/riot.asc .
 
 Note that Chrome does not allow microphone or webcam access for sites served
 over http (except localhost), so for working VoIP you will need to serve Riot
@@ -69,16 +68,22 @@ to build.
    is at least v5.x).
 1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`.
 1. Switch to the riot-web directory: `cd riot-web`.
+1. Install the prerequisites: `npm install`.
 1. If you're using the `develop` branch then it is recommended to set up a proper
    development environment ("Setting up a dev environment" below) however one can
    install the develop versions of the dependencies instead:
-   ```
+   ```bash
    scripts/fetch-develop.deps.sh
    ```
+   Note that running `npm install` will undo the symlinks put in place by
+   `scripts/fetch-develop.deps.sh` so you should run `npm install` first, or
+   run `npm link matrix-js-sdk` and `npm link matrix-react-sdk` after running
+   `npm install`.
+
    Whenever you git pull on riot-web you will also probably need to force an update
    to these dependencies - the simplest way is to re-run the script, but you can also
    manually update and rebuild them:
-   ```
+   ```bash
    cd matrix-js-sdk
    git pull
    npm install # re-run to pull in any new dependencies
@@ -94,18 +99,16 @@ to build.
    Or just use https://riot.im/develop - the continuous integration release of the
    develop branch. (Note that we don't reference the develop versions in git directly
    due to https://github.com/npm/npm/issues/3055.)
-1. Install the prerequisites: `npm install`.
 1. Configure the app by copying `config.sample.json` to `config.json` and
    modifying it (see below for details).
 1. `npm run dist` to build a tarball to deploy. Untaring this file will give
    a version-specific directory containing all the files that need to go on your
    web server.
 
-Note that `npm run dist` is not supported on Windows, so Windows users can run `npm
-run build`, which will build all the necessary files into the `webapp`
-directory. The version of Riot will not appear in Settings without
-using the dist script. You can then mount the `webapp` directory on your
-webserver to actually serve up the app, which is entirely static content.
+Note that `npm run dist` is not supported on Windows, so Windows users can run `npm run build`,
+which will build all the necessary files into the `webapp` directory. The version of Riot
+will not appear in Settings without using the dist script. You can then mount the
+`webapp` directory on your webserver to actually serve up the app, which is entirely static content.
 
 config.json
 ===========
@@ -129,6 +132,11 @@ For a good example, see https://riot.im/develop/config.json
    release to release.
 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the
    homeserver know what email template to use when talking to you.
+1. `branding`: Configures various branding and logo details, such as:
+    1. `welcomeBackgroundUrl`: An image to use as a wallpaper outside the app
+       during authentication flows
+    1. `authHeaderLogoUrl`: An logo image that is shown in the header during
+       authentication flows
 1. `integrations_ui_url`: URL to the web interface for the integrations server. The integrations
    server is not Riot and normally not your homeserver either. The integration server settings
    may be left blank to disable integrations.
@@ -158,6 +166,13 @@ For a good example, see https://riot.im/develop/config.json
     1. `whitelistedISUrls`: a list of IS URLs to not redact from the analytics
     1. `siteId`: The Piwik Site ID to use when sending analytics to the Piwik server configured above
 1. `welcomeUserId`: the user ID of a bot to invite whenever users register that can give them a tour
+1. `embeddedPages`: Configures the pages displayed in portions of Riot that
+   embed static files, such as:
+    1. `welcomeUrl`: Initial content shown on the outside of the app when not
+       logged in. Defaults to `welcome.html` supplied with Riot.
+    1. `homeUrl`: Content shown on the inside of the app when a specific room is
+       not selected. By default, no home page is configured. If one is set, a
+       button to access it will be shown in the top left menu.
 
 
 Note that `index.html` also has an og:image meta tag that is set to an image
@@ -183,15 +198,15 @@ To run as a desktop app:
    `npm run build` instead of `npm run dist` (since we don't need the tarball).
 2. Install electron and run it:
 
-   ```
+   ```bash
    npm install electron
    npm run electron
    ```
 
 To build packages, use electron-builder. This is configured to output:
- * dmg + zip for macOS
- * exe + nupkg for Windows
- * deb for Linux
+ * `dmg` + `zip` for macOS
+ * `exe` + `nupkg` for Windows
+ * `deb` for Linux
 But this can be customised by editing the `build` section of package.json
 as per https://github.com/electron-userland/electron-builder/wiki/Options
 
@@ -199,7 +214,7 @@ See https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Bu
 for dependencies required for building packages for various platforms.
 
 The only platform that can build packages for all three platforms is macOS:
-```
+```bash
 brew install wine --without-x11
 brew install mono
 brew install gnu-tar
@@ -221,7 +236,7 @@ Other options for running as a desktop app:
  * https://github.com/krisak/vector-electron-desktop
  * @asdf:matrix.org points out that you can use nativefier and it just works(tm)
 
-```
+```bash
 sudo npm install nativefier -g
 nativefier https://riot.im/app/
 ```
@@ -229,13 +244,13 @@ nativefier https://riot.im/app/
 Development
 ===========
 
-Before attempting to develop on Riot you **must** read the developer guide
-for `matrix-react-sdk` at https://github.com/matrix-org/matrix-react-sdk, which
+Before attempting to develop on Riot you **must** read the [developer guide
+for `matrix-react-sdk`](https://github.com/matrix-org/matrix-react-sdk), which
 also defines the design, architecture and style for Riot too.
 
-You should also familiarise yourself with the "Here be Dragons" guide to the
-tame & not-so-tame dragons (gotchas) which exist in the codebase:
-https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM
+You should also familiarise yourself with the ["Here be Dragons" guide
+](https://docs.google.com/document/d/12jYzvkidrp1h7liEuLIe6BMdU0NUjndUYI971O06ooM)
+to the tame & not-so-tame dragons (gotchas) which exist in the codebase.
 
 The idea of Riot is to be a relatively lightweight "skin" of customisations on
 top of the underlying `matrix-react-sdk`. `matrix-react-sdk` provides both the
@@ -260,46 +275,57 @@ having to manually rebuild each time.
 
 First clone and build `matrix-js-sdk`:
 
-1. `git clone https://github.com/matrix-org/matrix-js-sdk.git`
-1. `pushd matrix-js-sdk`
-1. `git checkout develop`
-1. `npm install`
-1. `npm install source-map-loader`  # because webpack is made of fail (https://github.com/webpack/webpack/issues/1472)
-1. `popd`
+``` bash
+git clone https://github.com/matrix-org/matrix-js-sdk.git
+pushd matrix-js-sdk
+git checkout develop
+npm install
+npm install source-map-loader  # because webpack is made of fail
+# see https://github.com/webpack/webpack/issues/1472
+popd
+```
 
 Then similarly with `matrix-react-sdk`:
 
-1. `git clone https://github.com/matrix-org/matrix-react-sdk.git`
-1. `pushd matrix-react-sdk`
-1. `git checkout develop`
-1. `npm link ../matrix-js-sdk`
-1. `popd`
+```bash
+git clone https://github.com/matrix-org/matrix-react-sdk.git
+pushd matrix-react-sdk
+git checkout develop
+npm link ../matrix-js-sdk
+popd
+```
 
 Finally, build and start Riot itself:
 
-1. `git clone https://github.com/vector-im/riot-web.git`
-1. `cd riot-web`
-1. `git checkout develop`
-1. `npm install`
-1. `npm link ../matrix-js-sdk`
-1. `npm link ../matrix-react-sdk`
-1. `npm start`
-1. Wait a few seconds for the initial build to finish; you should see something like:
-    ```
-    Hash: b0af76309dd56d7275c8
-    Version: webpack 1.12.14
-    Time: 14533ms
-             Asset     Size  Chunks             Chunk Names
-         bundle.js   4.2 MB       0  [emitted]  main
-        bundle.css  91.5 kB       0  [emitted]  main
-     bundle.js.map  5.29 MB       0  [emitted]  main
-    bundle.css.map   116 kB       0  [emitted]  main
-        + 1013 hidden modules
-    ```
+```bash
+git clone https://github.com/vector-im/riot-web.git
+cd riot-web
+git checkout develop
+npm install
+npm link ../matrix-js-sdk
+npm link ../matrix-react-sdk
+npm start
+```
+
+Wait a few seconds for the initial build to finish; you should see something like:
+```
+Hash: b0af76309dd56d7275c8
+Version: webpack 1.12.14
+Time: 14533ms
+         Asset     Size  Chunks             Chunk Names
+     bundle.js   4.2 MB       0  [emitted]  main
+    bundle.css  91.5 kB       0  [emitted]  main
+ bundle.js.map  5.29 MB       0  [emitted]  main
+bundle.css.map   116 kB       0  [emitted]  main
+    + 1013 hidden modules
+```
    Remember, the command will not terminate since it runs the web server
    and rebuilds source files when they change. This development server also
    disables caching, so do NOT use it in production.
-1. Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+Open http://127.0.0.1:8080/ in your browser to see your newly built Riot.
+
+___
 
 When you make changes to `matrix-react-sdk` or `matrix-js-sdk` they should be
 automatically picked up by webpack and built.
diff --git a/electron_app/build/icon.icns b/electron_app/build/icon.icns
index d74e97e738..eba95ecf4f 100644
Binary files a/electron_app/build/icon.icns and b/electron_app/build/icon.icns differ
diff --git a/electron_app/build/icon.ico b/electron_app/build/icon.ico
index 8f8ff94eea..1305b7dd9a 100644
Binary files a/electron_app/build/icon.ico and b/electron_app/build/icon.ico differ
diff --git a/electron_app/build/icons/128x128.png b/electron_app/build/icons/128x128.png
index 54149b1ae2..9c52d6695b 100644
Binary files a/electron_app/build/icons/128x128.png and b/electron_app/build/icons/128x128.png differ
diff --git a/electron_app/build/icons/16x16.png b/electron_app/build/icons/16x16.png
index def4ec5eee..7435c1b5be 100644
Binary files a/electron_app/build/icons/16x16.png and b/electron_app/build/icons/16x16.png differ
diff --git a/electron_app/build/icons/24x24.png b/electron_app/build/icons/24x24.png
index 6fe144ea13..f484995e72 100644
Binary files a/electron_app/build/icons/24x24.png and b/electron_app/build/icons/24x24.png differ
diff --git a/electron_app/build/icons/256x256.png b/electron_app/build/icons/256x256.png
index 563e6d5edc..f52d02c88b 100644
Binary files a/electron_app/build/icons/256x256.png and b/electron_app/build/icons/256x256.png differ
diff --git a/electron_app/build/icons/48x48.png b/electron_app/build/icons/48x48.png
index 9cd225d402..fcbcbc495f 100644
Binary files a/electron_app/build/icons/48x48.png and b/electron_app/build/icons/48x48.png differ
diff --git a/electron_app/build/icons/512x512.png b/electron_app/build/icons/512x512.png
index 328a723c97..801e1504db 100644
Binary files a/electron_app/build/icons/512x512.png and b/electron_app/build/icons/512x512.png differ
diff --git a/electron_app/build/icons/64x64.png b/electron_app/build/icons/64x64.png
index 20a7a6cff3..4a86e56efe 100644
Binary files a/electron_app/build/icons/64x64.png and b/electron_app/build/icons/64x64.png differ
diff --git a/electron_app/build/icons/96x96.png b/electron_app/build/icons/96x96.png
index eb48c2c91e..8a998989fe 100644
Binary files a/electron_app/build/icons/96x96.png and b/electron_app/build/icons/96x96.png differ
diff --git a/electron_app/img/riot.ico b/electron_app/img/riot.ico
index 8f8ff94eea..1305b7dd9a 100644
Binary files a/electron_app/img/riot.ico and b/electron_app/img/riot.ico differ
diff --git a/electron_app/img/riot.png b/electron_app/img/riot.png
index 85e9f8ca74..aacfc1a8a5 100644
Binary files a/electron_app/img/riot.png and b/electron_app/img/riot.png differ
diff --git a/karma.conf.js b/karma.conf.js
index d982aa2421..ae666a455b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -78,7 +78,7 @@ module.exports = function (config) {
                 watched: false, included: false, served: true, nocache: false,
             },
             {
-                pattern: 'res/themes/**',
+                pattern: 'res/**',
                 watched: false, included: false, served: true, nocache: false,
             },
         ],
@@ -87,6 +87,8 @@ module.exports = function (config) {
             // redirect img links to the karma server. See above.
             "/img/": "/base/node_modules/matrix-react-sdk/res/img/",
             "/themes/": "/base/res/themes/",
+            "/welcome.html": "/base/res/welcome.html",
+            "/welcome/": "/base/res/welcome/",
         },
 
         // preprocess matching files before serving them to the browser
diff --git a/res/home-status.html b/res/home-status.html
deleted file mode 100644
index 7d50470a22..0000000000
--- a/res/home-status.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<style type="text/css">
-
-/* we deliberately inline style here to avoid flash-of-CSS problems, and to avoid
- * voodoo where we have to set display: none by default
- */
-
-.mx_HomePage_container {
-    text-align: center;
-    display: block ! important;
-    width: 690px;
-    margin: 20px;
-}
-
-.mx_HomePage_header {
-    margin-top: 37px;
-    margin-left: 10px;
-    width: 670px;
-    box-sizing: border-box;
-    font-size: 18px;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    padding: 20px 80px 20px 80px;
-    align-items: center;
-}
-
-.mx_HomePage_header h1 {
-    font-size: 29px;
-    margin-bottom: 10px;
-}
-
-.mx_HomePage_intro h2 {
-    margin-top: 32px;
-    font-size: 25px;
-    color: #49555F;
-}
-
-.mx_HomePage_intro {
-    margin: auto;
-    width: 600px;
-    margin-top: 40px;
-    margin-bottom: 40px;
-    font-size: 18px;
-}
-
-.mx_HomePage_coc {
-    font-size: 16px;
-}
-
-.mx_HomePage_coc a {
-    color: #4360DF;
-}
-
-.mx_HomePage_room, .mx_HomePage_telegram {
-    float: left;
-    background-color: #fff;
-    box-shadow: 0px 2px 10px 0px rgba(48,55,81,0.05);
-    border-radius: 5px;
-    margin: 10px;
-    width: 210px;
-    height: 250px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.mx_HomePage_telegram {
-    background-color: transparent;
-    border: 1px solid rgba(113, 129, 142, 0.2);
-    box-shadow: none;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-    font-size: 16px;
-    line-height: 25px;
-    box-sizing: border-box;
-}
-
-.mx_HomePage_telegram a {
-    text-transform: uppercase;
-    color: #4360DF;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    opacity: 1.0;
-    transition: opacity .2s ease;
-}
-
-.mx_HomePage_telegram a:hover {
-    opacity: 0.5;
-}
-
-.mx_HomePage_room .mx_HomePage_icon {
-    margin-top: 24px;
-    margin-bottom: 16px;
-    width: 50px;
-    height: 50px;
-}
-
-.mx_HomePage_room .mx_HomePage_name {
-    display: block;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    font-size: 15px;
-    color: #49555F;
-    line-height: 25px;
-    margin: 0px 12px 0px 12px;
-}
-
-.mx_HomePage_room .mx_HomePage_desc {
-    flex: 1;
-    display: block;
-    margin: 0px 12px 0px 12px;
-    font-size: 14px;
-    line-height: 20px;
-}
-
-.mx_HomePage_button {
-    align-self: normal;
-    margin: 12px;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: #6CC1F6;
-    font-size: 13px;
-    font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: #fff ! important;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-}
-
-</style>
-
-<div class="mx_HomePage_container">
-    <div class="mx_HomePage_header">
-        <div>
-            <h1>Welcome to Status Community Chat, powered by Riot.</h1>
-            <p>For contributors, developers and Ethereum-enthusiasts who care about the movement for decentralization.</p>
-        </div>
-    </div>
-
-    <div class="mx_HomePage_intro">
-        <h2>Our rooms</h2>
-        <p>Please abide by the channels discussion categories and remain on topic to the specific category details listed.</p>
-        <p class="mx_HomePage_coc">Before posting please refer to our <a href="https://wiki.status.im/Code_of_conduct">Code of Conduct</a></p>
-    </div>
-
-
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/a.png">
-        <span class="mx_HomePage_name">#announcements</span>
-        <span class="mx_HomePage_desc">Company wide announcements.</span>
-        <a class="mx_HomePage_button" href="#/room/#announcements:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/i.png">
-        <span class="mx_HomePage_name">#introductions</span>
-        <span class="mx_HomePage_desc">Newcomer introductions.</span>
-        <a class="mx_HomePage_button" href="#/room/#introductions:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/g.png">
-        <span class="mx_HomePage_name">#general</span>
-        <span class="mx_HomePage_desc">General discussions of Status.</span>
-        <a class="mx_HomePage_button" href="#/room/#general:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/d.png">
-        <span class="mx_HomePage_name">#dev-status</span>
-        <span class="mx_HomePage_desc">Contributing to our codebase? Building a DApp or a chatbot? We're here to help.</span>
-        <a class="mx_HomePage_button" href="#/room/#dev-status:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_room">
-        <img class="mx_HomePage_icon" src="themes/status/img/n.png">
-        <span class="mx_HomePage_name">#news-articles</span>
-        <span class="mx_HomePage_desc">Share news, articles related to Ethereum or projects you're excited about</span>
-        <a class="mx_HomePage_button" href="#/room/#news-articles:status.im">Join</a>
-    </div>
-    <div class="mx_HomePage_telegram">
-        <p>
-            Interested in market and cryptocurrency type discussions?
-        </p>
-        <a href="https://t.me/StatusNetworkChat">Join Telegram</a>
-    </div>
-</div>
diff --git a/res/themes/status/css/_StatusLogin.scss b/res/themes/status/css/_StatusLogin.scss
deleted file mode 100644
index d3d9914ff5..0000000000
--- a/res/themes/status/css/_StatusLogin.scss
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// overrides for mx_Login* specific to Status.
-// Ideally this would be all Status prefixes for a Status specific version of the component
-// but given we're not doing Status as a dedicated 'skin' yet...
-
-.mx_StatusLogin {
-
-    width: 100%;
-    height: 100%;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    overflow: auto;
-
-    .mx_StatusLogin_brand {
-        position: absolute;
-        top: 30px;
-        left: 30px;
-    }
-
-    .mx_StatusLogin_content {
-        margin: auto;
-    }
-
-    .mx_StatusLogin_header {
-        text-align: center;
-        margin-top: 70px;
-        margin-bottom: 50px;
-    }
-
-    .mx_StatusLogin_header h1 {
-        font-size: 29px;
-        margin-bottom: 3px;
-    }
-
-    .mx_StatusLogin_subtitle {
-        font-size: 18px;
-    }
-
-    .mx_StatusLogin_subtitle a {
-        color: $riot-link-color;
-    }
-
-    .mx_StatusLogin_footer {
-        margin-top: 30px;
-        margin-bottom: 30px;
-        text-align: center;
-        font-size: 16px;
-        color: $footer-color;
-    }
-
-    .mx_StatusLogin_footer p {
-        margin-top: 0.5em;
-        margin-bottom: 0.5em;
-    }
-
-    .mx_StatusLogin_footer_cta {
-        color: $callout-color;
-        font-family: $header-font-family;
-        letter-spacing: 1px;
-        font-size: 13px;
-        text-transform: uppercase;
-        opacity: 1.0;
-        transition: opacity .2s ease;        
-    }
-
-    .mx_StatusLogin_footer_cta:hover {
-        opacity: 0.5;
-        text-decoration: none;
-    }
-
-    // overrides of .mx_Login
-
-    .mx_AuthPage_modal {
-        width: 330px;
-        min-height: initial;
-        padding-top: 40px;
-        padding-bottom: 20px;
-        padding-left: 10px;
-        padding-right: 10px;
-        border-radius: 8px;
-        color: $form-fg-color;
-        font-size: 16px;
-        line-height: 25px;
-        background-color: $form-bg-color;
-        background-image: url("$(status)/img/dot.svg");
-        box-shadow: 0px 5px 16px 0px rgba(25,12,46,0.16);
-        position: relative;
-        text-align: center;
-    }
-
-    .mx_AuthHeader_logo {
-        background-color: #fff;
-        width: 74px;
-        height: 74px;
-        border-radius: 37px;
-        box-shadow: 0px 5px 16px 0px rgba(0,0,0,0.2);
-        position: absolute;
-        top: -36px;
-        left: 50%;
-        margin-left: -36px;
-    }
-
-    .mx_AuthHeader_logo img {
-        width: 36px;
-        height: 36px;
-        padding: 19px;
-    }
-
-    .mx_AuthPage_modal h2 {
-        text-align: center;
-        color: $form-fg-color;
-        font-size: 25px;
-        margin-bottom: 24px;
-    }
-
-    .mx_Login_field {
-        width: 260px;
-        height: 27px;
-        padding: 8px 20px 10px 20px;
-        border-radius: 10px;
-        text-align: left;
-        border: 1px solid transparent;
-        background-color: $form-field-bg-color;
-        color: $form-field-fg-color;
-        font-weight: 300;
-        font-size: 15px;
-        margin-bottom: 14px;
-        transition: background-color .2s ease;
-    }
-
-    .mx_Login_field:focus {
-        border: 1px solid transparent;
-        background-color: $form-field-bg-hover-color;
-    }
-
-    .mx_Login_field::-webkit-input-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;
-    }
-
-    .mx_Login_field::-moz-placeholder {
-        font-family: $font-family;
-        color: $form-field-fg-color;
-        opacity: 0.6;        
-    }
-
-    .mx_Login_field_disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_prompt {
-        font-size: 16px;
-    }
-
-    .mx_Login_submit {
-        min-width: 200px;
-        width: auto;
-        margin-top: 13px;
-        margin-bottom: 10px;
-    }
-
-    .mx_Login_submit:disabled {
-        opacity: 0.3;
-    }
-
-    .mx_Login_create {
-        margin-top: 10px;
-        display: block;
-        text-align: center;
-        width: 100%;
-        font-size: 15px;
-        opacity: 1.0;
-    }
-
-    .mx_Login_create:link,
-    .mx_Login_create:hover,
-    .mx_Login_create:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_forgot {
-        display: block;
-        font-size: 15px;
-    }
-
-    .mx_Login_forgot:link,
-    .mx_Login_forgot:hover,
-    .mx_Login_forgot:visited
-    {
-        color: $form-fg-color;
-    }
-
-    .mx_Login_error {
-        color: $warning-color;
-        font-size: 18px;
-        width: 300px;
-        height: 44px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin: auto;
-        text-align: center;
-        margin-top: 12px;
-        margin-bottom: 16px;
-    }
-
-    .mx_Login_smallError {
-        font-size: 13px;
-        line-height: initial;
-    }
-
-}
diff --git a/res/themes/status/css/_fonts.scss b/res/themes/status/css/_fonts.scss
deleted file mode 100644
index e53b463839..0000000000
--- a/res/themes/status/css/_fonts.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@font-face {
-  font-family:PostGrotesk-Medium;
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Medium.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Medium.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Medium.svg#PostGrotesk-Medium') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}
-
-@font-face {
-  font-family:PostGrotesk-Book;
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot');
-  src:url('https://status.im/fonts/PostGrotesk-Book.eot?#iefix') format("embedded-opentype"),url('https://status.im/fonts/PostGrotesk-Book.woff') format("woff"),url('https://status.im/fonts/PostGrotesk-Book.svg#PostGrotesk-Book') format("svg");
-  font-weight: 400;
-  font-style: normal;
-}
diff --git a/res/themes/status/css/_paths.scss b/res/themes/status/css/_paths.scss
deleted file mode 100644
index 3a1140ecf9..0000000000
--- a/res/themes/status/css/_paths.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Path from root SCSS file (such as `status.scss`) to `res` dir in `matrix-react-sdk`
-$res: ../../../../node_modules/matrix-react-sdk/res;
-
-// Path from root SCSS file (such as `status.scss`) to `status` dir in `riot-web`
-$status: ..;
diff --git a/res/themes/status/css/_status.scss b/res/themes/status/css/_status.scss
deleted file mode 100644
index c2ce5dd281..0000000000
--- a/res/themes/status/css/_status.scss
+++ /dev/null
@@ -1,292 +0,0 @@
-// We deliberately prioritise Arial over Helvetica here due to diacritic problems (see _base.scss)
-// N.B. that the status.im website uses:
-// font-family:PostGrotesk-Book,-apple-system,BlinkMacSystemFont,"Segoe UI",Helvetica,Arial,sans-serif;
-// ...but can't be bothered to work out how the apple fonts & segoe interact, so keepingn it simple for now.
-
-$font-family: PostGrotesk-Book, Arial, Helvetica, Sans-Serif;
-
-// typical text (dark-on-white in light skin)
-$primary-fg-color: #70808D;
-$primary-bg-color: #EEF2F5;
-
-// ***** Start of Status theme specifics ******
-$header-color: #49555F;
-$header-font-family: PostGrotesk-Medium, Arial, Helvetica, Sans-Serif;
-
-$footer-color: #8D99A4;
-
-$riot-link-color: #A26988;
-
-a {
-    text-decoration: none;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-h1,h2,h3,h4,h5 {
-    color: $header-color;
-    font-family: $header-font-family;
-    font-weight: 400 ! important;
-}
-
-$callout-color: #4360DF; // or #4957b8 from status.im homepage
-
-$form-bg-color: $callout-color;
-$form-fg-color: #ffffff;
-
-$form-field-bg-color: rgba(244, 242, 247, 0.12);
-$form-field-bg-hover-color: rgba(255, 255, 255, 0.2);
-$form-field-fg-color: #ffffff;
-
-// ***** End of Status theme specifics ******
-
-
-// used for dialog box text
-$light-fg-color: #747474;
-
-// used for focusing form controls
-$focus-bg-color: #dddddd;
-
-// button UI (white-on-green in light skin)
-$accent-fg-color: #ffffff;
-$accent-color: #6CC1F6;
-$accent-color-alt: $accent-color;
-$accent-color-50pct: #6CC1F67F;
-$accent-hover-color: #84cfff;
-
-$selection-fg-color: $primary-bg-color;
-
-$focus-brightness: 125%;
-
-// red warning colour
-$warning-color: #F69E98;
-$warning-bg-color: #DF2A8B;
-$info-bg-color: #2A9EDF;
-$mention-user-pill-bg-color: #ff0064;
-$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
-
-$group-alert-color: #774f7e;
-
-$preview-bar-bg-color: #f7f7f7;
-
-// left-panel style muted accent color
-$secondary-accent-color: #586C7B;
-$tertiary-accent-color: #DBEBF6;
-
-// stop the tinter trying to change the secondary accent color
-// by overriding the key to something untintable
-// XXX: this is a bit of a hack.
-#mx_theme_secondaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-#mx_theme_tertiaryAccentColor {
-    color: #c0ffee ! important;
-}
-
-// used by RoomDirectory permissions
-$plinth-bg-color: $secondary-accent-color;
-
-// used by RoomDropTarget
-$droptarget-bg-color: rgba(255,255,255,0.5);
-
-// used by AddressSelector
-$selected-color: #eaf5f0;
-
-// selected for hoverover & selected event tiles
-$event-selected-color: #f7f7f7;
-
-// used for the hairline dividers in RoomView
-$primary-hairline-color: #e5e5e5;
-
-// used for the border of input text fields
-$input-border-color: #c9cfd4;
-$input-darker-bg-color: #c1c9d6;
-$input-darker-fg-color: #9fa9ba;
-
-$button-bg-color: #7ac9a1;
-$button-fg-color: white;
-// apart from login forms, which have stronger border
-$strong-input-border-color: #c7c7c7;
-
-// used for UserSettings EditableText
-$input-underline-color: rgba(151, 151, 151, 0.5);
-$input-fg-color: rgba(74, 74, 74, 0.9);
-
-// context menus
-$menu-border-color: rgba(187, 187, 187, 0.5);
-$menu-bg-color: #f6f6f6;
-$menu-selected-color: #f5f8fa;
-
-$avatar-initial-color: #ffffff;
-$avatar-bg-color: transparent;
-
-$h3-color: #3d3b39;
-
-$dialog-background-bg-color: #e9e9e9;
-$lightbox-background-bg-color: #000;
-
-$greyed-fg-color: #888;
-
-$neutral-badge-color: #dbdbdb;
-
-$preview-widget-bar-color: #ddd;
-$preview-widget-fg-color: $greyed-fg-color;
-
-$blockquote-bar-color: #ddd;
-$blockquote-fg-color: #777;
-
-$settings-grey-fg-color: #a2a2a2;
-
-$voip-decline-color: #f48080;
-$voip-accept-color: #80f480;
-
-$rte-bg-color: #e9e9e9;
-$rte-code-bg-color: rgba(0, 0, 0, 0.04);
-$rte-room-pill-color: #aaa;
-
-// ********************
-
-$roomtile-name-color: #ffffff;
-$roomtile-selected-bg-color: #465561;
-$roomtile-focused-bg-color: #6d8597;
-
-$username-variant1-color: #1e7ddc;
-$username-variant2-color: #a756a8;
-$username-variant3-color: #7ac9a1;
-$username-variant4-color: #f2809d;
-$username-variant5-color: #ffc666;
-$username-variant6-color: #76ddd7;
-$username-variant7-color: #45529b;
-$username-variant8-color: #bfd251;
-
-$roomsublist-background: rgba(0, 0, 0, 0.2);
-$roomsublist-label-fg-color: #ffffff;
-$roomsublist-label-bg-color: $secondary-accent-color;
-$roomsublist-chevron-color: #ffffff;
-
-$panel-divider-color: rgba(0, 0, 0, 0.2);
-
-// ********************
-
-$widget-menu-bar-bg-color: #f7f7f7;
-
-// ********************
-
-// event tile lifecycle
-$event-encrypting-color: #abddbc;
-$event-sending-color: #ddd;
-$event-notsent-color: #f44;
-
-// event redaction
-$event-redacted-fg-color: #e2e2e2;
-$event-redacted-border-color: #cccccc;
-
-// event timestamp
-$event-timestamp-color: #acacac;
-
-$edit-button-url: "$(res)/img/icon_context_message.svg";
-$copy-button-url: "$(res)/img/icon_copy_message.svg";
-
-// e2e
-$e2e-verified-color: #76cfa5; // N.B. *NOT* the same as $accent-color
-$e2e-unverified-color: #e8bf37;
-$e2e-warning-color: #ba6363;
-
-/*** ImageView ***/
-$lightbox-bg-color: #454545;
-$lightbox-fg-color: #ffffff;
-$lightbox-border-color: #ffffff;
-
-// unused?
-$progressbar-color: #000;
-
-@define-mixin mx_DialogButton {
-    /* align images in buttons (eg spinners) */
-    vertical-align: middle;
-    border-radius: 8px;
-    border: 1px solid rgba(199, 206, 209, 0.12);
-    background-color: $accent-color;
-    font-size: 13px;
-    font-family: $header-font-family;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    color: $accent-fg-color;
-    cursor: pointer;
-    outline: none;
-    padding: 14px;
-    box-sizing: border-box;
-    padding-left: 1.5em;
-    padding-right: 1.5em;
-    display: inline-block;
-    transition: background-color .2s ease;
-}
-
-@define-mixin mx_DialogButton_hover {
-    background-color: $accent-hover-color;
-}
-
-@define-mixin mx_DialogButton_small {
-    @mixin mx_DialogButton;
-    height: auto;
-    padding-top: 7px;
-    padding-bottom: 7px;
-    padding-left: 1em;
-    padding-right: 1em;
-}
-
-.mx_RoomSubList_label {
-    font-size: 13px;
-    font-family: $header-font-family;
-    letter-spacing: 1px;
-}
-
-// FIXME: all these ! importants are horrid - we should instead go and define
-// variables or something.
-.mx_SearchBox_search {
-    color: #fff ! important;
-}
-
-.mx_SearchBox_search::-webkit-input-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_SearchBox_search::-moz-placeholder  {
-    color: rgba(255, 255, 255, 0.6) ! important;
-}
-
-.mx_RoomList_emptySubListTip,
-.mx_RoomDropTarget {
-    font-size: 14px ! important;
-    border: 1.5px dashed rgba(0,0,0,0.2) ! important;
-    color: #fff ! important;
-    background-color: transparent ! important;
-    border-radius: 6px ! important;
-    margin-left: 6px ! important;
-    margin-right: 6px ! important;
-    margin-top: 8px ! important;
-    margin-bottom: 7px ! important;
-    padding: 8px ! important;
-}
-
-.mx_RoomDirectory_perm {
-    font-family: $header-font-family ! important;
-    background-color: #fff ! important;
-}
-
-.mx_RoomTile_badge,
-.mx_RoomSubList_badge {
-    height: 12px ! important;
-    padding-top: 1px ! important;
-    padding-bottom: 1px ! important;
-}
-
-.mx_RoomSubList_chevron {
-    top: 8px ! important;
-}
-
-.mx_MemberInfo .mx_RoomTile_name {
-    color: $primary-fg-color ! important;
-}
diff --git a/res/themes/status/css/status.scss b/res/themes/status/css/status.scss
deleted file mode 100644
index c5fa1fe114..0000000000
--- a/res/themes/status/css/status.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-@import "_paths.scss";
-@import "_fonts.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/themes/light/css/_base.scss";
-@import "_status.scss";
-@import "../../../../node_modules/matrix-react-sdk/res/css/_components.scss";
-@import "_StatusLogin.scss";
diff --git a/res/themes/status/fonts/README b/res/themes/status/fonts/README
deleted file mode 100644
index d7900145ed..0000000000
--- a/res/themes/status/fonts/README
+++ /dev/null
@@ -1 +0,0 @@
-We link out to status.im for fonts, although ideally we'd put them here.
diff --git a/res/themes/status/img/a.png b/res/themes/status/img/a.png
deleted file mode 100644
index defbcc4bcd..0000000000
Binary files a/res/themes/status/img/a.png and /dev/null differ
diff --git a/res/themes/status/img/d.png b/res/themes/status/img/d.png
deleted file mode 100644
index daeb0b0785..0000000000
Binary files a/res/themes/status/img/d.png and /dev/null differ
diff --git a/res/themes/status/img/dot.svg b/res/themes/status/img/dot.svg
deleted file mode 100644
index 45df23c049..0000000000
--- a/res/themes/status/img/dot.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><title>Artboard</title><circle cx="10" cy="10" r="1" fill="#FFF" fill-rule="evenodd" opacity=".11"/></svg>
\ No newline at end of file
diff --git a/res/themes/status/img/g.png b/res/themes/status/img/g.png
deleted file mode 100644
index f675a33022..0000000000
Binary files a/res/themes/status/img/g.png and /dev/null differ
diff --git a/res/themes/status/img/i.png b/res/themes/status/img/i.png
deleted file mode 100644
index b63eeae13b..0000000000
Binary files a/res/themes/status/img/i.png and /dev/null differ
diff --git a/res/themes/status/img/logo.svg b/res/themes/status/img/logo.svg
deleted file mode 100644
index 68e4a77a5c..0000000000
--- a/res/themes/status/img/logo.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="211px" height="53px" viewBox="0 0 211 53" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47 (45396) - http://www.bohemiancoding.com/sketch -->
-    <title>Status logo</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Status-logo">
-            <g>
-                <path d="M66.843,12.101 C66.843,12.7730034 67.0914975,13.2699984 67.5885,13.592 C68.0855025,13.9140016 68.9849935,14.179999 70.287,14.39 C72.0510088,14.6840015 73.3494958,15.1599967 74.1825,15.818 C75.0155042,16.4760033 75.432,17.4559935 75.432,18.758 C75.432,20.1160068 74.9140052,21.2079959 73.878,22.034 C72.8419948,22.8600041 71.4770085,23.273 69.783,23.273 C68.0329912,23.273 66.6400052,22.8495042 65.604,22.0025 C64.5679948,21.1554958 64.0220003,20.1020063 63.966,18.842 L66.423,18.464 C66.4930004,19.2760041 66.8044972,19.9479973 67.3575,20.48 C67.9105028,21.0120027 68.7189947,21.278 69.783,21.278 C70.7350048,21.278 71.4874972,21.0715021 72.0405,20.6585 C72.5935028,20.2454979 72.87,19.6610038 72.87,18.905 C72.87,18.2329966 72.6180025,17.7150018 72.114,17.351 C71.6099975,16.9869982 70.7280063,16.7140009 69.468,16.532 C67.7739915,16.2799987 66.4895044,15.8320032 65.6145,15.188 C64.7394956,14.5439968 64.302,13.5850064 64.302,12.311 C64.302,10.9669933 64.7919951,9.91700378 65.772,9.161 C66.7520049,8.40499622 68.039992,8.027 69.636,8.027 C71.1340075,8.027 72.3729951,8.3769965 73.353,9.077 C74.3330049,9.7770035 74.9349989,10.7429938 75.159,11.975 L72.66,12.542 C72.4079987,10.8619916 71.379009,10.022 69.573,10.022 C68.6769955,10.022 67.9980023,10.2074981 67.536,10.5785 C67.0739977,10.9495019 66.843,11.4569968 66.843,12.101 Z M82.803,20.984 L83.454,22.853 C82.8939972,23.1330014 82.215004,23.273 81.417,23.273 C80.4789953,23.273 79.7475026,23.0280025 79.2225,22.538 C78.6974974,22.0479976 78.435,21.3480046 78.435,20.438 L78.435,14.81 L76.755,14.81 L76.755,13.046 L78.435,13.046 L78.435,10.211 L80.808,9.119 L80.808,13.046 L83.055,13.046 L83.055,14.81 L80.808,14.81 L80.808,20.144 C80.808,20.9280039 81.1229968,21.32 81.753,21.32 C82.0330014,21.32 82.3829979,21.2080011 82.803,20.984 Z M91.392,23 C91.2519993,22.7479987 91.182,22.321003 91.182,21.719 C90.4539964,22.7550052 89.3970069,23.273 88.011,23.273 C87.002995,23.273 86.194503,23.0175026 85.5855,22.5065 C84.976497,21.9954974 84.672,21.3060043 84.672,20.438 C84.672,19.7939968 84.8434983,19.2410023 85.1865,18.779 C85.5295017,18.3169977 86.0124969,17.9565013 86.6355,17.6975 C87.2585031,17.4384987 87.9409963,17.2530006 88.683,17.141 C89.4250037,17.0289994 90.2439955,16.973 91.14,16.973 L91.14,16.343 C91.14,15.7969973 90.9860015,15.3630016 90.678,15.041 C90.3699985,14.7189984 89.915003,14.558 89.313,14.558 C88.710997,14.558 88.2490016,14.7049985 87.927,14.999 C87.6049984,15.2930015 87.4370001,15.6639978 87.423,16.112 L85.113,15.776 C85.2110005,14.8379953 85.662496,14.1030027 86.4675,13.571 C87.272504,13.0389973 88.2489943,12.773 89.397,12.773 C90.6290062,12.773 91.6159963,13.0844969 92.358,13.7075 C93.1000037,14.3305031 93.471,15.2229942 93.471,16.385 L93.471,21.635 C93.471,22.0830022 93.5479992,22.5379977 93.702,23 L91.392,23 Z M88.662,21.509 C89.3340034,21.509 89.9149976,21.309502 90.405,20.9105 C90.8950025,20.511498 91.14,19.9830033 91.14,19.325 L91.14,18.506 C88.3959863,18.506 87.024,19.1009941 87.024,20.291 C87.024,20.683002 87.1744985,20.983999 87.4755,21.194 C87.7765015,21.404001 88.1719976,21.509 88.662,21.509 Z M101.199,20.984 L101.85,22.853 C101.289997,23.1330014 100.611004,23.273 99.813,23.273 C98.8749953,23.273 98.1435026,23.0280025 97.6185,22.538 C97.0934974,22.0479976 96.831,21.3480046 96.831,20.438 L96.831,14.81 L95.151,14.81 L95.151,13.046 L96.831,13.046 L96.831,10.211 L99.204,9.119 L99.204,13.046 L101.451,13.046 L101.451,14.81 L99.204,14.81 L99.204,20.144 C99.204,20.9280039 99.5189969,21.32 100.149,21.32 C100.429001,21.32 100.778998,21.2080011 101.199,20.984 Z M112.56,13.046 L112.56,23 L110.292,23 L110.292,21.509 C109.591997,22.6850059 108.563007,23.273 107.205,23.273 C106.210995,23.273 105.385003,22.9825029 104.727,22.4015 C104.068997,21.8204971 103.74,20.9980053 103.74,19.934 L103.74,13.046 L106.113,13.046 L106.113,19.346 C106.113,20.0180034 106.284498,20.5149984 106.6275,20.837 C106.970502,21.1590016 107.400997,21.32 107.919,21.32 C108.535003,21.32 109.066998,21.0540027 109.515,20.522 C109.963002,19.9899973 110.187,19.2550047 110.187,18.317 L110.187,13.046 L112.56,13.046 Z M117.39,15.692 C117.39,16.098002 117.557998,16.3919991 117.894,16.574 C118.230002,16.7560009 118.747996,16.9029994 119.448,17.015 C120.022003,17.0990004 120.522498,17.2039994 120.9495,17.33 C121.376502,17.4560006 121.785998,17.6309989 122.178,17.855 C122.570002,18.0790011 122.867499,18.3764981 123.0705,18.7475 C123.273501,19.1185019 123.375,19.5559975 123.375,20.06 C123.375,21.054005 122.986504,21.8379971 122.2095,22.412 C121.432496,22.9860029 120.393007,23.273 119.091,23.273 C117.844994,23.273 116.833504,23.0140026 116.0565,22.496 C115.279496,21.9779974 114.835001,21.2360048 114.723,20.27 L117.033,19.934 C117.131,20.9980053 117.823994,21.53 119.112,21.53 C119.686003,21.53 120.140998,21.4215011 120.477,21.2045 C120.813002,20.9874989 120.981,20.6620022 120.981,20.228 C120.981,19.835998 120.823502,19.5455009 120.5085,19.3565 C120.193498,19.1674991 119.616004,19.0100006 118.776,18.884 C117.543994,18.7019991 116.606003,18.3800023 115.962,17.918 C115.317997,17.4559977 114.996,16.7700045 114.996,15.86 C114.996,14.865995 115.391496,14.1030027 116.1825,13.571 C116.973504,13.0389973 117.942994,12.773 119.091,12.773 C120.197006,12.773 121.127996,13.0179976 121.884,13.508 C122.640004,13.9980025 123.087999,14.6629958 123.228,15.503 L120.918,15.986 C120.791999,14.991995 120.169006,14.495 119.049,14.495 C118.572998,14.495 118.177502,14.5999989 117.8625,14.81 C117.547498,15.020001 117.39,15.3139981 117.39,15.692 Z" id="Status" fill="#49555F"></path>
-                <path d="M68.31,32.5 L72.135,43 L70.77,43 L69.75,40.15 L65.58,40.15 L64.56,43 L63.285,43 L67.11,32.5 L68.31,32.5 Z M67.665,34.195 L67.635,34.195 L65.94,39.13 L69.39,39.13 C68.4299952,36.4099864 67.855001,34.7650029 67.665,34.195 Z M82.905,43 L81.78,43 C80.1199917,38.8699794 79.0300026,35.9650084 78.51,34.285 L78.48,34.285 L78.48,43 L77.295,43 L77.295,32.5 L79.02,32.5 C80.9700098,37.6500257 82.0949985,40.619996 82.395,41.41 L85.68,32.5 L87.39,32.5 L87.39,43 L86.205,43 L86.205,34.285 L86.175,34.285 C85.5449969,36.2050096 84.4550077,39.1099806 82.905,43 Z M92.805,35.74 C93.8650053,35.74 94.697497,36.0849965 95.3025,36.775 C95.907503,37.4650034 96.21,38.3599945 96.21,39.46 C96.21,40.5600055 95.907503,41.4549966 95.3025,42.145 C94.697497,42.8350035 93.8650053,43.18 92.805,43.18 C91.7449947,43.18 90.912503,42.8350035 90.3075,42.145 C89.702497,41.4549966 89.4,40.5600055 89.4,39.46 C89.4,38.3599945 89.702497,37.4650034 90.3075,36.775 C90.912503,36.0849965 91.7449947,35.74 92.805,35.74 Z M92.805,42.175 C93.4850034,42.175 94.0049982,41.9175026 94.365,41.4025 C94.7250018,40.8874974 94.905,40.2400039 94.905,39.46 C94.905,38.6799961 94.7250018,38.0325026 94.365,37.5175 C94.0049982,37.0024974 93.4850034,36.745 92.805,36.745 C92.1249966,36.745 91.6050018,37.0024974 91.245,37.5175 C90.8849982,38.0325026 90.705,38.6799961 90.705,39.46 C90.705,40.2400039 90.8849982,40.8874974 91.245,41.4025 C91.6050018,41.9175026 92.1249966,42.175 92.805,42.175 Z M101.58,35.74 C102.530005,35.74 103.309997,36.0774966 103.92,36.7525 C104.530003,37.4275034 104.835,38.3299943 104.835,39.46 C104.835,40.5900057 104.530003,41.4924966 103.92,42.1675 C103.309997,42.8425034 102.530005,43.18 101.58,43.18 C100.549995,43.18 99.7750026,42.7650041 99.255,41.935 L99.255,43 L98.07,43 L98.07,32.5 L99.33,32.5 L99.33,36.82 C99.9000029,36.0999964 100.649995,35.74 101.58,35.74 Z M99.33,38.98 L99.33,39.94 C99.33,40.6700036 99.5474978,41.2199982 99.9825,41.59 C100.417502,41.9600018 100.904997,42.145 101.445,42.145 C102.075003,42.145 102.579998,41.8925025 102.96,41.3875 C103.340002,40.8824975 103.53,40.2400039 103.53,39.46 C103.53,38.6799961 103.340002,38.0375025 102.96,37.5325 C102.579998,37.0274975 102.075003,36.775 101.445,36.775 C100.904997,36.775 100.417502,36.9599982 99.9825,37.33 C99.5474978,37.7000018 99.33,38.2499964 99.33,38.98 Z M106.5,33.16 C106.5,32.9099987 106.577499,32.7100007 106.7325,32.56 C106.887501,32.4099992 107.084999,32.335 107.325,32.335 C107.565001,32.335 107.762499,32.4099992 107.9175,32.56 C108.072501,32.7100007 108.15,32.9099987 108.15,33.16 C108.15,33.3800011 108.072501,33.5699992 107.9175,33.73 C107.762499,33.8900008 107.565001,33.97 107.325,33.97 C107.084999,33.97 106.887501,33.8900008 106.7325,33.73 C106.577499,33.5699992 106.5,33.3800011 106.5,33.16 Z M106.695,43 L106.695,35.92 L107.955,35.92 L107.955,43 L106.695,43 Z M110.355,43 L110.355,32.5 L111.615,32.5 L111.615,43 L110.355,43 Z M118.65,40.93 L119.76,41.38 C119.159997,42.580006 118.190007,43.18 116.85,43.18 C115.809995,43.18 114.987503,42.8325035 114.3825,42.1375 C113.777497,41.4424965 113.475,40.5450055 113.475,39.445 C113.475,38.3649946 113.777497,37.4775035 114.3825,36.7825 C114.987503,36.0874965 115.794995,35.74 116.805,35.74 C117.825005,35.74 118.612497,36.0824966 119.1675,36.7675 C119.722503,37.4525034 120,38.2849951 120,39.265 L120,39.685 L114.765,39.685 C114.795,40.4150037 114.982498,41.0174976 115.3275,41.4925 C115.672502,41.9675024 116.184997,42.205 116.865,42.205 C117.325002,42.205 117.689999,42.1000011 117.96,41.89 C118.230001,41.6799989 118.459999,41.3600021 118.65,40.93 Z M116.775,36.715 C116.224997,36.715 115.775002,36.9024981 115.425,37.2775 C115.074998,37.6525019 114.87,38.139997 114.81,38.74 L118.71,38.74 C118.68,38.1199969 118.487502,37.6275018 118.1325,37.2625 C117.777498,36.8974982 117.325003,36.715 116.775,36.715 Z M131.67,43 L125.415,43 L125.415,32.5 L131.565,32.5 L131.565,33.55 L126.72,33.55 L126.72,37.06 L131.25,37.06 L131.25,38.11 L126.72,38.11 L126.72,41.95 L131.67,41.95 L131.67,43 Z M136.605,41.905 L137.01,42.895 C136.679998,43.085001 136.255003,43.18 135.735,43.18 C135.144997,43.18 134.692502,43.0150017 134.3775,42.685 C134.062498,42.3549984 133.905,41.9400025 133.905,41.44 L133.905,36.88 L132.705,36.88 L132.705,35.92 L133.905,35.92 L133.905,33.895 L135.165,33.325 L135.165,35.92 L136.815,35.92 L136.815,36.88 L135.165,36.88 L135.165,41.32 C135.165,41.5700013 135.229999,41.7674993 135.36,41.9125 C135.490001,42.0575007 135.669999,42.13 135.9,42.13 C136.150001,42.13 136.384999,42.0550007 136.605,41.905 Z M138.585,43 L138.585,32.5 L139.845,32.5 L139.845,36.895 C140.345002,36.1249962 141.064995,35.74 142.005,35.74 C142.725004,35.74 143.324998,35.944998 143.805,36.355 C144.285002,36.765002 144.525,37.3449963 144.525,38.095 L144.525,43 L143.265,43 L143.265,38.29 C143.265,37.7899975 143.115002,37.4125013 142.815,37.1575 C142.514998,36.9024987 142.160002,36.775 141.75,36.775 C141.229997,36.775 140.782502,36.9924978 140.4075,37.4275 C140.032498,37.8625022 139.845,38.4349964 139.845,39.145 L139.845,43 L138.585,43 Z M151.485,40.93 L152.595,41.38 C151.994997,42.580006 151.025007,43.18 149.685,43.18 C148.644995,43.18 147.822503,42.8325035 147.2175,42.1375 C146.612497,41.4424965 146.31,40.5450055 146.31,39.445 C146.31,38.3649946 146.612497,37.4775035 147.2175,36.7825 C147.822503,36.0874965 148.629995,35.74 149.64,35.74 C150.660005,35.74 151.447497,36.0824966 152.0025,36.7675 C152.557503,37.4525034 152.835,38.2849951 152.835,39.265 L152.835,39.685 L147.6,39.685 C147.63,40.4150037 147.817498,41.0174976 148.1625,41.4925 C148.507502,41.9675024 149.019997,42.205 149.7,42.205 C150.160002,42.205 150.524999,42.1000011 150.795,41.89 C151.065001,41.6799989 151.294999,41.3600021 151.485,40.93 Z M149.61,36.715 C149.059997,36.715 148.610002,36.9024981 148.26,37.2775 C147.909998,37.6525019 147.705,38.139997 147.645,38.74 L151.545,38.74 C151.515,38.1199969 151.322502,37.6275018 150.9675,37.2625 C150.612498,36.8974982 150.160003,36.715 149.61,36.715 Z M158.7,35.905 L158.415,37.075 C158.194999,36.874999 157.925002,36.775 157.605,36.775 C157.114998,36.775 156.697502,36.9999977 156.3525,37.45 C156.007498,37.9000023 155.835,38.4749965 155.835,39.175 L155.835,43 L154.575,43 L154.575,35.92 L155.76,35.92 L155.76,37.03 C155.940001,36.6099979 156.214998,36.2900011 156.585,36.07 C156.955002,35.8499989 157.369998,35.74 157.83,35.74 C158.180002,35.74 158.469999,35.7949994 158.7,35.905 Z M164.61,40.93 L165.72,41.38 C165.119997,42.580006 164.150007,43.18 162.81,43.18 C161.769995,43.18 160.947503,42.8325035 160.3425,42.1375 C159.737497,41.4424965 159.435,40.5450055 159.435,39.445 C159.435,38.3649946 159.737497,37.4775035 160.3425,36.7825 C160.947503,36.0874965 161.754995,35.74 162.765,35.74 C163.785005,35.74 164.572497,36.0824966 165.1275,36.7675 C165.682503,37.4525034 165.96,38.2849951 165.96,39.265 L165.96,39.685 L160.725,39.685 C160.755,40.4150037 160.942498,41.0174976 161.2875,41.4925 C161.632502,41.9675024 162.144997,42.205 162.825,42.205 C163.285002,42.205 163.649999,42.1000011 163.92,41.89 C164.190001,41.6799989 164.419999,41.3600021 164.61,40.93 Z M162.735,36.715 C162.184997,36.715 161.735002,36.9024981 161.385,37.2775 C161.034998,37.6525019 160.83,38.139997 160.77,38.74 L164.67,38.74 C164.64,38.1199969 164.447502,37.6275018 164.0925,37.2625 C163.737498,36.8974982 163.285003,36.715 162.735,36.715 Z M173.505,35.92 L173.505,43 L172.32,43 L172.32,41.935 C171.779997,42.7650041 171.045005,43.18 170.115,43.18 C169.404996,43.18 168.812502,42.9750021 168.3375,42.565 C167.862498,42.154998 167.625,41.5750038 167.625,40.825 L167.625,35.92 L168.885,35.92 L168.885,40.63 C168.885,41.1300025 169.032499,41.5074987 169.3275,41.7625 C169.622501,42.0175013 169.969998,42.145 170.37,42.145 C170.880003,42.145 171.319998,41.9275022 171.69,41.4925 C172.060002,41.0574978 172.245,40.4850036 172.245,39.775 L172.245,35.92 L173.505,35.92 Z M175.905,43 L175.905,35.92 L177.09,35.92 L177.09,36.985 C177.590002,36.1549958 178.299995,35.74 179.22,35.74 C179.720002,35.74 180.157498,35.8524989 180.5325,36.0775 C180.907502,36.3025011 181.179999,36.6199979 181.35,37.03 C181.560001,36.6799982 181.872498,36.3775013 182.2875,36.1225 C182.702502,35.8674987 183.154998,35.74 183.645,35.74 C184.315003,35.74 184.872498,35.944998 185.3175,36.355 C185.762502,36.765002 185.985,37.3449963 185.985,38.095 L185.985,43 L184.725,43 L184.725,38.29 C184.725,37.7899975 184.592501,37.4125013 184.3275,37.1575 C184.062499,36.9024987 183.740002,36.775 183.36,36.775 C182.869998,36.775 182.450002,36.9924978 182.1,37.4275 C181.749998,37.8625022 181.575,38.4349964 181.575,39.145 L181.575,43 L180.315,43 L180.315,38.29 C180.315,37.7899975 180.180001,37.4125013 179.91,37.1575 C179.639999,36.9024987 179.315002,36.775 178.935,36.775 C178.454998,36.775 178.040002,36.9924978 177.69,37.4275 C177.339998,37.8625022 177.165,38.4349964 177.165,39.145 L177.165,43 L175.905,43 Z M191.43,37.75 C191.43,36.0899917 191.859996,34.7700049 192.72,33.79 C193.580004,32.8099951 194.709993,32.32 196.11,32.32 C197.510007,32.32 198.639996,32.8099951 199.5,33.79 C200.360004,34.7700049 200.79,36.0899917 200.79,37.75 C200.79,39.4100083 200.360004,40.7299951 199.5,41.71 C198.639996,42.6900049 197.510007,43.18 196.11,43.18 C194.709993,43.18 193.580004,42.6900049 192.72,41.71 C191.859996,40.7299951 191.43,39.4100083 191.43,37.75 Z M192.78,37.75 C192.78,39.0300064 193.067497,40.0774959 193.6425,40.8925 C194.217503,41.7075041 195.039995,42.115 196.11,42.115 C197.180005,42.115 198.002497,41.7075041 198.5775,40.8925 C199.152503,40.0774959 199.44,39.0300064 199.44,37.75 C199.44,36.4699936 199.152503,35.4225041 198.5775,34.6075 C198.002497,33.7924959 197.180005,33.385 196.11,33.385 C195.039995,33.385 194.217503,33.7924959 193.6425,34.6075 C193.067497,35.4225041 192.78,36.4699936 192.78,37.75 Z M203.955,35.17 C203.955,35.7100027 204.129998,36.1049988 204.48,36.355 C204.830002,36.6050013 205.484995,36.8099992 206.445,36.97 C207.695006,37.170001 208.624997,37.4974977 209.235,37.9525 C209.845003,38.4075023 210.15,39.0949954 210.15,40.015 C210.15,40.9650047 209.807503,41.7299971 209.1225,42.31 C208.437497,42.8900029 207.505006,43.18 206.325,43.18 C205.094994,43.18 204.132503,42.8875029 203.4375,42.3025 C202.742497,41.7174971 202.375,40.9650046 202.335,40.045 L203.625,39.85 C203.665,40.4900032 203.899998,41.0324978 204.33,41.4775 C204.760002,41.9225022 205.424995,42.145 206.325,42.145 C207.105004,42.145 207.707498,41.9650018 208.1325,41.605 C208.557502,41.2449982 208.77,40.7500031 208.77,40.12 C208.77,39.5399971 208.575002,39.1025015 208.185,38.8075 C207.794998,38.5124985 207.110005,38.2950007 206.13,38.155 C204.939994,37.9849992 204.055003,37.6750022 203.475,37.225 C202.894997,36.7749977 202.605,36.1300042 202.605,35.29 C202.605,34.3799954 202.934997,33.6575027 203.595,33.1225 C204.255003,32.5874973 205.124995,32.32 206.205,32.32 C207.235005,32.32 208.077497,32.5649976 208.7325,33.055 C209.387503,33.5450024 209.784999,34.2199957 209.925,35.08 L208.635,35.41 C208.444999,34.0499932 207.630007,33.37 206.19,33.37 C205.449996,33.37 204.892502,33.5324984 204.5175,33.8575 C204.142498,34.1825016 203.955,34.6199972 203.955,35.17 Z" id="A-Mobile-Ethereum-OS" fill="#49555F" opacity="0.400000006"></path>
-                <path d="M32.4973501,25.5505037 C38.4424686,25.2185283 42.0452893,22.1564608 41.7899347,17.5784494 C41.5299374,12.9215068 36.7362358,10.0521244 31.9425343,10.3214192 C24.1286847,10.7578625 18.383207,17.6411301 17.7378564,25.5063951 C18.7987386,25.2579939 19.9153344,25.1094174 20.9692523,25.0513798 C25.356708,24.8053 28.107573,25.7965834 32.4973501,25.5505037 M20.5026499,27.6653964 C14.5575314,27.9973719 10.9547107,31.0594393 11.2100653,35.6374507 C11.472384,40.2943933 16.2637642,43.1614542 21.0574657,42.8944809 C28.8713153,42.4580377 34.616793,35.57477 35.2621436,27.7071835 C34.2012614,27.9579063 33.0846656,28.1064827 32.0330691,28.1645204 C27.643292,28.4106001 24.892427,27.4193167 20.5026499,27.6653964 M18.0210678,0 L34.9789322,0 C40.8544085,0 42.7277824,0 45.3765056,0.88217258 C48.4686172,1.98720981 51.0128772,4.52693824 52.1155447,7.61918528 C53,10.2680245 53,12.1461235 53,18.0195357 L53,34.9804643 C53,40.8538765 53,42.7319755 52.1155447,45.3831362 C51.0128772,48.5055629 48.5034383,51.0127902 45.3811484,52.1178274 C42.7301038,53 40.8544085,53 34.9789322,53 L18.0210678,53 C12.1455915,53 10.2698962,53 7.61885156,52.1178274 C4.49656169,51.0127902 1.98944418,48.5055629 0.884455346,45.3831362 C0,42.7319755 0,40.8538765 0,34.9804643 L0,18.0195357 C0,12.1461235 0,10.2680245 0.884455346,7.61918528 C1.98712277,4.49675865 4.49656169,1.98720981 7.61885156,0.88217258 C10.2698962,0 12.1455915,0 18.0210678,0" id="Fill-1" fill="#4360DF"></path>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/res/themes/status/img/n.png b/res/themes/status/img/n.png
deleted file mode 100644
index b8e33d41f7..0000000000
Binary files a/res/themes/status/img/n.png and /dev/null differ
diff --git a/res/vector-icons/android-chrome-144x144.png b/res/vector-icons/android-chrome-144x144.png
index 30c8cf18dc..5dbbd0ff11 100644
Binary files a/res/vector-icons/android-chrome-144x144.png and b/res/vector-icons/android-chrome-144x144.png differ
diff --git a/res/vector-icons/android-chrome-192x192.png b/res/vector-icons/android-chrome-192x192.png
index 560e20ad8c..93a4e9c8ad 100644
Binary files a/res/vector-icons/android-chrome-192x192.png and b/res/vector-icons/android-chrome-192x192.png differ
diff --git a/res/vector-icons/android-chrome-36x36.png b/res/vector-icons/android-chrome-36x36.png
index ee41772f4d..344157fe50 100644
Binary files a/res/vector-icons/android-chrome-36x36.png and b/res/vector-icons/android-chrome-36x36.png differ
diff --git a/res/vector-icons/android-chrome-48x48.png b/res/vector-icons/android-chrome-48x48.png
index 9cd225d402..70115c65c1 100644
Binary files a/res/vector-icons/android-chrome-48x48.png and b/res/vector-icons/android-chrome-48x48.png differ
diff --git a/res/vector-icons/android-chrome-72x72.png b/res/vector-icons/android-chrome-72x72.png
index d9de0c5715..e61b36e248 100644
Binary files a/res/vector-icons/android-chrome-72x72.png and b/res/vector-icons/android-chrome-72x72.png differ
diff --git a/res/vector-icons/android-chrome-96x96.png b/res/vector-icons/android-chrome-96x96.png
index eb48c2c91e..3a32b6c839 100644
Binary files a/res/vector-icons/android-chrome-96x96.png and b/res/vector-icons/android-chrome-96x96.png differ
diff --git a/res/vector-icons/apple-touch-icon-114x114.png b/res/vector-icons/apple-touch-icon-114x114.png
index e07fa43752..019780fd95 100644
Binary files a/res/vector-icons/apple-touch-icon-114x114.png and b/res/vector-icons/apple-touch-icon-114x114.png differ
diff --git a/res/vector-icons/apple-touch-icon-120x120.png b/res/vector-icons/apple-touch-icon-120x120.png
index 8265091318..4979a63e4e 100644
Binary files a/res/vector-icons/apple-touch-icon-120x120.png and b/res/vector-icons/apple-touch-icon-120x120.png differ
diff --git a/res/vector-icons/apple-touch-icon-144x144.png b/res/vector-icons/apple-touch-icon-144x144.png
index 30c8cf18dc..5dbbd0ff11 100644
Binary files a/res/vector-icons/apple-touch-icon-144x144.png and b/res/vector-icons/apple-touch-icon-144x144.png differ
diff --git a/res/vector-icons/apple-touch-icon-152x152.png b/res/vector-icons/apple-touch-icon-152x152.png
index 5bc63546c8..6aac26012f 100644
Binary files a/res/vector-icons/apple-touch-icon-152x152.png and b/res/vector-icons/apple-touch-icon-152x152.png differ
diff --git a/res/vector-icons/apple-touch-icon-180x180.png b/res/vector-icons/apple-touch-icon-180x180.png
index 85e9f8ca74..aacfc1a8a5 100644
Binary files a/res/vector-icons/apple-touch-icon-180x180.png and b/res/vector-icons/apple-touch-icon-180x180.png differ
diff --git a/res/vector-icons/apple-touch-icon-57x57.png b/res/vector-icons/apple-touch-icon-57x57.png
index 253c3db70a..e52c99c609 100644
Binary files a/res/vector-icons/apple-touch-icon-57x57.png and b/res/vector-icons/apple-touch-icon-57x57.png differ
diff --git a/res/vector-icons/apple-touch-icon-60x60.png b/res/vector-icons/apple-touch-icon-60x60.png
index 192a34675b..edaecda6b6 100644
Binary files a/res/vector-icons/apple-touch-icon-60x60.png and b/res/vector-icons/apple-touch-icon-60x60.png differ
diff --git a/res/vector-icons/apple-touch-icon-72x72.png b/res/vector-icons/apple-touch-icon-72x72.png
index d9de0c5715..e61b36e248 100644
Binary files a/res/vector-icons/apple-touch-icon-72x72.png and b/res/vector-icons/apple-touch-icon-72x72.png differ
diff --git a/res/vector-icons/apple-touch-icon-76x76.png b/res/vector-icons/apple-touch-icon-76x76.png
index b94716457b..1432fee38f 100644
Binary files a/res/vector-icons/apple-touch-icon-76x76.png and b/res/vector-icons/apple-touch-icon-76x76.png differ
diff --git a/res/vector-icons/apple-touch-icon-precomposed.png b/res/vector-icons/apple-touch-icon-precomposed.png
index 85e9f8ca74..aacfc1a8a5 100644
Binary files a/res/vector-icons/apple-touch-icon-precomposed.png and b/res/vector-icons/apple-touch-icon-precomposed.png differ
diff --git a/res/vector-icons/apple-touch-icon.png b/res/vector-icons/apple-touch-icon.png
index 85e9f8ca74..aacfc1a8a5 100644
Binary files a/res/vector-icons/apple-touch-icon.png and b/res/vector-icons/apple-touch-icon.png differ
diff --git a/res/vector-icons/favicon-16x16.png b/res/vector-icons/favicon-16x16.png
index def4ec5eee..c9b0f23e29 100644
Binary files a/res/vector-icons/favicon-16x16.png and b/res/vector-icons/favicon-16x16.png differ
diff --git a/res/vector-icons/favicon-32x32.png b/res/vector-icons/favicon-32x32.png
index c999923ac1..48bf1dc890 100644
Binary files a/res/vector-icons/favicon-32x32.png and b/res/vector-icons/favicon-32x32.png differ
diff --git a/res/vector-icons/favicon-96x96.png b/res/vector-icons/favicon-96x96.png
index eb48c2c91e..ea21306c0d 100644
Binary files a/res/vector-icons/favicon-96x96.png and b/res/vector-icons/favicon-96x96.png differ
diff --git a/res/vector-icons/favicon.ico b/res/vector-icons/favicon.ico
index 8f8ff94eea..619b51aaad 100644
Binary files a/res/vector-icons/favicon.ico and b/res/vector-icons/favicon.ico differ
diff --git a/res/vector-icons/mstile-144x144.png b/res/vector-icons/mstile-144x144.png
index 30c8cf18dc..5dbbd0ff11 100644
Binary files a/res/vector-icons/mstile-144x144.png and b/res/vector-icons/mstile-144x144.png differ
diff --git a/res/vector-icons/mstile-150x150.png b/res/vector-icons/mstile-150x150.png
index 5b8fca8a48..da0c101c94 100644
Binary files a/res/vector-icons/mstile-150x150.png and b/res/vector-icons/mstile-150x150.png differ
diff --git a/res/vector-icons/mstile-310x150.png b/res/vector-icons/mstile-310x150.png
index d809f00a05..c627adc2a1 100644
Binary files a/res/vector-icons/mstile-310x150.png and b/res/vector-icons/mstile-310x150.png differ
diff --git a/res/vector-icons/mstile-310x310.png b/res/vector-icons/mstile-310x310.png
index ec62f8ee9d..e96300293e 100644
Binary files a/res/vector-icons/mstile-310x310.png and b/res/vector-icons/mstile-310x310.png differ
diff --git a/res/vector-icons/mstile-70x70.png b/res/vector-icons/mstile-70x70.png
index 820a909e21..c4f306c5ff 100644
Binary files a/res/vector-icons/mstile-70x70.png and b/res/vector-icons/mstile-70x70.png differ
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index 9bfebb0ca3..cde96bc419 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -51,7 +51,6 @@ const INCLUDE_LANGS = [
 const COPY_LIST = [
     ["res/manifest.json", "webapp"],
     ["res/welcome.html", "webapp"],
-    ["res/home-status.html", "webapp"],
     ["res/welcome/**", "webapp/welcome"],
     ["res/themes/**", "webapp/themes"],
     ["res/vector-icons/**", "webapp/vector-icons"],
diff --git a/src/components/views/auth/VectorAuthFooter.js b/src/components/views/auth/VectorAuthFooter.js
index ded8e22976..6467485387 100644
--- a/src/components/views/auth/VectorAuthFooter.js
+++ b/src/components/views/auth/VectorAuthFooter.js
@@ -19,7 +19,6 @@ limitations under the License.
 
 const React = require('react');
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';
 
 module.exports = React.createClass({
     displayName: 'VectorAuthFooter',
@@ -28,10 +27,6 @@ module.exports = React.createClass({
     },
 
     render: function() {
-        // FIXME: replace this with a proper Status skin
-        // ...except then we wouldn't be able to switch to the Status theme at runtime.
-        if (SettingsStore.getValue("theme") === 'status') return <div />;
-
         return (
             <div className="mx_AuthFooter">
                 <a href="https://medium.com/@RiotChat" target="_blank" rel="noopener">blog</a>
diff --git a/src/components/views/auth/VectorAuthHeaderLogo.js b/src/components/views/auth/VectorAuthHeaderLogo.js
index 7a40f44559..0161fc3ffb 100644
--- a/src/components/views/auth/VectorAuthHeaderLogo.js
+++ b/src/components/views/auth/VectorAuthHeaderLogo.js
@@ -19,23 +19,26 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-const LOGO_URI = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+export default class VectorAuthHeaderLogo extends React.PureComponent {
+    static replaces = 'AuthHeaderLogo'
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthHeaderLogo',
-    statics: {
-        replaces: 'AuthHeaderLogo',
-    },
-    propTypes: {
+    static propTypes = {
         icon: PropTypes.string,
-    },
+    }
+
+    render() {
+        const brandingConfig = SdkConfig.get().branding;
+        let logoUrl = "themes/riot/img/logos/riot-im-logo-black-text.svg";
+        if (brandingConfig && brandingConfig.authHeaderLogoUrl) {
+            logoUrl = brandingConfig.authHeaderLogoUrl;
+        }
 
-    render: function() {
         return (
             <div className="mx_AuthHeaderLogo">
-                <img src={LOGO_URI} alt="Riot" />
+                <img src={logoUrl} alt="Riot" />
             </div>
         );
-    },
-});
+    }
+}
diff --git a/src/components/views/auth/VectorAuthPage.js b/src/components/views/auth/VectorAuthPage.js
index e277cb18c8..bae685b951 100644
--- a/src/components/views/auth/VectorAuthPage.js
+++ b/src/components/views/auth/VectorAuthPage.js
@@ -16,21 +16,24 @@ limitations under the License.
 
 'use strict';
 
-const React = require('react');
+import React from 'react';
 import sdk from 'matrix-react-sdk/lib/index';
+import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
 
-module.exports = React.createClass({
-    displayName: 'VectorAuthPage',
+export default class VectorAuthPage extends React.PureComponent {
+    static replaces = 'AuthPage'
 
-    statics: {
-        replaces: 'AuthPage',
-    },
-
-    render: function() {
+    render() {
         const AuthFooter = sdk.getComponent('auth.AuthFooter');
 
+        const brandingConfig = SdkConfig.get().branding;
+        let backgroundUrl = "themes/riot/img/backgrounds/valley.jpg";
+        if (brandingConfig && brandingConfig.welcomeBackgroundUrl) {
+            backgroundUrl = brandingConfig.welcomeBackgroundUrl;
+        }
+
         const pageStyle = {
-            background: 'center/cover fixed url(themes/riot/img/backgrounds/valley.jpg)',
+            background: `center/cover fixed url(${backgroundUrl})`,
         };
 
         const modalStyle = {
@@ -66,5 +69,5 @@ module.exports = React.createClass({
                 <AuthFooter />
             </div>
         );
-    },
-});
+    }
+}
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index ae574afa0f..fdf6a83517 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -37,5 +37,10 @@
     "Dev chat for the Dendrite dev team": "Чат за разработващия екип на Dendrite",
     "Co-ordination for Riot translators": "Координация за преводачи на Riot",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Може да настроите и собствен сървър за самоличност, но така няма да можете да каните потребители по имейл адрес или да бъдете поканени посредством вашия имейл адрес.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Може да използвате настройките за собствен сървър за да влезете в друг Matrix сървър, чрез указване на адреса му. Това Ви позволява да използвате Riot със съществуващ Matrix акаунт принадлежащ към друг сървър.",
+    "Sign In": "Вход",
+    "Create Account": "Създай акаунт",
+    "Need help?": "Нужда от помощ?",
+    "Explore rooms": "Открий стаи",
+    "Room Directory": "Директория със стаи"
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 441baa58b9..4c0f71c250 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -37,5 +37,10 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Die benutzerdefinierten Server-Einstellungen kannst du verwenden, um dich auf anderen Matrix-Servern anzumelden, indem du eine abweichende Heimserver-URL eingibst.<br/>Somit ist es möglich, Riot mit einem bereits bestehendem Matrix-Benutzerkonto auf einem anderen Heimserver zu verwenden.<br/><br/>Außerdem kannst du einen benutzerdefinierten Identitätsserver eingeben. Allerdings kannst du in diesem Fall Benutzer nicht mehr per E-Mail-Adresse einladen und auch selbst nicht mehr per E-Mail-Adresse eingeladen werden.",
     "Co-ordination for Riot translators": "Koordination für Riot-Übersetzer",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kannst die erweiterte Serveroption nutzen um dich an einem anderen Matrixserver anzumelden, indem du eine andere Heimserver-URL angibst. Dies erlaubt dir, Riot mit einem existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kannst auch einen anderen Identitätsserver setzen. Dieser hat einen anderen Wissensstand als der Standardserver, weswegen es beim Einladen oder Eingeladen werden mittels E-Mail-Adresse Probleme geben kann."
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kannst auch einen anderen Identitätsserver setzen. Dieser hat einen anderen Wissensstand als der Standardserver, weswegen es beim Einladen oder Eingeladen werden mittels E-Mail-Adresse Probleme geben kann.",
+    "Sign In": "Anmelden",
+    "Create Account": "Konto erstellen",
+    "Need help?": "Braucht du Hilfe?",
+    "Explore rooms": "Räume erkunden",
+    "Room Directory": "Raumverzeichnis"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index bd9edc8a95..7b42bd410a 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -35,5 +35,12 @@
     "Dev chat for the Dendrite dev team": "Dendrite garapen taldearen txata",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Badauden sareetara lotutako gela ugari daude Matrixen (Slack, IRC, Gitter eta abar), baita independienteak. Begiratu direktorioa!",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Zerbitzari pertsonalizatuaren aukerak erabili ditzakezu beste Matrix zerbitzarietan saioa hasteko, han beste hasiera-zerbitzari baten URLa sartuz.<br/>Horrela Riot aurretik duzun kontu batekin erabili dezakezu beste hasiera-zerbitzari batean.<br/><br/>Identitate-zerbitzari pertsonalizatu bat ezarri dezakezu ere, baina orduan ezin izango dituzu erabiltzaileak e-mail helbidea erabiliz gonbidatu, edo ezin izan izango zaituzte zu e-mail helbidea erabiliz gonbidatu.",
-    "Co-ordination for Riot translators": "Riot itzultzaileen koordinazioa"
+    "Co-ordination for Riot translators": "Riot itzultzaileen koordinazioa",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Zerbitzari pertsonalizatuaren aukera erabili dezakezu bestelako Matrix zerbitzari batera konektatzeko, bere URL-a adierazita. Honek Riot beste zerbitzari batean duzun Matrix kontuarekin erabiltzea ahalbidetzen dizu.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Identitate zerbitzari pertsonalizatu bat ere ezarri dezakezu, baina orduan ezin izango dituzu erabiltzaileak e-mail helbidearen bidez gonbidatu, edo ezin izango zaituzte e-mail helbidearen bidez zu gonbidatu.",
+    "Sign In": "Hasi saioa",
+    "Create Account": "Sortu kontua",
+    "Need help?": "Laguntza behar?",
+    "Explore rooms": "Arakatu gelak",
+    "Room Directory": "Gelen direktorioa"
 }
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index ad99f01fba..27222c8d0f 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -34,5 +34,12 @@
     "Contributing code to Matrix and Riot": "Osallistu kehitystyöhön",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s %(osName)s",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Salattua ja vikasietoista viestintää Matrix -teknologialla",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Voit käyttää edistyksellisiä asetuksia kirjautuaksesi muille Matrix palvelimille, määrittelemällä kotipalvelimen URL-osoitteen.<br/>Tämän avulla voit käyttää Riot:ia olemassa olevalla toisen Matrix palvelimen käyttäjätilillä.<br/><br/>Voit myös asettaa valinnaisen identiteettipalvelimen, mutta et voi kutsua käyttäjiä sähköpostiosoitteella tai tulla kutsutuksi.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Voit käyttää mukautettuja palvelinasetuksia kirjautuaksesi muihin Matrix-palvelimiin määrittämällä toisen kotipalvelimen osoitteen. Tämä mahdollistaa Riotin käyttämisen toisella palvelimella olevalla Matrix-tunnuksella.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Voit myös määrittää toisen identiteettipalvelimen, mutta et voi kutsua muita käyttäjiä sähköpostin perusteella, eivätkä se voi kutsua sinua.",
+    "Sign In": "Kirjaudu sisään",
+    "Create Account": "Luo tunnus",
+    "Need help?": "Tarvitsetko apua?",
+    "Explore rooms": "Etsi huoneita",
+    "Room Directory": "Huonehakemisto"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 653016b54d..b7401ea434 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -37,5 +37,10 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Vous pouvez utiliser les options de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en précisant un serveur d'accueil différent.<br/>Cela vous permet d'utiliser Riot avec un compte Matrix existant sur un autre serveur d'accueil.<br/><br/>Vous pouvez aussi renseigner un serveur d'identité personnalisé mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être invité avec votre adresse e-mail.",
     "Co-ordination for Riot translators": "Coordination des traducteurs de Riot",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Vous pouvez utiliser les options de serveur personnalisé pour vous connecter à d'autres serveurs Matrix en renseignant l'URL d'un autre serveur d'accueil. Cela vous permet d'utiliser Riot avec un compte Matrix existant sur un serveur d'accueil différent.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vous pouvez aussi renseigner un serveur d'identité personnalisé, mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être vous-même invité avec votre adresse e-mail."
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Vous pouvez aussi renseigner un serveur d'identité personnalisé, mais vous ne pourrez pas inviter d'utilisateurs avec leur adresse e-mail, ou être vous-même invité avec votre adresse e-mail.",
+    "Sign In": "Se connecter",
+    "Create Account": "Créer un compte",
+    "Need help?": "Besoin d'aide ?",
+    "Explore rooms": "Explorer les salons",
+    "Room Directory": "Répertoire de salons"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index aacc4947a6..3d58c10b4d 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -37,5 +37,10 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Bejelentkezhetsz más Matrix szerverre is az egyedi szerverbeállításoknál megadott Matrix szerver URL-jével.<br/>Így használhatod a Riotot egy már máshol meglévő Matrix fiókkal is.<br/><br/>Beállíthatsz egyéni identitásszervert is, de akkor nem tudsz más felhasználókat e-mail címmel meghívni, illetve ők sem tudnak téged.",
     "Co-ordination for Riot translators": "Koordináció Riot fordítók számára",
     "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Más azonosítási szervert is használhatsz, de akkor nem tudsz másokat e-mail cím alapján meghívni és téged sem fognak tudni.",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Használhatod az egyedi szerver beállítást más Matrix szerverre való belépéshez, azzal, hogy megadod a Matrix szerver URL-jét. Ezzel a Riot-ot használhatod más Matrix szerveren lévő fiókkal.",
+    "Sign In": "Bejelentkezés",
+    "Create Account": "Fiók készítés",
+    "Need help?": "Segíthetünk?",
+    "Explore rooms": "Szobák felfedezése",
+    "Room Directory": "Szoba lista"
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 1cf6a70278..5019066afd 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -25,5 +25,8 @@
     "Running Matrix services": "Kjør Matrix servicer",
     "Community-run support for Synapse": "Samfunnsholdt hjelpetjeneste for Synapse",
     "Admin support for Dendrite": "Administrator hjelp for Dendrite",
-    "Announcements about Synapse releases": "Kunngjøring om Synapse utgivelser"
+    "Announcements about Synapse releases": "Kunngjøring om Synapse utgivelser",
+    "Sign In": "Logg inn",
+    "Create Account": "Lag konto",
+    "Need help?": "Trenger du hjelp?"
 }
diff --git a/src/i18n/strings/nn.json b/src/i18n/strings/nn.json
index 0dc0f801af..a07747ba57 100644
--- a/src/i18n/strings/nn.json
+++ b/src/i18n/strings/nn.json
@@ -7,7 +7,7 @@
     "Dismiss": "Avvis",
     "powered by Matrix": "Matrixdriven",
     "Welcome to Riot.im": "Velkomen til Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; samarbeid driven av [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desentralisert, kryptert nettprat &amp; samarbeid drive av [matrix]",
     "Search the room directory": "Søk i romutvalet",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Det finst allereie massevis av rom på Matrix, anten lenkja til nettverk som allereie finst (Slack, IRC, Gitter osv.) eller uavhengige. Tak ein titt på utvalet!",
     "Chat with Riot Bot": "Nettprat med Riot Bot",
@@ -35,5 +35,12 @@
     "Dev chat for the Dendrite dev team": "Utviklar-prat for Dendrite-utviklargruppa",
     "Co-ordination for Riot translators": "Samordning for Riot-omsetjare",
     "Custom Server Options": "Eigentenar-innstillingar",
-    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med epost, eller å sjølv verta boden inn med epost."
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan bruka eigentenarinnstillingar til å logga inn på andre Matrixtenarar ved å oppgje ein annan Heimtenar-URL. <br/>Dette gjer at du kan bruka Riot med ein Matrixbrukar som allereie finst på ein annan heimtenar.<br/><br/>Du kan òg setja ein eigen identitetstenar men du kjem i so fall ikkje til å kunna byda brukare inn med epost, eller å sjølv verta boden inn med epost.",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Du kan nytta dei eigendefinerte tenarinstillingane for å logga inn på andre Matrix-tenarar ved å uppgje ein annan heimtenar-URL. Dette lèt deg bruka Riot med ein Matrix-konto som allereie finst på ein annan heimtenar.",
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Du kan òg velja ein eigendefinert identitetstenar, men då kjem du ikkje til å innvitere brukarar gjennom e-post, eller verta invitert med e-post sjølv.",
+    "Sign In": "Logg inn",
+    "Create Account": "Lag brukar",
+    "Need help?": "Treng du hjelp?",
+    "Explore rooms": "Vert kjend med romma",
+    "Room Directory": "Romutval"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index b182eeb894..85d9a5dd8a 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -35,5 +35,9 @@
     "Dev chat for the Dendrite dev team": "Czat deweloperów zespołu Dendrite",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix ma wiele, już działających pokoi, połączonych z istniejącymi sieciami, takimi jak Slack, IRC lub Gitter, a także wiele zupełnie niezależnych. Możesz przejrzeć je wszystkie w spisie pokoi!",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Możesz skorzystać z opcji niestandardowego serwera, aby zalogować się na inne serwery Matrix, podając inny adres URL serwera domowego.<br/>Pozwala to na używanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Możesz również ustawić niestandardowy serwer tożsamości, ale nie będziesz w stanie zapraszać użytkowników przez adres e-mail ani otrzymywać zaproszeń na adres e-mail.",
-    "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot"
+    "Co-ordination for Riot translators": "Koordynacja tłumaczy Riot",
+    "Create Account": "Stwórz konto",
+    "Sign In": "Zaloguj",
+    "Need help?": "Potrzebujesz pomocy?",
+    "Room Directory": "Katalog pokojów"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 34c9b32c5f..0e473bf6e2 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -37,5 +37,10 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "Вы можете войти на другой сервер Matrix, указав его URL-адрес.<br/>Это позволяет использовать Riot с учетной записью Matrix на другом сервере.<br/><br/>Кроме того, можно выбрать другой сервер идентификации, однако в таком случае вы не сможете приглашать пользователей или быть приглашенным по адресу электронной почты.",
     "Co-ordination for Riot translators": "Координационный чат для переводчиков Riot",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Вы можете изменить параметры для входа на другие Matrix серверы, указав другой URL.\nЭто позволит использовать Riot с учетной записью Matrix, существующей на другом сервере.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты."
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Также можно изменить сервер идентификации, но без возможности приглашать (или быть приглашённым) по адресу электронной почты.",
+    "Sign In": "Вход",
+    "Create Account": "Создать аккаунт",
+    "Need help?": "Помочь?",
+    "Room Directory": "Каталог комнат",
+    "Explore rooms": "Исследовать комнаты"
 }
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index 7555cc66c5..22862b5809 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -37,5 +37,10 @@
     "Dev chat for the Dendrite dev team": "Fjalosje mbi zhvillimi, për ekipin e zhvilluesve të Dendrite-it",
     "Co-ordination for Riot translators": "Bashkërendim për përkthyes të Riot-it",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "Mund të përdorni mundësitë mbi shërbyes vetjak, për të bërë hyrjen në shërbyes të tjerë Matrix, duke dhënë një tjetër URL shërbyesi Home. Kjo ju lejon ta përdorni këtë aplikacion në një tjetër shërbyes Home, me një llogari ekzistuese Matrix.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Mundeni edhe të caktoni një shërbyes vetjak identitetesh, por s’do të jeni në gjendje të ftoni përdorues përmes adresash email, ose të ftoheni ju vetë përmes adrese email."
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "Mundeni edhe të caktoni një shërbyes vetjak identitetesh, por s’do të jeni në gjendje të ftoni përdorues përmes adresash email, ose të ftoheni ju vetë përmes adrese email.",
+    "Sign In": "Hyni",
+    "Create Account": "Krijoni Llogari",
+    "Need help?": "Ju duhet ndihmë?",
+    "Explore rooms": "Eksploroni dhoma",
+    "Room Directory": "Listë Dhomash"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index d8528a5af2..0e65cb60ca 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -36,5 +36,10 @@
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix 中已有许多聊天室，连接到已有的网络（Slack、IRC 与 Gitter 等）或独立的网络，请查看目录！",
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "你可以修改主服务器 URL 以登录其他的 Matrix 服务器。<br/>这样，你就可以使用你在其他 Matrix 服务器上的账号。<br/><br/>你也可以修改身份认证服务器，但你可能因此无法使用电子邮件地址来邀请其他用户，或者被其他用户通过电子邮件邀请。",
     "Co-ordination for Riot translators": "Riot 翻译人员的合作讨论",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请或被邀请。"
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以自定义身份服务器，但是您将不能用电子邮箱地址邀请他人或被邀请。",
+    "Sign In": "登入",
+    "Create Account": "创建帐号",
+    "Need help?": "需要帮助？",
+    "Explore rooms": "探索房间",
+    "Room Directory": "房间目录"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index f5d75a7724..9e28f840ee 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -37,5 +37,10 @@
     "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "您可以使用自訂的伺服器選項，並指定不同的家伺服器 URL 來登入其他的 Matrix 伺服器。<br/>這讓您可以在不同的伺服器上以既有的 Matrix 帳號使用 Riot。<br/><br/>您也可以設定一個自訂的識別伺服器，但您可能無法透過電子郵件地址來邀請使用者，或是讓別人透過電子郵件邀請您。",
     "Co-ordination for Riot translators": "Riot 翻譯的協作",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "您可以以使用自訂伺服器選項指定不同的家伺服器 URL 以登入其他 Matrix 伺服器。這讓您可以在不同的家伺服器上使用既有的 Matrix 帳號登入 Riot。",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以設定自訂的身份識別伺服器，但您無法透過電子郵件地址邀請使用者，或是被邀請。"
+    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "您也可以設定自訂的身份識別伺服器，但您無法透過電子郵件地址邀請使用者，或是被邀請。",
+    "Sign In": "登入",
+    "Create Account": "建立帳號",
+    "Need help?": "需要協助？",
+    "Explore rooms": "探索聊天室",
+    "Room Directory": "聊天室目錄"
 }
diff --git a/src/vector/index.js b/src/vector/index.js
index af9ee7fd0c..6a70b76719 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -281,7 +281,7 @@ async function loadApp() {
 
     // as quickly as we possibly can, set a default theme...
     let a;
-    const theme = "dharma";//SettingsStore.getValue("theme");
+    const theme = SettingsStore.getValue("theme");
     for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
         const href = a.getAttribute("href");
         if (!href) continue;
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index b165e5d3c2..aa7fe58fa2 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -222,8 +222,7 @@ describe('loading:', function() {
             }).done(done, done);
         });
 
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('should follow the original link after successful login', function(done) {
+        it('should follow the original link after successful login', function(done) {
             loadApp({
                 uriFragment: "#/room/!room:id",
             });
@@ -258,10 +257,9 @@ describe('loading:', function() {
                 expect(localStorage.getItem('mx_hs_url')).toEqual(DEFAULT_HS_URL);
                 expect(localStorage.getItem('mx_is_url')).toEqual(DEFAULT_IS_URL);
             }).done(done, done);
-        }); */
+        });
 
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('should not register as a guest when using a #/login link', function() {
+        it('should not register as a guest when using a #/login link', function() {
             loadApp({
                 uriFragment: "#/login",
             });
@@ -288,7 +286,7 @@ describe('loading:', function() {
                     matrixChat, sdk.getComponent('structures.EmbeddedPage'));
                 expect(windowLocation.hash).toEqual("#/home");
             });
-        }); */
+        });
     });
 
     describe("MatrixClient rehydrated from stored credentials:", function() {
@@ -300,8 +298,7 @@ describe('loading:', function() {
             localStorage.setItem("mx_last_room_id", "!last_room:id");
         });
 
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('shows the last known room by default', function() {
+        it('shows the last known room by default', function() {
             httpBackend.when('GET', '/pushrules').respond(200, {});
             httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
@@ -357,7 +354,7 @@ describe('loading:', function() {
                 httpBackend.verifyNoOutstandingExpectation();
                 expect(windowLocation.hash).toEqual("#/room/!room:id");
             }).done(done, done);
-        }); */
+        });
 
         describe('/#/login link:', function() {
             beforeEach(function() {
@@ -387,8 +384,7 @@ describe('loading:', function() {
                 }
             });
 
-            // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-            /* it('shows the homepage after login', function() {
+            it('shows the homepage after login', function() {
                 return completeLogin(matrixChat).then(() => {
                     // we should see a home page, even though we previously had
                     // a stored mx_last_room_id
@@ -396,13 +392,12 @@ describe('loading:', function() {
                         matrixChat, sdk.getComponent('structures.EmbeddedPage'));
                     expect(windowLocation.hash).toEqual("#/home");
                 });
-            }); */
+            });
         });
     });
 
     describe('Guest auto-registration:', function() {
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('shows a welcome page by default', function(done) {
+        it('shows a welcome page by default', function(done) {
             loadApp();
 
             Promise.delay(1).then(() => {
@@ -430,10 +425,9 @@ describe('loading:', function() {
                     matrixChat, sdk.getComponent('auth.Welcome'));
                 expect(windowLocation.hash).toEqual("#/welcome");
             }).done(done, done);
-        }); */
+        });
 
-        // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-        /* it('uses the default homeserver to register with', function(done) {
+        it('uses the default homeserver to register with', function(done) {
             loadApp();
 
             Promise.delay(1).then(() => {
@@ -457,15 +451,15 @@ describe('loading:', function() {
             }).then((req) => {
                 expect(req.path).toStartWith(DEFAULT_HS_URL);
 
-                // once the sync completes, we should have a home page
+                // once the sync completes, we should have a welcome page
                 httpBackend.verifyNoOutstandingExpectation();
                 ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.EmbeddedPage'));
-                expect(windowLocation.hash).toEqual("#/home");
+                    matrixChat, sdk.getComponent('auth.Welcome'));
+                expect(windowLocation.hash).toEqual("#/welcome");
                 expect(MatrixClientPeg.get().baseUrl).toEqual(DEFAULT_HS_URL);
                 expect(MatrixClientPeg.get().idBaseUrl).toEqual(DEFAULT_IS_URL);
             }).done(done, done);
-        }); */
+        });
 
         it('shows a room view if we followed a room link', function(done) {
             loadApp({
@@ -534,15 +528,14 @@ describe('loading:', function() {
                 });
             });
 
-            // TODO: Repair this test in https://github.com/vector-im/riot-web/issues/8468
-            /* it('should give us a login page', function() {
+            it('should give us a login page', function() {
                 expect(windowLocation.hash).toEqual("#/login");
 
                 // we expect a single <Login> component
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.auth.Login'),
                 );
-            }); */
+            });
 
             /*
             // ILAG renders this obsolete. I think.
@@ -684,8 +677,6 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
 
     console.log(Date.now() + " Awaiting sync spinner: load complete.");
 
-    // state looks good, check the rendered output
-    assertAtSyncingSpinner(matrixChat);
     return Promise.resolve();
 }
 
diff --git a/webpack.config.js b/webpack.config.js
index d0711eaf40..aba990541b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,10 +16,8 @@ module.exports = {
         "mobileguide": "./src/vector/mobile_guide/index.js",
 
         // CSS themes
-        //"theme-light":  "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
-        //"theme-dark":   "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
-        "theme-dharma": "./node_modules/matrix-react-sdk/res/themes/dharma/css/dharma.scss",
-        //"theme-status": "./res/themes/status/css/status.scss",
+        "theme-light": "./node_modules/matrix-react-sdk/res/themes/light/css/light.scss",
+        "theme-dark": "./node_modules/matrix-react-sdk/res/themes/dark/css/dark.scss",
     },
     module: {
         rules: [