v0.9.1

Back to rc2 again & remove spurious chanelog
v0.9.1
2016-12-09 23:01:53 +00:00 · 2016-12-09 23:00:45 +00:00 · 2016-12-09 22:57:29 +00:00 · 2016-12-09 22:57:29 +00:00 · 2016-12-09 22:56:41 +00:00 · 2016-12-09 22:53:19 +00:00
169 changed files with 2002 additions and 4449 deletions
@@ -1,23 +0,0 @@
-#   Copyright 2017 Aviral Dasgupta
-#
-#   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.
-
-root = true
-
-[*]
-charset=utf-8
-end_of_line = lf
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
@@ -1,2 +0,0 @@
-src/vector/modernizr.js
-src/component-index.js
@@ -1,3 +0,0 @@
-module.exports = {
-    extends: ["./node_modules/matrix-react-sdk/.eslintrc.js"],
-}
@@ -1,44 +0,0 @@
-<!-- This is a bug report template. By following the instructions below and
-filling out the sections with your information, you will help the us to get all
-the necessary data to fix your issue.
-
-You can also preview your report before submitting it. You may remove sections
-that aren't relevant to your particular case.
-
-Text between <!-- and --> marks will be invisible in the report.
-->
-
-### Description
-
-Describe here the problem that you are experiencing, or the feature you are requesting.
-
-### Steps to reproduce
-
- For bugs, list the steps
- that reproduce the bug
- using hyphens as bullet points
-
-Describe how what happens differs from what you expected.
-
-Log: sent/not sent?    <!-- You can send us the app's logs via the 'Report bug'
-link on the 'Settings' page. Very important for hard-to-reproduce bugs. Please
-file a bug here too! -->
-
-<!-- Include screenshots if possible: you can drag and drop images below. -->
-
-### Version information
-
-<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
-
- **Platform**: web (in-browser) or desktop?
-
-For the web app:
-
- **Browser**: Chrome, Safari, Firefox? which version?
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **URL**: riot.im/develop / riot.im/app / somewhere else? If a private server, what version of riot-web?
-
-For the desktop app:
-
- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
- **Version**: 0.x.y <!-- check the user settings panel if unsure -->
@@ -3,5 +3,4 @@ node_js:
    - 6   # node v6, to match jenkins
 install:
    - npm install
-    - (cd node_modules/matrix-js-sdk && npm install)
-    - (cd node_modules/matrix-react-sdk && npm install)
+    - (cd node_modules/matrix-react-sdk && npm run build)
@@ -10,6 +10,3 @@ include:

 * Florent VIOLLEAU (https://github.com/floviolleau) <floviolleau at gmail dot com>
  Improve README.md for a better understanding of installation instructions
-
-* Michael Telatynski (https://github.com/t3chguy)
-  Improved consistency of inverted elements in dark theme across browsers
@@ -1,289 +1,3 @@
-Changes in [0.9.8](https://github.com/vector-im/riot-web/releases/tag/v0.9.8) (2017-04-12)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.3...v0.9.8)
-
- * No changes
-
-Changes in [0.9.8-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.3) (2017-04-11)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.2...v0.9.8-rc.3)
-
- * Make the clear cache button work on desktop
-   [\#3598](https://github.com/vector-im/riot-web/pull/3598)
-
-Changes in [0.9.8-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.2) (2017-04-10)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.8-rc.1...v0.9.8-rc.2)
-
- * Redacted events bg: black lozenge -> torn paper
-   [\#3596](https://github.com/vector-im/riot-web/pull/3596)
- * Add 'app' parameter to rageshake report
-   [\#3594](https://github.com/vector-im/riot-web/pull/3594)
-
-Changes in [0.9.8-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.8-rc.1) (2017-04-07)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7...v0.9.8-rc.1)
-
- * Add support for indexeddb sync in webworker
-   [\#3578](https://github.com/vector-im/riot-web/pull/3578)
- * Add CSS to make Emote sender cursor : pointer
-   [\#3574](https://github.com/vector-im/riot-web/pull/3574)
- * Remove rageshake server
-   [\#3565](https://github.com/vector-im/riot-web/pull/3565)
- * Adjust CSS for matrix-org/matrix-react-sdk#789
-   [\#3566](https://github.com/vector-im/riot-web/pull/3566)
- * Fix tests to reflect recent changes
-   [\#3537](https://github.com/vector-im/riot-web/pull/3537)
- * Do not assume getTs will return comparable integer
-   [\#3536](https://github.com/vector-im/riot-web/pull/3536)
- * Rename ReactPerf to Perf
-   [\#3535](https://github.com/vector-im/riot-web/pull/3535)
- * Don't show phone number as target for email notifs
-   [\#3530](https://github.com/vector-im/riot-web/pull/3530)
- * Fix people section again
-   [\#3458](https://github.com/vector-im/riot-web/pull/3458)
- * dark theme invert inconsistent across browsers
-   [\#3479](https://github.com/vector-im/riot-web/pull/3479)
- * CSS for adding phone number in UserSettings
-   [\#3451](https://github.com/vector-im/riot-web/pull/3451)
- * Support for phone number registration/signin, mk2
-   [\#3426](https://github.com/vector-im/riot-web/pull/3426)
- * Confirm redactions with a dialog
-   [\#3470](https://github.com/vector-im/riot-web/pull/3470)
- * Better CSS for redactions
-   [\#3453](https://github.com/vector-im/riot-web/pull/3453)
- * Fix the people section
-   [\#3448](https://github.com/vector-im/riot-web/pull/3448)
- * Merge the two RoomTile context menus into one
-   [\#3395](https://github.com/vector-im/riot-web/pull/3395)
- * Refactor screen set after login
-   [\#3385](https://github.com/vector-im/riot-web/pull/3385)
- * CSS for redacted EventTiles
-   [\#3379](https://github.com/vector-im/riot-web/pull/3379)
- * Height:100% for welcome pages on Safari
-   [\#3340](https://github.com/vector-im/riot-web/pull/3340)
- * `view_room` dispatch from `onClick` RoomTile
-   [\#3376](https://github.com/vector-im/riot-web/pull/3376)
- * Hide statusAreaBox_line entirely when inCall
-   [\#3350](https://github.com/vector-im/riot-web/pull/3350)
- * Set padding-bottom: 0px for .mx_Dialog spinner
-   [\#3351](https://github.com/vector-im/riot-web/pull/3351)
- * Support InteractiveAuth based registration
-   [\#3333](https://github.com/vector-im/riot-web/pull/3333)
- * Expose notification option for username/MXID
-   [\#3334](https://github.com/vector-im/riot-web/pull/3334)
- * Float the toggle in the top right of MELS
-   [\#3190](https://github.com/vector-im/riot-web/pull/3190)
- * More aggressive rageshake log culling
-   [\#3311](https://github.com/vector-im/riot-web/pull/3311)
- * Don't overflow directory network options
-   [\#3282](https://github.com/vector-im/riot-web/pull/3282)
- * CSS for ban / kick reason prompt
-   [\#3250](https://github.com/vector-im/riot-web/pull/3250)
- * Allow forgetting rooms you're banned from
-   [\#3246](https://github.com/vector-im/riot-web/pull/3246)
- * Fix icon paths in manifest
-   [\#3245](https://github.com/vector-im/riot-web/pull/3245)
- * Fix broken tests caused by adding IndexedDB support
-   [\#3242](https://github.com/vector-im/riot-web/pull/3242)
- * CSS for un-ban button in RoomSettings
-   [\#3227](https://github.com/vector-im/riot-web/pull/3227)
- * Remove z-index property on avatar initials
-   [\#3239](https://github.com/vector-im/riot-web/pull/3239)
- * Reposition certain icons in the status bar
-   [\#3233](https://github.com/vector-im/riot-web/pull/3233)
- * CSS for kick/ban confirmation dialog
-   [\#3224](https://github.com/vector-im/riot-web/pull/3224)
- * Style for split-out interactive auth
-   [\#3217](https://github.com/vector-im/riot-web/pull/3217)
- * Use the teamToken threaded through from react sdk
-   [\#3196](https://github.com/vector-im/riot-web/pull/3196)
- * rageshake: Add file server with basic auth
-   [\#3169](https://github.com/vector-im/riot-web/pull/3169)
- * Fix bug with home icon not appearing when logged in as team member
-   [\#3162](https://github.com/vector-im/riot-web/pull/3162)
- * Add ISSUE_TEMPLATE
-   [\#2836](https://github.com/vector-im/riot-web/pull/2836)
- * Store bug reports in separate directories
-   [\#3150](https://github.com/vector-im/riot-web/pull/3150)
- * Quick and dirty support for custom welcome pages.
-   [\#2575](https://github.com/vector-im/riot-web/pull/2575)
- * RTS Welcome Pages
-   [\#3103](https://github.com/vector-im/riot-web/pull/3103)
- * rageshake: Abide by Go standards
-   [\#3149](https://github.com/vector-im/riot-web/pull/3149)
- * Bug report server script
-   [\#3072](https://github.com/vector-im/riot-web/pull/3072)
- * Bump olm version
-   [\#3125](https://github.com/vector-im/riot-web/pull/3125)
-
-Changes in [0.9.7](https://github.com/vector-im/riot-web/releases/tag/v0.9.7) (2017-02-04)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.3...v0.9.7)
-
- * Update to matrix-js-sdk 0.7.5 (no changes from 0.7.5-rc.3)
- * Update to matrix-react-sdk 0.8.6 (no changes from 0.8.6-rc.3)
-
-Changes in [0.9.7-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.3) (2017-02-03)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.2...v0.9.7-rc.3)
- * Update to latest Olm to fix key import/export and use of megolm sessions
-   created on more recent versions
- * Update to latest matrix-react-sdk and matrix-js-sdk to fix e2e device
-   handling
-
-Changes in [0.9.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.2) (2017-02-03)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.7-rc.1...v0.9.7-rc.2)
-
- * Update matrix-js-sdk to get new device change
-   notifications interface for more reliable e2e crypto
-
-Changes in [0.9.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.7-rc.1) (2017-02-03)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.6...v0.9.7-rc.1)
-
- * Better user interface for screen readers and keyboard navigation
-   [\#2946](https://github.com/vector-im/riot-web/pull/2946)
- * Allow mxc: URLs for icons in the NetworkDropdown
-   [\#3118](https://github.com/vector-im/riot-web/pull/3118)
- * make TopRightMenu more intuitive
-   [\#3117](https://github.com/vector-im/riot-web/pull/3117)
- * Handle icons with width > height
-   [\#3110](https://github.com/vector-im/riot-web/pull/3110)
- * Fix jenkins build
-   [\#3105](https://github.com/vector-im/riot-web/pull/3105)
- * Add CSS for a support box in login
-   [\#3081](https://github.com/vector-im/riot-web/pull/3081)
- * Allow a custom login logo to be displayed on login
-   [\#3082](https://github.com/vector-im/riot-web/pull/3082)
- * Fix the width of input fields within login/reg box
-   [\#3080](https://github.com/vector-im/riot-web/pull/3080)
- * Set BaseAvatar_image bg colour = #fff
-   [\#3057](https://github.com/vector-im/riot-web/pull/3057)
- * only recalculate favicon if it changes
-   [\#3067](https://github.com/vector-im/riot-web/pull/3067)
- * CSS tweak for email address lookup
-   [\#3064](https://github.com/vector-im/riot-web/pull/3064)
- * Glue the dialog to rageshake: honour sendLogs flag.
-   [\#3061](https://github.com/vector-im/riot-web/pull/3061)
- * Don't use hash-named directory for dev server
-   [\#3049](https://github.com/vector-im/riot-web/pull/3049)
- * Implement bug reporting logic
-   [\#3000](https://github.com/vector-im/riot-web/pull/3000)
- * Add css for bug report dialog
-   [\#3045](https://github.com/vector-im/riot-web/pull/3045)
- * Increase the max-height of the expanded status bar
-   [\#3043](https://github.com/vector-im/riot-web/pull/3043)
- * Hopefully, fix intermittent test failure
-   [\#3040](https://github.com/vector-im/riot-web/pull/3040)
- * CSS for 'searching known users'
-   [\#2971](https://github.com/vector-im/riot-web/pull/2971)
- * Animate status bar max-height and margin-top
-   [\#2981](https://github.com/vector-im/riot-web/pull/2981)
- * Add eslint config
-   [\#3032](https://github.com/vector-im/riot-web/pull/3032)
- * Re-position typing avatars relative to "is typing"
-   [\#3030](https://github.com/vector-im/riot-web/pull/3030)
- * CSS for avatars that appear when users are typing
-   [\#2998](https://github.com/vector-im/riot-web/pull/2998)
- * Add StartupWMClass
-   [\#3001](https://github.com/vector-im/riot-web/pull/3001)
- * Fix link to image for event options menu
-   [\#3002](https://github.com/vector-im/riot-web/pull/3002)
- * Make riot desktop single instance
-   [\#2999](https://github.com/vector-im/riot-web/pull/2999)
- * Add electron tray icon
-   [\#2997](https://github.com/vector-im/riot-web/pull/2997)
- * Fixes to electron desktop notifs
-   [\#2994](https://github.com/vector-im/riot-web/pull/2994)
- * Auto-hide the electron menu bar
-   [\#2975](https://github.com/vector-im/riot-web/pull/2975)
- * A couple of tweaks to the karma config
-   [\#2987](https://github.com/vector-im/riot-web/pull/2987)
- * Deploy script
-   [\#2974](https://github.com/vector-im/riot-web/pull/2974)
- * Use the postcss-webpack-loader
-   [\#2990](https://github.com/vector-im/riot-web/pull/2990)
- * Switch CSS to using postcss, and implement a dark theme.
-   [\#2973](https://github.com/vector-im/riot-web/pull/2973)
- * Update redeploy script to keep old bundles
-   [\#2969](https://github.com/vector-im/riot-web/pull/2969)
- * Include current version in update check explicitly
-   [\#2967](https://github.com/vector-im/riot-web/pull/2967)
- * Add another layer of directory to webpack chunks
-   [\#2966](https://github.com/vector-im/riot-web/pull/2966)
- * Fix links to fonts and images from CSS
-   [\#2965](https://github.com/vector-im/riot-web/pull/2965)
- * Put parent build hash in webpack output filenames
-   [\#2961](https://github.com/vector-im/riot-web/pull/2961)
- * update README to point to new names/locations
-   [\#2846](https://github.com/vector-im/riot-web/pull/2846)
-
-Changes in [0.9.6](https://github.com/vector-im/riot-web/releases/tag/v0.9.6) (2017-01-16)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.6-rc.1...v0.9.6)
-
- * Update to matrix-js-sdk 0.9.6 for video calling fix
-
-Changes in [0.9.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.6-rc.1) (2017-01-13)
-====================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.5...v0.9.6-rc.1)
-
- * Build the js-sdk in the CI script
-   [\#2920](https://github.com/vector-im/riot-web/pull/2920)
- * Hopefully fix Windows shortcuts
-   [\#2917](https://github.com/vector-im/riot-web/pull/2917)
- * Update README now the js-sdk has a transpile step
-   [\#2921](https://github.com/vector-im/riot-web/pull/2921)
- * Use the role for 'toggle dev tools'
-   [\#2915](https://github.com/vector-im/riot-web/pull/2915)
- * Enable screen sharing easter-egg in desktop app
-   [\#2909](https://github.com/vector-im/riot-web/pull/2909)
- * make electron send email validation URLs with a nextlink of riot.im
-   [\#2808](https://github.com/vector-im/riot-web/pull/2808)
- * add Debian Stretch install steps to readme
-   [\#2809](https://github.com/vector-im/riot-web/pull/2809)
- * Update desktop build instructions fixes #2792
-   [\#2793](https://github.com/vector-im/riot-web/pull/2793)
- * CSS for the delete threepid button
-   [\#2784](https://github.com/vector-im/riot-web/pull/2784)
-
-Changes in [0.9.5](https://github.com/vector-im/riot-web/releases/tag/v0.9.5) (2016-12-24)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.4...v0.9.5)
-
- * make electron send email validation URLs with a nextlink of riot.im rather than file:///
- * add gnu-tar to debian electron build deps
- * fix win32 shortcut in start menu
-
-Changes in [0.9.4](https://github.com/vector-im/riot-web/releases/tag/v0.9.4) (2016-12-22)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.3...v0.9.4)
-
- * Update to libolm 2.1.0. This should help resolve a problem with browser
-   sessions being logged out ([\#2726](https://github.com/vector-im/riot-web/issues/2726)).
-
-Changes in [0.9.3](https://github.com/vector-im/riot-web/releases/tag/v0.9.3) (2016-12-22)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.2...v0.9.3)
-
- * (from matrix-react-sdk) Fix regression where the date separator would be displayed
-   at the wrong time of day.
- * README.md: fix GFMD for nativefier
-   [\#2755](https://github.com/vector-im/riot-web/pull/2755)
-
-Changes in [0.9.2](https://github.com/vector-im/riot-web/releases/tag/v0.9.2) (2016-12-16)
-==========================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.1...v0.9.2)
-
- * Remove the client side filtering from the room dir
-   [\#2750](https://github.com/vector-im/riot-web/pull/2750)
- * Configure olm memory size
-   [\#2745](https://github.com/vector-im/riot-web/pull/2745)
- * Support room dir 3rd party network filtering
-   [\#2747](https://github.com/vector-im/riot-web/pull/2747)
-
 Changes in [0.9.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.1) (2016-12-09)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.1-rc.2...v0.9.1)
@@ -384,7 +98,7 @@ Changes in [0.9.0](https://github.com/vector-im/vector-web/releases/tag/v0.9.0)
 * Implement Platforms
   [\#2531](https://github.com/vector-im/vector-web/pull/2531)

-Changes in [0.8.4](https://github.com/vector-im/vector-web/releases/tag/v0.8.4) (2016-11-04)
+hanges in [0.8.4](https://github.com/vector-im/vector-web/releases/tag/v0.8.4) (2016-11-04)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/vector-web/compare/v0.8.4-rc.2...v0.8.4)

@@ -1,4 +1,4 @@
-Contributing code to Riot
-=========================
+Contributing code to Vector
+===========================

-Riot follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst.
+Vector follows the same pattern as https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst
@@ -14,28 +14,17 @@ 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. Download the latest version from https://github.com/vector-im/vector-web/releases
 1. Untar the tarball on your web server
 1. Move (or symlink) the vector-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-master.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
 over https.

-### Installation Steps for Debian Stretch
-1. Add the repository to your sources.list using either of the following two options:
-  - Directly to sources.list: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee -a /etc/apt/sources.list`
-  - As a separate entry in sources.list.d: `echo "deb https://riot.im/packages/debian/ stretch main" | sudo tee /etc/apt/sources.list.d/riot.list`
-2. Add the gpg signing key for the riot repository: `curl -s https://riot.im/packages/debian/repo-key.asc | sudo apt-key add -`
-3. Update your package lists: `sudo apt-get update`
-4. Install Riot: `sudo apt-get install riot-web`
-
 Important Security Note
 =======================

@@ -47,7 +36,7 @@ access to Riot (or other apps) due to sharing the same domain.

 We have put some coarse mitigations into place to try to protect against this
 situation, but it's still not good practice to do it in the first place.  See
-https://github.com/vector-im/riot-web/issues/1977 for more details.
+https://github.com/vector-im/vector-web/issues/1977 for more details.

 Building From Source
 ====================
@@ -56,29 +45,13 @@ Riot is a modular webapp built with modern ES6 and requires a npm build system
 to build.

 1. Install or update `node.js` so that your `npm` is at least at version `2.0.0`
-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. Clone the repo: `git clone https://github.com/vector-im/vector-web.git`
+1. Switch to the vector-web directory: `cd vector-web`
 1. Install the prerequisites: `npm install`
 1. If you are using the `develop` branch of vector-web, you will probably need
-   to rebuild some of the dependencies, due to
-   https://github.com/npm/npm/issues/3055:
-
-   ```
-   (cd node_modules/matrix-js-sdk && npm install)
-   (cd node_modules/matrix-react-sdk && npm install)
-   ```
-   Whenever you git pull on riot-web you will also probably need to force an update
-   to these dependencies - the easiest way is probably:
-   ```
-   rm -rf node_modules/matrjx-{js,react}-sdk && npm i
-   (cd node_modules/matrix-js-sdk && npm install)
-   (cd node_modules/matrix-react-sdk && npm install)
-   ```
-   However, we recommend setting up a proper development environment (see "Setting
-   up a development environment" below) if you want to run your own copy of the
-   `develop` branch, as it makes it much easier to keep these dependencies
-   up-to-date.  Or just use https://riot.im/develop - the continuous integration
-   release of the develop branch.
+   to rebuild one of the dependencies, due to
+   https://github.com/npm/npm/issues/3055: `(cd node_modules/matrix-react-sdk
+   && 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
@@ -108,12 +81,35 @@ You can configure the app by copying `config.sample.json` to
   and https://vector.im.  In future identity servers will be decentralised.
 1. `integrations_ui_url`: URL to the web interface for the integrations server.
 1. `integrations_rest_url`: URL to the REST interface for the integrations server.
-1. `roomDirectory`: config for the public room directory. This section is optional.
+1. `roomDirectory`: config for the public room directory. This section encodes behaviour
+   on the room directory screen for filtering the list by server / network type and joining
+   third party networks. This config section will disappear once APIs are available to
+   get this information for home servers. This section is optional.
 1. `roomDirectory.servers`: List of other Home Servers' directories to include in the drop
   down list. Optional.
+1. `roomDirectory.serverConfig`: Config for each server in `roomDirectory.servers`. Optional.
+1. `roomDirectory.serverConfig.<server_name>.networks`: List of networks (named
+   in `roomDirectory.networks`) to include for this server. Optional.
+1. `roomDirectory.networks`: config for each network type. Optional.
+1. `roomDirectory.<network_type>.name`: Human-readable name for the network. Required.
+1. `roomDirectory.<network_type>.protocol`: Protocol as given by the server in
+   `/_matrix/client/unstable/thirdparty/protocols` response. Required to be able to join
+   this type of third party network.
+1. `roomDirectory.<network_type>.domain`: Domain as given by the server in
+   `/_matrix/client/unstable/thirdparty/protocols` response, if present. Required to be
+   able to join this type of third party network, if present in `thirdparty/protocols`.
+1. `roomDirectory.<network_type>.portalRoomPattern`: Regular expression matching aliases
+   for portal rooms to locations on this network. Required.
+1. `roomDirectory.<network_type>.icon`: URL to an icon to be displayed for this network. Required.
+1. `roomDirectory.<network_type>.example`: Textual example of a location on this network,
+   eg. '#channel' for an IRC network. Optional.
+1. `roomDirectory.<network_type>.nativePattern`: Regular expression that matches a
+   valid location on this network. This is used as a hint to the user to indicate
+   when a valid location has been entered so it's not necessary for this to be
+   exactly correct. Optional.
 1. `update_base_url` (electron app only): HTTPS URL to a web server to download
-   updates from. This should be the path to the directory containing `macos`
-   and `win32` (for update packages, not installer packages).
+   updates from. This should be the path to the directory containing `install`
+   and `update`.
 1. `cross_origin_renderer_url`: URL to a static HTML page hosting code to help display
   encrypted file attachments. This MUST be hosted on a completely separate domain to
   anything else since it is used to isolate the privileges of file attachments to this
@@ -124,19 +120,15 @@ Running as a Desktop app
 ========================

 Riot can also be run as a desktop app, wrapped in electron. You can download a
-pre-built version from https://riot.im/desktop.html or, if you prefer,
+pre-built version from https://riot.im/download/desktop/ or, if you prefer,
 built it yourself.

 To run as a desktop app:
-
-1. Follow the instructions in 'Building From Source' above, but run
-   `npm run build` instead of `npm run dist` (since we don't need the tarball).
-2. Install electron and run it:
-
-   ```
-   npm install electron
-   node_modules/.bin/electron .
-   ```
+```
+npm install
+npm install electron
+node_modules/.bin/electron .
+```

 To build packages, use electron-builder. This is configured to output:
 * dmg + zip for macOS
@@ -152,16 +144,17 @@ The only platform that can build packages for all three platforms is macOS:
 ```
 brew install wine --without-x11
 brew install mono
-brew install gnu-tar
 npm install
 npm run build:electron
 ```

 For other packages, use electron-builder manually. For example, to build a package
 for 64 bit Linux:
-
- 1. Follow the instructions in 'Building From Source' above
- 2. `node_modules/.bin/build -l --x64`
+```
+npm install
+npm run build
+node_modules/.bin/build -l --x64
+```

 All electron packages go into `electron/dist/`

@@ -170,11 +163,10 @@ Many thanks to @aviraldg for the initial work on the electron integration.
 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)
-
-```
-sudo npm install nativefier -g
-nativefier https://riot.im/app/
-```
+   ```
+   sudo npm install nativefier -g
+   nativefier https://riot.im/app/
+   ```

 Development
 ===========
@@ -195,13 +187,13 @@ the `component-index.js` for the app (used in future for skinning)
 development on Riot forcing `matrix-react-sdk` to move fast at the expense of
 maintaining a clear abstraction between the two.**  Hacking on Riot inevitably
 means hacking equally on `matrix-react-sdk`, and there are bits of
-`matrix-react-sdk` behaviour incorrectly residing in the `riot-web` project
+`matrix-react-sdk` behaviour incorrectly residing in the `vector-web` project
 (e.g. matrix-react-sdk specific CSS), and a bunch of Riot specific behaviour
 in the `matrix-react-sdk` (grep for `vector` / `riot`).  This separation problem will be
 solved asap once development on Riot (and thus matrix-react-sdk) has
 stabilised.  Until then, the two projects should basically be considered as a
 single unit.  In particular, `matrix-react-sdk` issues are currently filed
-against `riot-web` in github.
+against `vector-web` in github.

 Please note that Riot is intended to run correctly without access to the public
 internet.  So please don't depend on resources (JS libs, CSS, images, fonts)
@@ -236,8 +228,8 @@ Then similarly with `matrix-react-sdk`:

 Finally, build and start Riot itself:

-1. `git clone git@github.com:vector-im/riot-web.git`
-1. `cd riot-web`
+1. `git clone git@github.com:vector-im/vector-web.git`
+1. `cd vector-web`
 1. `git checkout develop`
 1. `npm install`
 1. `rm -r node_modules/matrix-js-sdk; ln -s ../../matrix-js-sdk node_modules/`
@@ -261,10 +253,10 @@ Finally, build and start Riot itself:
   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.

-When you make changes to `matrix-react-sdk` or `matrix-js-sdk`, you will need
-to run `npm run build` in the relevant directory. You can do this automatically
-by instead running `npm start` in the directory, to start a development builder
-which will watch for changes to the files and rebuild automatically.
+When you make changes to `matrix-react-sdk`, you will need to run `npm run
+build` in the relevant directory. You can do this automatically by instead
+running `npm start` in the directory, to start a development builder which
+will watch for changes to the files and rebuild automatically.

 If you add or remove any components from the Riot skin, you will need to rebuild
 the skin's index by running, `npm run reskindex`.
@@ -279,28 +271,21 @@ Triaging issues
 Issues will be triaged by the core team using the following primary set of tags:

 priority:
-
-* P1: top priority; typically blocks releases
-* P2: still need to fix, but lower than P1
-* P3: non-urgent
-* P4: intereseting idea - bluesky some day
-* P5: recorded for posterity/to avoid duplicates. No intention to resolves right now.
+    P1: top priority; typically blocks releases.
+    P2: one below that
+    P3: non-urgent
+    P4/P5: bluesky some day, who knows.

 bug or feature:
+  bug severity:
+     * cosmetic - feature works functionally but UI/UX is broken.
+     * critical - whole app doesn't work
+     * major - entire feature doesn't work
+     * minor - partially broken feature (but still usable)

-* bug
-* feature
+     * release blocker

-bug severity:
-  
-* cosmetic - feature works functionally but UI/UX is broken
-* critical - whole app doesn't work
-* major - entire feature doesn't work
-* minor - partially broken feature (but still usable)
+     * ui/ux (think of this as cosmetic)

-additional categories:
-
-* release blocker
-* ui/ux (think of this as cosmetic)
-* network (specific to network conditions)
-* platform (platform specific)
+     * network (specific to network conditions)
+     * platform (platform specific)
@@ -4,11 +4,68 @@
    "brand": "Riot",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
-    "bug_report_endpoint_url": "https://vector.im/bugs",
    "enableLabs": true,
    "roomDirectory": {
        "servers": [
            "matrix.org"
-        ]
+        ],
+        "serverConfig": {
+            "matrix.org": {
+                "networks": [
+                    "_matrix",
+                    "gitter",
+                    "irc:freenode",
+                    "irc:mozilla",
+                    "irc:snoonet",
+                    "irc:oftc"
+                ]
+            }
+        },
+        "networks": {
+            "gitter": {
+                "protocol": "gitter",
+                "portalRoomPattern": "#gitter_.*:matrix.org",
+                "name": "Gitter",
+                "icon": "//gitter.im/favicon.ico",
+                "example": "org/community",
+                "nativePattern": "[^\\s]+/[^\\s]+$"
+            },
+            "irc:freenode": {
+                "protocol": "irc",
+                "domain": "chat.freenode.net",
+                "portalRoomPattern": "#freenode_.*:matrix.org",
+                "name": "Freenode",
+                "icon": "//matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:mozilla": {
+                "protocol": "irc",
+                "domain": "irc.mozilla.org",
+                "portalRoomPattern": "#mozilla_.*:matrix.org",
+                "name": "Mozilla",
+                "icon": "//matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:snoonet": {
+                "protocol": "irc",
+                "domain": "ipv6-irc.snoonet.org",
+                "portalRoomPattern": "#_snoonet_.*:matrix.org",
+                "name": "Snoonet",
+                "icon": "//matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:oftc": {
+                "protocol": "irc",
+                "domain": "irc.oftc.net",
+                "portalRoomPattern": "#_oftc_.*:matrix.org",
+                "name": "OFTC",
+                "icon": "//matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            }
+        }
    }
 }
@@ -1,25 +0,0 @@
-Theming Riot
-============
-
-Themes are a very basic way of providing simple alternative look & feels to the
-riot-web app via CSS & custom imagery.
-
-They are *NOT* co be confused with 'skins', which describe apps which sit on top
-of matrix-react-sdk - e.g. in theory Riot itself is a react-sdk skin.
-As of Jan 2017, skins are not fully supported; riot is the only available skin.
-
-To define a theme for Riot:
-
- 1. Pick a name, e.g. `teal`. at time of writing we have `light` and `dark`.
- 2. Fork `src/skins/vector/css/themes/dark.scss` to be teal.scss
- 3. Fork `src/skins/vector/css/themes/_base.scss` to be _teal.scss
- 4. Override variables in _teal.scss as desired. You may wish to delete ones
-    which don't differ from _base.scss, to make it clear which are being
-    overridden. If every single colour is being changed (as per _dark.scss)
-    then you might as well keep them all.
- 5. Add the theme to the list of entrypoints in webpack.config.js
- 6. Add the theme to the list of themes in matrix-react-sdk's UserSettings.js
- 7. Sit back and admire your handywork.
-
-In future, the assets for a theme will probably be gathered together into a
-single directory tree.
@@ -1,11 +1,10 @@
 {
-    "update_base_url": "https://riot.im/download/desktop/update/",
+    "update_base_url": "https://riot.im/download/desktop/",
    "default_hs_url": "https://matrix.org",
    "default_is_url": "https://vector.im",
    "brand": "Riot",
    "integrations_ui_url": "https://scalar.vector.im/",
    "integrations_rest_url": "https://scalar.vector.im/api",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
    "enableLabs": true,
    "roomDirectory": {
        "servers": [
@@ -26,8 +26,6 @@ if (check_squirrel_hooks()) return;
 const electron = require('electron');
 const url = require('url');

-const tray = require('./tray');
-
 const VectorMenu = require('./vectormenu');

 let vectorConfig = {};
@@ -114,16 +112,7 @@ function startAutoUpdate(update_base_url) {
        // 204 No Content. On windows it takes a base path and looks for
        // files under that path.
        if (process.platform == 'darwin') {
-            // include the current version in the URL we hit. Electron doesn't add
-            // it anywhere (apart from the User-Agent) so it's up to us. We could
-            // (and previously did) just use the User-Agent, but this doesn't
-            // rely on NSURLConnection setting the User-Agent to what we expect,
-            // and also acts as a convenient cache-buster to ensure that when the
-            // app updates it always gets a fresh value to avoid update-looping.
-            electron.autoUpdater.setFeedURL(
-                update_base_url +
-                'macos/?localVersion=' + encodeURIComponent(electron.app.getVersion())
-            );
+            electron.autoUpdater.setFeedURL(update_base_url + 'macos/');
        } else if (process.platform == 'win32') {
            electron.autoUpdater.setFeedURL(update_base_url + 'win32/' + process.arch + '/');
        } else {
@@ -159,21 +148,6 @@ process.on('uncaughtException', function (error) {

 electron.ipcMain.on('install_update', installUpdate);

-electron.app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
-
-const shouldQuit = electron.app.makeSingleInstance((commandLine, workingDirectory) => {
-    // Someone tried to run a second instance, we should focus our window.
-    if (mainWindow) {
-        if (!mainWindow.isVisible()) mainWindow.show();
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-    }
-});
-
-if (shouldQuit) {
-    electron.app.quit()
-}
-
 electron.app.on('ready', () => {
    if (vectorConfig.update_base_url) {
        console.log("Starting auto update with base URL: " + vectorConfig.update_base_url);
@@ -190,17 +164,10 @@ electron.app.on('ready', () => {
        icon: icon_path,
        width: 1024, height: 768,
        show: false,
-        autoHideMenuBar: true,
    });
    mainWindow.loadURL(`file://${__dirname}/../../webapp/index.html`);
    electron.Menu.setApplicationMenu(VectorMenu);

-    // Create trayIcon icon
-    tray.create(mainWindow, {
-        icon_path: icon_path,
-        brand: vectorConfig.brand || 'Riot'
-    });
-
    mainWindow.once('ready-to-show', () => {
        mainWindow.show();
    });
@@ -208,7 +175,7 @@ electron.app.on('ready', () => {
        mainWindow = null;
    });
    mainWindow.on('close', (e) => {
-        if (!appQuitting && (tray.hasTray() || process.platform == 'darwin')) {
+        if (process.platform == 'darwin' && !appQuitting) {
            // On Mac, closing the window just hides it
            // (this is generally how single-window Mac apps
            // behave, eg. Mail.app)
@@ -1,30 +1,9 @@
-/*
-Copyright 2017 OpenMarket 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.
-*/
-
 const path = require('path');
 const spawn = require('child_process').spawn;
 const app = require('electron').app;

 function run_update_exe(args, done) {
-    // Invokes Squirrel's Update.exe which will do things for us like create shortcuts
-    // Note that there's an Update.exe in the app-x.x.x directory and one in the parent
-    // directory: we need to run the one in the parent directory, because it discovers
-    // information about the app by inspecting the directory it's run from.
    const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe');
-    console.log('Spawning `%s` with args `%s`', updateExe, args);
    spawn(updateExe, args, {
      detached: true
    }).on('close', done);
@@ -1,67 +0,0 @@
-/*
-Copyright 2017 Karl Glatz <karl@glatz.biz>
-Copyright 2017 OpenMarket 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.
-*/
-
-const path = require('path');
-const electron = require('electron');
-
-const app = electron.app;
-const Tray = electron.Tray;
-const MenuItem = electron.MenuItem;
-
-let trayIcon = null;
-
-exports.hasTray = function hasTray() {
-    return (trayIcon !== null);
-}
-
-exports.create = function (win, config) {
-    // no trays on darwin
-    if (process.platform === 'darwin' || trayIcon) {
-        return;
-    }
-
-    const toggleWin = function () {
-        if (win.isVisible() && !win.isMinimized()) {
-            win.hide();
-        } else {
-            if (win.isMinimized()) win.restore();
-            if (!win.isVisible()) win.show();
-            win.focus();
-        }
-    };
-
-    const contextMenu = electron.Menu.buildFromTemplate([
-        {
-            label: 'Show/Hide ' + config.brand,
-            click: toggleWin
-        },
-        {
-            type: 'separator'
-        },
-        {
-            label: 'Quit',
-            click: function () {
-                app.quit();
-            }
-        }
-    ]);
-
-    trayIcon = new Tray(config.icon_path);
-    trayIcon.setToolTip(config.brand);
-    trayIcon.setContextMenu(contextMenu);
-    trayIcon.on('click', toggleWin);
-};
@@ -72,7 +72,11 @@ const template = [
                role: 'togglefullscreen'
            },
            {
-                role: 'toggledevtools'
+                label: 'Toggle Developer Tools',
+                accelerator: process.platform == 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+                click: function(item, focusedWindow) {
+                    if (focusedWindow) focusedWindow.toggleDevTools();
+                }
            }
        ]
    },
@@ -2,14 +2,13 @@

 var path = require('path');
 var webpack = require('webpack');
-var webpack_config = require('./webpack.config');

 /*
 * We use webpack to build our tests. It's a pain to have to wait for webpack
 * to build everything; however it's the easiest way to load our dependencies
 * from node_modules.
 *
- * If you run karma in multi-run mode (with `npm run test-multi`), it will watch
+ * If you run karma in multi-run mode (with `npm run test:multi`), it will watch
 * the tests for changes, and webpack will rebuild using a cache. This is much quicker
 * than a clean rebuild.
 */
@@ -20,41 +19,8 @@ var testFile = process.env.KARMA_TEST_FILE || 'test/all-tests.js';
 process.env.PHANTOMJS_BIN = 'node_modules/.bin/phantomjs';
 process.env.Q_DEBUG = 1;

-/* the webpack config is based on the real one, to (a) try to simulate the
- * deployed environment as closely as possible, and (b) to avoid a shedload of
- * cut-and-paste.
- */
-
-// find out if we're shipping olm, and where it is, if so.
-const olm_entry = webpack_config.entry['olm'];
-
-// remove the default entries - karma provides its own (via the 'files' and
-// 'preprocessors' config below)
-delete webpack_config['entry'];
-
-// add ./test as a search path for js
-webpack_config.module.loaders.unshift({
-    test: /\.js$/, loader: "babel",
-    include: [path.resolve('./src'), path.resolve('./test')],
-});
-
-// disable parsing for sinon, because it
-// tries to do voodoo with 'require' which upsets
-// webpack (https://github.com/webpack/webpack/issues/304)
-webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
-
-// ?
-webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
-
-webpack_config.resolve.root = [
-    path.resolve('./src'),
-    path.resolve('./test'),
-];
-
-webpack_config.devtool = 'inline-source-map';
-
 module.exports = function (config) {
-    const myconfig = {
+    config.set({
        // frameworks to use
        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
        frameworks: ['mocha'],
@@ -63,29 +29,19 @@ module.exports = function (config) {
        files: [
            'node_modules/babel-polyfill/browser.js',
            testFile,
-
-            // make the images available via our httpd. They will be avaliable
-            // below http://localhost:[PORT]/base/. See also `proxies` which
-            // defines alternative URLs for them.
-            //
-            // This isn't required by any of the tests, but it stops karma
-            // logging warnings when it serves a 404 for them.
-            {
-                pattern: 'src/skins/vector/img/*',
-                watched: false, included: false, served: true, nocache: false,
-            },
+            {pattern: 'vector/img/*', watched: false, included: false, served: true, nocache: false},
        ],

+        // redirect img links to the karma server
        proxies: {
-            // redirect img links to the karma server. See above.
-            "/img/": "/base/src/skins/vector/img/",
+            "/img/": "/base/vector/img/",
        },

        // preprocess matching files before serving them to the browser
        // available preprocessors:
        // https://npmjs.org/browse/keyword/karma-preprocessor
        preprocessors: {
-            '{src,test}/**/*.js': ['webpack'],
+            'test/**/*.js': ['webpack', 'sourcemap']
        },

        // test results reporter to use
@@ -128,20 +84,53 @@ module.exports = function (config) {
            outputDir: 'karma-reports',
        },

-        webpack: webpack_config,
+        webpack: {
+            module: {
+                loaders: [
+                    { test: /\.json$/, loader: "json" },
+                    {
+                        test: /\.js$/, loader: "babel",
+                        include: [path.resolve('./src'),
+                                  path.resolve('./test'),
+                                 ]
+                    },
+                ],
+                noParse: [
+                    // don't parse the languages within highlight.js. They
+                    // cause stack overflows
+                    // (https://github.com/webpack/webpack/issues/1721), and
+                    // there is no need for webpack to parse them - they can
+                    // just be included as-is.
+                    /highlight\.js\/lib\/languages/,

-        webpackMiddleware: {
-            stats: {
-                // don't fill the console up with a mahoosive list of modules
-                chunks: false,
+                    // also disable parsing for sinon, because it
+                    // tries to do voodoo with 'require' which upsets
+                    // webpack (https://github.com/webpack/webpack/issues/304)
+                    /sinon\/pkg\/sinon\.js$/,
+                ],
            },
+            resolve: {
+                alias: {
+                    // alias any requires to the react module to the one in our path, otherwise
+                    // we tend to get the react source included twice when using npm link.
+                    react: path.resolve('./node_modules/react'),
+
+                    // same goes for js-sdk
+                    "matrix-js-sdk": path.resolve('./node_modules/matrix-js-sdk'),
+
+                    sinon: 'sinon/pkg/sinon.js',
+                },
+                root: [
+                    path.resolve('./src'),
+                    path.resolve('./test'),
+                ],
+            },
+            plugins: [
+                // olm may not be installed, so avoid webpack warnings by
+                // ignoring it.
+                new webpack.IgnorePlugin(/^olm$/),
+            ],
+            devtool: 'inline-source-map',
        },
-    };
-
-    // include the olm loader if we have it.
-    if (olm_entry) {
-        myconfig.files.unshift(olm_entry);
-    }
-
-    config.set(myconfig);
+    });
 };
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "electron/src/electron-main.js",
-  "version": "0.9.8",
+  "version": "0.9.1",
  "description": "A feature-rich client for Matrix.org",
  "author": "Vector Creations Ltd.",
  "repository": {
@@ -27,26 +27,30 @@
  "matrix-react-parent": "matrix-react-sdk",
  "scripts": {
    "reskindex": "reskindex -h src/header",
-    "build:res": "node scripts/copy-res.js",
+    "build:res": "cpx \"{src/skins/vector/fonts,src/skins/vector/img}/**\" webapp/ && cpx \"{res/media,res/vector-icons}/**\" webapp/",
+    "build:config": "cpx config.json webapp/",
+    "build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" webapp/emojione/svg/",
    "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
+    "build:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css --no-watch",
    "build:compile": "babel --source-maps -d lib src",
    "build:bundle": "NODE_ENV=production webpack -p --progress",
    "build:bundle:dev": "webpack --optimize-occurence-order --progress",
    "build:electron": "npm run clean && npm run build && build -wml --ia32 --x64",
-    "build": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle",
-    "build:dev": "node scripts/babelcheck.js && npm run build:res && npm run build:bundle:dev",
+    "build": "node scripts/babelcheck.js && npm run build:res && npm run build:config && npm run build:emojione && npm run build:css && npm run build:bundle",
+    "build:dev": "node scripts/babelcheck.js && npm run build:res && npm run build:config && npm run build:emojione && npm run build:css && npm run build:bundle:dev",
    "dist": "scripts/package.sh",
-    "start:res": "node scripts/copy-res.js -w",
-    "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
+    "start:res": "parallelshell \"cpx -w \\\"{src/skins/vector/fonts,src/skins/vector/img}/**\\\" webapp/\" \"cpx -w \\\"{res/media,res/vector-icons}/**\\\" webapp/\"",
+    "start:config": "cpx -w config.json webapp/",
+    "start:emojione": "cpx \"node_modules/emojione/assets/svg/*\" webapp/emojione/svg/ -w",
+    "start:js": "webpack-dev-server -w --progress",
    "start:js:prod": "NODE_ENV=production webpack-dev-server -w --progress",
-    "start": "node scripts/babelcheck.js && parallelshell \"npm run start:res\" \"npm run start:js\"",
-    "start:prod": "parallelshell \"npm run start:res\" \"npm run start:js:prod\"",
-    "lint": "eslint src/",
-    "lintall": "eslint src/ test/",
-    "clean": "rimraf lib webapp electron/dist",
+    "start:skins:css": "mkdirp build && catw \"src/skins/vector/css/**/*.css\" -o build/components.css",
+    "start": "node scripts/babelcheck.js && parallelshell \"npm run start:emojione\" \"npm run start:res\" \"npm run start:config\" \"npm run start:js\" \"npm run start:skins:css\"",
+    "start:prod": "parallelshell \"npm run start:emojione\" \"npm run start:js:prod\" \"npm run start:skins:css\"",
+    "clean": "rimraf build lib webapp electron/dist",
    "prepublish": "npm run build:compile",
    "test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
-    "test-multi": "karma start"
+    "test:multi": "karma start"
  },
  "dependencies": {
    "babel-polyfill": "^6.5.0",
@@ -62,8 +66,8 @@
    "gfm.css": "^1.1.1",
    "highlight.js": "^9.0.0",
    "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.6",
-    "matrix-react-sdk": "0.8.7",
+    "matrix-js-sdk": "0.7.1",
+    "matrix-react-sdk": "0.8.1",
    "modernizr": "^3.1.0",
    "q": "^1.4.1",
    "react": "^15.4.0",
@@ -76,7 +80,6 @@
    "url": "^0.11.0"
  },
  "devDependencies": {
-    "autoprefixer": "^6.6.0",
    "babel-cli": "^6.5.2",
    "babel-core": "^6.14.0",
    "babel-eslint": "^6.1.0",
@@ -91,16 +94,11 @@
    "babel-preset-es2017": "^6.16.0",
    "babel-preset-react": "^6.16.0",
    "babel-preset-stage-2": "^6.17.0",
-    "chokidar": "^1.6.1",
+    "catw": "^1.0.1",
    "cpx": "^1.3.2",
    "css-raw-loader": "^0.1.1",
-    "electron-builder": "^11.2.4",
-    "electron-builder-squirrel-windows": "^11.2.1",
-    "emojione": "^2.2.7",
-    "eslint": "^3.14.0",
-    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^6.9.0",
+    "electron-builder": "^10.4.1",
+    "emojione": "^2.2.3",
    "expect": "^1.16.0",
    "fs-extra": "^0.30.0",
    "html-webpack-plugin": "^2.24.0",
@@ -111,20 +109,12 @@
    "karma-junit-reporter": "^0.4.1",
    "karma-mocha": "^0.2.2",
    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
    "karma-webpack": "^1.7.0",
-    "minimist": "^1.2.0",
    "mkdirp": "^0.5.1",
    "mocha": "^2.4.5",
    "parallelshell": "^1.2.0",
    "phantomjs-prebuilt": "^2.1.7",
-    "postcss-extend": "^1.0.5",
-    "postcss-import": "^9.0.0",
-    "postcss-loader": "^1.2.2",
-    "postcss-mixins": "^5.4.1",
-    "postcss-nested": "^1.0.0",
-    "postcss-scss": "^0.4.0",
-    "postcss-simple-vars": "^3.0.0",
-    "postcss-strip-inline-comments": "^0.1.5",
    "react-addons-perf": "^15.4.0",
    "react-addons-test-utils": "^15.4.0",
    "rimraf": "^2.4.3",
@@ -133,12 +123,12 @@
    "webpack-dev-server": "^1.16.2"
  },
  "optionalDependencies": {
-    "olm": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz"
+    "olm": "https://matrix.org/packages/npm/olm/olm-2.0.0.tgz"
  },
  "build": {
    "appId": "im.riot.app",
    "category": "Network",
-    "electronVersion": "1.6.2",
+    "electronVersion": "1.4.11",
    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
    "asar": false,
    "dereference": true,
@@ -151,10 +141,7 @@
    ],
    "linux": {
      "target": "deb",
-      "maintainer": "support@riot.im",
-      "desktop": {
-        "StartupWMClass": "riot-web"
-      }
+      "maintainer": "support@riot.im"
    },
    "win": {
      "target": "squirrel"
@@ -1,13 +0,0 @@
-module.exports = {
-    plugins: [
-        require("postcss-import")(),
-        require("autoprefixer")(),
-        require("postcss-simple-vars")(),
-        require("postcss-extend")(),
-        require("postcss-nested")(),
-        require("postcss-mixins")(),
-        require("postcss-strip-inline-comments")(),
-    ],
-    "parser": "postcss-scss",
-    "local-plugins": true,
-};
@@ -2,37 +2,37 @@
 	"name": "Riot",
 	"icons": [
 		{
-			"src": "android-chrome-36x36.png",
+			"src": "\/icons\/android-chrome-36x36.png",
 			"sizes": "36x36",
 			"type": "image\/png",
 			"density": "0.75"
 		},
 		{
-			"src": "android-chrome-48x48.png",
+			"src": "\/icons\/android-chrome-48x48.png",
 			"sizes": "48x48",
 			"type": "image\/png",
 			"density": "1.0"
 		},
 		{
-			"src": "android-chrome-72x72.png",
+			"src": "\/icons\/android-chrome-72x72.png",
 			"sizes": "72x72",
 			"type": "image\/png",
 			"density": "1.5"
 		},
 		{
-			"src": "android-chrome-96x96.png",
+			"src": "\/icons\/android-chrome-96x96.png",
 			"sizes": "96x96",
 			"type": "image\/png",
 			"density": "2.0"
 		},
 		{
-			"src": "android-chrome-144x144.png",
+			"src": "\/icons\/android-chrome-144x144.png",
 			"sizes": "144x144",
 			"type": "image\/png",
 			"density": "3.0"
 		},
 		{
-			"src": "android-chrome-192x192.png",
+			"src": "\/icons\/android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png",
 			"density": "4.0"
@@ -1,81 +0,0 @@
-#!/usr/bin/env node
-
-// copies the resources into the webapp directory.
-//
-
-// cpx includes globbed parts of the filename in the destination, but excludes
-// common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
-// "dest/b/...".
-const COPY_LIST = [
-    ["res/{media,vector-icons}/**", "webapp"],
-    ["src/skins/vector/{fonts,img}/**", "webapp"],
-    ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],
-    ["./config.json", "webapp", {directwatch: 1}],
-];
-
-const parseArgs = require('minimist');
-const Cpx = require('cpx');
-const chokidar = require('chokidar');
-
-const argv = parseArgs(
-    process.argv.slice(2), {}
-);
-
-var watch = argv.w;
-var verbose = argv.v;
-
-function errCheck(err) {
-    if (err) {
-        console.error(err.message);
-        process.exit(1);
-    }
-}
-
-function next(i, err) {
-    errCheck(err);
-
-    if (i >= COPY_LIST.length) {
-        return;
-    }
-
-    const ent = COPY_LIST[i];
-    const source = ent[0];
-    const dest = ent[1];
-    const opts = ent[2] || {};
-
-    const cpx = new Cpx.Cpx(source, dest);
-
-    if (verbose) {
-        cpx.on("copy", (event) => {
-            console.log(`Copied: ${event.srcPath} --> ${event.dstPath}`);
-        });
-        cpx.on("remove", (event) => {
-            console.log(`Removed: ${event.path}`);
-        });
-    }
-
-    const cb = (err) => {next(i+1, err)};
-
-    if (watch) {
-        if (opts.directwatch) {
-            // cpx -w creates a watcher for the parent of any files specified,
-            // which in the case of config.json is '.', which inevitably takes
-            // ages to crawl. So we create our own watcher on the files
-            // instead.
-            const copy = () => {cpx.copy(errCheck)};
-            chokidar.watch(source)
-                .on('add', copy)
-                .on('change', copy)
-                .on('ready', cb)
-                .on('error', errCheck);
-        } else {
-            cpx.on('watch-ready', cb);
-            cpx.on("watch-error", cb);
-            cpx.watch();
-        }
-    } else {
-        cpx.copy(cb);
-    }
-}
-
-next(0);
@@ -1,183 +0,0 @@
-#!/usr/bin/env python
-#
-# download and unpack a riot-web tarball.
-#
-# Allows `bundles` to be extracted to a common directory, and a link to
-# config.json to be added.
-
-from __future__ import print_function
-
-import argparse
-import os
-import os.path
-import subprocess
-import sys
-import tarfile
-
-try:
-    # python3
-    from urllib.request import urlretrieve
-except ImportError:
-    # python2
-    from urllib import urlretrieve
-
-class DeployException(Exception):
-    pass
-
-def create_relative_symlink(linkname, target):
-    relpath = os.path.relpath(target, os.path.dirname(linkname))
-    print ("Symlink %s -> %s" % (linkname, relpath))
-    os.symlink(relpath, linkname)
-
-
-def move_bundles(source, dest):
-    """Move the contents of the 'bundles' directory to a common dir
-
-    We check that we will not be overwriting anything before we proceed.
-
-    Args:
-        source (str): path to 'bundles' within the extracted tarball
-        dest (str): target common directory
-    """
-
-    if not os.path.isdir(dest):
-        os.mkdir(dest)
-
-    # build a map from source to destination, checking for non-existence as we go.
-    renames = {}
-    for f in os.listdir(source):
-        dst = os.path.join(dest, f)
-        if os.path.exists(dst):
-            raise DeployException(
-                "Not deploying. The bundle includes '%s' which we have previously deployed."
-                % f
-            )
-        renames[os.path.join(source, f)] = dst
-
-    for (src, dst) in renames.iteritems():
-        print ("Move %s -> %s" % (src, dst))
-        os.rename(src, dst)
-
-class Deployer:
-    def __init__(self):
-        self.packages_path = "."
-        self.bundles_path = None
-        self.should_clean = False
-        self.config_location = None
-        self.verify_signature = True
-
-    def deploy(self, tarball, extract_path):
-        """Download a tarball if necessary, and unpack it
-
-        Returns:
-            (str) the path to the unpacked deployment
-        """
-        print("Deploying %s to %s" % (tarball, extract_path))
-
-        name_str = os.path.basename(tarball).replace(".tar.gz", "")
-        extracted_dir = os.path.join(extract_path, name_str)
-        if os.path.exists(extracted_dir):
-            raise DeployException('Cannot unpack %s: %s already exists' % (
-                tarball, extracted_dir))
-
-        downloaded = False
-        if tarball.startswith("http://") or tarball.startswith("https://"):
-            tarball = self.download_and_verify(tarball)
-            print("Downloaded file: %s" % tarball)
-            downloaded = True
-
-        try:
-            with tarfile.open(tarball) as tar:
-                tar.extractall(extract_path)
-        finally:
-            if self.should_clean and downloaded:
-                os.remove(tarball)
-
-        print ("Extracted into: %s" % extracted_dir)
-
-        if self.config_location:
-            create_relative_symlink(
-                target=self.config_location,
-                linkname=os.path.join(extracted_dir, 'config.json')
-            )
-
-        if self.bundles_path:
-            extracted_bundles = os.path.join(extracted_dir, 'bundles')
-            move_bundles(source=extracted_bundles, dest=self.bundles_path)
-
-            # replace the (hopefully now empty) extracted_bundles dir with a
-            # symlink to the common dir.
-            os.rmdir(extracted_bundles)
-            create_relative_symlink(
-                target=self.bundles_path,
-                linkname=extracted_bundles,
-            )
-        return extracted_dir
-
-    def download_and_verify(self, url):
-        tarball = self.download_file(url)
-
-        if self.verify_signature:
-            sigfile = self.download_file(url + ".asc")
-            subprocess.check_call(["gpg", "--verify", sigfile, tarball])
-
-        return tarball
-
-    def download_file(self, url):
-        if not os.path.isdir(self.packages_path):
-            os.mkdir(self.packages_path)
-        local_filename = os.path.join(self.packages_path,
-                                      url.split('/')[-1])
-        sys.stdout.write("Downloading %s -> %s..." % (url, local_filename))
-        sys.stdout.flush()
-        urlretrieve(url, local_filename)
-        print ("Done")
-        return local_filename
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser("Deploy a Riot build on a web server.")
-    parser.add_argument(
-        "-p", "--packages-dir", default="./packages", help=(
-            "The directory to download the tarball into. (Default: '%(default)s')"
-        )
-    )
-    parser.add_argument(
-        "-e", "--extract-path", default="./deploys", help=(
-            "The location to extract .tar.gz files to. (Default: '%(default)s')"
-        )
-    )
-    parser.add_argument(
-        "-b", "--bundles-dir", nargs='?', default="./bundles", help=(
-            "A directory to move the contents of the 'bundles' directory to. A \
-            symlink to the bundles directory will also be written inside the \
-            extracted tarball. Example: './bundles'. \
-            (Default: '%(default)s')"
-        )
-    )
-    parser.add_argument(
-        "-c", "--clean", action="store_true", default=False, help=(
-            "Remove .tar.gz files after they have been downloaded and extracted. \
-            (Default: %(default)s)"
-        )
-    )
-    parser.add_argument(
-        "--config", nargs='?', default='./config.json', help=(
-            "Write a symlink at config.json in the extracted tarball to this \
-            location. (Default: '%(default)s')"
-        )
-    )
-    parser.add_argument(
-        "tarball", help=(
-            "filename of tarball, or URL to download."
-        ),
-    )
-
-    args = parser.parse_args()
-
-    deployer = Deployer()
-    deployer.packages_path = args.packages_dir
-    deployer.bundles_path = args.bundles_dir
-    deployer.should_clean = args.clean
-    deployer.config_location = args.config
-
-    deployer.deploy(args.tarball, args.extract_path)
@@ -73,12 +73,12 @@ projdir=`pwd`
 builddir=`mktemp -d 2>/dev/null || mktemp -d -t 'buildtmp'`
 pushd "$builddir"

-git clone "$projdir" .
-git checkout "$version"
-
 # Figure out what version we're building
 vername=`jq -r .version package.json`

+git clone "$projdir" .
+git checkout "$version"
+
 if [ -n "$conffile" ]; then
    popd
    cp "$conffile" "$builddir/"
@@ -113,7 +113,7 @@ echo "$vername" > "$pubdir/update/macos/latest"

 mkdir -p "$pubdir/update/win32/ia32/"
 cp $distdir/win-ia32/*.nupkg "$pubdir/update/win32/ia32/"
-cp $distdir/win-ia32/RELEASES "$pubdir/update/win32/ia32/"
+cp $distdir/win-ia32/RELEASES "$pubdir/install/win32/ia32/"

 mkdir -p "$pubdir/update/win32/x64/"
 cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
@@ -2,7 +2,7 @@

 set -e

-export NVM_DIR="$HOME/.nvm"
+export NVM_DIR="/home/jenkins/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 nvm use 6

@@ -11,29 +11,20 @@ set -x
 npm install

 # apparently npm 3.10.3 on node 6.4.0 doesn't upgrade #develop target with npm install unless explicitly asked.
-npm install matrix-react-sdk matrix-js-sdk olm
+npm install matrix-react-sdk matrix-js-sdk

 # install olm. A naive 'npm i ./olm/olm-*.tgz' fails because it uses the url
 # from our package.json (or even matrix-js-sdk's) in preference.
-#
-# disabled for now, to avoid the annoying scenario of a release doing something
-# different to /develop. Instead, add it to the 'npm install' list above.
-# -- rav 2016/02/03
-#tar -C olm -xz < olm/olm-*.tgz
-#rm -r node_modules/olm
-#cp -r olm/package node_modules/olm
+tar -C olm -xz < olm/olm-*.tgz
+rm -r node_modules/olm
+cp -r olm/package node_modules/olm

-
-# we may be using dev branches of js-sdk and react-sdk, in which case we need to build them
-(cd node_modules/matrix-js-sdk && npm install)
-(cd node_modules/matrix-react-sdk && npm install)
+# we may be using a dev branch of react-sdk, in which case we need to build it
+(cd node_modules/matrix-react-sdk && npm run build)

 # run the mocha tests
 npm run test

-# run eslint
-npm run lintall -- -f checkstyle -o eslint.xml || true
-
 rm dist/vector-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist

 # node_modules deps from 'npm install' don't have a .git dir so can't
@@ -80,7 +80,7 @@ cp "$tmpdir/150.png" "res/vector-icons/mstile-150x150.png"
 cp "$tmpdir/310.png" "res/vector-icons/mstile-310x310.png"
 cp "$tmpdir/310x150.png" "res/vector-icons/mstile-310x150.png"

-convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png"  "$tmpdir/256.png" "res/vector-icons/favicon.ico"
+convert "$tmpdir/16.png" "$tmpdir/32.png" "$tmpdir/64.png" "$tmpdir/128.png"  "res/vector-icons/favicon.ico"

 cp "res/vector-icons/favicon.ico" "electron/build/icon.ico"

@@ -1,30 +1,26 @@
 #!/usr/bin/env python
-#
-# auto-deploy script for https://riot.im/develop
-#
-# Listens for HTTP hits. When it gets one, downloads the artifact from jenkins
-# and deploys it as the new version.
-#
-# Requires the following python packages:
-#
-#   - requests
-#   - flask
-#
 from __future__ import print_function
 import json, requests, tarfile, argparse, os, errno
-import time
 from urlparse import urljoin
-
 from flask import Flask, jsonify, request, abort
-
-from deploy import Deployer, DeployException
-
 app = Flask(__name__)

-arg_jenkins_url = None
-deployer = None
-arg_extract_path = None
-arg_symlink = None
+arg_jenkins_url, arg_extract_path, arg_should_clean, arg_symlink, arg_config_location = (
+    None, None, None, None, None
+)
+
+def download_file(url):
+    local_filename = url.split('/')[-1]
+    r = requests.get(url, stream=True)
+    with open(local_filename, 'wb') as f:
+        for chunk in r.iter_content(chunk_size=1024): 
+            if chunk: # filter out keep-alive new chunks
+                f.write(chunk)
+    return local_filename
+
+def untar_to(tarball, dest):
+    with tarfile.open(tarball) as tar:
+        tar.extractall(dest)

 def create_symlink(source, linkname):
    try:
@@ -61,9 +57,6 @@ def on_receive_jenkins_poke():
        abort(400, "Missing or bad build number")
        return

-    return fetch_jenkins_build(job_name, build_num)
-
-def fetch_jenkins_build(job_name, build_num):
    artifact_url = urljoin(
        arg_jenkins_url, "job/%s/%s/api/json" % (job_name, build_num)
    )
@@ -113,41 +106,24 @@ def fetch_jenkins_build(job_name, build_num):
        arg_jenkins_url, "job/%s/%s/artifact/%s" % (job_name, build_num, tar_gz_path)
    )

-    # we extract into a directory based on the build number. This avoids the
-    # problem of multiple builds building the same git version and thus having
-    # the same tarball name. That would lead to two potential problems:
-    #   (a) sometimes jenkins serves corrupted artifacts; we would replace
-    #       a good deploy with a bad one
-    #   (b) we'll be overwriting the live deployment, which means people might
-    #       see half-written files.
-    build_dir = os.path.join(arg_extract_path, "%s-#%s" % (job_name, build_num))
-    try:
-        extracted_dir = deploy_tarball(tar_gz_url, build_dir)
-    except DeployException as e:
-        abort(400, e.message)
+    print("Retrieving .tar.gz file: %s" % tar_gz_url)
+    filename = download_file(tar_gz_url)
+    print("Downloaded file: %s" % filename)
+    name_str = filename.replace(".tar.gz", "")
+    untar_to(filename, arg_extract_path)
+
+    extracted_dir = os.path.join(arg_extract_path, name_str)
+
+    if arg_should_clean:
+        os.remove(filename)

    create_symlink(source=extracted_dir, linkname=arg_symlink)

+    if arg_config_location:
+        create_symlink(source=arg_config_location, linkname=os.path.join(extracted_dir, 'config.json'))
+
    return jsonify({})

-def deploy_tarball(tar_gz_url, build_dir):
-    """Download a tarball from jenkins and unpack it
-
-    Returns:
-        (str) the path to the unpacked deployment
-    """
-    if os.path.exists(build_dir):
-        raise DeployException(
-            "Not deploying. We have previously deployed this build."
-        )
-    os.mkdir(build_dir)
-
-    # we rely on the fact that flask only serves one request at a time to
-    # ensure that we do not overwrite a tarball from a concurrent request.
-
-    return deployer.deploy(tar_gz_url, build_dir)
-
-
 if __name__ == "__main__":
    parser = argparse.ArgumentParser("Runs a Vector redeployment server.")
    parser.add_argument(
@@ -166,13 +142,6 @@ if __name__ == "__main__":
            "The location to extract .tar.gz files to."
        )
    )
-    parser.add_argument(
-        "-b", "--bundles-dir", dest="bundles_dir", help=(
-            "A directory to move the contents of the 'bundles' directory to. A \
-            symlink to the bundles directory will also be written inside the \
-            extracted tarball. Example: './bundles'."
-        )
-    )
    parser.add_argument(
        "-c", "--clean", dest="clean", action="store_true", default=False, help=(
            "Remove .tar.gz files after they have been downloaded and extracted."
@@ -191,47 +160,18 @@ if __name__ == "__main__":
            To this location."
        )
    )
-    parser.add_argument(
-        "--test", dest="tarball_uri", help=(
-            "Don't start an HTTP listener. Instead download a build from Jenkins \
-            immediately."
-        ),
-    )
-
    args = parser.parse_args()
    if args.jenkins.endswith("/"): # important for urljoin
        arg_jenkins_url = args.jenkins
    else:
        arg_jenkins_url = args.jenkins + "/"
    arg_extract_path = args.extract
+    arg_should_clean = args.clean
    arg_symlink = args.symlink
-
-    if not os.path.isdir(arg_extract_path):
-        os.mkdir(arg_extract_path)
-
-    deployer = Deployer()
-    deployer.bundles_path = args.bundles_dir
-    deployer.should_clean = args.clean
-    deployer.config_location = args.config
-
-    # we don't pgp-sign jenkins artifacts; instead we rely on HTTPS access to
-    # the jenkins server (and the jenkins server not being compromised and/or
-    # github not serving it compromised source). If that's not good enough for
-    # you, don't use riot.im/develop.
-    deployer.verify_signature = False
-
-    if args.tarball_uri is not None:
-        build_dir = os.path.join(arg_extract_path, "test-%i" % (time.time()))
-        deploy_tarball(args.tarball_uri, build_dir)
-    else:
-        print(
-            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Config location: %s" %
-            (args.port,
-             arg_extract_path,
-             " (clean after)" if deployer.should_clean else "",
-             arg_symlink,
-             arg_jenkins_url,
-             deployer.config_location,
-            )
-        )
-        app.run(host="0.0.0.0", port=args.port, debug=True)
+    arg_config_location = args.config
+    print(
+        "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Config location: %s" %
+        (args.port, arg_extract_path,
+            " (clean after)" if arg_should_clean else "", arg_symlink, arg_jenkins_url, arg_config_location)
+    )
+    app.run(host="0.0.0.0", port=args.port, debug=True)
@@ -27,62 +27,60 @@ limitations under the License.
 module.exports.components = require('matrix-react-sdk/lib/component-index').components;

 import structures$BottomLeftMenu from './components/structures/BottomLeftMenu';
-structures$BottomLeftMenu && (module.exports.components['structures.BottomLeftMenu'] = structures$BottomLeftMenu);
+module.exports.components['structures.BottomLeftMenu'] = structures$BottomLeftMenu;
 import structures$CompatibilityPage from './components/structures/CompatibilityPage';
-structures$CompatibilityPage && (module.exports.components['structures.CompatibilityPage'] = structures$CompatibilityPage);
-import structures$HomePage from './components/structures/HomePage';
-structures$HomePage && (module.exports.components['structures.HomePage'] = structures$HomePage);
+module.exports.components['structures.CompatibilityPage'] = structures$CompatibilityPage;
 import structures$LeftPanel from './components/structures/LeftPanel';
-structures$LeftPanel && (module.exports.components['structures.LeftPanel'] = structures$LeftPanel);
+module.exports.components['structures.LeftPanel'] = structures$LeftPanel;
 import structures$RightPanel from './components/structures/RightPanel';
-structures$RightPanel && (module.exports.components['structures.RightPanel'] = structures$RightPanel);
+module.exports.components['structures.RightPanel'] = structures$RightPanel;
 import structures$RoomDirectory from './components/structures/RoomDirectory';
-structures$RoomDirectory && (module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory);
+module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory;
 import structures$RoomSubList from './components/structures/RoomSubList';
-structures$RoomSubList && (module.exports.components['structures.RoomSubList'] = structures$RoomSubList);
+module.exports.components['structures.RoomSubList'] = structures$RoomSubList;
 import structures$SearchBox from './components/structures/SearchBox';
-structures$SearchBox && (module.exports.components['structures.SearchBox'] = structures$SearchBox);
+module.exports.components['structures.SearchBox'] = structures$SearchBox;
 import structures$ViewSource from './components/structures/ViewSource';
-structures$ViewSource && (module.exports.components['structures.ViewSource'] = structures$ViewSource);
+module.exports.components['structures.ViewSource'] = structures$ViewSource;
 import views$context_menus$MessageContextMenu from './components/views/context_menus/MessageContextMenu';
-views$context_menus$MessageContextMenu && (module.exports.components['views.context_menus.MessageContextMenu'] = views$context_menus$MessageContextMenu);
-import views$context_menus$RoomTileContextMenu from './components/views/context_menus/RoomTileContextMenu';
-views$context_menus$RoomTileContextMenu && (module.exports.components['views.context_menus.RoomTileContextMenu'] = views$context_menus$RoomTileContextMenu);
-import views$dialogs$BugReportDialog from './components/views/dialogs/BugReportDialog';
-views$dialogs$BugReportDialog && (module.exports.components['views.dialogs.BugReportDialog'] = views$dialogs$BugReportDialog);
+module.exports.components['views.context_menus.MessageContextMenu'] = views$context_menus$MessageContextMenu;
+import views$context_menus$NotificationStateContextMenu from './components/views/context_menus/NotificationStateContextMenu';
+module.exports.components['views.context_menus.NotificationStateContextMenu'] = views$context_menus$NotificationStateContextMenu;
+import views$context_menus$RoomTagContextMenu from './components/views/context_menus/RoomTagContextMenu';
+module.exports.components['views.context_menus.RoomTagContextMenu'] = views$context_menus$RoomTagContextMenu;
 import views$dialogs$ChangelogDialog from './components/views/dialogs/ChangelogDialog';
-views$dialogs$ChangelogDialog && (module.exports.components['views.dialogs.ChangelogDialog'] = views$dialogs$ChangelogDialog);
+module.exports.components['views.dialogs.ChangelogDialog'] = views$dialogs$ChangelogDialog;
 import views$directory$NetworkDropdown from './components/views/directory/NetworkDropdown';
-views$directory$NetworkDropdown && (module.exports.components['views.directory.NetworkDropdown'] = views$directory$NetworkDropdown);
+module.exports.components['views.directory.NetworkDropdown'] = views$directory$NetworkDropdown;
 import views$elements$ImageView from './components/views/elements/ImageView';
-views$elements$ImageView && (module.exports.components['views.elements.ImageView'] = views$elements$ImageView);
+module.exports.components['views.elements.ImageView'] = views$elements$ImageView;
 import views$elements$Spinner from './components/views/elements/Spinner';
-views$elements$Spinner && (module.exports.components['views.elements.Spinner'] = views$elements$Spinner);
+module.exports.components['views.elements.Spinner'] = views$elements$Spinner;
 import views$globals$GuestWarningBar from './components/views/globals/GuestWarningBar';
-views$globals$GuestWarningBar && (module.exports.components['views.globals.GuestWarningBar'] = views$globals$GuestWarningBar);
+module.exports.components['views.globals.GuestWarningBar'] = views$globals$GuestWarningBar;
 import views$globals$MatrixToolbar from './components/views/globals/MatrixToolbar';
-views$globals$MatrixToolbar && (module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar);
+module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar;
 import views$globals$NewVersionBar from './components/views/globals/NewVersionBar';
-views$globals$NewVersionBar && (module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar);
+module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar;
 import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog';
-views$login$VectorCustomServerDialog && (module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog);
+module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog;
 import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter';
-views$login$VectorLoginFooter && (module.exports.components['views.login.VectorLoginFooter'] = views$login$VectorLoginFooter);
+module.exports.components['views.login.VectorLoginFooter'] = views$login$VectorLoginFooter;
 import views$login$VectorLoginHeader from './components/views/login/VectorLoginHeader';
-views$login$VectorLoginHeader && (module.exports.components['views.login.VectorLoginHeader'] = views$login$VectorLoginHeader);
+module.exports.components['views.login.VectorLoginHeader'] = views$login$VectorLoginHeader;
 import views$messages$DateSeparator from './components/views/messages/DateSeparator';
-views$messages$DateSeparator && (module.exports.components['views.messages.DateSeparator'] = views$messages$DateSeparator);
+module.exports.components['views.messages.DateSeparator'] = views$messages$DateSeparator;
 import views$messages$MessageTimestamp from './components/views/messages/MessageTimestamp';
-views$messages$MessageTimestamp && (module.exports.components['views.messages.MessageTimestamp'] = views$messages$MessageTimestamp);
+module.exports.components['views.messages.MessageTimestamp'] = views$messages$MessageTimestamp;
 import views$rooms$DNDRoomTile from './components/views/rooms/DNDRoomTile';
-views$rooms$DNDRoomTile && (module.exports.components['views.rooms.DNDRoomTile'] = views$rooms$DNDRoomTile);
+module.exports.components['views.rooms.DNDRoomTile'] = views$rooms$DNDRoomTile;
 import views$rooms$RoomDropTarget from './components/views/rooms/RoomDropTarget';
-views$rooms$RoomDropTarget && (module.exports.components['views.rooms.RoomDropTarget'] = views$rooms$RoomDropTarget);
+module.exports.components['views.rooms.RoomDropTarget'] = views$rooms$RoomDropTarget;
 import views$rooms$RoomTooltip from './components/views/rooms/RoomTooltip';
-views$rooms$RoomTooltip && (module.exports.components['views.rooms.RoomTooltip'] = views$rooms$RoomTooltip);
+module.exports.components['views.rooms.RoomTooltip'] = views$rooms$RoomTooltip;
 import views$rooms$SearchBar from './components/views/rooms/SearchBar';
-views$rooms$SearchBar && (module.exports.components['views.rooms.SearchBar'] = views$rooms$SearchBar);
+module.exports.components['views.rooms.SearchBar'] = views$rooms$SearchBar;
 import views$settings$IntegrationsManager from './components/views/settings/IntegrationsManager';
-views$settings$IntegrationsManager && (module.exports.components['views.settings.IntegrationsManager'] = views$settings$IntegrationsManager);
+module.exports.components['views.settings.IntegrationsManager'] = views$settings$IntegrationsManager;
 import views$settings$Notifications from './components/views/settings/Notifications';
-views$settings$Notifications && (module.exports.components['views.settings.Notifications'] = views$settings$Notifications);
+module.exports.components['views.settings.Notifications'] = views$settings$Notifications;
@@ -20,21 +20,18 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 module.exports = React.createClass({
    displayName: 'BottomLeftMenu',

    propTypes: {
        collapsed: React.PropTypes.bool.isRequired,
-        teamToken: React.PropTypes.string,
    },

    getInitialState: function() {
        return({
            directoryHover : false,
            roomsHover : false,
-            homeHover: false,
            peopleHover : false,
            settingsHover : false,
        });
@@ -65,19 +62,6 @@ module.exports = React.createClass({
        this.setState({ roomsHover: false });
    },

-    // Home button events
-    onHomeClick: function() {
-        dis.dispatch({ action: 'view_home_page' });
-    },
-
-    onHomeMouseEnter: function() {
-        this.setState({ homeHover: true });
-    },
-
-    onHomeMouseLeave: function() {
-        this.setState({ homeHover: false });
-    },
-
    // People events
    onPeopleClick: function() {
        dis.dispatch({ action: 'view_create_chat' });
@@ -114,37 +98,25 @@ module.exports = React.createClass({

    render: function() {
        var TintableSvg = sdk.getComponent('elements.TintableSvg');
-
-        var homeButton;
-        if (this.props.teamToken) {
-            homeButton = (
-                <AccessibleButton className="mx_BottomLeftMenu_homePage" onClick={ this.onHomeClick } onMouseEnter={ this.onHomeMouseEnter } onMouseLeave={ this.onHomeMouseLeave } >
-                    <TintableSvg src="img/icons-home.svg" width="25" height="25" />
-                    { this.getLabel("Welcome page", this.state.homeHover) }
-                </AccessibleButton>
-            );
-        }
-
        return (
            <div className="mx_BottomLeftMenu">
                <div className="mx_BottomLeftMenu_options">
-                    { homeButton }
-                    <AccessibleButton className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } >
+                    <div className="mx_BottomLeftMenu_people" onClick={ this.onPeopleClick } onMouseEnter={ this.onPeopleMouseEnter } onMouseLeave={ this.onPeopleMouseLeave } >
                        <TintableSvg src="img/icons-people.svg" width="25" height="25" />
                        { this.getLabel("Start chat", this.state.peopleHover) }
-                    </AccessibleButton>
-                    <AccessibleButton className="mx_BottomLeftMenu_directory" onClick={ this.onDirectoryClick } onMouseEnter={ this.onDirectoryMouseEnter } onMouseLeave={ this.onDirectoryMouseLeave } >
+                    </div>
+                    <div className="mx_BottomLeftMenu_directory" onClick={ this.onDirectoryClick } onMouseEnter={ this.onDirectoryMouseEnter } onMouseLeave={ this.onDirectoryMouseLeave } >
                        <TintableSvg src="img/icons-directory.svg" width="25" height="25"/>
                        { this.getLabel("Room directory", this.state.directoryHover) }
-                    </AccessibleButton>
-                    <AccessibleButton className="mx_BottomLeftMenu_createRoom" onClick={ this.onRoomsClick } onMouseEnter={ this.onRoomsMouseEnter } onMouseLeave={ this.onRoomsMouseLeave } >
+                    </div>
+                    <div className="mx_BottomLeftMenu_createRoom" onClick={ this.onRoomsClick } onMouseEnter={ this.onRoomsMouseEnter } onMouseLeave={ this.onRoomsMouseLeave } >
                        <TintableSvg src="img/icons-create-room.svg" width="25" height="25" />
                        { this.getLabel("Create new room", this.state.roomsHover) }
-                    </AccessibleButton>
-                    <AccessibleButton className="mx_BottomLeftMenu_settings" onClick={ this.onSettingsClick } onMouseEnter={ this.onSettingsMouseEnter } onMouseLeave={ this.onSettingsMouseLeave } >
+                    </div>
+                    <div className="mx_BottomLeftMenu_settings" onClick={ this.onSettingsClick } onMouseEnter={ this.onSettingsMouseEnter } onMouseLeave={ this.onSettingsMouseLeave } >
                        <TintableSvg src="img/icons-settings.svg" width="25" height="25" />
                        { this.getLabel("Settings", this.state.settingsHover) }
-                    </AccessibleButton>
+                    </div>
                </div>
            </div>
        );
@@ -45,8 +45,10 @@ module.exports = React.createClass({
                available or experimental in your current browser.
                </p>
                <p>
-                Please install <a href="https://www.google.com/chrome">Chrome</a> or <a href="https://getfirefox.com">Firefox</a> for
-                the best experience. <a href="http://apple.com/safari">Safari</a> and <a href="http://opera.com">Opera</a> work too.
+                Please install <a href="https://www.google.com/chrome">Chrome</a> or
+                <a href="https://getfirefox.com">Firefox</a> for the best experience.
+                <a href="http://apple.com/safari">Safari</a> and
+                <a href="http://opera.com">Opera</a> work too.
                </p>
                <p>
                With your current browser, the look and feel of the application may
@@ -1,40 +0,0 @@
-/*
-Copyright 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations 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.
-*/
-
-'use strict';
-
-import React from 'react';
-import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import sdk from 'matrix-react-sdk';
-
-module.exports = React.createClass({
-    displayName: 'HomePage',
-
-    propTypes: {
-        teamServerUrl: React.PropTypes.string.isRequired,
-        teamToken: React.PropTypes.string.isRequired,
-        collapsedRhs: React.PropTypes.bool,
-    },
-
-    render: function() {
-        return (
-        <div className="mx_HomePage">
-            <iframe src={`${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`}/>
-        </div>
-        );
-    }
-});
@@ -28,11 +28,6 @@ var CallHandler = require("matrix-react-sdk/lib/CallHandler");
 var LeftPanel = React.createClass({
    displayName: 'LeftPanel',

-    propTypes: {
-        collapsed: React.PropTypes.bool.isRequired,
-        teamToken: React.PropTypes.string,
-    },
-
    getInitialState: function() {
        return {
            showCallElement: null,
@@ -129,7 +124,7 @@ var LeftPanel = React.createClass({
                    collapsed={this.props.collapsed}
                    searchFilter={this.state.searchFilter}
                    ConferenceHandler={VectorConferenceHandler} />
-                <BottomLeftMenu collapsed={this.props.collapsed} teamToken={this.props.teamToken}/>
+                <BottomLeftMenu collapsed={this.props.collapsed}/>
            </aside>
        );
    }
@@ -23,7 +23,6 @@ var dis = require('matrix-react-sdk/lib/dispatcher');
 var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
 var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
 var Modal = require('matrix-react-sdk/lib/Modal');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 module.exports = React.createClass({
    displayName: 'RightPanel',
@@ -70,21 +69,45 @@ module.exports = React.createClass({
    },

    onMemberListButtonClick: function() {
-        this.setState({ phase: this.Phase.MemberList });
+        if (this.props.collapsed || this.state.phase !== this.Phase.MemberList) {
+            this.setState({ phase: this.Phase.MemberList });
+            dis.dispatch({
+                action: 'show_right_panel',
+            });
+        }
+        else {
+            dis.dispatch({
+                action: 'hide_right_panel',
+            });
+        }
    },

    onFileListButtonClick: function() {
-        this.setState({ phase: this.Phase.FilePanel });
+        if (this.props.collapsed || this.state.phase !== this.Phase.FilePanel) {
+            this.setState({ phase: this.Phase.FilePanel });
+            dis.dispatch({
+                action: 'show_right_panel',
+            });
+        }
+        else {
+            dis.dispatch({
+                action: 'hide_right_panel',
+            });
+        }
    },

    onNotificationListButtonClick: function() {
-        this.setState({ phase: this.Phase.NotificationPanel });
-    },
-
-    onCollapseClick: function() {
-        dis.dispatch({
-            action: 'hide_right_panel',
-        });
+        if (this.props.collapsed || this.state.phase !== this.Phase.NotificationPanel) {
+            this.setState({ phase: this.Phase.NotificationPanel });
+            dis.dispatch({
+                action: 'show_right_panel',
+            });
+        }
+        else {
+            dis.dispatch({
+                action: 'hide_right_panel',
+            });
+        }
    },

    onInviteButtonClick: function() {
@@ -184,12 +207,12 @@ module.exports = React.createClass({

            if (user_is_in_room) {
                inviteGroup =
-                    <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+                    <div className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
                        <div className="mx_RightPanel_icon" >
                            <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
                        </div>
                        <div className="mx_RightPanel_message">Invite to this room</div>
-                    </AccessibleButton>;
+                    </div>;
            }

        }
@@ -197,28 +220,20 @@ module.exports = React.createClass({
        if (this.props.roomId) {
            buttonGroup =
                    <div className="mx_RightPanel_headerButtonGroup">
-                        <AccessibleButton className="mx_RightPanel_headerButton"
-                                title="Members" onClick={ this.onMemberListButtonClick }>
+                        <div className="mx_RightPanel_headerButton" title="Members" onClick={ this.onMemberListButtonClick }>
                            <div className="mx_RightPanel_headerButton_badge">{ membersBadge ? membersBadge : <span>&nbsp;</span>}</div>
                            <TintableSvg src="img/icons-people.svg" width="25" height="25"/>
                            { membersHighlight }
-                        </AccessibleButton>
-                        <AccessibleButton
-                                className="mx_RightPanel_headerButton mx_RightPanel_filebutton"
-                                title="Files" onClick={ this.onFileListButtonClick }>
+                        </div>
+                        <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton" title="Files" onClick={ this.onFileListButtonClick }>
                            <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
                            <TintableSvg src="img/icons-files.svg" width="25" height="25"/>
                            { filesHighlight }
-                        </AccessibleButton>
-                        <AccessibleButton
-                                className="mx_RightPanel_headerButton mx_RightPanel_notificationbutton"
-                                title="Notifications" onClick={ this.onNotificationListButtonClick }>
+                        </div>
+                        <div className="mx_RightPanel_headerButton mx_RightPanel_notificationbutton" title="Notifications" onClick={ this.onNotificationListButtonClick }>
                            <div className="mx_RightPanel_headerButton_badge">&nbsp;</div>
                            <TintableSvg src="img/icons-notifications.svg" width="25" height="25"/>
                            { notificationsHighlight }
-                        </AccessibleButton>
-                        <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" title="Hide panel" onClick={ this.onCollapseClick }>
-                            <TintableSvg src="img/minimise.svg" width="10" height="16"/>
                        </div>
                    </div>;
        }
@@ -261,3 +276,4 @@ module.exports = React.createClass({
        );
    }
 });
+
@@ -31,8 +31,6 @@ var linkifyMatrix = require('matrix-react-sdk/lib/linkify-matrix');
 var sanitizeHtml = require('sanitize-html');
 var q = require('q');

-import {instanceForInstanceId, protocolNameForInstanceId} from '../../utils/DirectoryUtils';
-
 linkifyMatrix(linkify);

 module.exports = React.createClass({
@@ -44,7 +42,9 @@ module.exports = React.createClass({

    getDefaultProps: function() {
        return {
-            config: {},
+            config: {
+                networks: [],
+            },
        }
    },

@@ -52,26 +52,36 @@ module.exports = React.createClass({
        return {
            publicRooms: [],
            loading: true,
-            protocolsLoading: true,
-            instanceId: null,
-            includeAll: false,
+            network: null,
            roomServer: null,
            filterString: null,
        }
    },

    componentWillMount: function() {
+        // precompile Regexps
+        this.portalRoomPatterns = {};
+        this.nativePatterns = {};
+        if (this.props.config.networks) {
+            for (const network of Object.keys(this.props.config.networks)) {
+                const network_info = this.props.config.networks[network];
+                if (network_info.portalRoomPattern) {
+                    this.portalRoomPatterns[network] = new RegExp(network_info.portalRoomPattern);
+                }
+                if (network_info.nativePattern) {
+                    this.nativePatterns[network] = new RegExp(network_info.nativePattern);
+                }
+            }
+        }
+
        this.nextBatch = null;
        this.filterTimeout = null;
        this.scrollPanel = null;
        this.protocols = null;

-        this.setState({protocolsLoading: true});
        MatrixClientPeg.get().getThirdpartyProtocols().done((response) => {
            this.protocols = response;
-            this.setState({protocolsLoading: false});
        }, (err) => {
-            this.setState({protocolsLoading: false});
            if (MatrixClientPeg.get().isGuest()) {
                // Guests currently aren't allowed to use this API, so
                // ignore this as otherwise this error is literally the
@@ -121,11 +131,6 @@ module.exports = React.createClass({
        if (my_server != MatrixClientPeg.getHomeServerName()) {
            opts.server = my_server;
        }
-        if (this.state.instanceId) {
-            opts.third_party_instance_id = this.state.instanceId;
-        } else if (this.state.includeAll) {
-            opts.include_all_networks = true;
-        }
        if (this.nextBatch) opts.since = this.nextBatch;
        if (my_filter_string) opts.filter = { generic_search_term: my_filter_string } ;
        return MatrixClientPeg.get().publicRooms(opts).then((data) => {
@@ -162,7 +167,7 @@ module.exports = React.createClass({
            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
            Modal.createDialog(ErrorDialog, {
                title: "Failed to get public room list",
-                description: "The server may be unavailable or overloaded",
+                description: err.message
            });
        });
    },
@@ -208,10 +213,9 @@ module.exports = React.createClass({
                }, function(err) {
                    modal.close();
                    this.refreshRoomList();
-                    console.error("Failed to " + step + ": " + err);
                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to " + step,
+                        title: "Failed to "+step,
+                        description: err.toString()
                    });
                });
            }
@@ -227,7 +231,7 @@ module.exports = React.createClass({
        }
    },

-    onOptionChange: function(server, instanceId, includeAll) {
+    onOptionChange: function(server, network) {
        // clear next batch so we don't try to load more rooms
        this.nextBatch = null;
        this.setState({
@@ -236,8 +240,7 @@ module.exports = React.createClass({
            // to clear the list anyway.
            publicRooms: [],
            roomServer: server,
-            instanceId: instanceId,
-            includeAll: includeAll,
+            network: network,
        }, this.refreshRoomList);
        // We also refresh the room list each time even though this
        // filtering is client-side. It hopefully won't be client side
@@ -268,7 +271,7 @@ module.exports = React.createClass({
        this.filterTimeout = setTimeout(() => {
            this.filterTimeout = null;
            this.refreshRoomList();
-        }, 700);
+        }, 300);
    },

    onFilterClear: function() {
@@ -283,19 +286,14 @@ module.exports = React.createClass({
    },

    onJoinClick: function(alias) {
-        // If we don't have a particular instance id selected, just show that rooms alias
-        if (!this.state.instanceId) {
-            // If the user specified an alias without a domain, add on whichever server is selected
-            // in the dropdown
-            if (alias.indexOf(':') == -1) {
-                alias = alias + ':' + this.state.roomServer;
-            }
+        // If we're on the 'Matrix' network (or all networks),
+        // just show that rooms alias
+        if (this.state.network == null || this.state.network == '_matrix') {
            this.showRoomAlias(alias);
        } else {
-            // This is a 3rd party protocol. Let's see if we can join it
-            const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
-            const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
-            const fields = protocolName ? this._getFieldsForThirdPartyLocation(alias, this.protocols[protocolName], instance) : null;
+            // This is a 3rd party protocol. Let's see if we
+            // can join it
+            const fields = this._getFieldsForThirdPartyLocation(alias, this.state.network);
            if (!fields) {
                const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                Modal.createDialog(ErrorDialog, {
@@ -304,7 +302,8 @@ module.exports = React.createClass({
                });
                return;
            }
-            MatrixClientPeg.get().getThirdpartyLocation(protocolName, fields).done((resp) => {
+            const protocol = this._protocolForThirdPartyNetwork(this.state.network);
+            MatrixClientPeg.get().getThirdpartyLocation(protocol, fields).done((resp) => {
                if (resp.length > 0 && resp[0].alias) {
                    this.showRoomAlias(resp[0].alias);
                } else {
@@ -373,7 +372,13 @@ module.exports = React.createClass({

        if (!this.state.publicRooms) return [];

-        var rooms = this.state.publicRooms;
+        var rooms = this.state.publicRooms.filter((a) => {
+            if (this.state.network) {
+                if (!this._isRoomInNetwork(a, this.state.roomServer, this.state.network)) return false;
+            }
+
+            return true;
+        });
        var rows = [];
        var self = this;
        var guestRead, guestJoin, perms;
@@ -435,46 +440,119 @@ module.exports = React.createClass({
        this.scrollPanel = element;
    },

-    _stringLooksLikeId: function(s, field_type) {
+    /**
+     * Terrible temporary function that guess what network a public room
+     * entry is in, until synapse is able to tell us
+     */
+    _isRoomInNetwork: function(room, server, network) {
+        // We carve rooms into two categories here. 'portal' rooms are
+        // rooms created by a user joining a bridge 'portal' alias to
+        // participate in that room or a foreign network. A room is a
+        // portal room if it has exactly one alias and that alias matches
+        // a pattern defined in the config. Its network is the key
+        // of the pattern that it matches.
+        // All other rooms are considered 'native matrix' rooms, and
+        // go into the special '_matrix' network.
+
+        let roomNetwork = '_matrix';
+        if (room.aliases && room.aliases.length == 1) {
+            if (this.props.config.serverConfig && this.props.config.serverConfig[server] && this.props.config.serverConfig[server].networks) {
+                for (const n of this.props.config.serverConfig[server].networks) {
+                    const pat = this.portalRoomPatterns[n];
+                    if (pat && pat.test(room.aliases[0])) {
+                        roomNetwork = n;
+                    }
+                }
+            }
+        }
+        return roomNetwork == network;
+    },
+
+    _stringLooksLikeId: function(s, network) {
        let pat = /^#[^\s]+:[^\s]/;
-        if (field_type && field_type.regexp) {
-            pat = new RegExp(field_type.regexp);
+        if (
+            network && network != '_matrix' &&
+            this.nativePatterns[network]
+        ) {
+            pat = this.nativePatterns[network];
        }

        return pat.test(s);
    },

-    _getFieldsForThirdPartyLocation: function(userInput, protocol, instance) {
-        // make an object with the fields specified by that protocol. We
+    _protocolForThirdPartyNetwork: function(network) {
+        if (
+            this.props.config.networks &&
+            this.props.config.networks[network] &&
+            this.props.config.networks[network].protocol
+        ) {
+            return this.props.config.networks[network].protocol;
+        }
+    },
+
+    _getFieldsForThirdPartyLocation: function(user_input, network) {
+        if (!this.props.config.networks || !this.props.config.networks[network]) return null;
+
+        const network_info = this.props.config.networks[network];
+        if (!network_info.protocol) return null;
+
+        if (!this.protocols) return null;
+
+        let matched_instance;
+        // Try to find which instance in the 'protocols' response
+        // matches this network. We look for a matching protocol
+        // and the existence of a 'domain' field and if present,
+        // its value.
+        if (
+            this.protocols[network_info.protocol] &&
+            this.protocols[network_info.protocol].instances &&
+            this.protocols[network_info.protocol].instances.length == 1
+        ) {
+            const the_instance = this.protocols[network_info.protocol].instances[0];
+            // If there's only one instance in this protocol, use it
+            // as long as it has no domain (which we assume to mean it's
+            // there is only one possible instance).
+            if (
+                (
+                    the_instance.fields.domain === undefined &&
+                    network_info.domain === undefined
+                ) ||
+                (
+                    the_instance.fields.domain !== undefined &&
+                    the_instance.fields.domain == network_info.domain
+                )
+            ) {
+                matched_instance = the_instance;
+            }
+        } else if (network_info.domain) {
+            // otherwise, we look for one with a matching domain.
+            for (const this_instance of this.protocols[network_info.protocol].instances) {
+                if (this_instance.fields.domain == network_info.domain) {
+                    matched_instance = this_instance;
+                }
+            }
+        }
+
+        if (matched_instance === undefined) return null;
+
+        // now make an object with the fields specified by that protocol. We
        // require that the values of all but the last field come from the
        // instance. The last is the user input.
-        const requiredFields = protocol.location_fields;
-        if (!requiredFields) return null;
+        const required_fields = this.protocols[network_info.protocol].location_fields;
        const fields = {};
-        for (let i = 0; i < requiredFields.length - 1; ++i) {
-            const thisField = requiredFields[i];
-            if (instance.fields[thisField] === undefined) return null;
-            fields[thisField] = instance.fields[thisField];
+        for (let i = 0; i < required_fields.length - 1; ++i) {
+            const this_field = required_fields[i];
+            if (matched_instance.fields[this_field] === undefined) return null;
+            fields[this_field] = matched_instance.fields[this_field];
        }
-        fields[requiredFields[requiredFields.length - 1]] = userInput;
+        fields[required_fields[required_fields.length - 1]] = user_input;
        return fields;
    },

    render: function() {
-        const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
-        const Loader = sdk.getComponent("elements.Spinner");
-
-        if (this.state.protocolsLoading) {
-            return (
-                <div className="mx_RoomDirectory">
-                    <SimpleRoomHeader title="Directory" />
-                    <Loader />
-                </div>
-            );
-        }
-
        let content;
        if (this.state.loading) {
+            const Loader = sdk.getComponent("elements.Spinner");
            content = <div className="mx_RoomDirectory">
                <Loader />
            </div>;
@@ -505,35 +583,26 @@ module.exports = React.createClass({
            </ScrollPanel>;
        }

-        const protocolName = protocolNameForInstanceId(this.protocols, this.state.instanceId);
-        let instance_expected_field_type;
-        if (
-            protocolName &&
-            this.protocols &&
-            this.protocols[protocolName] &&
-            this.protocols[protocolName].location_fields.length > 0 &&
-            this.protocols[protocolName].field_types
-        ) {
-            const last_field = this.protocols[protocolName].location_fields.slice(-1)[0];
-            instance_expected_field_type = this.protocols[protocolName].field_types[last_field];
-        }
-
-
        let placeholder = 'Search for a room';
-        if (!this.state.instanceId) {
+        if (this.state.network === null || this.state.network === '_matrix') {
            placeholder = '#example:' + this.state.roomServer;
-        } else if (instance_expected_field_type) {
-            placeholder = instance_expected_field_type.placeholder;
+        } else if (
+            this.props.config.networks &&
+            this.props.config.networks[this.state.network] &&
+            this.props.config.networks[this.state.network].example &&
+            this._getFieldsForThirdPartyLocation(this.state.filterString, this.state.network)
+        ) {
+            placeholder = this.props.config.networks[this.state.network].example;
        }

-        let showJoinButton = this._stringLooksLikeId(this.state.filterString, instance_expected_field_type);
-        if (protocolName) {
-            const instance = instanceForInstanceId(this.protocols, this.state.instanceId);
-            if (this._getFieldsForThirdPartyLocation(this.state.filterString, this.protocols[protocolName], instance) === null) {
+        let showJoinButton = this._stringLooksLikeId(this.state.filterString, this.state.network);
+        if (this.state.network && this.state.network != '_matrix') {
+            if (this._getFieldsForThirdPartyLocation(this.state.filterString, this.state.network) === null) {
                showJoinButton = false;
            }
        }

+        const SimpleRoomHeader = sdk.getComponent('rooms.SimpleRoomHeader');
        const NetworkDropdown = sdk.getComponent('directory.NetworkDropdown');
        const DirectorySearchBox = sdk.getComponent('elements.DirectorySearchBox');
        return (
@@ -546,7 +615,7 @@ module.exports = React.createClass({
                            onChange={this.onFilterChange} onClear={this.onFilterClear} onJoinClick={this.onJoinClick}
                            placeholder={placeholder} showJoinButton={showJoinButton}
                        />
-                        <NetworkDropdown config={this.props.config} protocols={this.protocols} onOptionChange={this.onOptionChange} />
+                        <NetworkDropdown config={this.props.config} onOptionChange={this.onOptionChange} />
                    </div>
                    {content}
                </div>
@@ -26,7 +26,6 @@ var Unread = require('matrix-react-sdk/lib/Unread');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var RoomNotifs = require('matrix-react-sdk/lib/RoomNotifs');
 var FormattingUtils = require('matrix-react-sdk/lib/utils/FormattingUtils');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 // turn this on for drop & drag console debugging galore
 var debug = false;
@@ -146,20 +145,12 @@ var RoomSubList = React.createClass({
        }
    },

-    onRoomTileClick(roomId) {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: roomId,
-        });
-    },
-
    tsOfNewestEvent: function(room) {
        for (var i = room.timeline.length - 1; i >= 0; --i) {
            var ev = room.timeline[i];
-            if (ev.getTs() &&
-                (Unread.eventTriggersUnreadCount(ev) ||
-                (ev.getSender() === MatrixClientPeg.get().credentials.userId))
-            ) {
+            if (Unread.eventTriggersUnreadCount(ev) ||
+                (ev.sender && ev.sender.userId === MatrixClientPeg.get().credentials.userId))
+            {
                return ev.getTs();
            }
        }
@@ -167,7 +158,7 @@ var RoomSubList = React.createClass({
        // we might only have events that don't trigger the unread indicator,
        // in which case use the oldest event even if normally it wouldn't count.
        // This is better than just assuming the last event was forever ago.
-        if (room.timeline.length && room.timeline[0].getTs()) {
+        if (room.timeline.length) {
            return room.timeline[0].getTs();
        } else {
            return Number.MAX_SAFE_INTEGER;
@@ -372,9 +363,7 @@ var RoomSubList = React.createClass({
                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
                    isInvite={ self.props.label === 'Invites' }
                    refreshSubList={ self._updateSubListCount }
-                    incomingCall={ null }
-                    onClick={ self.onRoomTileClick }
-                />
+                    incomingCall={ null } />
            );
        });
    },
@@ -418,7 +407,7 @@ var RoomSubList = React.createClass({
        if (this.props.incomingCall) {
            var self = this;
            // Check if the incoming call is for this section
-            var incomingCallRoom = this.props.list.filter(function(room) {
+            var incomingCallRoom = this.state.sortedList.filter(function(room) {
                return self.props.incomingCall.roomId === room.roomId;
            });

@@ -428,17 +417,15 @@ var RoomSubList = React.createClass({
            }
        }

-        var tabindex = this.props.searchFilter === "" ? "0" : "-1";
-
        return (
            <div className="mx_RoomSubList_labelContainer" title={ title } ref="header">
-                <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
+                <div onClick={ this.onClick } className="mx_RoomSubList_label">
                    { this.props.collapsed ? '' : this.props.label }
                    <div className="mx_RoomSubList_roomCount">{ roomCount }</div>
                    <div className={chevronClasses}></div>
                    { badge }
                    { incomingCall }
-                </AccessibleButton>
+                </div>
            </div>
        );
    },
@@ -460,11 +447,11 @@ var RoomSubList = React.createClass({
        });

        return (
-            <AccessibleButton className="mx_RoomSubList_ellipsis" onClick={this._showFullMemberList}>
+            <div className="mx_RoomSubList_ellipsis" onClick={this._showFullMemberList}>
                <div className="mx_RoomSubList_line"></div>
                <div className="mx_RoomSubList_more">more</div>
-                <div className={ badgeClasses }>{ content }</div>
-            </AccessibleButton>
+            <div className={ badgeClasses }>{ content }</div>
+            </div>
        );
    },

@@ -506,10 +493,9 @@ var RoomSubList = React.createClass({
                        // Do any final stuff here
                    }).fail(function(err) {
                        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        console.error("Failed to add tag " + self.props.tagName + " to room" + err);
                        Modal.createDialog(ErrorDialog, {
-                            title: "Error",
-                            description: "Failed to add tag " + self.props.tagName + " to room",
+                            title: "Failed to add tag " + self.props.tagName + " to room",
+                            description: err.toString()
                        });
                    });
                    break;
@@ -20,7 +20,6 @@ var React = require('react');
 var sdk = require('matrix-react-sdk')
 var dis = require('matrix-react-sdk/lib/dispatcher');
 var rate_limited_func = require('matrix-react-sdk/lib/ratelimitedfunc');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 module.exports = React.createClass({
    displayName: 'SearchBox',
@@ -36,29 +35,6 @@ module.exports = React.createClass({
        };
    },

-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
-    },
-
-    componentWillUnmount: function() {
-        dis.unregister(this.dispatcherRef);
-    },
-
-    onAction: function(payload) {
-        // Disabling this as I find it really really annoying, and was used to the
-        // previous behaviour - see https://github.com/vector-im/riot-web/issues/3348
-/*        
-        switch (payload.action) {
-            // Clear up the text field when a room is selected.
-            case 'view_room':
-                if (this.refs.search) {
-                    this._clearSearch();
-                }
-                break;
-        }
-*/        
-    },
-
    onChange: function() {
        if (!this.refs.search) return;
        this.setState({ searchTerm: this.refs.search.value });
@@ -85,42 +61,35 @@ module.exports = React.createClass({
        }
    },

-    _clearSearch: function() {
-        this.refs.search.value = "";
-        this.onChange();
-    },
-
    render: function() {
        var TintableSvg = sdk.getComponent('elements.TintableSvg');

-        var collapseTabIndex = this.refs.search && this.refs.search.value !== "" ? "-1" : "0";
-
        var toggleCollapse;
        if (this.props.collapsed) {
            toggleCollapse =
-                <AccessibleButton className="mx_SearchBox_maximise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, true) }>
-                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt="Expand panel"/>
-                </AccessibleButton>
+                <div className="mx_SearchBox_maximise" onClick={ this.onToggleCollapse.bind(this, true) }>
+                    <TintableSvg src="img/maximise.svg" width="10" height="16" alt="&lt;"/>
+                </div>
        }
        else {
            toggleCollapse =
-                <AccessibleButton className="mx_SearchBox_minimise" tabIndex={collapseTabIndex} onClick={ this.onToggleCollapse.bind(this, false) }>
-                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt="Collapse panel"/>
-                </AccessibleButton>
+                <div className="mx_SearchBox_minimise" onClick={ this.onToggleCollapse.bind(this, false) }>
+                    <TintableSvg src="img/minimise.svg" width="10" height="16" alt="&lt;"/>
+                </div>
        }

        var searchControls;
        if (!this.props.collapsed) {
            searchControls = [
                    this.state.searchTerm.length > 0 ?
-                    <AccessibleButton key="button"
-                            className="mx_SearchBox_closeButton"
-                            onClick={ ()=>{ this._clearSearch(); } }>
+                    <div key="button"
+                         className="mx_SearchBox_closeButton"
+                         onClick={ ()=>{ this.refs.search.value = ""; this.onChange(); } }>
                        <TintableSvg
                            className="mx_SearchBox_searchButton"
                            src="img/icons-close.svg" width="24" height="24"
                        />
-                    </AccessibleButton>
+                    </div>
                    :
                    <TintableSvg
                        key="button"
@@ -62,24 +62,19 @@ module.exports = React.createClass({
    },

    onRedactClick: function() {
-        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createDialog(ConfirmRedactDialog, {
-            onFinished: (proceed) => {
-                if (!proceed) return;
-
-                MatrixClientPeg.get().redactEvent(
-                    this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
-                ).catch(function(e) {
-                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    // display error message stating you couldn't delete this.
-                    var code = e.errcode || e.statusCode;
-                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "You cannot delete this message. (" + code + ")"
-                    });
-                }).done();
-            },
-        }, 'mx_Dialog_confirmredact');
+        MatrixClientPeg.get().redactEvent(
+            this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
+        ).done(function() {
+            // message should disappear by itself
+        }, function(e) {
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            // display error message stating you couldn't delete this.
+            var code = e.errcode || e.statusCode;
+            Modal.createDialog(ErrorDialog, {
+                title: "Error",
+                description: "You cannot delete this message. (" + code + ")"
+            });
+        });
        if (this.props.onFinished) this.props.onFinished();
    },

@@ -126,7 +121,7 @@ module.exports = React.createClass({
            );
        }

-        if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
+        if (!eventStatus) { // sent
            redactButton = (
                <div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
                    Redact
@@ -0,0 +1,144 @@
+/*
+Copyright 2015, 2016 OpenMarket 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.
+*/
+
+'use strict';
+
+var q = require("q");
+var React = require('react');
+var classNames = require('classnames');
+var RoomNotifs = require('matrix-react-sdk/lib/RoomNotifs');
+var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
+
+module.exports = React.createClass({
+    displayName: 'NotificationStateContextMenu',
+
+    propTypes: {
+        room: React.PropTypes.object.isRequired,
+        /* callback called when the menu is dismissed */
+        onFinished: React.PropTypes.func,
+    },
+
+    getInitialState() {
+        return {
+            roomNotifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
+        }
+    },
+
+    componentWillMount: function() {
+        this._unmounted = false;
+    },
+
+    componentWillUnmount: function() {
+        this._unmounted = true;
+    },
+
+    _save: function(newState) {
+        const oldState = this.state.roomNotifState;
+        const roomId = this.props.room.roomId;
+        var cli = MatrixClientPeg.get();
+
+        if (cli.isGuest()) return;
+
+        this.setState({
+            roomNotifState: newState,
+        });
+        RoomNotifs.setRoomNotifsState(this.props.room.roomId, newState).done(() => {
+            // delay slightly so that the user can see their state change
+            // before closing the menu
+            return q.delay(500).then(() => {
+                if (this._unmounted) return;
+                // Close the context menu
+                if (this.props.onFinished) {
+                    this.props.onFinished();
+                };
+            });
+        }, (error) => {
+            // TODO: some form of error notification to the user
+            // to inform them that their state change failed.
+            // For now we at least set the state back
+            if (this._unmounted) return;
+            this.setState({
+                roomNotifState: oldState,
+            });
+        });
+    },
+
+    _onClickAlertMe: function() {
+        this._save(RoomNotifs.ALL_MESSAGES_LOUD);
+    },
+
+    _onClickAllNotifs: function() {
+        this._save(RoomNotifs.ALL_MESSAGES);
+    },
+
+    _onClickMentions: function() {
+        this._save(RoomNotifs.MENTIONS_ONLY);
+    },
+
+    _onClickMute: function() {
+        this._save(RoomNotifs.MUTE);
+    },
+
+    render: function() {
+        var alertMeClasses = classNames({
+            'mx_NotificationStateContextMenu_field': true,
+            'mx_NotificationStateContextMenu_fieldSet': this.state.roomNotifState == RoomNotifs.ALL_MESSAGES_LOUD,
+        });
+
+        var allNotifsClasses = classNames({
+            'mx_NotificationStateContextMenu_field': true,
+            'mx_NotificationStateContextMenu_fieldSet': this.state.roomNotifState == RoomNotifs.ALL_MESSAGES,
+        });
+
+        var mentionsClasses = classNames({
+            'mx_NotificationStateContextMenu_field': true,
+            'mx_NotificationStateContextMenu_fieldSet': this.state.roomNotifState == RoomNotifs.MENTIONS_ONLY,
+        });
+
+        var muteNotifsClasses = classNames({
+            'mx_NotificationStateContextMenu_field': true,
+            'mx_NotificationStateContextMenu_fieldSet': this.state.roomNotifState == RoomNotifs.MUTE,
+        });
+
+        return (
+            <div>
+                <div className="mx_NotificationStateContextMenu_picker" >
+                    <img src="img/notif-slider.svg" width="20" height="107" />
+                </div>
+                <div className={ alertMeClasses } onClick={this._onClickAlertMe} >
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img className="mx_NotificationStateContextMenu_icon" src="img/icon-context-mute-off-copy.svg" width="16" height="12" />
+                    All messages (loud)
+                </div>
+                <div className={ allNotifsClasses } onClick={this._onClickAllNotifs} >
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img className="mx_NotificationStateContextMenu_icon" src="img/icon-context-mute-off.svg" width="16" height="12" />
+                    All messages
+                </div>
+                <div className={ mentionsClasses } onClick={this._onClickMentions} >
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img className="mx_NotificationStateContextMenu_icon" src="img/icon-context-mute-mentions.svg" width="16" height="12" />
+                    Mentions only
+                </div>
+                <div className={ muteNotifsClasses } onClick={this._onClickMute} >
+                    <img className="mx_NotificationStateContextMenu_activeIcon" src="img/notif-active.svg" width="12" height="12" />
+                    <img className="mx_NotificationStateContextMenu_icon" src="img/icon-context-mute.svg" width="16" height="12" />
+                    Mute
+                </div>
+            </div>
+        );
+    }
+});
@@ -0,0 +1,253 @@
+/*
+Copyright 2015, 2016 OpenMarket 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.
+*/
+
+'use strict';
+
+var q = require("q");
+var React = require('react');
+var classNames = require('classnames');
+var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
+var dis = require('matrix-react-sdk/lib/dispatcher');
+var DMRoomMap = require('matrix-react-sdk/lib/utils/DMRoomMap');
+var Rooms = require('matrix-react-sdk/lib/Rooms');
+
+module.exports = React.createClass({
+    displayName: 'RoomTagContextMenu',
+
+    propTypes: {
+        room: React.PropTypes.object.isRequired,
+        /* callback called when the menu is dismissed */
+        onFinished: React.PropTypes.func,
+    },
+
+    getInitialState: function() {
+        const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
+        return {
+            isFavourite: this.props.room.tags.hasOwnProperty("m.favourite"),
+            isLowPriority: this.props.room.tags.hasOwnProperty("m.lowpriority"),
+            isDirectMessage: Boolean(dmRoomMap.getUserIdForRoomId(this.props.room.roomId)),
+        };
+    },
+
+    _toggleTag: function(tagNameOn, tagNameOff) {
+        var self = this;
+        const roomId = this.props.room.roomId;
+        var cli = MatrixClientPeg.get();
+        if (!cli.isGuest()) {
+            q.delay(500).then(function() {
+                if (tagNameOff !== null && tagNameOff !== undefined) {
+                    cli.deleteRoomTag(roomId, tagNameOff).finally(function() {
+                        // Close the context menu
+                        if (self.props.onFinished) {
+                            self.props.onFinished();
+                        };
+                    }).fail(function(err) {
+                        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                        Modal.createDialog(ErrorDialog, {
+                            title: "Failed to remove tag " + tagNameOff + " from room",
+                            description: err.toString()
+                        });
+                    });
+                }
+
+                if (tagNameOn !== null && tagNameOn !== undefined) {
+                    // If the tag ordering meta data is required, it is added by
+                    // the RoomSubList when it sorts its rooms
+                    cli.setRoomTag(roomId, tagNameOn, {}).finally(function() {
+                        // Close the context menu
+                        if (self.props.onFinished) {
+                            self.props.onFinished();
+                        };
+                    }).fail(function(err) {
+                        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                        Modal.createDialog(ErrorDialog, {
+                            title: "Failed to add tag " + tagNameOn + " to room",
+                            description: err.toString()
+                        });
+                    });
+                }
+            });
+        }
+    },
+
+    _onClickFavourite: function() {
+        // Tag room as 'Favourite'
+        if (!this.state.isFavourite && this.state.isLowPriority) {
+            this.setState({
+                isFavourite: true,
+                isLowPriority: false,
+            });
+            this._toggleTag("m.favourite", "m.lowpriority");
+        } else if (this.state.isFavourite) {
+            this.setState({isFavourite: false});
+            this._toggleTag(null, "m.favourite");
+        } else if (!this.state.isFavourite) {
+            this.setState({isFavourite: true});
+            this._toggleTag("m.favourite");
+        }
+    },
+
+    _onClickLowPriority: function() {
+        // Tag room as 'Low Priority'
+        if (!this.state.isLowPriority && this.state.isFavourite) {
+            this.setState({
+                isFavourite: false,
+                isLowPriority: true,
+            });
+            this._toggleTag("m.lowpriority", "m.favourite");
+        } else if (this.state.isLowPriority) {
+            this.setState({isLowPriority: false});
+            this._toggleTag(null, "m.lowpriority");
+        } else if (!this.state.isLowPriority) {
+            this.setState({isLowPriority: true});
+            this._toggleTag("m.lowpriority");
+        }
+    },
+
+    _onClickDM: function() {
+        const newIsDirectMessage = !this.state.isDirectMessage;
+        this.setState({
+            isDirectMessage: newIsDirectMessage,
+        });
+
+        if (MatrixClientPeg.get().isGuest()) return;
+
+        let newTarget;
+        if (newIsDirectMessage) {
+            const guessedTarget = Rooms.guessDMRoomTarget(
+                this.props.room,
+                this.props.room.getMember(MatrixClientPeg.get().credentials.userId),
+            );
+            newTarget = guessedTarget.userId;
+        } else {
+            newTarget = null;
+        }
+
+        // give some time for the user to see the icon change first, since
+        // this will hide the context menu once it completes
+        q.delay(500).done(() => {
+            return Rooms.setDMRoom(this.props.room.roomId, newTarget).finally(() => {
+                // Close the context menu
+                if (this.props.onFinished) {
+                    this.props.onFinished();
+                };
+            }, (err) => {
+                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+                Modal.createDialog(ErrorDialog, {
+                    title: "Failed to set Direct Message status of room",
+                    description: err.toString()
+                });
+            });
+        });
+    },
+
+    _onClickLeave: function() {
+        // Leave room
+        dis.dispatch({
+            action: 'leave_room',
+            room_id: this.props.room.roomId,
+        });
+
+        // Close the context menu
+        if (this.props.onFinished) {
+            this.props.onFinished();
+        };
+    },
+
+    _onClickForget: function() {
+        // FIXME: duplicated with RoomSettings (and dead code in RoomView)
+        MatrixClientPeg.get().forget(this.props.room.roomId).done(function() {
+            dis.dispatch({ action: 'view_next_room' });
+        }, function(err) {
+            var errCode = err.errcode || "unknown error code";
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            Modal.createDialog(ErrorDialog, {
+                title: "Error",
+                description: `Failed to forget room (${errCode})`
+            });
+        });
+
+        // Close the context menu
+        if (this.props.onFinished) {
+            this.props.onFinished();
+        };
+    },
+
+    render: function() {
+        const myUserId = MatrixClientPeg.get().credentials.userId;
+        const myMember = this.props.room.getMember(myUserId);
+
+        const favouriteClasses = classNames({
+            'mx_RoomTagContextMenu_field': true,
+            'mx_RoomTagContextMenu_fieldSet': this.state.isFavourite,
+            'mx_RoomTagContextMenu_fieldDisabled': false,
+        });
+
+        const lowPriorityClasses = classNames({
+            'mx_RoomTagContextMenu_field': true,
+            'mx_RoomTagContextMenu_fieldSet': this.state.isLowPriority,
+            'mx_RoomTagContextMenu_fieldDisabled': false,
+        });
+
+        const leaveClasses = classNames({
+            'mx_RoomTagContextMenu_field': true,
+            'mx_RoomTagContextMenu_fieldSet': false,
+            'mx_RoomTagContextMenu_fieldDisabled': false,
+        });
+
+        const dmClasses = classNames({
+            'mx_RoomTagContextMenu_field': true,
+            'mx_RoomTagContextMenu_fieldSet': this.state.isDirectMessage,
+            'mx_RoomTagContextMenu_fieldDisabled': false,
+        });
+
+        if (myMember && myMember.membership === "leave") {
+            return (
+                <div>
+                    <div className={ leaveClasses } onClick={ this._onClickForget } >
+                        <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_delete.svg" width="15" height="15" />
+                        Forget
+                    </div>
+                </div>
+            );
+        }
+
+        return (
+            <div>
+                <div className={ favouriteClasses } onClick={this._onClickFavourite} >
+                    <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_fave.svg" width="15" height="15" />
+                    <img className="mx_RoomTagContextMenu_icon_set" src="img/icon_context_fave_on.svg" width="15" height="15" />
+                    Favourite
+                </div>
+                <div className={ lowPriorityClasses } onClick={this._onClickLowPriority} >
+                    <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_low.svg" width="15" height="15" />
+                    <img className="mx_RoomTagContextMenu_icon_set" src="img/icon_context_low_on.svg" width="15" height="15" />
+                    Low Priority
+                </div>
+                <div className={ dmClasses } onClick={this._onClickDM} >
+                    <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_person.svg" width="15" height="15" />
+                    <img className="mx_RoomTagContextMenu_icon_set" src="img/icon_context_person_on.svg" width="15" height="15" />
+                    Direct Chat
+                </div>
+                <hr className="mx_RoomTagContextMenu_separator" />
+                <div className={ leaveClasses } onClick={(myMember && myMember.membership === "join") ? this._onClickLeave : null} >
+                    <img className="mx_RoomTagContextMenu_icon" src="img/icon_context_delete.svg" width="15" height="15" />
+                    Leave
+                </div>
+            </div>
+        );
+    }
+});
@@ -1,392 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations 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.
-*/
-
-'use strict';
-
-import q from 'q';
-import React from 'react';
-import classNames from 'classnames';
-import sdk from 'matrix-react-sdk';
-import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import dis from 'matrix-react-sdk/lib/dispatcher';
-import DMRoomMap from 'matrix-react-sdk/lib/utils/DMRoomMap';
-import * as Rooms from 'matrix-react-sdk/lib/Rooms';
-import * as RoomNotifs from 'matrix-react-sdk/lib/RoomNotifs';
-import Modal from 'matrix-react-sdk/lib/Modal';
-
-module.exports = React.createClass({
-    displayName: 'RoomTileContextMenu',
-
-    propTypes: {
-        room: React.PropTypes.object.isRequired,
-        /* callback called when the menu is dismissed */
-        onFinished: React.PropTypes.func,
-    },
-
-    getInitialState() {
-        const dmRoomMap = new DMRoomMap(MatrixClientPeg.get());
-        return {
-            roomNotifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
-            isFavourite: this.props.room.tags.hasOwnProperty("m.favourite"),
-            isLowPriority: this.props.room.tags.hasOwnProperty("m.lowpriority"),
-            isDirectMessage: Boolean(dmRoomMap.getUserIdForRoomId(this.props.room.roomId)),
-        }
-    },
-
-    componentWillMount: function() {
-        this._unmounted = false;
-    },
-
-    componentWillUnmount: function() {
-        this._unmounted = true;
-    },
-
-    _toggleTag: function(tagNameOn, tagNameOff) {
-        var self = this;
-        const roomId = this.props.room.roomId;
-        var cli = MatrixClientPeg.get();
-        if (!cli.isGuest()) {
-            q.delay(500).then(function() {
-                if (tagNameOff !== null && tagNameOff !== undefined) {
-                    cli.deleteRoomTag(roomId, tagNameOff).finally(function() {
-                        // Close the context menu
-                        if (self.props.onFinished) {
-                            self.props.onFinished();
-                        };
-                    }).fail(function(err) {
-                        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        Modal.createDialog(ErrorDialog, {
-                            title: "Failed to remove tag " + tagNameOff + " from room",
-                            description: err.toString()
-                        });
-                    });
-                }
-
-                if (tagNameOn !== null && tagNameOn !== undefined) {
-                    // If the tag ordering meta data is required, it is added by
-                    // the RoomSubList when it sorts its rooms
-                    cli.setRoomTag(roomId, tagNameOn, {}).finally(function() {
-                        // Close the context menu
-                        if (self.props.onFinished) {
-                            self.props.onFinished();
-                        };
-                    }).fail(function(err) {
-                        var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        Modal.createDialog(ErrorDialog, {
-                            title: "Failed to add tag " + tagNameOn + " to room",
-                            description: err.toString()
-                        });
-                    });
-                }
-            });
-        }
-    },
-
-    _onClickFavourite: function() {
-        // Tag room as 'Favourite'
-        if (!this.state.isFavourite && this.state.isLowPriority) {
-            this.setState({
-                isFavourite: true,
-                isLowPriority: false,
-            });
-            this._toggleTag("m.favourite", "m.lowpriority");
-        } else if (this.state.isFavourite) {
-            this.setState({isFavourite: false});
-            this._toggleTag(null, "m.favourite");
-        } else if (!this.state.isFavourite) {
-            this.setState({isFavourite: true});
-            this._toggleTag("m.favourite");
-        }
-    },
-
-    _onClickLowPriority: function() {
-        // Tag room as 'Low Priority'
-        if (!this.state.isLowPriority && this.state.isFavourite) {
-            this.setState({
-                isFavourite: false,
-                isLowPriority: true,
-            });
-            this._toggleTag("m.lowpriority", "m.favourite");
-        } else if (this.state.isLowPriority) {
-            this.setState({isLowPriority: false});
-            this._toggleTag(null, "m.lowpriority");
-        } else if (!this.state.isLowPriority) {
-            this.setState({isLowPriority: true});
-            this._toggleTag("m.lowpriority");
-        }
-    },
-
-    _onClickDM: function() {
-        const newIsDirectMessage = !this.state.isDirectMessage;
-        this.setState({
-            isDirectMessage: newIsDirectMessage,
-        });
-
-        if (MatrixClientPeg.get().isGuest()) return;
-
-        Rooms.guessAndSetDMRoom(
-            this.props.room, newIsDirectMessage
-        ).delay(500).finally(() => {
-            // Close the context menu
-            if (this.props.onFinished) {
-                this.props.onFinished();
-            };
-        }, (err) => {
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
-                title: "Failed to set Direct Message status of room",
-                description: err.toString()
-            });
-        });
-    },
-
-    _onClickLeave: function() {
-        // Leave room
-        dis.dispatch({
-            action: 'leave_room',
-            room_id: this.props.room.roomId,
-        });
-
-        // Close the context menu
-        if (this.props.onFinished) {
-            this.props.onFinished();
-        };
-    },
-
-    _onClickReject: function() {
-        dis.dispatch({
-            action: 'reject_invite',
-            room_id: this.props.room.roomId,
-        });
-
-        // Close the context menu
-        if (this.props.onFinished) {
-            this.props.onFinished();
-        };
-    },
-
-    _onClickForget: function() {
-        // FIXME: duplicated with RoomSettings (and dead code in RoomView)
-        MatrixClientPeg.get().forget(this.props.room.roomId).done(function() {
-            dis.dispatch({ action: 'view_next_room' });
-        }, function(err) {
-            var errCode = err.errcode || "unknown error code";
-            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: `Failed to forget room (${errCode})`
-            });
-        });
-
-        // Close the context menu
-        if (this.props.onFinished) {
-            this.props.onFinished();
-        };
-    },
-
-    _saveNotifState: function(newState) {
-        const oldState = this.state.roomNotifState;
-        const roomId = this.props.room.roomId;
-        var cli = MatrixClientPeg.get();
-
-        if (cli.isGuest()) return;
-
-        this.setState({
-            roomNotifState: newState,
-        });
-        RoomNotifs.setRoomNotifsState(this.props.room.roomId, newState).done(() => {
-            // delay slightly so that the user can see their state change
-            // before closing the menu
-            return q.delay(500).then(() => {
-                if (this._unmounted) return;
-                // Close the context menu
-                if (this.props.onFinished) {
-                    this.props.onFinished();
-                };
-            });
-        }, (error) => {
-            // TODO: some form of error notification to the user
-            // to inform them that their state change failed.
-            // For now we at least set the state back
-            if (this._unmounted) return;
-            this.setState({
-                roomNotifState: oldState,
-            });
-        });
-    },
-
-    _onClickAlertMe: function() {
-        this._saveNotifState(RoomNotifs.ALL_MESSAGES_LOUD);
-    },
-
-    _onClickAllNotifs: function() {
-        this._saveNotifState(RoomNotifs.ALL_MESSAGES);
-    },
-
-    _onClickMentions: function() {
-        this._saveNotifState(RoomNotifs.MENTIONS_ONLY);
-    },
-
-    _onClickMute: function() {
-        this._saveNotifState(RoomNotifs.MUTE);
-    },
-
-    _renderNotifMenu: function() {
-        var alertMeClasses = classNames({
-            'mx_RoomTileContextMenu_notif_field': true,
-            'mx_RoomTileContextMenu_notif_fieldSet': this.state.roomNotifState == RoomNotifs.ALL_MESSAGES_LOUD,
-        });
-
-        var allNotifsClasses = classNames({
-            'mx_RoomTileContextMenu_notif_field': true,
-            'mx_RoomTileContextMenu_notif_fieldSet': this.state.roomNotifState == RoomNotifs.ALL_MESSAGES,
-        });
-
-        var mentionsClasses = classNames({
-            'mx_RoomTileContextMenu_notif_field': true,
-            'mx_RoomTileContextMenu_notif_fieldSet': this.state.roomNotifState == RoomNotifs.MENTIONS_ONLY,
-        });
-
-        var muteNotifsClasses = classNames({
-            'mx_RoomTileContextMenu_notif_field': true,
-            'mx_RoomTileContextMenu_notif_fieldSet': this.state.roomNotifState == RoomNotifs.MUTE,
-        });
-
-        return (
-            <div>
-                <div className="mx_RoomTileContextMenu_notif_picker" >
-                    <img src="img/notif-slider.svg" width="20" height="107" />
-                </div>
-                <div className={ alertMeClasses } onClick={this._onClickAlertMe} >
-                    <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
-                    <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-off-copy.svg" width="16" height="12" />
-                    All messages (loud)
-                </div>
-                <div className={ allNotifsClasses } onClick={this._onClickAllNotifs} >
-                    <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
-                    <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-off.svg" width="16" height="12" />
-                    All messages
-                </div>
-                <div className={ mentionsClasses } onClick={this._onClickMentions} >
-                    <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
-                    <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute-mentions.svg" width="16" height="12" />
-                    Mentions only
-                </div>
-                <div className={ muteNotifsClasses } onClick={this._onClickMute} >
-                    <img className="mx_RoomTileContextMenu_notif_activeIcon" src="img/notif-active.svg" width="12" height="12" />
-                    <img className="mx_RoomTileContextMenu_notif_icon mx_filterFlipColor" src="img/icon-context-mute.svg" width="16" height="12" />
-                    Mute
-                </div>
-            </div>
-        );
-    },
-
-    _renderLeaveMenu: function(membership) {
-        if (!membership) {
-            return null;
-        }
-
-        let leaveClickHandler = null;
-        let leaveText = null;
-
-        switch (membership) {
-            case "join":
-                leaveClickHandler = this._onClickLeave;
-                leaveText = "Leave";
-                break;
-            case "leave":
-            case "ban":
-                leaveClickHandler = this._onClickForget;
-                leaveText = "Forget";
-                break;
-            case "invite":
-                leaveClickHandler = this._onClickReject;
-                leaveText = "Reject";
-                break;
-        }
-
-        return (
-            <div>
-                <div className="mx_RoomTileContextMenu_leave" onClick={ leaveClickHandler } >
-                    <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_delete.svg" width="15" height="15" />
-                    { leaveText }
-                </div>
-            </div>
-        );
-    },
-
-    _renderRoomTagMenu: function() {
-        const favouriteClasses = classNames({
-            'mx_RoomTileContextMenu_tag_field': true,
-            'mx_RoomTileContextMenu_tag_fieldSet': this.state.isFavourite,
-            'mx_RoomTileContextMenu_tag_fieldDisabled': false,
-        });
-
-        const lowPriorityClasses = classNames({
-            'mx_RoomTileContextMenu_tag_field': true,
-            'mx_RoomTileContextMenu_tag_fieldSet': this.state.isLowPriority,
-            'mx_RoomTileContextMenu_tag_fieldDisabled': false,
-        });
-
-        const dmClasses = classNames({
-            'mx_RoomTileContextMenu_tag_field': true,
-            'mx_RoomTileContextMenu_tag_fieldSet': this.state.isDirectMessage,
-            'mx_RoomTileContextMenu_tag_fieldDisabled': false,
-        });
-
-        return (
-            <div>
-                <div className={ favouriteClasses } onClick={this._onClickFavourite} >
-                    <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_fave.svg" width="15" height="15" />
-                    <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_fave_on.svg" width="15" height="15" />
-                    Favourite
-                </div>
-                <div className={ lowPriorityClasses } onClick={this._onClickLowPriority} >
-                    <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_low.svg" width="15" height="15" />
-                    <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_low_on.svg" width="15" height="15" />
-                    Low Priority
-                </div>
-                <div className={ dmClasses } onClick={this._onClickDM} >
-                    <img className="mx_RoomTileContextMenu_tag_icon" src="img/icon_context_person.svg" width="15" height="15" />
-                    <img className="mx_RoomTileContextMenu_tag_icon_set" src="img/icon_context_person_on.svg" width="15" height="15" />
-                    Direct Chat
-                </div>
-            </div>
-        );
-    },
-
-    render: function() {
-        const myMember = this.props.room.getMember(
-            MatrixClientPeg.get().credentials.userId
-        );
-
-        // Can't set notif level or tags on non-join rooms
-        if (myMember.membership !== 'join') {
-            return this._renderLeaveMenu(myMember.membership);
-        }
-
-        return (
-            <div>
-                { this._renderNotifMenu() }
-                <hr className="mx_RoomTileContextMenu_separator" />
-                { this._renderLeaveMenu(myMember.membership) }
-                <hr className="mx_RoomTileContextMenu_separator" />
-                { this._renderRoomTagMenu() }
-            </div>
-        );
-    }
-});
@@ -1,127 +0,0 @@
-/*
-Copyright 2017 OpenMarket 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.
-*/
-
-import React from 'react';
-import sdk from 'matrix-react-sdk';
-import rageshake from '../../../vector/rageshake';
-
-export default class BugReportDialog extends React.Component {
-    constructor(props, context) {
-        super(props, context);
-        this.state = {
-            sendLogs: true,
-            busy: false,
-            err: null,
-            text: "",
-        };
-        this._onSubmit = this._onSubmit.bind(this);
-        this._onCancel = this._onCancel.bind(this);
-        this._onTextChange = this._onTextChange.bind(this);
-        this._onSendLogsChange = this._onSendLogsChange.bind(this);
-    }
-
-    _onCancel(ev) {
-        this.props.onFinished(false);
-    }
-
-    _onSubmit(ev) {
-        const sendLogs = this.state.sendLogs;
-        const userText = this.state.text;
-        if (!sendLogs && userText.trim().length === 0) {
-            this.setState({
-                err: "Please describe the bug and/or send logs.",
-            });
-            return;
-        }
-        this.setState({ busy: true, err: null });
-        rageshake.sendBugReport(userText, sendLogs).then(() => {
-            this.setState({ busy: false });
-            this.props.onFinished(false);
-        }, (err) => {
-            this.setState({ busy: false, err: `Failed: ${err.message}` });
-        });
-    }
-
-    _onTextChange(ev) {
-        this.setState({ text: ev.target.value });
-    }
-
-    _onSendLogsChange(ev) {
-        this.setState({ sendLogs: ev.target.checked });
-    }
-
-    render() {
-        const Loader = sdk.getComponent("elements.Spinner");
-
-        let error = null;
-        if (this.state.err) {
-            error = <div className="error">
-                {this.state.err}
-            </div>;
-        }
-
-        const okLabel = this.state.busy ? <Loader /> : 'Send';
-
-        let cancelButton = null;
-        if (!this.state.busy) {
-            cancelButton = <button onClick={this._onCancel}>
-                Cancel
-            </button>;
-        }
-
-        return (
-            <div className="mx_BugReportDialog">
-                <div className="mx_Dialog_title">
-                    Report a bug
-                </div>
-                <div className="mx_Dialog_content">
-                    <p>Please describe the bug. What did you do?
-                    What did you expect to happen?
-                    What actually happened?</p>
-                    <textarea
-                        className="mx_BugReportDialog_input"
-                        rows={5}
-                        onChange={this._onTextChange}
-                        value={this.state.text}
-                        placeholder="Describe your problem here."
-                    />
-                    <p>In order to diagnose problems, logs from this client will be sent with
-                    this bug report.
-                    If you would prefer to only send the text above, please untick:</p>
-                    <input type="checkbox" checked={this.state.sendLogs}
-                        onChange={this._onSendLogsChange} id="mx_BugReportDialog_logs"/>
-                    <label htmlFor="mx_BugReportDialog_logs">Send logs</label>
-                    {error}
-                </div>
-                <div className="mx_Dialog_buttons">
-                    <button
-                        className="mx_Dialog_primary danger"
-                        onClick={this._onSubmit}
-                        autoFocus={true}
-                    >
-                        {okLabel}
-                    </button>
-
-                    {cancelButton}
-                </div>
-            </div>
-        );
-    }
-}
-
-BugReportDialog.propTypes = {
-    onFinished: React.PropTypes.func.isRequired,
-};
@@ -16,9 +16,6 @@ limitations under the License.

 import React from 'react';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import {instanceForInstanceId} from '../../../utils/DirectoryUtils';
-
-const DEFAULT_ICON_URL = "img/network-matrix.svg";

 export default class NetworkDropdown extends React.Component {
    constructor(props) {
@@ -38,11 +35,20 @@ export default class NetworkDropdown extends React.Component {
        this.inputTextBox = null;

        const server = MatrixClientPeg.getHomeServerName();
+        let defaultNetwork = null;
+        if (
+            this.props.config.serverConfig &&
+            this.props.config.serverConfig[server] &&
+            this.props.config.serverConfig[server].networks &&
+            this.props.config.serverConfig[server].networks.indexOf('_matrix') > -1
+        ) {
+            defaultNetwork = '_matrix';
+        }
+
        this.state = {
            expanded: false,
            selectedServer: server,
-            selectedInstance: null,
-            includeAllNetworks: false,
+            selectedNetwork: defaultNetwork,
        };
    }

@@ -52,7 +58,7 @@ export default class NetworkDropdown extends React.Component {
        document.addEventListener('click', this.onDocumentClick, false);

        // fire this now so the defaults can be set up
-        this.props.onOptionChange(this.state.selectedServer, this.state.selectedInstance, this.state.includeAllNetworks);
+        this.props.onOptionChange(this.state.selectedServer, this.state.selectedNetwork);
    }

    componentWillUnmount() {
@@ -92,14 +98,13 @@ export default class NetworkDropdown extends React.Component {
        ev.preventDefault();
    }

-    onMenuOptionClick(server, instance, includeAll) {
+    onMenuOptionClick(server, network, ev) {
        this.setState({
            expanded: false,
            selectedServer: server,
-            selectedInstanceId: instance ? instance.instance_id : null,
-            includeAll: includeAll,
+            selectedNetwork: network,
        });
-        this.props.onOptionChange(server, instance ? instance.instance_id : null, includeAll);
+        this.props.onOptionChange(server, network);
    }

    onInputKeyUp(e) {
@@ -139,22 +144,11 @@ export default class NetworkDropdown extends React.Component {
            servers.unshift(MatrixClientPeg.getHomeServerName());
        }

-        // For our own HS, we can use the instance_ids given in the third party protocols
-        // response to get the server to filter the room list by network for us.
-        // We can't get thirdparty protocols for remote server yet though, so for those
-        // we can only show the default room list.
        for (const server of servers) {
-            options.push(this._makeMenuOption(server, null, true));
-            if (server == MatrixClientPeg.getHomeServerName()) {
-                options.push(this._makeMenuOption(server, null, false));
-                if (this.props.protocols) {
-                    for (const proto of Object.keys(this.props.protocols)) {
-                        if (!this.props.protocols[proto].instances) continue;
-                        for (const instance of this.props.protocols[proto].instances) {
-                            if (!instance.instance_id) continue;
-                            options.push(this._makeMenuOption(server, instance, false));
-                        }
-                    }
+            options.push(this._makeMenuOption(server, null));
+            if (this.props.config.serverConfig && this.props.config.serverConfig[server] && this.props.config.serverConfig[server].networks) {
+                for (const network of this.props.config.serverConfig[server].networks) {
+                    options.push(this._makeMenuOption(server, network));
                }
            }
        }
@@ -162,39 +156,50 @@ export default class NetworkDropdown extends React.Component {
        return options;
    }

-    _makeMenuOption(server, instance, includeAll, handleClicks) {
-        if (handleClicks === undefined) handleClicks = true;
-
+    _makeMenuOption(server, network, wire_onclick) {
+        if (wire_onclick === undefined) wire_onclick = true;
        let icon;
        let name;
        let span_class;
-        let key;

-        if (!instance && includeAll) {
-            key = server;
+        if (network === null) {
            name = server;
            span_class = 'mx_NetworkDropdown_menu_all';
-        } else if (!instance) {
-            key = server + '_all';
+        } else if (network == '_matrix') {
            name = 'Matrix';
-            icon = <img src="img/network-matrix.svg" />;
+            icon = <img src="img/network-matrix.svg" width="16" height="16" />;
            span_class = 'mx_NetworkDropdown_menu_network';
        } else {
-            key = server + '_inst_' + instance.instance_id;
-            const imgUrl = instance.icon ?
-                MatrixClientPeg.get().mxcUrlToHttp(instance.icon, 25, 25, 'crop', true) :
-                DEFAULT_ICON_URL;
-            icon = <img src={imgUrl} />;
-            name = instance.desc;
+            if (this.props.config.networks[network] === undefined) {
+                throw new Error(network + ' network missing from config');
+            }
+            if (this.props.config.networks[network].name) {
+                name = this.props.config.networks[network].name;
+            } else {
+                name = network;
+            }
+            if (this.props.config.networks[network].icon) {
+                // omit height here so if people define a non-square logo in the config, it
+                // will keep the aspect when it scales
+                icon = <img src={this.props.config.networks[network].icon} width="16" />;
+            } else {
+                icon = <img src={iconPath} width="16" height="16" />;
+            }
+
            span_class = 'mx_NetworkDropdown_menu_network';
        }

-        const click_handler = handleClicks ? this.onMenuOptionClick.bind(this, server, instance, includeAll) : null;
+        const click_handler = wire_onclick ? this.onMenuOptionClick.bind(this, server, network) : null;
+
+        let key = server;
+        if (network !== null) {
+            key += '_' + network;
+        }

        return <div key={key} className="mx_NetworkDropdown_networkoption" onClick={click_handler}>
            {icon}
-            <span className="mx_NetworkDropdown_menu_network">{name}</span>
-        </div>
+            <span className={span_class}>{name}</span>
+        </div>;
    }

    render() {
@@ -211,9 +216,8 @@ export default class NetworkDropdown extends React.Component {
                placeholder="matrix.org" // 'matrix.org' as an example of an HS name
            />
        } else {
-            const instance = instanceForInstanceId(this.props.protocols, this.state.selectedInstanceId);
            current_value = this._makeMenuOption(
-                this.state.selectedServer, instance, this.state.includeAll, false
+                this.state.selectedServer, this.state.selectedNetwork, false
            );
        }

@@ -229,12 +233,12 @@ export default class NetworkDropdown extends React.Component {

 NetworkDropdown.propTypes = {
    onOptionChange: React.PropTypes.func.isRequired,
-    protocols: React.PropTypes.object,
-    // The room directory config. May have a 'servers' key that is a list of server names to include in the dropdown
    config: React.PropTypes.object,
 };

 NetworkDropdown.defaultProps = {
-    protocols: {},
-    config: {},
+    config: {
+        networks: [],
+    }
 };
+
@@ -22,9 +22,6 @@ var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');

 var DateUtils = require('matrix-react-sdk/lib/DateUtils');
 var filesize = require('filesize');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
-const Modal = require('matrix-react-sdk/lib/Modal');
-const sdk = require('matrix-react-sdk');

 module.exports = React.createClass({
    displayName: 'ImageView',
@@ -64,23 +61,19 @@ module.exports = React.createClass({
    },

    onRedactClick: function() {
-        const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createDialog(ConfirmRedactDialog, {
-            onFinished: (proceed) => {
-                if (!proceed) return;
-                var self = this;
-                MatrixClientPeg.get().redactEvent(
-                    this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
-                ).catch(function(e) {
-                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    // display error message stating you couldn't delete this.
-                    var code = e.errcode || e.statusCode;
-                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "You cannot delete this image. (" + code + ")"
-                    });
-                }).done();
-            }
+        var self = this;
+        MatrixClientPeg.get().redactEvent(
+            this.props.mxEvent.getRoomId(), this.props.mxEvent.getId()
+        ).done(function() {
+            if (self.props.onFinished) self.props.onFinished();
+        }, function(e) {
+            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
+            // display error message stating you couldn't delete this.
+            var code = e.errcode || e.statusCode;
+            Modal.createDialog(ErrorDialog, {
+                title: "Error",
+                description: "You cannot delete this image. (" + code + ")"
+            });
        });
    },

@@ -169,7 +162,7 @@ module.exports = React.createClass({
                    <img src={this.props.src} style={style}/>
                    <div className="mx_ImageView_labelWrapper">
                        <div className="mx_ImageView_label">
-                            <AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src="img/cancel-white.svg" width="18" height="18" alt="Close"/></AccessibleButton>
+                            <img className="mx_ImageView_cancel" src="img/cancel-white.svg" width="18" height="18" alt="Close" onClick={ this.props.onFinished }/>
                            <div className="mx_ImageView_shim">
                            </div>
                            <div className="mx_ImageView_name">
@@ -19,7 +19,6 @@ limitations under the License.
 var React = require('react');
 var Notifier = require("matrix-react-sdk/lib/Notifier");
 var sdk = require('matrix-react-sdk')
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 module.exports = React.createClass({
    displayName: 'MatrixToolbar',
@@ -39,7 +38,7 @@ module.exports = React.createClass({
                <div className="mx_MatrixToolbar_content">
                    You are not receiving desktop notifications. <a className="mx_MatrixToolbar_link" onClick={ this.onClick }>Enable them now</a>
                </div>
-                <AccessibleButton className="mx_MatrixToolbar_close" onClick={ this.hideToolbar } ><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
+                <div className="mx_MatrixToolbar_close"><img src="img/cancel.svg" width="18" height="18" onClick={ this.hideToolbar } /></div>
            </div>
        );
    }
@@ -23,14 +23,11 @@ module.exports = React.createClass({
    statics: {
        replaces: 'LoginHeader',
    },
-    propTypes: {
-        icon: React.PropTypes.string,
-    },

    render: function() {
        return (
            <div className="mx_Login_logo">
-                <img src={this.props.icon || "img/logo.png"} alt="Riot"/>
+                <img src="img/logo.png" width="195" height="195" alt="Riot"/>
            </div>
        );
    }
@@ -16,16 +16,14 @@ limitations under the License.

 'use strict';

-import React from 'react';
-import {DragSource} from 'react-dnd';
-import {DropTarget} from 'react-dnd';
+var React = require('react');
+var DragSource = require('react-dnd').DragSource;
+var DropTarget = require('react-dnd').DropTarget;

-import dis from 'matrix-react-sdk/lib/dispatcher';
-import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-import sdk from 'matrix-react-sdk';
-import RoomTile from 'matrix-react-sdk/lib/components/views/rooms/RoomTile';
-import * as Rooms from 'matrix-react-sdk/lib/Rooms';
-import Modal from 'matrix-react-sdk/lib/Modal';
+var dis = require("matrix-react-sdk/lib/dispatcher");
+var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
+var sdk = require('matrix-react-sdk');
+var RoomTile = require('matrix-react-sdk/lib/components/views/rooms/RoomTile');

 /**
 * Defines a new Component, DNDRoomTile that wraps RoomTile, making it draggable.
@@ -74,49 +72,21 @@ var roomTileSource = {
            item.targetList.forceUpdate(); // as we're not using state
        }

-        const prevTag = item.originalList.props.tagName;
-        const newTag = item.targetList.props.tagName;
-
        if (monitor.didDrop() && item.targetList.props.editable) {
-            // Evil hack to get DMs behaving
-            if ((prevTag === undefined && newTag === 'im.vector.fake.direct') ||
-                (prevTag === 'im.vector.fake.direct' && newTag === undefined)
-            ) {
-                Rooms.guessAndSetDMRoom(
-                    item.room, newTag === 'im.vector.fake.direct',
-                ).done(() => {
-                    item.originalList.removeRoomTile(item.room);
-                }, (err) => {
-                    const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    console.error("Failed to set direct chat tag " + err);
-                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to set direct chat tag",
-                    });
-                });
-                return;
-            }
-
-            // More evilness: We will still be dealing with moving to favourites/low prio,
-            // but we avoid ever doing a request with 'im.vector.fake.direct`.
-
            // if we moved lists, remove the old tag
-            if (prevTag && prevTag !== 'im.vector.fake.direct' &&
-                item.targetList !== item.originalList
-            ) {
+            if (item.targetList !== item.originalList && item.originalList.props.tagName) {
                // commented out attempts to set a spinner on our target component as component is actually
                // the original source component being dragged, not our target.  To fix we just need to
                // move all of this to endDrop in the target instead.  FIXME later.

                //component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
-                MatrixClientPeg.get().deleteRoomTag(item.room.roomId, prevTag).finally(function() {
+                MatrixClientPeg.get().deleteRoomTag(item.room.roomId, item.originalList.props.tagName).finally(function() {
                    //component.state.set({ spinner: component.state.spinner-- });
                }).fail(function(err) {
                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    console.error("Failed to remove tag " + prevTag + " from room: " + err);
                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to remove tag " + prevTag + " from room",
+                        title: "Failed to remove tag " + item.originalList.props.tagName + " from room",
+                        description: err.toString()
                    });
                });
            }
@@ -127,18 +97,15 @@ var roomTileSource = {
            }

            // if we moved lists or the ordering changed, add the new tag
-            if (newTag && newTag !== 'im.vector.fake.direct' &&
-                (item.targetList !== item.originalList || newOrder)
-            ) {
+            if (item.targetList.props.tagName && (item.targetList !== item.originalList || newOrder)) {
                //component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
-                MatrixClientPeg.get().setRoomTag(item.room.roomId, newTag, newOrder).finally(function() {
+                MatrixClientPeg.get().setRoomTag(item.room.roomId, item.targetList.props.tagName, newOrder).finally(function() {
                    //component.state.set({ spinner: component.state.spinner-- });
                }).fail(function(err) {
                    var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    console.error("Failed to add tag " + newTag + " to room: " + err);
                    Modal.createDialog(ErrorDialog, {
-                        title: "Error",
-                        description: "Failed to add tag " + newTag + " to room",
+                        title: "Failed to add tag " + item.targetList.props.tagName + " to room",
+                        description: err.toString()
                    });
                });
            }
@@ -31,6 +31,7 @@ module.exports = React.createClass({
        else {
            return (
                <div className="mx_RoomDropTarget">
+                    <div className="mx_RoomDropTarget_avatar"></div>
                    <div className="mx_RoomDropTarget_label">
                        { this.props.label }
                    </div>
@@ -20,7 +20,6 @@ var React = require('react');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var sdk = require('matrix-react-sdk');
 var classNames = require('classnames');
-var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');

 module.exports = React.createClass({
    displayName: 'SearchBar',
@@ -58,12 +57,12 @@ module.exports = React.createClass({
        var allRoomsClasses = classNames({ mx_SearchBar_button : true, mx_SearchBar_unselected : this.state.scope !== 'All' });

        return (
-            <div className="mx_SearchBar"> 
+            <div className="mx_SearchBar">
                <input ref="search_term" className="mx_SearchBar_input" type="text" autoFocus={true} placeholder="Search..." onKeyDown={this.onSearchChange}/>
-                <AccessibleButton className={ searchButtonClasses } onClick={this.onSearch}><img src="img/search-button.svg" width="37" height="37" alt="Search"/></AccessibleButton>
-                <AccessibleButton className={ thisRoomClasses } onClick={this.onThisRoomClick}>This Room</AccessibleButton>
-                <AccessibleButton className={ allRoomsClasses } onClick={this.onAllRoomsClick}>All Rooms</AccessibleButton>
-                <AccessibleButton className="mx_SearchBar_cancel" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
+                <div className={ searchButtonClasses } onClick={this.onSearch}><img src="img/search-button.svg" width="37" height="37" alt="Search"/></div>
+                <div className={ thisRoomClasses } onClick={this.onThisRoomClick}>This Room</div>
+                <div className={ allRoomsClasses } onClick={this.onAllRoomsClick}>All Rooms</div>
+                <img className="mx_SearchBar_cancel" src="img/cancel.svg" width="18" height="18" onClick={this.props.onCancelClick} />
            </div>
        );
    }
@@ -238,10 +238,9 @@ module.exports = React.createClass({
                self._refreshFromServer();
            }, function(error) {
                var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                console.error("Failed to change settings: " + error);
                Modal.createDialog(ErrorDialog, {
-                    title: "Error",
-                    description: "Failed to change settings",
+                    title: "Can't change settings",
+                    description: error.toString(),
                    onFinished: self._refreshFromServer
                });
            });
@@ -308,10 +307,9 @@ module.exports = React.createClass({
            self._refreshFromServer();
        }, function(error) {
            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            console.error("Can't update user notification settings: " + error);
            Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: "Can't update user notification settings",
+                title: "Can't update user notification settings",
+                description: error.toString(),
                onFinished: self._refreshFromServer
            });
        });
@@ -350,10 +348,9 @@ module.exports = React.createClass({

        var onError = function(error) {
            var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            console.error("Failed to update keywords: " + error);
            Modal.createDialog(ErrorDialog, {
-                title: "Error",
-                description: "Failed to update keywords",
+                title: "Can't update keywords",
+                description: error.toString(),
                onFinished: self._refreshFromServer
            });
        }
@@ -461,8 +458,8 @@ module.exports = React.createClass({
                '.m.rule.master': 'master',

                // The default push rules displayed by Vector UI
+                // XXX: .m.rule.contains_user_name is not managed (not a fancy rule for Vector?)
                '.m.rule.contains_display_name': 'vector',
-                '.m.rule.contains_user_name': 'vector',
                '.m.rule.room_one_to_one': 'vector',
                '.m.rule.message': 'vector',
                '.m.rule.invite_for_me': 'vector',
@@ -515,7 +512,6 @@ module.exports = React.createClass({

            var vectorRuleIds = [
                '.m.rule.contains_display_name',
-                '.m.rule.contains_user_name',
                '_keywords',
                '.m.rule.room_one_to_one',
                '.m.rule.message',
@@ -719,17 +715,20 @@ module.exports = React.createClass({
            );
        }

-        const emailThreepids = this.props.threepids.filter((tp) => tp.medium === "email");
-        let emailNotificationsRow;
-        if (emailThreepids.length === 0) {
+        var emailNotificationsRow;
+        if (this.props.threepids.filter(function(tp) {
+                if (tp.medium == "email") {
+                    return true;
+                }
+            }).length == 0) {
            emailNotificationsRow = <div>
                Add an email address above to configure email notifications
            </div>;
        } else {
            // This only supports the first email address in your profile for now
            emailNotificationsRow = this.emailNotificationsRow(
-                emailThreepids[0].address,
-                "Enable email notifications ("+emailThreepids[0].address+")"
+                this.props.threepids[0].address,
+                "Enable email notifications ("+this.props.threepids[0].address+")"
            );
        }

@@ -63,20 +63,10 @@ class VectorPushRuleDefinition {
 */
 module.exports = {
    // Messages containing user's display name
+    // (skip contains_user_name which is too geeky)
    ".m.rule.contains_display_name": new VectorPushRuleDefinition({
        kind: "override",
-        description: "Messages containing my display name",
-        vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
-            on: StandardActions.ACTION_NOTIFY,
-            loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
-            off: StandardActions.ACTION_DISABLED
-        }
-    }),
-
-    // Messages containing user's username (localpart/MXID)
-    ".m.rule.contains_user_name": new VectorPushRuleDefinition({
-        kind: "override",
-        description: "Messages containing my user name",
+        description: "Messages containing my name",
        vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
            on: StandardActions.ACTION_NOTIFY,
            loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
@@ -1,80 +0,0 @@
-// autogenerated by rethemendex.sh
-@import "./_common.scss";
-@import "./matrix-react-sdk/structures/_ContextualMenu.scss";
-@import "./matrix-react-sdk/structures/_CreateRoom.scss";
-@import "./matrix-react-sdk/structures/_FilePanel.scss";
-@import "./matrix-react-sdk/structures/_MatrixChat.scss";
-@import "./matrix-react-sdk/structures/_NotificationPanel.scss";
-@import "./matrix-react-sdk/structures/_RoomStatusBar.scss";
-@import "./matrix-react-sdk/structures/_RoomView.scss";
-@import "./matrix-react-sdk/structures/_SearchBox.scss";
-@import "./matrix-react-sdk/structures/_UploadBar.scss";
-@import "./matrix-react-sdk/structures/_UserSettings.scss";
-@import "./matrix-react-sdk/structures/login/_Login.scss";
-@import "./matrix-react-sdk/views/avatars/_BaseAvatar.scss";
-@import "./matrix-react-sdk/views/dialogs/_BugReportDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_SetDisplayNameDialog.scss";
-@import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
-@import "./matrix-react-sdk/views/elements/_AddressSelector.scss";
-@import "./matrix-react-sdk/views/elements/_AddressTile.scss";
-@import "./matrix-react-sdk/views/elements/_DirectorySearchBox.scss";
-@import "./matrix-react-sdk/views/elements/_Dropdown.scss";
-@import "./matrix-react-sdk/views/elements/_MemberEventListSummary.scss";
-@import "./matrix-react-sdk/views/elements/_ProgressBar.scss";
-@import "./matrix-react-sdk/views/elements/_RichText.scss";
-@import "./matrix-react-sdk/views/login/_InteractiveAuthEntryComponents.scss";
-@import "./matrix-react-sdk/views/login/_ServerConfig.scss";
-@import "./matrix-react-sdk/views/messages/_MEmoteBody.scss";
-@import "./matrix-react-sdk/views/messages/_MImageBody.scss";
-@import "./matrix-react-sdk/views/messages/_MNoticeBody.scss";
-@import "./matrix-react-sdk/views/messages/_MTextBody.scss";
-@import "./matrix-react-sdk/views/messages/_TextualEvent.scss";
-@import "./matrix-react-sdk/views/messages/_UnknownBody.scss";
-@import "./matrix-react-sdk/views/rooms/_Autocomplete.scss";
-@import "./matrix-react-sdk/views/rooms/_EntityTile.scss";
-@import "./matrix-react-sdk/views/rooms/_EventTile.scss";
-@import "./matrix-react-sdk/views/rooms/_LinkPreviewWidget.scss";
-@import "./matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss";
-@import "./matrix-react-sdk/views/rooms/_MemberInfo.scss";
-@import "./matrix-react-sdk/views/rooms/_MemberList.scss";
-@import "./matrix-react-sdk/views/rooms/_MessageComposer.scss";
-@import "./matrix-react-sdk/views/rooms/_PresenceLabel.scss";
-@import "./matrix-react-sdk/views/rooms/_RoomHeader.scss";
-@import "./matrix-react-sdk/views/rooms/_RoomList.scss";
-@import "./matrix-react-sdk/views/rooms/_RoomPreviewBar.scss";
-@import "./matrix-react-sdk/views/rooms/_RoomSettings.scss";
-@import "./matrix-react-sdk/views/rooms/_RoomTile.scss";
-@import "./matrix-react-sdk/views/rooms/_SearchableEntityList.scss";
-@import "./matrix-react-sdk/views/rooms/_TabCompleteBar.scss";
-@import "./matrix-react-sdk/views/rooms/_TopUnreadMessagesBar.scss";
-@import "./matrix-react-sdk/views/settings/_DevicesPanel.scss";
-@import "./matrix-react-sdk/views/settings/_IntegrationsManager.scss";
-@import "./matrix-react-sdk/views/voip/_CallView.scss";
-@import "./matrix-react-sdk/views/voip/_IncomingCallbox.scss";
-@import "./matrix-react-sdk/views/voip/_VideoView.scss";
-@import "./vector-web/_fonts.scss";
-@import "./vector-web/structures/_CompatibilityPage.scss";
-@import "./vector-web/structures/_HomePage.scss";
-@import "./vector-web/structures/_LeftPanel.scss";
-@import "./vector-web/structures/_RightPanel.scss";
-@import "./vector-web/structures/_RoomDirectory.scss";
-@import "./vector-web/structures/_RoomSubList.scss";
-@import "./vector-web/structures/_ViewSource.scss";
-@import "./vector-web/views/context_menus/_MessageContextMenu.scss";
-@import "./vector-web/views/context_menus/_RoomTileContextMenu.scss";
-@import "./vector-web/views/dialogs/_ChangelogDialog.scss";
-@import "./vector-web/views/directory/_NetworkDropdown.scss";
-@import "./vector-web/views/elements/_ImageView.scss";
-@import "./vector-web/views/elements/_Spinner.scss";
-@import "./vector-web/views/globals/_GuestWarningBar.scss";
-@import "./vector-web/views/globals/_MatrixToolbar.scss";
-@import "./vector-web/views/messages/_MessageTimestamp.scss";
-@import "./vector-web/views/messages/_SenderProfile.scss";
-@import "./vector-web/views/rooms/_RoomDropTarget.scss";
-@import "./vector-web/views/rooms/_RoomTooltip.scss";
-@import "./vector-web/views/rooms/_SearchBar.scss";
-@import "./vector-web/views/settings/_Notifications.scss";
@@ -1,6 +1,5 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -30,8 +29,7 @@ body {
       Arial here. */
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
    font-size: 15px;
-    background-color: $primary-bg-color;
-    color: $primary-fg-color;
+    color: #454545;
    border: 0px;
    margin: 0px;
    /* This should render the fonts the same accross browsers */
@@ -43,7 +41,7 @@ div.error {
 }

 h2 {
-    color: $primary-fg-color;
+    color: #454545;
    font-weight: 400;
    font-size: 18px;
    margin-top: 16px;
@@ -53,20 +51,15 @@ h2 {
 a:hover,
 a:link,
 a:visited {
-    color: $accent-color;
-}
-
-input[type=text], input[type=password], textarea {
-    background-color: transparent;
-    color: $primary-fg-color;
+    color: #76cfa6;
 }

 input[type=text].error, input[type=password].error {
-    border: 1px solid $warning-color;
+    border: 1px solid red;
 }

 input[type=text]:focus, textarea:focus {
-    border: 1px solid $accent-color;
+    border: 1px solid #76CFA6;
    outline: none;
    box-shadow: none;
 }
@@ -84,7 +77,10 @@ textarea {
 /* applied to side-panels and messagepanel when in RoomSettings */
 .mx_fadable {
    opacity: 1;
-    transition: opacity 0.2s ease-in-out;
+    -webkit-transition: opacity 0.2s ease-in-out;
+    -moz-transition: opacity 0.2s ease-in-out;
+    -ms-transition: opacity 0.2s ease-in-out;
+    -o-transition: opacity 0.2s ease-in-out;
 }

 /* XXX: critical hack to GeminiScrollbar to allow them to work in FF 42 and Chrome 48.
@@ -126,8 +122,14 @@ textarea {
    width: 100%;
    height: 100%;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
+    -webkit-align-items: center;
    align-items: center;
+    -webkit-justify-content: center;
    justify-content: center;
 }

@@ -135,7 +137,7 @@ textarea {
 .mx_Dialog_wrapper.mx_Dialog_spinner .mx_Dialog {
    width: auto;
    border-radius: 8px;
-    padding: 0px;
+    padding-left: 0px;
    box-shadow: none;
 }

@@ -146,14 +148,13 @@ textarea {
 }

 .mx_Dialog {
-    background-color: $primary-bg-color;
-    color: $light-fg-color;
+    background-color: #fff;
+    color: #747474;
    z-index: 4010;
    font-weight: 300;
    font-size: 15px;
    position: relative;
    padding-left: 58px;
-    padding-bottom: 36px;
    width: 60%;
    max-width: 704px;
    box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
@@ -167,13 +168,13 @@ textarea {
    left: 0;
    width: 100%;
    height: 100%;
-    background-color: $dialog-background-bg-color;
+    background-color: #e9e9e9;
    opacity: 0.8;
 }

 .mx_Dialog_lightbox .mx_Dialog_background {
    opacity: 0.85;
-    background-color: $lightbox-background-bg-color;
+    background-color: #000;
 }

 .mx_Dialog_lightbox .mx_Dialog {
@@ -186,29 +187,22 @@ textarea {
    pointer-events: none;
 }

-.mx_Dialog_cancelButton {
-    position: absolute;
-    right: 11px;
-    top: 13px;
-    cursor: pointer;
-}
-
-.mx_Dialog_cancelButton object {
-    pointer-events: none;
-}
-
 .mx_Dialog_content {
    margin: 24px 58px 68px 0;
    font-size: 14px;
-    color: $primary-fg-color;
+    color: #4a4a4a;
    word-wrap: break-word;
 }

+.mx_Dialog_buttons {
+    padding-bottom: 36px;
+}
+
 .mx_Dialog button, .mx_Dialog input[type="submit"] {
    border: 0px;
    height: 36px;
    border-radius: 40px;
-    border: solid 1px $accent-color;
+    border: solid 1px #76cfa6;
    font-weight: 600;
    font-size: 14px;
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
@@ -218,26 +212,26 @@ textarea {
    padding-right: 1.5em;
    outline: none;
    cursor: pointer;
-    color: $accent-color;
-    background-color: $primary-bg-color;
+    color: #76cfa6;
+    background-color: #fff;

    /* align images in buttons (eg spinners) */
    vertical-align: middle;
 }

 .mx_Dialog button.mx_Dialog_primary, .mx_Dialog  input[type="submit"].mx_Dialog_primary {
-    color: $accent-fg-color;
-    background-color: $accent-color;
+    color: #fff;
+    background-color: #76cfa6;
 }

 .mx_Dialog button.danger, .mx_Dialog input[type="submit"].danger {
-    background-color: $warning-color;
-    border: solid 1px $warning-color;
+    background-color: #ff0064;
+    border: solid 1px #ff0064;
 }

 .mx_Dialog button:disabled, .mx_Dialog input[type="submit"]:disabled {
-    background-color: $light-fg-color;
-    border: solid 1px $light-fg-color;
+    background-color: #777777;
+    border: solid 1px #777777;
    opacity: 0.7;
 }

@@ -247,11 +241,11 @@ textarea {
    font-weight: bold;
    font-size: 22px;
    line-height: 1.4;
-    color: $primary-fg-color;
+    color: #454545;
 }

 .mx_Dialog_title.danger {
-    color: $warning-color;
+    color: #ff0064;
 }

 .mx_TextInputDialog_label {
@@ -262,10 +256,10 @@ textarea {
 .mx_TextInputDialog_input {
    font-size: 15px;
    border-radius: 3px;
-    border: 1px solid $input-border-color;
+    border: 1px solid #f0f0f0;
    padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: #454545;
+    background-color: #fff;
 }

 .mx_emojione {
@@ -274,19 +268,19 @@ textarea {
 }

 ::-moz-selection {
-    background-color: $accent-color;
-    color: $selection-fg-color;
+    background-color: #76CFA6;
+    color: white;
 }

 ::selection {
-    background-color: $accent-color;
-    color: $selection-fg-color;
+    background-color: #76CFA6;
+    color: white;
 }

 /** green button with rounded corners */
 .mx_textButton {
-    color: $accent-fg-color;
-    background-color: $accent-color;
+    color: #fff;
+    background-color: #76cfa6;
    border-radius: 17px;
    text-align: center;
    padding-left: 1em;
@@ -295,10 +289,6 @@ textarea {
    display: inline;
 }

-.mx_button_row {
-    margin-top: 69px;
-}
-
 .changelog_text {
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
 }
@@ -30,10 +30,10 @@ limitations under the License.
 }

 .mx_ContextualMenu {
-    border: solid 1px $menu-border-color;
+    border: solid 1px rgba(187, 187, 187, 0.5);
    border-radius: 4px;
-    background-color: $menu-bg-color;
-    color: $primary-fg-color;
+    background-color: #f6f6f6;
+    color: #4a4a4a;
    position: absolute;
    padding: 6px;
 	font-size: 14px;
@@ -51,7 +51,7 @@ limitations under the License.
    width: 0;
    height: 0;
    border-top: 8px solid transparent;
-    border-left: 8px solid $menu-border-color;
+    border-left: 8px solid rgba(187, 187, 187, 0.5);
    border-bottom: 8px solid transparent;
 }

@@ -60,7 +60,7 @@ limitations under the License.
    width: 0;
    height: 0;
    border-top: 7px solid transparent;
-    border-left: 7px solid $menu-bg-color;
+    border-left: 7px solid #f6f6f6;
    border-bottom: 7px solid transparent;
    position:absolute;
    top: -7px;
@@ -78,7 +78,7 @@ limitations under the License.
    width: 0;
    height: 0;
    border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid rgba(187, 187, 187, 0.5);
    border-bottom: 8px solid transparent;
 }

@@ -87,7 +87,7 @@ limitations under the License.
    width: 0;
    height: 0;
    border-top: 7px solid transparent;
-    border-right: 7px solid $menu-bg-color;
+    border-right: 7px solid #f6f6f6;
    border-bottom: 7px solid transparent;
    position:absolute;
    top: -7px;
@@ -18,13 +18,13 @@ limitations under the License.
    width: 960px;
    margin-left: auto;
    margin-right: auto;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_CreateRoom input,
 .mx_CreateRoom textarea  {
    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
+    border: 1px solid #c7c7c7;
    font-weight: 300;
    font-size: 13px;
    padding: 9px;
@@ -15,8 +15,13 @@ limitations under the License.
 */

 .mx_FilePanel {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

+    -webkit-flex: 1 1 0;
    flex: 1 1 0;

    width: 100%;
@@ -53,12 +58,12 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile .mx_MImageBody_download {
    display: flex;
    font-size: 14px;
-    color: $event-timestamp-color;
+    color: #acacac;
 }

 .mx_FilePanel .mx_EventTile .mx_MImageBody_downloadLink {
    flex: 1 1 auto;
-    color: $light-fg-color;
+    color: #747474;
 }

 .mx_FilePanel .mx_EventTile .mx_MImageBody_size {
@@ -85,7 +90,7 @@ limitations under the License.
    padding: 0px;
    font-size: 11px;
    opacity: 1.0;
-    color: $event-timestamp-color;
+    color: #acacac;
 }

 .mx_FilePanel .mx_EventTile .mx_MessageTimestamp {
@@ -95,7 +100,7 @@ limitations under the License.
    position: initial;
    font-size: 11px;
    opacity: 1.0;
-    color: $event-timestamp-color;
+    color: #acacac;
 }

 /* Overrides for the wrappers around the body tile */
@@ -106,7 +111,7 @@ limitations under the License.
 }

 .mx_FilePanel .mx_EventTile:hover .mx_EventTile_line {
-    background-color: $primary-bg-color;
+    background-color: #fff;
 }

 .mx_FilePanel .mx_EventTile_selected .mx_EventTile_line {
@@ -27,21 +27,34 @@ limitations under the License.
 }

 .mx_MatrixChat_wrapper {
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;

    flex-direction: column;
+    -webkit-flex-direction: column;

    width: 100%;
    height: 100%;
 }

 .mx_MatrixToolbar {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;

    height: 40px;
 }

 .mx_GuestWarningBar {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;

    height: 40px;
@@ -55,32 +68,52 @@ limitations under the License.
    width: 100%;
    height: 100%;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;

+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

+    -webkit-flex: 1;
    flex: 1;
 }

 .mx_MatrixChat .mx_LeftPanel {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;

-    background-color: $secondary-accent-color;
+    background-color: #eaf5f0;

+    -webkit-flex: 0 0 235px;
    flex: 0 0 235px;
 }

 .mx_MatrixChat .mx_LeftPanel.collapsed {
+    -webkit-flex: 0 0 60px;
    flex: 0 0 60px;
 }

 .mx_MatrixChat .mx_MatrixChat_middlePanel {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

    padding-left: 20px;
    padding-right: 22px;
-    background-color: $primary-bg-color;
+    background-color: #fff;

+    -webkit-flex: 1;
    flex: 1;

    /* Experimental fix for https://github.com/vector-im/vector-web/issues/947
@@ -90,21 +123,34 @@ limitations under the License.
       */
    overflow-x: auto;

+    /* XXX: Hack: apparently if you try to nest a flex-box
+     * within a non-flex-box within a flex-box, the height
+     * of the innermost element gets miscalculated if the
+     * parents are both auto.  Height has to be auto here
+     * for RoomView to correctly fit when the Toolbar is shown.
+     * Ideally we'd launch straight into the RoomView at this
+     * point, but instead we fudge it and make the middlePanel
+     * flex itself.
+     */
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
-
-    /* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
-       needed height 100% all the way down to the HomePage. Height does not
-       have to be auto, empirically.
-    */
-    height: 100%;
 }

 .mx_MatrixChat .mx_RightPanel {
+    -webkit-box-ordinal-group: 3;
+    -moz-box-ordinal-group: 3;
+    -ms-flex-order: 3;
+    -webkit-order: 3;
    order: 3;

+    -webkit-flex: 0 0 235px;
    flex: 0 0 235px;
 }

 .mx_MatrixChat .mx_RightPanel.collapsed {
+    -webkit-flex: 0 0 122px;
    flex: 0 0 122px;
 }
@@ -15,8 +15,13 @@ limitations under the License.
 */

 .mx_NotificationPanel {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

+    -webkit-flex: 1 1 0;
    flex: 1 1 0;

    width: 100%;
@@ -46,7 +51,7 @@ limitations under the License.
 }

 .mx_NotificationPanel .mx_EventTile_roomName a {
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_NotificationPanel .mx_EventTile_avatar {
@@ -56,7 +61,8 @@ limitations under the License.

 .mx_NotificationPanel .mx_EventTile .mx_SenderProfile, 
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
-    color: $primary-fg-color;
+    color: #000;
+    opacity: 0.3;
    font-size: 12px;
    display: inline;
    padding-left: 0px;
@@ -88,7 +94,7 @@ limitations under the License.
 }

 .mx_NotificationPanel .mx_EventTile:hover .mx_EventTile_line {
-    background-color: $primary-bg-color;
+    background-color: #fff;
 }

 .mx_NotificationPanel .mx_EventTile_selected .mx_EventTile_line {
@@ -16,15 +16,15 @@ limitations under the License.

 .mx_RoomStatusBar {
    margin-left: 65px;
-    min-height: 50px;
+    min-height: 34px;
 }

 /* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
 .mx_RoomStatusBar_indicator {
-    padding-left: 17px;
+    padding-left: 18px;
    padding-right: 12px;
    margin-left: -73px;
-    margin-top: 15px;
+    margin-top: 13px;
    float: left;
    width: 24px;
    text-align: center;
@@ -36,16 +36,16 @@ limitations under the License.
 }

 .mx_RoomStatusBar_placeholderIndicator span {
-    color: $primary-fg-color;
+    color: #4a4a4a;
    opacity: 0.5;
    position: relative;
    top: -4px;
-/*
+/*    
    animation-duration: 1s;
    animation-name: bounce;
    animation-direction: alternate;
    animation-iteration-count: infinite;
-*/
+*/    
 }

 .mx_RoomStatusBar_placeholderIndicator span:nth-child(1) {
@@ -70,51 +70,19 @@ limitations under the License.
    }
 }

-.mx_RoomStatusBar_typingIndicatorAvatars {
-    width: 52px;
-    margin-top: -1px;
-    text-align: left;
-}
-
-.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_image {
-    margin-right: -12px;
-    border: 1px solid $primary-bg-color;
-}
-
-.mx_RoomStatusBar_typingIndicatorAvatars .mx_BaseAvatar_initial {
-    padding-left: 1px;
-    padding-top: 1px;
-}
-
-.mx_RoomStatusBar_typingIndicatorRemaining {
-    display: inline-block;
-    color: #acacac;
-    background-color: #ddd;
-    border: 1px solid $primary-bg-color;
-    border-radius: 40px;
-    width: 24px;
-    height: 24px;
-    line-height: 24px;
-    font-size: 0.8em;
-    vertical-align: top;
-    text-align: center;
-    position: absolute;
-}
-
 .mx_RoomStatusBar_scrollDownIndicator {
    cursor: pointer;
-    padding-left: 1px;
 }

 .mx_RoomStatusBar_unreadMessagesBar {
    padding-top: 10px;
-    color: $warning-color;
+    color: #ff0064;
    cursor: pointer;
 }

 .mx_RoomStatusBar_connectionLostBar {
    margin-top: 19px;
-    min-height: 58px;
+    height: 58px;
 }

 .mx_RoomStatusBar_connectionLostBar img {
@@ -125,31 +93,29 @@ limitations under the License.
 }

 .mx_RoomStatusBar_connectionLostBar_title {
-    color: $warning-color;
+    color: #ff0064;
 }

 .mx_RoomStatusBar_connectionLostBar_desc {
-    color: $primary-fg-color;
+    color: #454545;
    font-size: 13px;
    opacity: 0.5;
 }

 .mx_RoomStatusBar_resend_link {
-    color: $primary-fg-color ! important;
+    color: #454545 ! important;
    text-decoration: underline ! important;
    cursor: pointer;
 }

 .mx_RoomStatusBar_tabCompleteBar {
    padding-top: 10px;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_RoomStatusBar_typingBar {
-    height: 50px;
-    line-height: 50px;
-
-    color: $primary-fg-color;
+    padding-top: 10px;
+    color: #4a4a4a;
    opacity: 0.5;
    overflow-y: hidden;
    display: block;
@@ -157,16 +123,19 @@ limitations under the License.

 .mx_RoomStatusBar_tabCompleteWrapper {
    display: flex;
+    display: -webkit-flex;
    height: 26px;
 }

 .mx_RoomStatusBar_tabCompleteWrapper .mx_TabCompleteBar {
    flex: 1 1 auto;
+    -webkit-flex: 1 1 auto;
 }

 .mx_RoomStatusBar_tabCompleteEol {
    flex: 0 0 auto;
-    color: $accent-color;
+    -webkit-flex: 0 0 auto;
+    color: #76CFA6;
 }

 .mx_RoomStatusBar_tabCompleteEol object {
@@ -18,15 +18,25 @@ limitations under the License.
    word-wrap: break-word;
    position: relative;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
    width: 100%;

    flex-direction: column;
+    -webkit-flex-direction: column;
 }

 .mx_RoomView .mx_RoomHeader {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;

+    -webkit-flex: 0 0 70px;
    flex: 0 0 70px;
 }

@@ -43,10 +53,14 @@ limitations under the License.
    padding-right: 12px;
    margin-left: -12px;

+    -webkit-border-top-left-radius: 10px;
+    -webkit-border-top-right-radius: 10px;
+    -moz-border-radius-topleft: 10px;
+    -moz-border-radius-topright: 10px;
    border-top-left-radius: 10px;
    border-top-right-radius: 10px;

-    background-color: $droptarget-bg-color;
+    background-color: rgba(255, 255, 255, 0.9);
    border: 2px #e1dddd solid;
    border-bottom: none;
    position: absolute;
@@ -63,6 +77,10 @@ limitations under the License.
 }

 .mx_RoomView_auxPanel {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

    min-width: 0px;
@@ -71,18 +89,28 @@ limitations under the License.
    margin: auto;

    overflow: auto;
-    border-bottom: 1px solid $primary-hairline-color;
+    border-bottom: 1px solid #e5e5e5;

+    -webkit-flex: 0 0 auto;
    flex: 0 0 auto;
 }

 .mx_RoomView_topUnreadMessagesBar {
+    -webkit-box-ordinal-group: 3;
+    -moz-box-ordinal-group: 3;
+    -ms-flex-order: 3;
+    -webkit-order: 3;
    order: 3;
 }

 .mx_RoomView_messagePanel {
+    -webkit-box-ordinal-group: 4;
+    -moz-box-ordinal-group: 4;
+    -ms-flex-order: 4;
+    -webkit-order: 4;
    order: 4;

+    -webkit-flex: 1 1 0;
    flex: 1 1 0;

    width: 100%;
@@ -96,25 +124,22 @@ limitations under the License.

    min-height: 100%;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;

    flex-direction: column;
+    -webkit-flex-direction: column;

    justify-content: flex-end;
+    -webkit-justify-content: flex-end;
 }

 .mx_RoomView_searchResultsPanel .mx_RoomView_messageListWrapper {
    justify-content: flex-start;
-}
-
-.mx_RoomView_empty {
-    flex: 1 1 auto;
-    font-size: 13px;
-    padding-left: 3em;
-    padding-right: 3em;
-    margin-right: 20px;
-    margin-top: 33%;
-    text-align: center;
+    -webkit-justify-content: flex-start;
 }

 .mx_RoomView_MessageList {
@@ -133,10 +158,14 @@ limitations under the License.
    margin-bottom: 8px;
    margin-left: 63px;
    padding-bottom: 6px;
-    border-bottom: 1px solid $primary-hairline-color;
+    border-bottom: 1px solid #e5e5e5;
 }

 .mx_RoomView_invitePrompt {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

    min-width: 0px;
@@ -156,32 +185,23 @@ li.mx_RoomView_myReadMarker_container {
 }

 hr.mx_RoomView_myReadMarker {
-    border-top: solid 1px $accent-color;
-    border-bottom: solid 1px $accent-color;
+    border-top: solid 1px #76cfa6;
+    border-bottom: solid 1px #76cfa6;
    margin-top: 0px;
    position: relative;
    top: 5px;
 }

 .mx_RoomView_statusArea {
+    -webkit-box-ordinal-group: 5;
+    -moz-box-ordinal-group: 5;
+    -ms-flex-order: 5;
+    -webkit-order: 5;
    order: 5;

    width: 100%;
+    -webkit-flex: 0 0 auto;
    flex: 0 0 auto;
-
-    max-height: 0px;
-    background-color: $primary-bg-color;
-    z-index: 1000;
-    overflow: hidden;
-
-    -webkit-transition: all .2s ease-out;
-    -moz-transition: all .2s ease-out;
-    -ms-transition: all .2s ease-out;
-    -o-transition: all .2s ease-out;
-}
-
-.mx_RoomView_statusArea_expanded {
-    max-height: 100px;
 }

 .mx_RoomView_statusAreaBox {
@@ -192,33 +212,30 @@ hr.mx_RoomView_myReadMarker {

 .mx_RoomView_statusAreaBox_line {
    margin-left: 65px;
-    border-top: 1px solid $primary-hairline-color;
+    border-top: 1px solid #e5e5e5;
    height: 1px;
 }

 .mx_RoomView_callStatusBar .mx_UploadBar_uploadProgressInner {
-    background-color: $primary-bg-color;
+    background-color: #fff;
 }

 .mx_RoomView_callStatusBar .mx_UploadBar_uploadFilename {
-    color: $accent-fg-color;
+    color: #fff;
    opacity: 1.0;
 }

 .mx_RoomView_inCall .mx_RoomView_statusAreaBox_line {
-    margin-top: 2px;
-    border: none;
-    height: 0px;
+    border-top: 1px hidden;
 }

 .mx_RoomView_inCall .mx_MessageComposer_wrapper {
    border-top: 2px hidden;
-    padding-top: 1px;
 }

 .mx_RoomView_inCall .mx_RoomView_statusAreaBox {
-    background-color: $accent-color;
-    color: $accent-fg-color;
+    background-color: #76CFA6;
+    color: #fff;
    position: relative;
 }

@@ -240,9 +257,14 @@ hr.mx_RoomView_myReadMarker {
 }

 .mx_RoomView .mx_MessageComposer {
+    -webkit-box-ordinal-group: 6;
+    -moz-box-ordinal-group: 6;
+    -ms-flex-order: 6;
+    -webkit-order: 6;
    order: 6;

    width: 100%;
+    -webkit-flex: 0 0 auto;
    flex: 0 0 auto;
    margin-right: 2px;
 }
@@ -250,13 +272,13 @@ hr.mx_RoomView_myReadMarker {
 .mx_RoomView_ongoingConfCallNotification {
    width: 100%;
    text-align: center;
-    background-color: $warning-color;
-    color: $accent-fg-color;
+    background-color: #ff0064;
+    color: #fff;
    font-weight: bold;
    padding: 6px 0;
    cursor: pointer;
 }

 .mx_RoomView_ongoingConfCallNotification a {
-    color: $accent-fg-color ! important;
+    color: #fff ! important;
 }
@@ -22,6 +22,7 @@ limitations under the License.
    padding-bottom: 22px;

    display: flex;
+    display: -webkit-flex;
 }

 .mx_SearchBox_searchButton {
@@ -37,6 +38,7 @@ limitations under the License.

 .mx_SearchBox_search {
    flex: 1 1 auto;
+    -webkit-flex: 1 1 auto;
    width: 0px;
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
    font-size: 12px;
@@ -44,6 +46,7 @@ limitations under the License.
    height: 24px;
    border: 0px ! important;
    /* border-bottom: 1px solid rgba(0, 0, 0, 0.1) ! important; */
+    background-color: transparent;
    border: 0px;
 }

@@ -26,7 +26,7 @@ limitations under the License.
 }

 .mx_UploadBar_uploadProgressInner {
-    background-color: $accent-color;
+    background-color: #76cfa6;
    height: 5px;
 }

@@ -34,7 +34,7 @@ limitations under the License.
    margin-top: 5px;
    margin-left: 65px;
    opacity: 0.5;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_UploadBar_uploadIcon {
@@ -57,5 +57,5 @@ limitations under the License.
    float: right;
    margin-top: 5px;
    margin-right: 30px;
-    color: $accent-color;
+    color: #76cfa6;
 }
@@ -1,6 +1,5 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 Vector Creations Ltd

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,19 +20,34 @@ limitations under the License.
    margin-left: auto;
    margin-right: auto;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
    flex-direction: column;
+    -webkit-flex-direction: column;
 }

 .mx_UserSettings .mx_RoomHeader {
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;

+    -webkit-flex: 0 0 70px;
    flex: 0 0 70px;
 }

 .mx_UserSettings_body {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;

+    -webkit-flex: 1 1 0;
    flex: 1 1 0;

    margin-top: -20px;
@@ -44,7 +58,7 @@ limitations under the License.
    clear: both;
    margin-left: 63px;
    text-transform: uppercase;
-    color: $h3-color;
+    color: #3d3b39;
    font-weight: 600;
    font-size: 13px;
    margin-top: 26px;
@@ -70,8 +84,8 @@ limitations under the License.
    border-radius: 36px;
    font-weight: 400;
    font-size: 16px;
-    color: $accent-fg-color;
-    background-color: $accent-color;
+    color: #fff;
+    background-color: #76cfa6;
    width: auto;
    margin: auto;
    padding: 7px;
@@ -81,7 +95,7 @@ limitations under the License.
 }

 .mx_UserSettings_button.danger {
-    background-color: $warning-color;
+    background-color: #ff0064;
 }

 .mx_UserSettings_section {
@@ -102,15 +116,6 @@ limitations under the License.
    padding-right: 1em;
 }

-.mx_UserSettings_importExportButtons {
-    padding-top: 10px;
-    padding-left: 40px;
-}
-
-.mx_UserSettings_importExportButtons .mx_UserSettings_button {
-    margin-right: 1em;
-}
-
 .mx_UserSettings_toggle input {
    width: 16px;
    margin-right: 8px;
@@ -161,27 +166,21 @@ limitations under the License.
 {
    display: inline-block;
    border: 0px;
-    border-bottom: 1px solid $input-underline-color;
+    border-bottom: 1px solid rgba(151, 151, 151, 0.5);
    padding: 0px;
    width: 240px;
-    color: $input-fg-color;
+    color: rgba(74, 74, 74, 0.9);
    font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
    font-size: 16px;
 }

-.mx_UserSettings_threepidButton {
+.mx_UserSettings_addThreepid {
    display: table-cell;
    padding-left: 0.5em;
    position: relative;
    cursor: pointer;
 }

-input.mx_UserSettings_phoneNumberField {
-    margin-left: 3px;
-    width: 172px;
-    border: 1px solid transparent;
-}
-
 .mx_UserSettings_changePasswordButton {
    float: right;
    margin-right: 32px;
@@ -18,15 +18,21 @@ limitations under the License.
    width: 100%;
    height: 100%;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
+    -webkit-align-items: center;
    align-items: center;
+    -webkit-justify-content: center;
    justify-content: center;

    overflow: auto;
 }

 .mx_Login h2 {
-    color: $primary-fg-color;
+    color: #4a4a4a;
    font-weight: 300;
    margin-top: 32px;
    margin-bottom: 20px;
@@ -42,34 +48,18 @@ limitations under the License.

 .mx_Login_logo {
    text-align: center;
-    height: 195px;
-}
-
-.mx_Login_logo img {
-    max-height: 100%
-}
-
-.mx_Login_support {
-    text-align: center;
-    font-size: 13px;
-    margin-top: 0px;
-    opacity: 0.7;
 }

 .mx_Login_field {
-    width: 280px;
+    width: 100%;
    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
+    border: 1px solid #c7c7c7;
    font-weight: 300;
    font-size: 13px;
    padding: 9px;
    margin-bottom: 14px;
 }

-.mx_Login_username {
-    margin-bottom: 0px;
-}
-
 .mx_Login_fieldLabel {
    margin-top: -10px;
    margin-left: 8px;
@@ -85,9 +75,9 @@ limitations under the License.
    border-radius: 40px;
    height: 40px;
    border: 0px;
-    background-color: $accent-color;
+    background-color: #76cfa6;
    font-size: 15px;
-    color: $accent-fg-color;
+    color: #fff;
 }

 .mx_Login_label {
@@ -109,7 +99,7 @@ limitations under the License.
 }

 .mx_Login_create:link {
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_Login_links {
@@ -122,7 +112,7 @@ limitations under the License.
 }

 .mx_Login_links a:link {
-   color: $primary-fg-color;
+   color: #4a4a4a;
 }

 .mx_Login_prompt {
@@ -137,7 +127,7 @@ limitations under the License.
 }

 .mx_Login_forgot:link {
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_Login_loader {
@@ -157,7 +147,7 @@ limitations under the License.
 }

 .mx_Login_error {
-    color: $warning-color;
+    color: #ff2020;
    font-weight: bold;
    text-align: center;
 /*
@@ -167,16 +157,3 @@ limitations under the License.
    margin-bottom: 12px;
 }

-.mx_Login_phoneSection {
-    display: table;
-}
-
-.mx_Login_phoneCountry {
-    display: table-cell;
-    width: 70px;
-}
-
-.mx_Login_phoneNumberField {
-    width: 210px;
-    margin-left: 3px;
-}
@@ -20,7 +20,8 @@ limitations under the License.

 .mx_BaseAvatar_initial {
    position: absolute;
-    color: $avatar-initial-color;
+    z-index: 1;
+    color: #fff;
    text-align: center;
    speak: none;
    pointer-events: none;
@@ -30,5 +31,4 @@ limitations under the License.
 .mx_BaseAvatar_image {
    border-radius: 40px;
    vertical-align: top;
-    background-color: #fff;
 }
@@ -36,7 +36,7 @@ limitations under the License.

 .mx_ChatInviteDialog_inputContainer {
    border-radius: 3px;
-    border: solid 1px $input-border-color;
+    border: solid 1px #f0f0f0;
    line-height: 36px;
    padding-left: 4px;
    padding-right: 4px;
@@ -49,7 +49,7 @@ limitations under the License.

 .mx_ChatInviteDialog_error {
    position: absolute;
-    color: $warning-color;
+    color: #ff0064;
    line-height: 36px;
 }

@@ -63,9 +63,3 @@ limitations under the License.
 .mx_ChatInviteDialog_cancel object {
    pointer-events: none;
 }
-
-.mx_ChatInviteDialog_addressSelectHeader {
-    font-weight: bold;
-    line-height: 150%;
-    text-indent: 4px;
-}
@@ -24,7 +24,7 @@ limitations under the License.
    border: 0px;
    height: 36px;
    border-radius: 40px;
-    border: solid 1px $accent-color;
+    border: solid 1px #76cfa6;
    font-weight: 600;
    font-size: 14px;
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
@@ -34,6 +34,6 @@ limitations under the License.
    padding-right: 1.5em;
    outline: none;
    cursor: pointer;
-    color: $accent-color;
-    background-color: $primary-bg-color;
+    color: #76cfa6;
+    background-color: #fff;
 }
@@ -16,9 +16,9 @@ limitations under the License.

 .mx_SetDisplayNameDialog_input {
    border-radius: 3px;
-    border: 1px solid $input-border-color;
+    border: 1px solid #f0f0f0;
    padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: #454545;
+    background-color: #fff;
    font-size: 15px;
 }
@@ -1,20 +0,0 @@
-/*
-Copyright 2017 OpenMarket 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.
-*/
-
-.mx_BugReportDialog_input {
-    width: 100%;
-    box-sizing: border-box;
-}
@@ -1,27 +0,0 @@
-/*
-Copyright 2016 OpenMarket 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.
-*/
-
-.mx_ChatCreateOrReuseDialog .mx_ChatCreateOrReuseDialog_tiles {
-    margin-top: 24px;
-}
-
-.mx_ChatCreateOrReuseDialog .mx_Dialog_content {
-    margin-bottom: 24px;
-}
-
-.mx_ChatCreateOrReuseDialog .mx_RoomTile_badge {
-    display: none;
-}
@@ -1,52 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-*/
-
-.mx_ConfirmUserActionDialog .mx_Dialog_content {
-    min-height: 48px;
-    margin-bottom: 24px;
-}
-
-.mx_ConfirmUserActionDialog_avatar {
-    float: left;
-    margin-right: 20px;
-    margin-top: -2px;
-}
-
-.mx_ConfirmUserActionDialog_name {
-    font-size: 18px;
-}
-
-.mx_ConfirmUserActionDialog_userId {
-    font-size: 13px;
-}
-
-.mx_ConfirmUserActionDialog_reasonField {
-    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
-    font-size: 14px;
-    color: $primary-fg-color;
-
-    border-radius: 3px;
-    border: solid 1px $input-border-color;
-    line-height: 36px;
-    padding-left: 16px;
-    padding-right: 16px;
-    padding-top: 1px;
-    padding-bottom: 1px;
-
-    margin-bottom: 24px;
-
-    width: 90%;
-}
@@ -1,67 +0,0 @@
-/*
-Copyright 2016 OpenMarket 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.
-*/
-
-// CSS voodoo to support a gemini-scrollbar for the contents of the dialog
-.mx_Dialog_unknownDevice .mx_Dialog {
-    // ideally we'd shrink the height to fit when needed, but in practice this
-    // is a pain in the ass. plus might as well make the dialog big given how
-    // important it is.
-    height: 100%;
-
-    // position the gemini scrollbar nicely
-    padding-right: 58px;
-}
-
-.mx_UnknownDeviceDialog {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.mx_UnknownDeviceDialog .mx_Dialog_content {
-    margin-bottom: 24px;
-}
-
-.mx_UnknownDeviceDialog .mx_MemberDeviceInfo {
-    float: right;
-    clear: both;
-    padding: 0px;
-    padding-top: 8px;
-}
-
-.mx_UnknownDeviceDialog .mx_MemberDeviceInfo_textButton {
-    border: 0px;
-    height: 24px;
-    border-radius: 40px;
-    border: solid 1px $accent-color;
-    font-weight: 600;
-    font-size: 13px;
-    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
-    margin-left: 0px;
-    margin-right: 8px;
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-    width: 85px;
-    outline: none;
-    cursor: pointer;
-    color: $accent-color;
-    background-color: $primary-bg-color;
-}
-
-.mx_UnknownDeviceDialog .mx_UnknownDeviceDialog_deviceList li {
-    height: 40px;
-    border-bottom: 1px solid $primary-hairline-color;
-}
@@ -16,13 +16,13 @@ limitations under the License.

 .mx_AddressSelector {
    position: absolute;
-    background-color: $primary-bg-color;
+    background-color: #fff;
    width: 485px;
    max-height: 116px;
    overflow-y: auto;
 	border-radius: 3px;
-	background-color: $primary-bg-color;
-	border: solid 1px $accent-color;
+	background-color: #fff;
+	border: solid 1px #76cfa6;
    cursor: pointer;
 }

@@ -31,15 +31,15 @@ limitations under the License.
 }

 .mx_AddressSelector_addressListElement .mx_AddressTile {
-    background-color: $primary-bg-color;
-    border: solid 1px $primary-bg-color;
+    background-color: #fff;
+    border: solid 1px #fff;
 }

 .mx_AddressSelector_addressListElement.mx_AddressSelector_selected {
-    background-color: $selected-color;
+     background-color: #eaf5f0; /* selected colour */
 }

 .mx_AddressSelector_addressListElement.mx_AddressSelector_selected .mx_AddressTile {
-    background-color: $selected-color;
-    border: solid 1px $selected-color;
+    background-color: #eaf5f0; /* selected colour */
+    border: solid 1px #eaf5f0; /* selected colour */
 }
@@ -18,9 +18,9 @@ limitations under the License.
    display: inline-block;
    border-radius: 3px;
    background-color: rgba(74, 73, 74, 0.1);
-    border: solid 1px $input-border-color;
+    border: solid 1px #f0f0f0;
    line-height: 26px;
-    color: $primary-fg-color;
+    color: #454545;
    font-size: 14px;
    font-weight: normal;
    margin-right: 4px;
@@ -28,8 +28,8 @@ limitations under the License.

 .mx_AddressTile.mx_AddressTile_error {
    background-color: rgba(255, 0, 100, 0.1);
-    color: $warning-color;
-    border-color: $warning-color;
+    color: #ff0064;
+    border-color: #ff0064;
 }

 .mx_AddressTile_network {
@@ -106,7 +106,7 @@ limitations under the License.
 }

 .mx_AddressTile_email.mx_AddressTile_justified {
-    width: 200px; /* same as id width */
+    width: 380px; /* name + id width */
    overflow: hidden;
    white-space: nowrap;
    text-overflow: ellipsis;
@@ -17,17 +17,19 @@ limitations under the License.
 .mx_DirectorySearchBox {
    position: relative;
    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
+    border: 1px solid #c7c7c7;
 }

 .mx_DirectorySearchBox_container {
    display: flex;
+    display: -webkit-flex;
    padding-left: 9px;
    padding-right: 9px;
 }

 .mx_DirectorySearchBox_input {
    flex-grow: 1;
+    -webkit-flex-grow: 1;
    border: 0;
    padding: 0;
    font-weight: 300;
@@ -42,9 +44,9 @@ input[type=text].mx_DirectorySearchBox_input:focus {
    padding: 3px;
    padding-left: 10px;
    padding-right: 10px;
-    background-color: $plinth-bg-color;
+    background-color: #efefef;
    border-radius: 3px;
-    background-image: url('../../img/icon-return.svg');
+    background-image: url('img/icon-return.svg');
    background-position: 8px 70%;
    background-repeat: no-repeat;
    text-indent: 18px;
@@ -61,7 +63,7 @@ input[type=text].mx_DirectorySearchBox_input:focus {
 .mx_DirectorySearchBox_clear {
    display: inline-block;
    vertical-align: middle;
-    background: url('../../img/icon_context_delete.svg');
+    background: url('img/icon_context_delete.svg');
    background-position: 0 50%;
    background-repeat: no-repeat;
    width: 15px;
@@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-.mx_MemberEventListSummary {
-    position: relative;
-}
-
 .mx_TextualEvent.mx_MemberEventListSummary_summary {
    font-size: 14px;
 }
@@ -35,15 +31,6 @@ limitations under the License.
 }

 .mx_MemberEventListSummary_toggle {
-    color: $accent-color;
-    cursor: pointer;
-    float: right;
-    margin-right: 10px;
-    margin-top: 8px;
-}
-
-.mx_MemberEventListSummary_line {
-    border-bottom: 1px solid $primary-hairline-color;
-    margin-left: 63px;
-    line-height: 30px;
+    color:#76cfa6;
+    cursor:pointer;
 }
@@ -16,10 +16,10 @@ limitations under the License.

 .mx_ProgressBar {
    height: 5px;
-    border: 1px solid $progressbar-color;
+    border: 1px solid black;
 }

 .mx_ProgressBar_fill {
    height: 100%;
-    background-color: $progressbar-color;
+    background-color: #000;
 }
@@ -1,18 +1,14 @@
-// XXX: bleurgh, what is this? These classes totally break the component
-// naming scheme; it's completely unclear where or how they're being used
-// --Matthew
-
 .mx_UserPill {
    color: white;
-    background-color: $accent-color;
+    background-color: #76cfa6;
    padding: 2px 8px;
    border-radius: 16px;
 }

 .mx_RoomPill {
    background-color: white;
-    color: $accent-color;
-    border: 1px solid $accent-color;
+    color: #76cfa6;
+    border: 1px solid #76cfa6;
    padding: 2px 8px;
    border-radius: 16px;
 }
@@ -29,13 +25,13 @@
    padding: .2em 0;
    margin: 0;
    font-size: 85%;
-    background-color: $rte-code-bg-color;
+    background-color: rgba(0,0,0,.04);
    border-radius: 3px;
 }

 .mx_Markdown_HR {
    display: block;
-    background: $rte-bg-color;
+    background: #e7e7e7;
 }

 .mx_Markdown_STRIKETHROUGH {
@@ -1,93 +0,0 @@
-/*
-Copyright 2017 OpenMarket 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.
-*/
-
-.mx_Dropdown {
-    position: relative;
-}
-
-.mx_Dropdown_input {
-    position: relative;
-    border-radius: 3px;
-    border: 1px solid $strong-input-border-color;
-    font-weight: 300;
-    font-size: 13px;
-    user-select: none;
-}
-
-.mx_Dropdown_arrow {
-    border-color: $primary-fg-color transparent transparent;
-    border-style: solid;
-    border-width: 5px 5px 0;
-    display: block;
-    height: 0;
-    position: absolute;
-    right: 10px;
-    top: 14px;
-    width: 0
-}
-
-.mx_Dropdown_option {
-    height: 35px;
-    line-height: 35px;
-    padding-left: 8px;
-    padding-right: 8px;
-}
-
-.mx_Dropdown_option img {
-    margin: 5px;
-    width: 25px;
-    vertical-align: middle;
-}
-
-input.mx_Dropdown_option, input.mx_Dropdown_option:focus {
-    border: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    // XXX: hack to prevent text box being too big and pushing
-    // its parent out / overlapping the dropdown arrow. Only really
-    // works in the Country dropdown.
-    width: 60%;
-}
-
-.mx_Dropdown_menu {
-    position: absolute;
-    left: -1px;
-    right: -1px;
-    top: 100%;
-    z-index: 2;
-    margin: 0;
-    padding: 0px;
-    border-radius: 3px;
-    border: 1px solid $accent-color;
-    background-color: $primary-bg-color;
-    max-height: 200px;
-    overflow-y: scroll;
-}
-
-.mx_Dropdown_menu .mx_Dropdown_option_highlight {
-    background-color: $focus-bg-color;
-}
-
-.mx_Dropdown_menu {
-    font-weight: bold;
-}
-
-.mx_Dropdown_searchPrompt {
-    font-weight: normal;
-    margin-left: 5px;
-    margin-bottom: 5px;
-}
-
@@ -27,5 +27,5 @@ limitations under the License.
    opacity: 0.8;
    font-size: 13px;
    font-weight: 300;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }
@@ -1,42 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-*/
-
-.mx_InteractiveAuthEntryComponents_msisdnWrapper {
-    text-align: center;
-}
-
-.mx_InteractiveAuthEntryComponents_msisdnEntry {
-    font-size: 200%;
-    font-weight: bold;
-    border: 1px solid $strong-input-border-color;
-    border-radius: 3px;
-    width: 6em;
-}
-
-.mx_InteractiveAuthEntryComponents_msisdnEntry:focus {
-    border: 1px solid $accent-color;
-}
-
-.mx_InteractiveAuthEntryComponents_msisdnSubmit {
-    margin-top: 4px;
-    margin-bottom: 5px;
-}
-
-// XXX: This should be a common button class
-.mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled {
-    background-color: $light-fg-color;
-    cursor: default;
-}
@@ -22,18 +22,18 @@ limitations under the License.
 .mx_MImageBody_thumbnail {
    max-width: 100%;
 /*
-    background-color: $primary-bg-color;
-    border: 2px solid $primary-bg-color;
+    background-color: #fff;
+    border: 2px solid #fff;
    border-radius: 1px;
 */
 }

 .mx_MImageBody_download {
-    color: $accent-color;
+    color: #76cfa6;
 }

 .mx_MImageBody_download a {
-    color: $accent-color;
+    color: #76cfa6;
    text-decoration: none;
 }

@@ -1,19 +0,0 @@
-/*
-Copyright 2017 Vector Creations 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.
-*/
-
-.mx_MEmoteBody_sender {
-    cursor: pointer;
-}
@@ -3,8 +3,8 @@
    bottom: 0;
    z-index: 1000;
    width: 100%;
-    border: 1px solid $primary-hairline-color;
-    background: $primary-bg-color;
+    border: 1px solid #e5e5e5;
+    background: white;
    border-bottom: none;
    border-radius: 4px 4px 0 0;
    max-height: 50vh;
@@ -12,7 +12,7 @@
 }

 .mx_Autocomplete_ProviderSection {
-    border-bottom: 1px solid $primary-hairline-color;
+    border-bottom: 1px solid #e5e5e5;
 }

 .mx_Autocomplete_Completion_container_pill {
@@ -28,7 +28,7 @@
    user-select: none;
    cursor: pointer;
    align-items: center;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_Autocomplete_Completion_block * {
@@ -42,7 +42,7 @@
    user-select: none;
    cursor: pointer;
    align-items: center;
-    color: $primary-fg-color;
+    color: #4a4a4a;
 }

 .mx_Autocomplete_Completion_pill * {
@@ -57,13 +57,13 @@
 }

 .mx_Autocomplete_Completion.selected {
-    background: $menu-bg-color;
+    background: #f6f6f6;
    outline: none;
 }

 .mx_Autocomplete_provider_name {
    margin: 12px;
-    color: $primary-fg-color;
+    color: #454545;
    font-weight: 400;
    opacity: 0.4;
 }
@@ -17,7 +17,7 @@ limitations under the License.
 .mx_EntityTile {
    display: table-row;
    position: relative;
-    color: $primary-fg-color;
+    color: #454545;
    cursor: pointer;
 }

@@ -77,12 +77,12 @@ limitations under the License.

 .mx_EntityTile_ellipsis .mx_EntityTile_name {
    font-style: italic;
-    color: $primary-fg-color;
+    font-color: #454545;
 }

 .mx_EntityTile_invitePlaceholder .mx_EntityTile_name {
    font-style: italic;
-    color: $primary-fg-color;
+    font-color: #454545;
 }

 .mx_EntityTile_unavailable .mx_EntityTile_avatar,
@@ -44,7 +44,7 @@ limitations under the License.
 }

 .mx_EventTile .mx_SenderProfile {
-    color: $primary-fg-color;
+    color: #454545;
    opacity: 0.5;
    font-size: 14px;
    display: block; /* anti-zalgo, with overflow hidden */
@@ -61,7 +61,7 @@ limitations under the License.
    display: block;
    visibility: hidden;
    white-space: nowrap;
-    color: $event-timestamp-color;
+    color: #acacac;
    font-size: 11px;
    left: 8px;
    position: absolute;
@@ -93,20 +93,20 @@ limitations under the License.
 * TODO: ultimately we probably want some transition on here.
 */
 .mx_EventTile_selected .mx_EventTile_line {
-    border-left: $accent-color 5px solid;
+    border-left: #76cfa6 5px solid;
    padding-left: 60px;
-    background-color: $event-selected-color;
+    background-color: #f7f7f7;
 }

 .mx_EventTile:hover .mx_EventTile_line,
 .mx_EventTile.menu .mx_EventTile_line
 {
-    background-color: $event-selected-color;
+    background-color: #f7f7f7;
 }

 .mx_EventTile_searchHighlight {
-    background-color: $accent-color;
-    color: $accent-fg-color;
+    background-color: #76cfa6;
+    color: #fff;
    border-radius: 5px;
    padding-left: 2px;
    padding-right: 2px;
@@ -114,43 +114,26 @@ limitations under the License.
 }

 .mx_EventTile_searchHighlight a {
-    background-color: $accent-color;
-    color: $accent-fg-color;
+    background-color: #76cfa6;
+    color: #fff;
 }

 .mx_EventTile_encrypting {
-    color: $event-encrypting-color ! important;
+    color: #abddbc ! important;
 }

 .mx_EventTile_sending {
-    color: $event-sending-color;
+    color: #ddd;
 }

 .mx_EventTile_notSent {
-    color: $event-notsent-color;
-}
-
-.mx_EventTile_redacted .mx_EventTile_line .mx_UnknownBody {
-    display: block;
-    width: 100%;
-    height: 36px;
-    background-image: $event-redacted-img;
-    background-repeat: no-repeat;
-    background-size: contain;
-}
-
-.mx_EventTile.mx_EventTile_redacted .mx_EventTile_line {
-    /*
-       Prevent changing colour of the background because
-       $event-redacted-img matches $primary-bg-color
-    */
-    background-color: initial !important;
+    color: #f44;
 }

 .mx_EventTile_highlight,
 .mx_EventTile_highlight .markdown-body
 {
-    color: $warning-color;
+    color: #FF0064;
 }

 .mx_EventTile_contextual {
@@ -163,12 +146,7 @@ limitations under the License.
    z-index: 1;
    position: relative;
    width: 90px;
-
-    /* Hack to stop the height of this pushing the messages apart.
-       Replaces margin-top: -6px. This interacts better with a read
-       marker being in between. Content overflows. */
-    height: 1px;
-
+    height: 1px; /* Hack to stop the height of this pushing the messages apart. Replaces marigin-top: -6px. This interacts better with a read marker being in between. Content overflows. */
    margin-right: 10px;
 }

@@ -194,9 +172,6 @@ limitations under the License.
    cursor: pointer;
    top: 6px;
    right: 6px;
-    width: 19px;
-    height: 19px;
-    background-image: url($edit-button-url);
 }

 .mx_EventTile:hover .mx_EventTile_editButton,
@@ -229,7 +204,7 @@ limitations under the License.
 }

 .mx_EventTile_readAvatarRemainder {
-    color: $event-timestamp-color;
+    color: #acacac;
    font-size: 11px;
    position: absolute;
 }
@@ -268,17 +243,11 @@ limitations under the License.
    padding-left: 60px;
 }

-.mx_EventTile_selected.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_verified.mx_EventTile_info .mx_EventTile_line,
-.mx_EventTile:hover.mx_EventTile_unverified.mx_EventTile_info .mx_EventTile_line {
-    padding-left: 78px;
-}
-
 .mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line {
-    border-left: $e2e-verified-color 5px solid;
+    border-left: #76cfa5 5px solid;
 }
 .mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
-    border-left: $e2e-unverified-color 5px solid;
+    border-left: #e8bf37 5px solid;
 }

 .mx_EventTile:hover.mx_EventTile_verified .mx_MessageTimestamp,
@@ -317,10 +286,6 @@ limitations under the License.
    overflow-y: visible;
 }

-.mx_EventTile_content .markdown-body code {
-    background-color: #f8f8f8;
-}
-
 .mx_EventTile_content .markdown-body h1,
 .mx_EventTile_content .markdown-body h2,
 .mx_EventTile_content .markdown-body h3,
@@ -332,7 +297,7 @@ limitations under the License.
 }

 .mx_EventTile_content .markdown-body a {
-    color: $accent-color;
+    color: #76cfa6;
 }

 .mx_EventTile_content .markdown-body .hljs {
@@ -18,12 +18,14 @@ limitations under the License.
    margin-top: 15px;
    margin-right: 15px;
    margin-bottom: 15px;
+    display: -webkit-flex;
    display: flex;
-    border-left: 4px solid $preview-widget-bar-color;
-    color: $preview-widget-fg-color;
+    border-left: 4px solid #ddd;
+    color: #888;
 }

 .mx_LinkPreviewWidget_image {
+    -webkit-flex: 0 0 100px;
    flex: 0 0 100px;
    margin-left: 15px;
    text-align: center;
@@ -32,13 +34,13 @@ limitations under the License.

 .mx_LinkPreviewWidget_caption {
    margin-left: 15px;
+    -webkit-flex: 1 1 auto;
    flex: 1 1 auto;
 }

 .mx_LinkPreviewWidget_title {
    display: inline;
    font-weight: bold;
-    white-space: normal;
 }

 .mx_LinkPreviewWidget_siteName {
@@ -54,6 +56,7 @@ limitations under the License.
 .mx_LinkPreviewWidget_cancel {
    visibility: hidden;
    cursor: pointer;
+    -webkit-flex: 0 0 40px;
    flex: 0 0 40px;
 }

@@ -20,8 +20,8 @@ limitations under the License.


 .mx_MemberDeviceInfo_textButton {
-    color: $accent-fg-color;
-    background-color: $accent-color;
+    color: #fff;
+    background-color: #76cfa6;
    border-radius: 17px;
    text-align: center;
    padding-left: 1em;
@@ -50,13 +50,13 @@ limitations under the License.
 }

 /* "Unblacklist" is too long for a regular button: make it wider and
-   reduce the padding. */
+   reduce the padding. */  
 .mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,
 .mx_EncryptedEventDialog .mx_MemberDeviceInfo_unblacklist {
    width: 8em;
    padding-left: 1em;
    padding-right: 1em;
-}
+}    

 .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified,
 .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified,
@@ -66,13 +66,13 @@ limitations under the License.
 }

 .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified {
-    color: $e2e-verified-color;
+    color: #76cfa5;
 }

 .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified {
-    color: $e2e-unverified-color;
+    color: #e8bf37;
 }

 .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
-    color: $e2e-warning-color;
+    color: #ba6363;
 }
@@ -48,10 +48,11 @@ limitations under the License.
 }

 .mx_MemberInfo_avatar .mx_BaseAvatar {
+    cursor: not-allowed;
 }

 .mx_MemberInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
-    cursor: zoom-in;
+    cursor: pointer;
 }

 .mx_MemberInfo_profile {
@@ -60,7 +61,7 @@ limitations under the License.

 .mx_MemberInfo h3 {
    text-transform: uppercase;
-    color: $h3-color;
+    color: #3d3b39;
    font-weight: 600;
    font-size: 13px;
    margin-top: 16px;
@@ -68,9 +69,10 @@ limitations under the License.
 }

 .mx_MemberInfo_profileField {
+    font-color: #999999;
    font-size: 13px;
    position: relative;
-    background-color: $primary-bg-color;
+    background-color: #fff;
 }

 .mx_MemberInfo_buttons {
@@ -80,7 +82,7 @@ limitations under the License.
 .mx_MemberInfo_field {
    cursor: pointer;
    font-size: 13px;
-    color: $accent-color;
+    color: #76cfa6;
    margin-left: 8px;
    line-height: 23px;
 }
@@ -20,15 +20,22 @@ limitations under the License.
    margin-top: 12px;
    margin-right: 20px;

+    -webkit-flex: 1;
    flex: 1;

+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;

    flex-direction: column;
+    -webkit-flex-direction: column;
 }

 .mx_MemberList .mx_Spinner {
-    flex: 0 0 auto;
+    flex: 0;
+    -webkit-flex: 0;
 }

 .mx_MemberList_chevron {
@@ -41,16 +48,17 @@ limitations under the License.
    overflow-y: auto;

    order: 1;
+    -webkit-flex: 1 1 0;
    flex: 1 1 0px;
 }

 .mx_MemberList_query {
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
    border-radius: 3px;
-    border: 1px solid $input-border-color;
+    border: 1px solid #f0f0f0;
    padding: 9px;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: #454545;
+    background-color: #fff;
    margin-left: 3px;
    font-size: 14px;
    margin-bottom: 8px;
@@ -58,13 +66,13 @@ limitations under the License.
 }

 .mx_MemberList_query::-moz-placeholder {
-    color: $primary-fg-color;
+    color: #454545;
    opacity: 0.5;
    font-size: 14px;
 }

 .mx_MemberList_query::-webkit-input-placeholder {
-    color: $primary-fg-color;
+    color: #454545;
    opacity: 0.5;
    font-size: 14px;
 }
@@ -72,6 +80,7 @@ limitations under the License.
 .mx_MemberList_joined {
    order: 2;
    flex: 1 0 0;
+    -webkit-flex: 1 0 0;

    overflow-y: auto;
 }
@@ -80,13 +89,14 @@ limitations under the License.
 .mx_MemberList_invited {
    order: 3;
    flex: 0 0 100px;
+    -webkit-flex: 0 0 100px;
    overflow-y: auto;
 }
 */

 .mx_MemberList_invited h2 {
    text-transform: uppercase;
-    color: $h3-color;
+    color: #3d3b39;
    font-weight: 600;
    font-size: 13px;
    padding-left: 3px;
@@ -18,7 +18,7 @@ limitations under the License.
    max-width: 960px;
    vertical-align: middle;
    margin: auto;
-    border-top: 1px solid $primary-hairline-color;
+    border-top: 1px solid #e5e5e5;
    position: relative;
 }

@@ -57,7 +57,7 @@ limitations under the License.
    height: 60px;
    text-align: center;
    font-style: italic;
-    color: $greyed-fg-color;
+    color: #888;
 }

 .mx_MessageComposer_input_wrapper {
@@ -90,10 +90,10 @@ limitations under the License.
 }

 .mx_MessageComposer_input blockquote {
-    color: $blockquote-fg-color;
+    color: rgb(119, 119, 119);
    margin: 0 0 16px;
    padding: 0 15px;
-    border-left: 4px solid $blockquote-bar-color;
+    border-left: 4px solid rgb(221, 221, 221);
 }

 .mx_MessageComposer_input textarea {
@@ -105,9 +105,11 @@ limitations under the License.
    border: 0px;
    resize: none;
    outline: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
    box-shadow: none;
-    color: $primary-fg-color;
-    background-color: $primary-bg-color;
+    color: #454545;
+    background-color: #fff;
    font-size: 14px;
    max-height: 120px;
    overflow: auto;
@@ -118,11 +120,11 @@ limitations under the License.
 /* hack for FF as vertical alignment of custom placeholder text is broken */
 .mx_MessageComposer_input textarea::-moz-placeholder {
    line-height: 100%;
-    color: $accent-color;
+    color: #76cfa6;
    opacity: 1.0;
 }
 .mx_MessageComposer_input textarea::-webkit-input-placeholder {
-    color: $accent-color;
+    color: #76cfa6;
 }

 .mx_MessageComposer_upload,
@@ -151,7 +153,7 @@ limitations under the License.

 .mx_MessageComposer_formatbar_wrapper {
    width: 100%;
-    background-color: $menu-bg-color;
+    background-color: #f7f7f7;
    box-shadow: inset 0 1px 0 0 rgba(0, 0, 0, 0.08);
 }

@@ -168,7 +170,7 @@ limitations under the License.
    flex-direction: row;
    align-items: center;
    font-size: 10px;
-    color: $greyed-fg-color;
+    color: #888;
 }

 .mx_MessageComposer_formatbar * {
@@ -16,6 +16,7 @@ limitations under the License.

 /* add 20px to the height of the header when editing */
 .mx_RoomHeader_editing {
+    -webit-flex: 0 0 93px ! important;
    flex: 0 0 93px ! important;
 }

@@ -23,36 +24,63 @@ limitations under the License.
    max-width: 960px;
    margin: auto;
    height: 70px;
+
+    -webkit-align-items: center;
    align-items: center;
+
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: -webkit-flex;
    display: flex;
 }

 .mx_RoomHeader_leftRow {
    margin-left: -2px;
+
+    -webkit-box-ordinal-group: 1;
+    -moz-box-ordinal-group: 1;
+    -ms-flex-order: 1;
+    -webkit-order: 1;
    order: 1;
+
+    -webkit-flex: 1;
    flex: 1;
 }

 .mx_RoomHeader_spinner {
    height: 36px;
+
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;
+
    padding-left: 12px;
    padding-right: 12px;
 }

 .mx_RoomHeader_textButton {
    height: 36px;
-    background-color: $accent-color;
+    background-color: #76cfa6;
    border-radius: 36px;
    margin-right: 8px;
-    color: $accent-fg-color;
+    color: #fff;
    line-height: 34px;
    margin-top: -2px;
    text-align: center;
+
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;
+
    cursor: pointer;

 /*
+    -webkit-flex: 0 0 90px;
    flex: 0 0 90px;
 */
    padding-left: 12px;
@@ -60,17 +88,27 @@ limitations under the License.
 }

 .mx_RoomHeader_cancelButton {
+    -webkit-box-ordinal-group: 2;
+    -moz-box-ordinal-group: 2;
+    -ms-flex-order: 2;
+    -webkit-order: 2;
    order: 2;
+
    cursor: pointer;
+
    padding-left: 12px;
    padding-right: 12px;
 }

 .mx_RoomHeader_rightRow {
    margin-top: 4px;
-    background-color: $primary-bg-color;
+    background-color: #fff;
    display: flex;
    align-items: center;
+    -webkit-box-ordinal-group: 3;
+    -moz-box-ordinal-group: 3;
+    -ms-flex-order: 3;
+    -webkit-order: 3;
    order: 3;
 }

@@ -82,7 +120,7 @@ limitations under the License.

 .mx_RoomHeader_simpleHeader {
    line-height: 70px;
-    color: $primary-fg-color;
+    color: #454545;
    font-size: 22px;
    font-weight: bold;
    overflow: hidden;
@@ -100,7 +138,7 @@ limitations under the License.
    width: 100%;
    height: 31px;
    overflow: hidden;
-    color: $primary-fg-color;
+    color: #454545;
    font-weight: bold;
    font-size: 22px;
    padding-left: 19px;
@@ -115,7 +153,7 @@ limitations under the License.
 }

 .mx_RoomHeader_settingsHint {
-    color: $settings-grey-fg-color ! important;
+    color: #a2a2a2 ! important;
 }

 .mx_RoomHeader_searchStatus {
@@ -136,21 +174,21 @@ limitations under the License.
 }

 .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
-    color: $accent-color;
+    color: #76cfa6;
 }

 .mx_RoomHeader_placeholder {
-    color: $settings-grey-fg-color ! important;
+    color: #a2a2a2 ! important;
 }

 .mx_RoomHeader_editable {
-    border-bottom: 1px solid $strong-input-border-color ! important;
+    border-bottom: 1px solid #c7c7c7 ! important;
    min-width: 150px;
    cursor: text;
 }

 .mx_RoomHeader_editable:focus {
-    border-bottom: 1px solid $accent-color ! important;
+    border-bottom: 1px solid #76CFA6 ! important;
    outline: none;
    box-shadow: none;
 }
@@ -159,7 +197,7 @@ limitations under the License.
    vertical-align: bottom;
    float: left;
    max-height: 42px;
-    color: $settings-grey-fg-color;
+    color: #A2A2A2;
    font-weight: 300;
    font-size: 13px;
    margin-left: 19px;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
David Baker	b22dd523e0	v0.9.1	2016-12-09 23:01:53 +00:00
David Baker	dccf7d64f5	Back to rc2 again & remove spurious chanelog	2016-12-09 23:00:45 +00:00
David Baker	38866899f2	v0.9.1	2016-12-09 22:57:29 +00:00
David Baker	2b81f43474	Prepare changelog for v0.9.1	2016-12-09 22:57:29 +00:00
David Baker	c47e44e8be	Back to rc2 temporarily	2016-12-09 22:56:41 +00:00
David Baker	6742f8eb2a	256x256 ico file	2016-12-09 22:53:19 +00:00