diff --git a/.babelrc b/.babelrc
index 8c7b66269d..6ba0e0dae0 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,4 +1,4 @@
 {
   "presets": ["react", "es2015", "es2016"],
-  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-generator", "transform-runtime", "add-module-exports"]
+  "plugins": ["transform-class-properties", "transform-object-rest-spread", "transform-async-to-bluebird", "transform-runtime", "add-module-exports"]
 }
diff --git a/.gitignore b/.gitignore
index 060ca6e934..2ad05012a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,6 @@
 npm-debug.log
 electron/dist
 electron/pub
-/.idea
+**/.idea
 /config.json
 /src/component-index.js
diff --git a/.travis.yml b/.travis.yml
index e020ba7d15..94ed745cd8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,10 @@
+# we need trusty for the chrome addon
+dist: trusty
+
+# we don't need sudo, so can run in a container, which makes startup much
+# quicker.
+sudo: false
+
 language: node_js
 node_js:
     # make sure we work with a range of node versions.
@@ -5,8 +12,9 @@ node_js:
     #  - 4.x is still in LTS (until April 2018), but some of our deps (notably
     #    extract-zip) don't work with it
     #  - 5.x has been EOLed for nearly a year.
-    #  - 6.x is the current 'LTS' version
-    #  - 7.x is the current 'current' version (until October 2017)
+    #  - 6.x is the active 'LTS' version
+    #  - 7.x is no longer supported
+    #  - 8.x is the current 'current' version (until October 2017)
     #
     # see: https://github.com/nodejs/LTS/
     #
@@ -16,6 +24,8 @@ node_js:
     - 6.3
     - 6
     - 7
+addons:
+    chrome: stable
 install:
     # clone the deps with depth 1: we know we will only ever need that one
     # commit.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdba055144..93bf83f6f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,334 @@
+Changes in [0.12.7](https://github.com/vector-im/riot-web/releases/tag/v0.12.7) (2017-10-16)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.7-rc.3...v0.12.7)
+
+ * Released versions of react-sdk & js-sdk
+
+Changes in [0.12.7-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.7-rc.3) (2017-10-13)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.7-rc.2...v0.12.7-rc.3)
+
+ * Hide the join group button
+   [\#5275](https://github.com/vector-im/riot-web/pull/5275)
+
+Changes in [0.12.7-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.12.7-rc.2) (2017-10-13)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.7-rc.1...v0.12.7-rc.2)
+
+
+Changes in [0.12.7-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.7-rc.1) (2017-10-13)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.6...v0.12.7-rc.1)
+
+ * switch to new logos, and use import rather than VAR
+   [\#5203](https://github.com/vector-im/riot-web/pull/5203)
+ * Clarify what an integrations server is
+   [\#5266](https://github.com/vector-im/riot-web/pull/5266)
+ * Update from Weblate.
+   [\#5269](https://github.com/vector-im/riot-web/pull/5269)
+ * Remove trailing comma in JSON
+   [\#5167](https://github.com/vector-im/riot-web/pull/5167)
+ * Added default_federate property
+   [\#3849](https://github.com/vector-im/riot-web/pull/3849)
+ * CSS for greying out login form
+   [\#5197](https://github.com/vector-im/riot-web/pull/5197)
+ * Fix bug that made sub list placeholders not show for ILAG etc.
+   [\#5164](https://github.com/vector-im/riot-web/pull/5164)
+ * Factor out EditableItemList component from AliasSettings
+   [\#5161](https://github.com/vector-im/riot-web/pull/5161)
+ * Mark and remove some translations
+   [\#5110](https://github.com/vector-im/riot-web/pull/5110)
+ * CSS for "remove" button on GroupRoomTile
+   [\#5141](https://github.com/vector-im/riot-web/pull/5141)
+ * Create basic icon for the GroupRoomList tab and adding rooms to groups
+   [\#5140](https://github.com/vector-im/riot-web/pull/5140)
+ * Add button to get to MyGroups
+   [\#5131](https://github.com/vector-im/riot-web/pull/5131)
+ * Remove `key` prop pass-thru on HeaderButton
+   [\#5137](https://github.com/vector-im/riot-web/pull/5137)
+ * Implement "Add room to group" feature
+   [\#5125](https://github.com/vector-im/riot-web/pull/5125)
+ * Add Jitsi screensharing support in electron app
+   [\#4967](https://github.com/vector-im/riot-web/pull/4967)
+ * Refactor right panel header buttons
+   [\#5117](https://github.com/vector-im/riot-web/pull/5117)
+ * CSS for publicity status & toggle button
+   [\#5104](https://github.com/vector-im/riot-web/pull/5104)
+ * CSS for "X" in top right of features users/rooms
+   [\#5103](https://github.com/vector-im/riot-web/pull/5103)
+ * Include Finnish translation
+   [\#5051](https://github.com/vector-im/riot-web/pull/5051)
+ * Redesign membership section of GroupView
+   [\#5096](https://github.com/vector-im/riot-web/pull/5096)
+ * Make --config accept globs
+   [\#5090](https://github.com/vector-im/riot-web/pull/5090)
+ * CSS for GroupView: Add a User
+   [\#5093](https://github.com/vector-im/riot-web/pull/5093)
+ * T3chguy/devtools 1
+   [\#5074](https://github.com/vector-im/riot-web/pull/5074)
+ * Alter opacity for flair
+   [\#5085](https://github.com/vector-im/riot-web/pull/5085)
+ * Fix ugly integ button
+   [\#5082](https://github.com/vector-im/riot-web/pull/5082)
+ * Group Membership UI
+   [\#4830](https://github.com/vector-im/riot-web/pull/4830)
+
+Changes in [0.12.6](https://github.com/vector-im/riot-web/releases/tag/v0.12.6) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.5...v0.12.6)
+
+ * Use matrix-js-sdk v0.8.4 to fix build
+
+Changes in [0.12.5](https://github.com/vector-im/riot-web/releases/tag/v0.12.5) (2017-09-21)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4...v0.12.5)
+
+ * Use react-sdk v0.10.5 to fix build
+
+Changes in [0.12.4](https://github.com/vector-im/riot-web/releases/tag/v0.12.4) (2017-09-20)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.4-rc.1...v0.12.4)
+
+ * No changes
+
+Changes in [0.12.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.4-rc.1) (2017-09-19)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3...v0.12.4-rc.1)
+
+ * Fix test for new behaviour of 'joining' flag
+   [\#5053](https://github.com/vector-im/riot-web/pull/5053)
+ * fix really dumb blunder/typo preventing system from going to sleep.
+   [\#5080](https://github.com/vector-im/riot-web/pull/5080)
+ * T3chguy/devtools
+   [\#4735](https://github.com/vector-im/riot-web/pull/4735)
+ * CSS for unignore button in UserSettings
+   [\#5042](https://github.com/vector-im/riot-web/pull/5042)
+ * Fix alias on home page for identity room
+   [\#5044](https://github.com/vector-im/riot-web/pull/5044)
+ * generic contextual menu for tooltip/responses
+   [\#4989](https://github.com/vector-im/riot-web/pull/4989)
+ * Update from Weblate.
+   [\#5018](https://github.com/vector-im/riot-web/pull/5018)
+ * Avoid re-rendering RoomList on room switch
+   [\#5015](https://github.com/vector-im/riot-web/pull/5015)
+ * Fix menu on change keyboard language issue #4345
+   [\#4623](https://github.com/vector-im/riot-web/pull/4623)
+ * Make isInvite default to false
+   [\#4999](https://github.com/vector-im/riot-web/pull/4999)
+ * Revert "Implement sticky date separators"
+   [\#4991](https://github.com/vector-im/riot-web/pull/4991)
+ * Implement sticky date separators
+   [\#4939](https://github.com/vector-im/riot-web/pull/4939)
+
+Changes in [0.12.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.3) (2017-09-06)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.3...v0.12.3)
+
+ * No changes
+
+Changes in [0.12.3-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.3) (2017-09-05)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.2...v0.12.3-rc.3)
+
+ * Fix plurals in translations
+   [\#4971](https://github.com/vector-im/riot-web/pull/4971)
+ * Update from Weblate.
+   [\#4968](https://github.com/vector-im/riot-web/pull/4968)
+
+Changes in [0.12.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.2) (2017-09-05)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.3-rc.1...v0.12.3-rc.2)
+
+ * New react-sdk version to pull in new translations and fix some translation bugs.
+
+
+Changes in [0.12.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.3-rc.1) (2017-09-01)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.2...v0.12.3-rc.1)
+
+ * Fix overflowing login/register buttons on some languages issue #4804
+   [\#4858](https://github.com/vector-im/riot-web/pull/4858)
+ * Update vector-im to riot-im on Login
+   [\#4943](https://github.com/vector-im/riot-web/pull/4943)
+ * lets let people know that the bug report actually sent properly :)
+   [\#4910](https://github.com/vector-im/riot-web/pull/4910)
+ * another s/vector/riot/ in README
+   [\#4934](https://github.com/vector-im/riot-web/pull/4934)
+ * fix two room list regressions
+   [\#4907](https://github.com/vector-im/riot-web/pull/4907)
+
+Changes in [0.12.2](https://github.com/vector-im/riot-web/releases/tag/v0.12.2) (2017-08-24)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.1...v0.12.2)
+
+ * Update react-sdk and js-sdk to fix bugs with incoming calls, messages and notifications
+   in encrypted rooms.
+
+Changes in [0.12.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.1) (2017-08-23)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.1-rc.1...v0.12.1)
+
+ * [No changes]
+
+Changes in [0.12.1-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.1-rc.1) (2017-08-22)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.12.0-rc.2...v0.12.1-rc.1)
+
+ * Update from Weblate.
+   [\#4832](https://github.com/vector-im/riot-web/pull/4832)
+ * Misc styling fixes.
+   [\#4826](https://github.com/vector-im/riot-web/pull/4826)
+ * Show / Hide apps icons
+   [\#4774](https://github.com/vector-im/riot-web/pull/4774)
+
+Changes in [0.12.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.12.0-rc.1) (2017-08-16)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.4...v0.12.0-rc.1)
+
+ * Update from Weblate.
+   [\#4797](https://github.com/vector-im/riot-web/pull/4797)
+ * move focus-via-up/down cursors to LeftPanel
+   [\#4777](https://github.com/vector-im/riot-web/pull/4777)
+ * Remove userId property on RightPanel
+   [\#4775](https://github.com/vector-im/riot-web/pull/4775)
+ * Make member device info buttons fluid and stackable with flexbox
+   [\#4776](https://github.com/vector-im/riot-web/pull/4776)
+ * un-i18n Modal Analytics
+   [\#4688](https://github.com/vector-im/riot-web/pull/4688)
+ * Quote using innerText
+   [\#4773](https://github.com/vector-im/riot-web/pull/4773)
+ * Karma tweaks for riot-web
+   [\#4765](https://github.com/vector-im/riot-web/pull/4765)
+ * Fix typo with scripts/fetch-develop-deps.sh in Building From Source
+   [\#4764](https://github.com/vector-im/riot-web/pull/4764)
+ * Adjust CSS for optional avatars in pills
+   [\#4757](https://github.com/vector-im/riot-web/pull/4757)
+ * Fix crypto on develop
+   [\#4754](https://github.com/vector-im/riot-web/pull/4754)
+ * Fix signing key url in readme
+   [\#4464](https://github.com/vector-im/riot-web/pull/4464)
+ * update gitignore to allow .idea directory to exist in subdirs
+   [\#4749](https://github.com/vector-im/riot-web/pull/4749)
+ * tweak compact theme
+   [\#4665](https://github.com/vector-im/riot-web/pull/4665)
+ * Update draft-js from 0.10.1 to 0.11.0-alpha
+   [\#4740](https://github.com/vector-im/riot-web/pull/4740)
+ * electron support for mouse forward/back buttons in Windows
+   [\#4739](https://github.com/vector-im/riot-web/pull/4739)
+ * Update draft-js from 0.8.1 to 0.10.1
+   [\#4730](https://github.com/vector-im/riot-web/pull/4730)
+ * Make pills, emoji translucent when sending
+   [\#4693](https://github.com/vector-im/riot-web/pull/4693)
+ * Widget permissions styling and icon
+   [\#4690](https://github.com/vector-im/riot-web/pull/4690)
+ * CSS required for composer autoscroll
+   [\#4682](https://github.com/vector-im/riot-web/pull/4682)
+ * CSS for group edit UI
+   [\#4608](https://github.com/vector-im/riot-web/pull/4608)
+ * Fix a couple of minor errors in the room list
+   [\#4671](https://github.com/vector-im/riot-web/pull/4671)
+ * Styling for beta testing icon.
+   [\#4584](https://github.com/vector-im/riot-web/pull/4584)
+ * Increase the timeout for clearing indexeddbs
+   [\#4650](https://github.com/vector-im/riot-web/pull/4650)
+ * Make some adjustments to mx_UserPill and mx_RoomPill
+   [\#4597](https://github.com/vector-im/riot-web/pull/4597)
+ * Apply CSS to <pre> tags to distinguish them from each other
+   [\#4639](https://github.com/vector-im/riot-web/pull/4639)
+ * Use `catch` instead of `fail` to handle room tag error
+   [\#4643](https://github.com/vector-im/riot-web/pull/4643)
+ * CSS for decorated matrix.to links in the composer
+   [\#4583](https://github.com/vector-im/riot-web/pull/4583)
+ * Deflake the joining test
+   [\#4579](https://github.com/vector-im/riot-web/pull/4579)
+ * Bump react to 15.6 to fix build problems
+   [\#4577](https://github.com/vector-im/riot-web/pull/4577)
+ * Improve AppTile menu bar button styling.
+   [\#4567](https://github.com/vector-im/riot-web/pull/4567)
+ * Transform `async` functions to bluebird promises
+   [\#4572](https://github.com/vector-im/riot-web/pull/4572)
+ * use flushAllExpected in joining test
+   [\#4570](https://github.com/vector-im/riot-web/pull/4570)
+ * Switch riot-web to bluebird
+   [\#4565](https://github.com/vector-im/riot-web/pull/4565)
+ * loading tests: wait for login component
+   [\#4564](https://github.com/vector-im/riot-web/pull/4564)
+ * Remove CSS for the MessageComposerInputOld
+   [\#4568](https://github.com/vector-im/riot-web/pull/4568)
+ * Implement the focus_room_filter action
+   [\#4560](https://github.com/vector-im/riot-web/pull/4560)
+ * CSS for Rooms in Group View
+   [\#4530](https://github.com/vector-im/riot-web/pull/4530)
+ * more HomePage tweaks
+   [\#4557](https://github.com/vector-im/riot-web/pull/4557)
+ * Give HomePage an unmounted guard
+   [\#4556](https://github.com/vector-im/riot-web/pull/4556)
+ * Take RTE out of labs
+   [\#4500](https://github.com/vector-im/riot-web/pull/4500)
+ * CSS for Groups page
+   [\#4468](https://github.com/vector-im/riot-web/pull/4468)
+ * CSS for GroupView
+   [\#4442](https://github.com/vector-im/riot-web/pull/4442)
+ * remove unused class
+   [\#4525](https://github.com/vector-im/riot-web/pull/4525)
+ * Fix long words causing MessageComposer to widen
+   [\#4466](https://github.com/vector-im/riot-web/pull/4466)
+ * Add visual bell animation for RTE
+   [\#4516](https://github.com/vector-im/riot-web/pull/4516)
+ * Truncate auto-complete pills properly
+   [\#4502](https://github.com/vector-im/riot-web/pull/4502)
+ * Use chrome headless instead of phantomjs
+   [\#4512](https://github.com/vector-im/riot-web/pull/4512)
+ * Use external mock-request
+   [\#4489](https://github.com/vector-im/riot-web/pull/4489)
+ * fix Quote not closing contextual menu
+   [\#4443](https://github.com/vector-im/riot-web/pull/4443)
+ * Apply white-space: pre-wrap to mx_MEmoteBody
+   [\#4470](https://github.com/vector-im/riot-web/pull/4470)
+ * Add some style improvements to autocompletions
+   [\#4456](https://github.com/vector-im/riot-web/pull/4456)
+ * Styling for apps / widgets
+   [\#4447](https://github.com/vector-im/riot-web/pull/4447)
+ * Attempt to flush the rageshake logs on close
+   [\#4400](https://github.com/vector-im/riot-web/pull/4400)
+ * Update from Weblate.
+   [\#4401](https://github.com/vector-im/riot-web/pull/4401)
+ * improve update polling electron and provide a manual check for updates
+   button
+   [\#4176](https://github.com/vector-im/riot-web/pull/4176)
+ * Fix load failure in firefox when indexedDB is disabled
+   [\#4395](https://github.com/vector-im/riot-web/pull/4395)
+ * Change missed 'Redact' to 'Remove' in ImageView.
+   [\#4362](https://github.com/vector-im/riot-web/pull/4362)
+ * explicit convert to nativeImage to stabilise trayIcon on Windows [Electron]
+   [\#4355](https://github.com/vector-im/riot-web/pull/4355)
+ * Use _tJsx for PasswordNagBar (because it has <u>)
+   [\#4373](https://github.com/vector-im/riot-web/pull/4373)
+ * Clean up some log outputs from the integ tests
+   [\#4376](https://github.com/vector-im/riot-web/pull/4376)
+ * CSS for redeisng of password warning
+   [\#4367](https://github.com/vector-im/riot-web/pull/4367)
+ * Give _t to PasswordNagBar, add CSS for UserSettings password warning
+   [\#4366](https://github.com/vector-im/riot-web/pull/4366)
+ * Update from Weblate.
+   [\#4361](https://github.com/vector-im/riot-web/pull/4361)
+ * Update from Weblate.
+   [\#4360](https://github.com/vector-im/riot-web/pull/4360)
+ * Test 'return-to-app' functionality
+   [\#4352](https://github.com/vector-im/riot-web/pull/4352)
+ * Update from Weblate.
+   [\#4354](https://github.com/vector-im/riot-web/pull/4354)
+ * onLoadCompleted is now onTokenLoginCompleted
+   [\#4335](https://github.com/vector-im/riot-web/pull/4335)
+ * Tweak tests to match updates to matrixchat
+   [\#4325](https://github.com/vector-im/riot-web/pull/4325)
+ * Update from Weblate.
+   [\#4346](https://github.com/vector-im/riot-web/pull/4346)
+ * change dispatcher forward_event signature
+   [\#4337](https://github.com/vector-im/riot-web/pull/4337)
+ * Add border on hover for code blocks
+   [\#4259](https://github.com/vector-im/riot-web/pull/4259)
+
 Changes in [0.11.4](https://github.com/vector-im/riot-web/releases/tag/v0.11.4) (2017-06-22)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.11.3...v0.11.4)
@@ -5,7 +336,7 @@ Changes in [0.11.4](https://github.com/vector-im/riot-web/releases/tag/v0.11.4)
  * Update matrix-js-sdk and react-sdk to fix a regression where the
    background indexedb worker was disabled, failures to open indexeddb
    causing the app to fail to start, a race when starting that could break
-   switching to rooms, and the inability to to invite user with mixed case
+   switching to rooms, and the inability to invite users with mixed case
    usernames.
 
 Changes in [0.11.3](https://github.com/vector-im/riot-web/releases/tag/v0.11.3) (2017-06-20)
diff --git a/README.md b/README.md
index 89f2148f5e..1da2063212 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,13 @@ released version of Riot:
 
 1. Download the latest version from https://github.com/vector-im/riot-web/releases
 1. Untar the tarball on your web server
-1. Move (or symlink) the vector-x.x.x directory to an appropriate name
+1. Move (or symlink) the riot-x.x.x directory to an appropriate name
 1. If desired, copy `config.sample.json` to `config.json` and edit it
    as desired. See below for details.
 1. Enter the URL into your browser and log into Riot!
 
 Releases are signed by PGP, and can be checked against the public key
-at https://riot.im/packages/keys/riot-master.asc
+at https://riot.im/packages/keys/riot.asc
 
 Note that Chrome does not allow microphone or webcam access for sites served
 over http (except localhost), so for working VoIP you will need to serve Riot
@@ -62,7 +62,7 @@ to build.
 1. If you're using the `develop` branch, install the develop versions of the
    dependencies, as the released ones will be too old:
    ```
-   scripts/fetch-develop-deps.sh
+   scripts/fetch-develop.deps.sh
    ```
    Whenever you git pull on riot-web you will also probably need to force an update
    to these dependencies - the simplest way is to re-run the script, but you can also
@@ -81,7 +81,7 @@ to build.
    npm run build
    ```
    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
+   up a dev 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.
@@ -115,7 +115,9 @@ You can configure the app by copying `config.sample.json` to
    addresses) to matrix IDs: see http://matrix.org/docs/spec/identity_service/unstable.html
    for more details.  Currently the only public matrix identity servers are https://matrix.org
    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_ui_url`: URL to the web interface for the integrations server. The integrations
+   server is not Riot and normally not your Home Server either. The integration server settings
+   may be left blank to disable integrations.
 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.servers`: List of other Home Servers' directories to include in the drop
@@ -253,7 +255,6 @@ Finally, build and start Riot itself:
 1. `rm -r node_modules/matrix-react-sdk; ln -s ../../matrix-react-sdk node_modules/`
 1. `npm start`
 1. Wait a few seconds for the initial build to finish; you should see something like:
-
     ```
     Hash: b0af76309dd56d7275c8
     Version: webpack 1.12.14
@@ -282,19 +283,34 @@ If any of these steps error with, `file table overflow`, you are probably on a m
 which has a very low limit on max open files. Run `ulimit -Sn 1024` and try again.
 You'll need to do this in each new terminal you open before building Riot.
 
-How to add a new translation?
-=============================
+Running the tests
+-----------------
+
+There are a number of application-level tests in the `tests` directory; these
+are designed to run in a browser instance under the control of
+[karma](https://karma-runner.github.io). To run them:
+
+* Make sure you have Chrome installed (a recent version, like 59)
+* Make sure you have `matrix-js-sdk` and `matrix-react-sdk` installed and
+  built, as above
+* `npm run test`
+
+The above will run the tests under Chrome in a `headless` mode.
+
+You can also tell karma to run the tests in a loop (every time the source
+changes), in an instance of Chrome on your desktop, with `npm run
+test-multi`. This also gives you the option of running the tests in 'debug'
+mode, which is useful for stepping through the tests in the developer tools.
+
+Translations
+============
+
+To add a new translation, head to the [translating doc](docs/translating.md).
+
+For a developer guide, see the [translating dev doc](docs/translating-dev.md).
 
 [<img src="https://translate.riot.im/widgets/riot-web/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.riot.im/engage/riot-web/?utm_source=widget)
 
-
-Head to the [translating doc](docs/translating.md)
-
-Adding Strings to the translations (Developer Guide)
-====================================================
-
-Head to the [translating dev doc](docs/translating-dev.md)
-
 Triaging issues
 ===============
 
diff --git a/config.sample.json b/config.sample.json
index 7f2c97f92c..9cb2b5e727 100644
--- a/config.sample.json
+++ b/config.sample.json
@@ -5,7 +5,11 @@
     "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,
+    "features": {
+        "feature_groups": "labs",
+        "feature_pinning": "labs"
+    },
+    "default_federate": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"
diff --git a/docs/translating-dev.md b/docs/translating-dev.md
index 55ba34be10..b4682be136 100644
--- a/docs/translating-dev.md
+++ b/docs/translating-dev.md
@@ -6,11 +6,32 @@
 - Be able to understand English
 - Be able to understand the language you want to translate riot-web into
 
+## Translating strings vs. marking strings for translation
+
+Translating strings are done with the `_t()` function found in matrix-react-sdk/lib/languageHandler.js. It is recommended to call this function wherever you introduce a string constant which should be translated. However, translating can not be performed until after the translation system has been initialized. Thus, sometimes translation must be performed at a different location in the source code than where the string is introduced. This breaks some tooling and makes it difficult to find translatable strings. Therefore, there is the alternative `_td()` function which is used to mark strings for translation, without actually performing the translation (which must still be performed separately, and after the translation system has been initialized).
+
+Basically, whenever a translatable string is introduced, you should call either `_t()` immediately OR `_td()` and later `_t()`.
+
+Example:
+```
+// Module-level constant
+const COLORS = {
+    '#f8481c': _td('reddish orange'), // Can't call _t() here yet
+    '#fc2647': _td('pinky red') // Use _td() instead so the text is picked up for translation anyway
+}
+
+// Function that is called some time after i18n has been loaded
+function getColorName(hex) {
+    return _t(COLORS[hex]); // Perform actual translation here
+}
+```
+
 ## Adding new strings
 
-1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements.
-2. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method)
-3. Add the String to the ``en_EN.json`` file in ``src/i18n/strings`` (respect which repository you are on).
+ 1. Check if the import ``import { _t } from 'matrix-react-sdk/lib/languageHandler';`` is present. If not add it to the other import statements. Also import `_td` if needed.
+ 1. Add ``_t()`` to your string. (Don't forget curly braces when you assign an expression to JSX attributes in the render method). If the string is introduced at a point before the translation system has not yet been initialized, use `_td()` instead, and call `_t()` at the appropriate time.
+ 1. Run `npm run i18n` to update ``src/i18n/strings/en_EN.json`` (if it fails because it can't find the script, your dev environment predates the script, so reinstall/link react-sdk with `npm link ../matrix-react-sdk`). If it segfaults, you may be on Node 6, so try a newer version of node.
+ 1. If you added a string with a plural, you can add other English plural variants to ``src/i18n/strings/en_EN.json`` (remeber to edit the one in the same project as the source file containing your new translation).
 
 ## Adding variables inside a string.
 
@@ -21,6 +42,8 @@
 
 ## Things to know/Style Guides
 
-- Do not use it inside ``getDefaultProps`` at the point where ``getDefaultProps`` is initialized the translations aren't loaded yet and it causes missing translations.
-- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded.
+- Do not use `_t()` inside ``getDefaultProps``: the translations aren't loaded when `getDefaultProps` is called, leading to missing translations. Use `_td()` to indicate that `_t()` will be called on the string later.
+- If using translated strings as constants, translated strings can't be in constants loaded at class-load time since the translations won't be loaded. Mark the strings using `_td()` instead and perform the actual translation later.
 - If a string is presented in the UI with punctuation like a full stop, include this in the translation strings, since punctuation varies between languages too.
+- Avoid "translation in parts", i.e. concatenating translated strings or using translated strings in variable substitutions. Context is important for translations, and translating partial strings this way is simply not always possible.
+- Concatenating strings often also introduces an implicit assumption about word order (e.g. that the subject of the sentence comes first), which is incorrect for many languages.
diff --git a/electron_app/package.json b/electron_app/package.json
index 2c6e62f2f5..8494b2163f 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.11.4",
+  "version": "0.12.7",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {
diff --git a/electron_app/riot.im/New Vector Ltd.pem b/electron_app/riot.im/New Vector Ltd.pem
new file mode 100644
index 0000000000..1a34127210
--- /dev/null
+++ b/electron_app/riot.im/New Vector Ltd.pem	
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF0jCCBLqgAwIBAgIRAISYBqZi3VvCUeSfHXF+cbwwDQYJKoZIhvcNAQELBQAw
+gZExCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTcwNQYD
+VQQDEy5DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5n
+IENBMB4XDTE3MDgyMzAwMDAwMFoXDTIwMDgyMjIzNTk1OVowgdgxETAPBgNVBAUT
+CDEwODczNjYxMRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0wGwYDVQQPExRQcml2YXRl
+IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxETAPBgNVBBEMCFdDMVIgNEFHMQ8w
+DQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UECQwSMjYgUmVk
+IExpb24gU3F1YXJlMRcwFQYDVQQKDA5OZXcgVmVjdG9yIEx0ZDEXMBUGA1UEAwwO
+TmV3IFZlY3RvciBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
+X0HP3oM/SVr6PboD03ndtYTONZDcJ/GJ3EyYi6UNrcbKjuDHwPktx9hjAhNjcVkG
+lmuTEPluPj9DbvjaTrers0cQsAS1vJ0RHjLfA93Flg1ys9Q6OThUMw77FtFPtiJU
+z5cSYzfFAhn/4dv7BcgGptn+Mv/8CaTu+RUZJUgoSlRWcT1TREmxkzWotbblqsHO
+zjDmUg20tL5/qpt6BSWsNespf5udKQFXMtqkczBcLvBLmql0vurVcQy8BibB+Q89
+QKwRzwLgaIa7O8WEssFcW8uJe9s0SNtUy8ehbuoSxpA/DbHFwsiDbNA78vp7HrqM
+qY6t6OIgLtDYBFCfe/btAgMBAAGjggHaMIIB1jAfBgNVHSMEGDAWgBTfj/MgDOnK
+pgTYW1g3Kj2rRtyDSTAdBgNVHQ4EFgQUH+mDOdRkF3bYDxCWEaGB4lxiCxcwDgYD
+VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMw
+EQYJYIZIAYb4QgEBBAQDAgQQMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQYBMCsw
+KQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMFUGA1Ud
+HwROMEwwSqBIoEaGRGh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4
+dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3JsMIGGBggrBgEFBQcBAQR6
+MHgwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JT
+QUV4dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3J0MCQGCCsGAQUFBzAB
+hhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJgYDVR0RBB8wHaAbBggrBgEFBQcI
+A6APMA0MC0dCLTEwODczNjYxMA0GCSqGSIb3DQEBCwUAA4IBAQBJ2aH4aixh0aiz
+4WKlK+LMVLHpQ2POE3FZYNpAW7o1q2YDGEADXdGrygPE9NCGNBXKo0CAemCYNWfX
+Ov/jdoiMfeqW3vrZ66oEy8OqbvJSwK1xmomWuYw3wYPWcPVG+YbWYD2CGdQu8jTz
+fzAJCpvAuY3Wji3fQjiecAC7JCSB4fBHa0ALJOmiSqKQUUpkXs5kW7O0lPBnHzNF
+2tQGltXMSIrq1QfFtcreMyKlwDOxPIh360dv5aHhaeSRDRKxq7uq5ikQF2gjKx4k
+ieg2HRbAW6fVPpFr4zRS5umpeZV3i06i11VQQPS/mA/OBEXyaqzx4mr6B7U6ptrp
+jMqiUv2w
+-----END CERTIFICATE-----
diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json
index 1303985ecd..5b48cf671f 100644
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@@ -7,7 +7,6 @@
     "integrations_rest_url": "https://scalar.vector.im/api",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "welcomeUserId": "@riot-bot:matrix.org",
-    "enableLabs": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"
diff --git a/electron_app/src/electron-main.js b/electron_app/src/electron-main.js
index 3491ce0fa3..4ffe211044 100644
--- a/electron_app/src/electron-main.js
+++ b/electron_app/src/electron-main.js
@@ -29,6 +29,7 @@ const AutoLaunch = require('auto-launch');
 const tray = require('./tray');
 const vectorMenu = require('./vectormenu');
 const webContentsHandler = require('./webcontents-handler');
+const updater = require('./updater');
 
 const windowStateKeeper = require('electron-window-state');
 
@@ -46,69 +47,9 @@ try {
     // Continue with the defaults (ie. an empty config)
 }
 
-const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
-const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
-
 let mainWindow = null;
-let appQuitting = false;
+global.appQuitting = false;
 
-function installUpdate() {
-    // for some reason, quitAndInstall does not fire the
-    // before-quit event, so we need to set the flag here.
-    appQuitting = true;
-    electron.autoUpdater.quitAndInstall();
-}
-
-function pollForUpdates() {
-    try {
-        electron.autoUpdater.checkForUpdates();
-    } catch (e) {
-        console.log('Couldn\'t check for update', e);
-    }
-}
-
-function startAutoUpdate(updateBaseUrl) {
-    if (updateBaseUrl.slice(-1) !== '/') {
-        updateBaseUrl = updateBaseUrl + '/';
-    }
-    try {
-        // For reasons best known to Squirrel, the way it checks for updates
-        // is completely different between macOS and windows. On macOS, it
-        // hits a URL that either gives it a 200 with some json or
-        // 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(
-                `${updateBaseUrl}macos/?localVersion=${encodeURIComponent(electron.app.getVersion())}`);
-
-        } else if (process.platform === 'win32') {
-            electron.autoUpdater.setFeedURL(`${updateBaseUrl}win32/${process.arch}/`);
-        } else {
-            // Squirrel / electron only supports auto-update on these two platforms.
-            // I'm not even going to try to guess which feed style they'd use if they
-            // implemented it on Linux, or if it would be different again.
-            console.log('Auto update not supported on this platform');
-        }
-        // We check for updates ourselves rather than using 'updater' because we need to
-        // do it in the main process (and we don't really need to check every 10 minutes:
-        // every hour should be just fine for a desktop app)
-        // However, we still let the main window listen for the update events.
-        // We also wait a short time before checking for updates the first time because
-        // of squirrel on windows and it taking a small amount of time to release a
-        // lock file.
-        setTimeout(pollForUpdates, INITIAL_UPDATE_DELAY_MS);
-        setInterval(pollForUpdates, UPDATE_POLL_INTERVAL_MS);
-    } catch (err) {
-        // will fail if running in debug mode
-        console.log('Couldn\'t enable update checking', err);
-    }
-}
 
 // handle uncaught errors otherwise it displays
 // stack traces in popup dialogs, which is terrible (which
@@ -120,8 +61,6 @@ process.on('uncaughtException', function(error) {
     console.log('Unhandled exception', error);
 });
 
-electron.ipcMain.on('install_update', installUpdate);
-
 let focusHandlerAttached = false;
 electron.ipcMain.on('setBadgeCount', function(ev, count) {
     electron.app.setBadgeCount(count);
@@ -145,7 +84,7 @@ let powerSaveBlockerId;
 electron.ipcMain.on('app_onAction', function(ev, payload) {
     switch (payload.action) {
         case 'call_state':
-            if (powerSaveBlockerId && powerSaveBlockerId.isStarted(powerSaveBlockerId)) {
+            if (powerSaveBlockerId && electron.powerSaveBlocker.isStarted(powerSaveBlockerId)) {
                 if (payload.state === 'ended') {
                     electron.powerSaveBlocker.stop(powerSaveBlockerId);
                 }
@@ -233,7 +172,7 @@ electron.app.on('ready', () => {
 
     if (vectorConfig.update_base_url) {
         console.log(`Starting auto update with base URL: ${vectorConfig.update_base_url}`);
-        startAutoUpdate(vectorConfig.update_base_url);
+        updater.start(vectorConfig.update_base_url);
     } else {
         console.log('No update_base_url is defined: auto update is disabled');
     }
@@ -246,7 +185,7 @@ electron.app.on('ready', () => {
         defaultHeight: 768,
     });
 
-    mainWindow = new electron.BrowserWindow({
+    mainWindow = global.mainWindow = new electron.BrowserWindow({
         icon: iconPath,
         show: false,
         autoHideMenuBar: true,
@@ -264,7 +203,7 @@ electron.app.on('ready', () => {
     mainWindow.hide();
 
     // Create trayIcon icon
-    tray.create(mainWindow, {
+    tray.create({
         icon_path: iconPath,
         brand: vectorConfig.brand || 'Riot',
     });
@@ -276,10 +215,10 @@ electron.app.on('ready', () => {
     }
 
     mainWindow.on('closed', () => {
-        mainWindow = null;
+        mainWindow = global.mainWindow = null;
     });
     mainWindow.on('close', (e) => {
-        if (!appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
+        if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
             // On Mac, closing the window just hides it
             // (this is generally how single-window Mac apps
             // behave, eg. Mail.app)
@@ -289,6 +228,17 @@ electron.app.on('ready', () => {
         }
     });
 
+    if (process.platform === 'win32') {
+        // Handle forward/backward mouse buttons in Windows
+        mainWindow.on('app-command', (e, cmd) => {
+            if (cmd === 'browser-backward' && mainWindow.webContents.canGoBack()) {
+                mainWindow.webContents.goBack();
+            } else if (cmd === 'browser-forward' && mainWindow.webContents.canGoForward()) {
+                mainWindow.webContents.goForward();
+            }
+        });
+    }
+
     webContentsHandler(mainWindow.webContents);
     mainWindowState.manage(mainWindow);
 });
@@ -302,7 +252,10 @@ electron.app.on('activate', () => {
 });
 
 electron.app.on('before-quit', () => {
-    appQuitting = true;
+    global.appQuitting = true;
+    if (mainWindow) {
+        mainWindow.webContents.send('before-quit');
+    }
 });
 
 // Set the App User Model ID to match what the squirrel
diff --git a/electron_app/src/tray.js b/electron_app/src/tray.js
index 039e7133fa..bd07d7d433 100644
--- a/electron_app/src/tray.js
+++ b/electron_app/src/tray.js
@@ -26,17 +26,17 @@ exports.hasTray = function hasTray() {
     return (trayIcon !== null);
 };
 
-exports.create = function(win, config) {
+exports.create = function(config) {
     // no trays on darwin
     if (process.platform === 'darwin' || trayIcon) return;
 
     const toggleWin = function() {
-        if (win.isVisible() && !win.isMinimized()) {
-            win.hide();
+        if (global.mainWindow.isVisible() && !global.mainWindow.isMinimized()) {
+            global.mainWindow.hide();
         } else {
-            if (win.isMinimized()) win.restore();
-            if (!win.isVisible()) win.show();
-            win.focus();
+            if (global.mainWindow.isMinimized()) global.mainWindow.restore();
+            if (!global.mainWindow.isVisible()) global.mainWindow.show();
+            global.mainWindow.focus();
         }
     };
 
@@ -54,41 +54,46 @@ exports.create = function(win, config) {
         },
     ]);
 
-    trayIcon = new Tray(config.icon_path);
+    const defaultIcon = nativeImage.createFromPath(config.icon_path);
+
+    trayIcon = new Tray(defaultIcon);
     trayIcon.setToolTip(config.brand);
     trayIcon.setContextMenu(contextMenu);
     trayIcon.on('click', toggleWin);
 
     let lastFavicon = null;
-    win.webContents.on('page-favicon-updated', async function(ev, favicons) {
-        let newFavicon = config.icon_path;
-        if (favicons && favicons.length > 0 && favicons[0].startsWith('data:')) {
-            newFavicon = favicons[0];
+    global.mainWindow.webContents.on('page-favicon-updated', async function(ev, favicons) {
+        if (!favicons || favicons.length <= 0 || !favicons[0].startsWith('data:')) {
+            if (lastFavicon !== null) {
+                win.setIcon(defaultIcon);
+                trayIcon.setImage(defaultIcon);
+                lastFavicon = null;
+            }
+            return;
         }
 
         // No need to change, shortcut
-        if (newFavicon === lastFavicon) return;
-        lastFavicon = newFavicon;
+        if (favicons[0] === lastFavicon) return;
+        lastFavicon = favicons[0];
 
-        // if its not default we have to construct into nativeImage
-        if (newFavicon !== config.icon_path) {
-            newFavicon = nativeImage.createFromDataURL(favicons[0]);
+        let newFavicon = nativeImage.createFromDataURL(favicons[0]);
 
-            if (process.platform === 'win32') {
-                try {
-                    const icoPath = path.join(app.getPath('temp'), 'win32_riot_icon.ico')
-                    const icoBuf = await pngToIco(newFavicon.toPNG());
-                    fs.writeFileSync(icoPath, icoBuf);
-                    newFavicon = icoPath;
-                } catch (e) {console.error(e);}
+        // Windows likes ico's too much.
+        if (process.platform === 'win32') {
+            try {
+                const icoPath = path.join(app.getPath('temp'), 'win32_riot_icon.ico');
+                fs.writeFileSync(icoPath, await pngToIco(newFavicon.toPNG()));
+                newFavicon = nativeImage.createFromPath(icoPath);
+            } catch (e) {
+                console.error("Failed to make win32 ico", e);
             }
         }
 
         trayIcon.setImage(newFavicon);
-        win.setIcon(newFavicon);
+        global.mainWindow.setIcon(newFavicon);
     });
 
-    win.webContents.on('page-title-updated', function(ev, title) {
+    global.mainWindow.webContents.on('page-title-updated', function(ev, title) {
         trayIcon.setToolTip(title);
     });
 };
diff --git a/electron_app/src/updater.js b/electron_app/src/updater.js
new file mode 100644
index 0000000000..49fa4e0419
--- /dev/null
+++ b/electron_app/src/updater.js
@@ -0,0 +1,84 @@
+const { app, autoUpdater, ipcMain } = require('electron');
+
+const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000;
+const INITIAL_UPDATE_DELAY_MS = 30 * 1000;
+
+function installUpdate() {
+    // for some reason, quitAndInstall does not fire the
+    // before-quit event, so we need to set the flag here.
+    global.appQuitting = true;
+    autoUpdater.quitAndInstall();
+}
+
+function pollForUpdates() {
+    try {
+        autoUpdater.checkForUpdates();
+    } catch (e) {
+        console.log('Couldn\'t check for update', e);
+    }
+}
+
+module.exports = {};
+module.exports.start = function startAutoUpdate(updateBaseUrl) {
+    if (updateBaseUrl.slice(-1) !== '/') {
+        updateBaseUrl = updateBaseUrl + '/';
+    }
+    try {
+        let url;
+        // For reasons best known to Squirrel, the way it checks for updates
+        // is completely different between macOS and windows. On macOS, it
+        // hits a URL that either gives it a 200 with some json or
+        // 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.
+            url = `${updateBaseUrl}macos/?localVersion=${encodeURIComponent(app.getVersion())}`;
+
+        } else if (process.platform === 'win32') {
+            url = `${updateBaseUrl}win32/${process.arch}/`;
+        } else {
+            // Squirrel / electron only supports auto-update on these two platforms.
+            // I'm not even going to try to guess which feed style they'd use if they
+            // implemented it on Linux, or if it would be different again.
+            console.log('Auto update not supported on this platform');
+        }
+
+        if (url) {
+            autoUpdater.setFeedURL(url);
+            // We check for updates ourselves rather than using 'updater' because we need to
+            // do it in the main process (and we don't really need to check every 10 minutes:
+            // every hour should be just fine for a desktop app)
+            // However, we still let the main window listen for the update events.
+            // We also wait a short time before checking for updates the first time because
+            // of squirrel on windows and it taking a small amount of time to release a
+            // lock file.
+            setTimeout(pollForUpdates, INITIAL_UPDATE_DELAY_MS);
+            setInterval(pollForUpdates, UPDATE_POLL_INTERVAL_MS);
+        }
+    } catch (err) {
+        // will fail if running in debug mode
+        console.log('Couldn\'t enable update checking', err);
+    }
+}
+
+ipcMain.on('install_update', installUpdate);
+ipcMain.on('check_updates', pollForUpdates);
+
+function ipcChannelSendUpdateStatus(status) {
+    if (global.mainWindow) {
+        global.mainWindow.webContents.send('check_updates', status);
+    }
+}
+
+autoUpdater.on('update-available', function() {
+    ipcChannelSendUpdateStatus(true);
+}).on('update-not-available', function() {
+    ipcChannelSendUpdateStatus(false);
+}).on('error', function(error) {
+    ipcChannelSendUpdateStatus(error.message);
+});
diff --git a/electron_app/src/vectormenu.js b/electron_app/src/vectormenu.js
index ab30b376b3..14f91a5268 100644
--- a/electron_app/src/vectormenu.js
+++ b/electron_app/src/vectormenu.js
@@ -19,7 +19,7 @@ const {app, shell, Menu} = require('electron');
 // Menu template from http://electron.atom.io/docs/api/menu/, edited
 const template = [
     {
-        label: 'Edit',
+        label: '&Edit',
         submenu: [
             { role: 'undo' },
             { role: 'redo' },
@@ -33,7 +33,7 @@ const template = [
         ],
     },
     {
-        label: 'View',
+        label: '&View',
         submenu: [
             { type: 'separator' },
             { role: 'resetzoom' },
@@ -45,6 +45,7 @@ const template = [
         ],
     },
     {
+        label: '&Window',
         role: 'window',
         submenu: [
             { role: 'minimize' },
@@ -52,6 +53,7 @@ const template = [
         ],
     },
     {
+        label: '&Help',
         role: 'help',
         submenu: [
             {
@@ -122,7 +124,7 @@ if (process.platform === 'darwin') {
     ];
 } else {
     template.unshift({
-        label: 'File',
+        label: '&File',
         submenu: [
             // For some reason, 'about' does not seem to work on windows.
             /*{
diff --git a/karma.conf.js b/karma.conf.js
index 1e04366313..3b415b1ae6 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -84,13 +84,23 @@ module.exports = function (config) {
         // available preprocessors:
         // https://npmjs.org/browse/keyword/karma-preprocessor
         preprocessors: {
-            '{src,test}/**/*.js': ['webpack'],
+            '{src,test}/**/*.js': ['webpack', 'sourcemap'],
         },
 
         // test results reporter to use
-        // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-        reporters: ['progress', 'junit'],
+        reporters: ['logcapture', 'spec', 'junit', 'summary'],
+
+        specReporter: {
+            suppressErrorSummary: false, // do print error summary
+            suppressFailed: false, // do print information about failed tests
+            suppressPassed: false, // do print information about passed tests
+            showSpecTiming: true, // print the time elapsed for each spec
+        },
+
+        client: {
+            captureLogs: true,
+        },
 
         // web server port
         port: 9876,
@@ -113,8 +123,23 @@ module.exports = function (config) {
         browsers: [
             'Chrome',
             //'PhantomJS',
+            //'ChromeHeadless'
         ],
 
+        customLaunchers: {
+            'ChromeHeadless': {
+                base: 'Chrome',
+                flags: [
+                    // '--no-sandbox',
+                    // See https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
+                    '--headless',
+                    '--disable-gpu',
+                    // Without a remote debugging port, Google Chrome exits immediately.
+                    '--remote-debugging-port=9222',
+                ],
+            }
+        },
+
         // Continuous Integration mode
         // if true, Karma captures browsers, runs the tests and exits
         // singleRun: false,
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000000..64e2e49aef
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,9512 @@
+{
+  "name": "riot-web",
+  "version": "0.12.2",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "7zip": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/7zip/-/7zip-0.0.6.tgz",
+      "integrity": "sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=",
+      "dev": true
+    },
+    "7zip-bin": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-2.2.7.tgz",
+      "integrity": "sha512-+rr4OgeTNrLuJAf09o3USdttEYiXvZshWMkhD6wR9v1ieXH0JM1Q2yT41/cJuJcqiPpSXlM/g3aR+Y5MWQdr0Q==",
+      "dev": true,
+      "requires": {
+        "7zip-bin-mac": "1.0.1"
+      }
+    },
+    "7zip-bin-mac": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz",
+      "integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=",
+      "dev": true,
+      "optional": true
+    },
+    "accepts": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
+      "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.17",
+        "negotiator": "0.6.1"
+      }
+    },
+    "acorn": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
+      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
+      "dev": true
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "ajv": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+      "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.0.0",
+        "json-schema-traverse": "0.3.1",
+        "json-stable-stringify": "1.0.1"
+      }
+    },
+    "ajv-keywords": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+      "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
+      "dev": true
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2",
+        "longest": "1.0.1",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "another-json": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/another-json/-/another-json-0.2.0.tgz",
+      "integrity": "sha1-tfQBnJc7bdXGUGotk0acttMq7tw="
+    },
+    "ansi-align": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz",
+      "integrity": "sha1-LwwWWIKXOa3V67FeawxuNCPwFro=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "ansi-escapes": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+      "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+      "dev": true
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true
+    },
+    "any-promise": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz",
+      "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=",
+      "dev": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "archiver": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.3.0.tgz",
+      "integrity": "sha1-TyGU1tj5nfP1MeaIHxTxXVX6ryI=",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "1.3.0",
+        "async": "2.5.0",
+        "buffer-crc32": "0.2.13",
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3",
+        "tar-stream": "1.5.4",
+        "walkdir": "0.0.11",
+        "zip-stream": "1.2.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
+          "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+          "dev": true,
+          "requires": {
+            "lodash": "4.17.4"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "archiver-utils": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+      "integrity": "sha1-5QtMCccL89aA4y/xt5lOn52JUXQ=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lazystream": "1.0.0",
+        "lodash": "4.17.4",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "argparse": {
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz",
+      "integrity": "sha1-z9AeD7uj1srtBJ+9dY1A9lGW9Xw=",
+      "requires": {
+        "underscore": "1.7.0",
+        "underscore.string": "2.4.0"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
+      "dev": true
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
+      "dev": true
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+      "dev": true
+    },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
+      "dev": true
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "1.0.3"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "array.prototype.find": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz",
+      "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.9.0"
+      }
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
+      "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=",
+      "dev": true
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "dev": true
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asar-electron-builder": {
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/asar-electron-builder/-/asar-electron-builder-0.13.5.tgz",
+      "integrity": "sha1-TM1NEf18nTs8/8eC/ePe7Z75GvY=",
+      "dev": true,
+      "requires": {
+        "chromium-pickle-js": "0.2.0",
+        "commander": "2.11.0",
+        "cuint": "0.2.2",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1"
+      }
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
+    },
+    "assert": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "dev": true,
+      "requires": {
+        "util": "0.10.3"
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "async": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+      "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "autolinker": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/autolinker/-/autolinker-0.15.3.tgz",
+      "integrity": "sha1-NCQX2PLzRhsUzwkIjV7fh5HcmDI="
+    },
+    "autoprefixer": {
+      "version": "6.7.7",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+      "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+      "dev": true,
+      "requires": {
+        "browserslist": "1.7.7",
+        "caniuse-db": "1.0.30000748",
+        "normalize-range": "0.1.2",
+        "num2fraction": "1.2.2",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
+    },
+    "babel-cli": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
+      "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.0",
+        "babel-polyfill": "6.26.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "chokidar": "1.7.0",
+        "commander": "2.11.0",
+        "convert-source-map": "1.5.0",
+        "fs-readdir-recursive": "1.0.0",
+        "glob": "7.1.2",
+        "lodash": "4.17.4",
+        "output-file-sync": "1.1.2",
+        "path-is-absolute": "1.0.1",
+        "slash": "1.0.0",
+        "source-map": "0.5.7",
+        "v8flags": "2.1.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "esutils": "2.0.2",
+        "js-tokens": "3.0.2"
+      }
+    },
+    "babel-core": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
+      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-generator": "6.26.0",
+        "babel-helpers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-register": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "convert-source-map": "1.5.0",
+        "debug": "2.6.9",
+        "json5": "0.5.1",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "path-is-absolute": "1.0.1",
+        "private": "0.1.8",
+        "slash": "1.0.0",
+        "source-map": "0.5.7"
+      }
+    },
+    "babel-eslint": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-6.1.2.tgz",
+      "integrity": "sha1-UpNBn+NnLWZZjTJ9qWlFZ7pqXy8=",
+      "dev": true,
+      "requires": {
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash.assign": "4.2.0",
+        "lodash.pickby": "4.6.0"
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.0.tgz",
+      "integrity": "sha1-rBriAHC3n248odMmlhMFN3TyDcU=",
+      "dev": true,
+      "requires": {
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "detect-indent": "4.0.0",
+        "jsesc": "1.3.0",
+        "lodash": "4.17.4",
+        "source-map": "0.5.7",
+        "trim-right": "1.0.1"
+      }
+    },
+    "babel-helper-bindify-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-assignable-expression": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-explode-class": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
+      "dev": true,
+      "requires": {
+        "babel-helper-bindify-decorators": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-loader": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.4.1.tgz",
+      "integrity": "sha1-CzQRLVsHSKjc2/Uaz2+b1C1QuMo=",
+      "dev": true,
+      "requires": {
+        "find-cache-dir": "0.1.1",
+        "loader-utils": "0.2.17",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-add-module-exports": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-add-module-exports/-/babel-plugin-add-module-exports-0.2.1.tgz",
+      "integrity": "sha1-mumh9KjcZ/DN7E9K7aHkOl/2XiU=",
+      "dev": true
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
+      "dev": true
+    },
+    "babel-plugin-syntax-async-generators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
+      "dev": true
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
+      "dev": true
+    },
+    "babel-plugin-syntax-decorators": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
+      "dev": true
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
+      "dev": true
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
+      "dev": true
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
+      "dev": true
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
+      "dev": true
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=",
+      "dev": true
+    },
+    "babel-plugin-transform-async-generator-functions": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-generators": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-async-to-bluebird": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-bluebird/-/babel-plugin-transform-async-to-bluebird-1.1.1.tgz",
+      "integrity": "sha1-Ruo+fFr2KXgqyfHtG3zTj4Qlr9Q=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "dev": true,
+      "requires": {
+        "babel-helper-remap-async-to-generator": "6.24.1",
+        "babel-plugin-syntax-async-functions": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-plugin-syntax-class-properties": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-decorators": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
+      "dev": true,
+      "requires": {
+        "babel-helper-explode-class": "6.24.1",
+        "babel-plugin-syntax-decorators": "6.13.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "6.26.0",
+        "babel-helper-function-name": "6.24.1",
+        "babel-helper-optimise-call-expression": "6.24.1",
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
+      "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "6.24.1",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "6.24.1",
+        "babel-helper-get-function-arity": "6.24.1",
+        "babel-runtime": "6.26.0",
+        "babel-template": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "regexpu-core": "2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-flow": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "6.13.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-display-name": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
+      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-self": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
+      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-source": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "0.10.1"
+      }
+    },
+    "babel-plugin-transform-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0"
+      }
+    },
+    "babel-polyfill": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.10.5"
+      }
+    },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "6.26.0",
+        "babel-plugin-transform-es2015-classes": "6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
+        "babel-plugin-transform-es2015-for-of": "6.23.0",
+        "babel-plugin-transform-es2015-function-name": "6.24.1",
+        "babel-plugin-transform-es2015-literals": "6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "6.24.1",
+        "babel-plugin-transform-es2015-object-super": "6.24.1",
+        "babel-plugin-transform-es2015-parameters": "6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
+        "babel-plugin-transform-es2015-spread": "6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
+        "babel-plugin-transform-regenerator": "6.26.0"
+      }
+    },
+    "babel-preset-es2016": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz",
+      "integrity": "sha1-+QC/k+LrwNJ235uKtZck6/2Vn4s=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-exponentiation-operator": "6.24.1"
+      }
+    },
+    "babel-preset-es2017": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz",
+      "integrity": "sha1-WXvq37n38gi8/YoS6bKym4svFNE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-to-generator": "6.24.1"
+      }
+    },
+    "babel-preset-flow": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
+      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-flow-strip-types": "6.22.0"
+      }
+    },
+    "babel-preset-react": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-plugin-transform-react-display-name": "6.25.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-preset-flow": "6.23.0"
+      }
+    },
+    "babel-preset-stage-2": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-decorators": "6.24.1",
+        "babel-preset-stage-3": "6.24.1"
+      }
+    },
+    "babel-preset-stage-3": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
+      "dev": true,
+      "requires": {
+        "babel-plugin-syntax-trailing-function-commas": "6.22.0",
+        "babel-plugin-transform-async-generator-functions": "6.24.1",
+        "babel-plugin-transform-async-to-generator": "6.24.1",
+        "babel-plugin-transform-exponentiation-operator": "6.24.1",
+        "babel-plugin-transform-object-rest-spread": "6.26.0"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "dev": true,
+      "requires": {
+        "babel-core": "6.26.0",
+        "babel-runtime": "6.26.0",
+        "core-js": "2.5.1",
+        "home-or-tmp": "2.0.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "source-map-support": "0.4.18"
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "2.5.1",
+        "regenerator-runtime": "0.11.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
+          "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A=="
+        }
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-traverse": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "babel-messages": "6.23.0",
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "babylon": "6.18.0",
+        "debug": "2.6.9",
+        "globals": "9.18.0",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "esutils": "2.0.2",
+        "lodash": "4.17.4",
+        "to-fast-properties": "1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "dev": true
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64-js": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
+      "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "big.js": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
+    },
+    "binary-extensions": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
+      "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=",
+      "dev": true
+    },
+    "bl": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
+      "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "blob": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+    },
+    "bluebird-lst-c": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/bluebird-lst-c/-/bluebird-lst-c-1.0.6.tgz",
+      "integrity": "sha1-gfiB0T+d9wD2fVd/E0gLwy2Eu6k=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1"
+      }
+    },
+    "blueimp-canvas-to-blob": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/blueimp-canvas-to-blob/-/blueimp-canvas-to-blob-3.14.0.tgz",
+      "integrity": "sha512-i6I2CiX1VR8YwUNYBo+dM8tg89ns4TTHxSpWjaDeHKcYS3yFalpLCwDaY21/EsJMufLy2tnG4j0JN5L8OVNkKQ=="
+    },
+    "body-parser": {
+      "version": "1.18.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
+      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.9",
+        "depd": "1.1.1",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "on-finished": "2.3.0",
+        "qs": "6.5.1",
+        "raw-body": "2.3.2",
+        "type-is": "1.6.15"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "boom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "boxen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz",
+      "integrity": "sha1-g2TUJIrDT/DvGy8r9JpsYM4NgbY=",
+      "dev": true,
+      "requires": {
+        "ansi-align": "1.1.0",
+        "camelcase": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-boxes": "1.0.0",
+        "filled-array": "1.1.0",
+        "object-assign": "4.1.1",
+        "repeating": "2.0.1",
+        "string-width": "1.0.2",
+        "widest-line": "1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "browser-encrypt-attachment": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/browser-encrypt-attachment/-/browser-encrypt-attachment-0.3.0.tgz",
+      "integrity": "sha1-IFqUyq3w3H6BQTlBgS9lW9GQ/xw="
+    },
+    "browser-request": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz",
+      "integrity": "sha1-ns5bWsqJopkyJC4Yv5M975h2zBc="
+    },
+    "browserify-aes": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz",
+      "integrity": "sha1-BnFJtmjfMcS1hTPgLQHoBthgjiw=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
+      "dev": true,
+      "requires": {
+        "pako": "0.2.9"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "0.2.9",
+          "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=",
+          "dev": true
+        }
+      }
+    },
+    "browserslist": {
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+      "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+      "dev": true,
+      "requires": {
+        "caniuse-db": "1.0.30000748",
+        "electron-to-chromium": "1.3.27"
+      }
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.2.0",
+        "ieee754": "1.1.8",
+        "isarray": "1.0.0"
+      }
+    },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+      "dev": true
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "dev": true,
+      "requires": {
+        "callsites": "0.2.0"
+      }
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
+      "dev": true
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
+      }
+    },
+    "camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+    },
+    "camelcase-css": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-1.0.1.tgz",
+      "integrity": "sha1-FXxCOCZfXPlKHf/ehkRlUsvz9wU=",
+      "dev": true
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "dev": true,
+      "requires": {
+        "camelcase": "2.1.1",
+        "map-obj": "1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+          "dev": true
+        }
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000748",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000748.tgz",
+      "integrity": "sha1-eF2e381kW/eVxv887TPEXVgMSKA=",
+      "dev": true
+    },
+    "capture-stack-trace": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz",
+      "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=",
+      "dev": true
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4",
+        "lazy-cache": "1.0.4"
+      }
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
+      },
+      "dependencies": {
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "dev": true
+        }
+      }
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.1.2",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "chromium-pickle-js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz",
+      "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=",
+      "dev": true
+    },
+    "ci-info": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.1.tgz",
+      "integrity": "sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ==",
+      "dev": true
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
+      "dev": true
+    },
+    "classnames": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
+      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
+    },
+    "clean-css": {
+      "version": "3.4.28",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+          "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+          "dev": true,
+          "requires": {
+            "graceful-readlink": "1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+      "dev": true
+    },
+    "cli-cursor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+      "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+      "dev": true,
+      "requires": {
+        "restore-cursor": "1.0.1"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "wrap-ansi": "2.1.0"
+      }
+    },
+    "clone": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+      "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=",
+      "dev": true
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "color-convert": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
+      "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
+      "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "dev": true
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+      "dev": true
+    },
+    "commonmark": {
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.27.0.tgz",
+      "integrity": "sha1-2GwmK5YoIelIPGnFR7xYhAwEezQ=",
+      "requires": {
+        "entities": "1.1.1",
+        "mdurl": "1.0.1",
+        "minimist": "1.2.0",
+        "string.prototype.repeat": "0.2.0"
+      }
+    },
+    "compare-version": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
+      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
+      "dev": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
+      "integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "compress-commons": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.2.2.tgz",
+      "integrity": "sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=",
+      "dev": true,
+      "requires": {
+        "buffer-crc32": "0.2.13",
+        "crc32-stream": "2.0.0",
+        "normalize-path": "2.1.1",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "compressible": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz",
+      "integrity": "sha1-FnGKdd4oPtjmBAQWJaIGRYZ5fYo=",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "compression": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.1.tgz",
+      "integrity": "sha1-7/JgPvwuIs+G810uuTWJ+YdTc9s=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "bytes": "3.0.0",
+        "compressible": "2.0.11",
+        "debug": "2.6.9",
+        "on-headers": "1.0.1",
+        "safe-buffer": "5.1.1",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+          "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.17",
+            "negotiator": "0.6.1"
+          }
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
+      "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "typedarray": "0.0.6"
+      }
+    },
+    "configstore": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz",
+      "integrity": "sha1-c3o6cDbpiGECqmCZ5HuzOrGroaE=",
+      "dev": true,
+      "requires": {
+        "dot-prop": "3.0.0",
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1",
+        "os-tmpdir": "1.0.2",
+        "osenv": "0.1.4",
+        "uuid": "2.0.3",
+        "write-file-atomic": "1.3.4",
+        "xdg-basedir": "2.0.0"
+      },
+      "dependencies": {
+        "uuid": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+          "dev": true
+        }
+      }
+    },
+    "connect": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.5.tgz",
+      "integrity": "sha1-+43ee6B2OHfQ7J352sC0tA5yx9o=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.0.6",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.4.0.tgz",
+      "integrity": "sha1-PbJPlz9LkjsOgvYZzg3wJBHKYj0=",
+      "dev": true
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "dev": true,
+      "requires": {
+        "date-now": "0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "dev": true
+    },
+    "content-disposition": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
+      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=",
+      "dev": true
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "convert-source-map": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+      "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.1.tgz",
+      "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cosmiconfig": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "dev": true,
+      "requires": {
+        "is-directory": "0.3.1",
+        "js-yaml": "3.10.0",
+        "minimist": "1.2.0",
+        "object-assign": "4.1.1",
+        "os-homedir": "1.0.2",
+        "parse-json": "2.2.0",
+        "require-from-string": "1.2.1"
+      }
+    },
+    "counterpart": {
+      "version": "0.18.3",
+      "resolved": "https://registry.npmjs.org/counterpart/-/counterpart-0.18.3.tgz",
+      "integrity": "sha512-tli4qPAFeYB34LvvCc/1xYRLCWjf4WsUt6sXfpggDfGDKoI8rhnabz0SljDoBpAK8z1u8GBCg0YDkbvWb16uUQ==",
+      "requires": {
+        "date-names": "0.1.10",
+        "except": "0.1.3",
+        "extend": "3.0.1",
+        "pluralizers": "0.1.6",
+        "sprintf-js": "1.1.1"
+      }
+    },
+    "cpx": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/cpx/-/cpx-1.5.0.tgz",
+      "integrity": "sha1-GFvgGFEdhycN7czCkxceN2VauI8=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "chokidar": "1.7.0",
+        "duplexer": "0.1.1",
+        "glob": "7.1.2",
+        "glob2base": "0.0.12",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "resolve": "1.4.0",
+        "safe-buffer": "5.1.1",
+        "shell-quote": "1.6.1",
+        "subarg": "1.0.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "crc": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.5.0.tgz",
+      "integrity": "sha1-mLi6fUiWZbo5efWbITgTdBAaGWQ=",
+      "dev": true
+    },
+    "crc32-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-2.0.0.tgz",
+      "integrity": "sha1-483TtN8xaN10494/u8t7KX/pCPQ=",
+      "dev": true,
+      "requires": {
+        "crc": "3.5.0",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "dev": true,
+      "requires": {
+        "capture-stack-trace": "1.0.0"
+      }
+    },
+    "create-react-class": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.2.tgz",
+      "integrity": "sha1-zx7RXxKq1/FO9fLf4F5sQvke8Co=",
+      "requires": {
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "cross-env": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-4.0.0.tgz",
+      "integrity": "sha1-Fgg4YtCCdaRiiwskOxIb7apV3YA=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "5.1.0",
+        "is-windows": "1.0.1"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "4.1.1",
+        "shebang-command": "1.2.0",
+        "which": "1.3.0"
+      }
+    },
+    "cross-unzip": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/cross-unzip/-/cross-unzip-0.0.2.tgz",
+      "integrity": "sha1-UYO8R6CVWb78+YzEZXlkmZNZNy8=",
+      "dev": true
+    },
+    "cryptiles": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+      "requires": {
+        "boom": "5.2.0"
+      },
+      "dependencies": {
+        "boom": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+          "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        }
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz",
+      "integrity": "sha1-ufx1u0oO1h3PHNXa6W6zDJw+UGw=",
+      "dev": true,
+      "requires": {
+        "browserify-aes": "0.4.0",
+        "pbkdf2-compat": "2.0.1",
+        "ripemd160": "0.2.0",
+        "sha.js": "2.2.6"
+      }
+    },
+    "css-raw-loader": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/css-raw-loader/-/css-raw-loader-0.1.2.tgz",
+      "integrity": "sha1-NC5tP1VRwIjGO0eg6rZ5HDCFBhw=",
+      "dev": true,
+      "requires": {
+        "clean-css": "3.4.28",
+        "loader-utils": "0.2.17",
+        "source-list-map": "0.1.8"
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0",
+        "css-what": "2.1.0",
+        "domutils": "1.5.1",
+        "nth-check": "1.0.1"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.5.1",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+          "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "0.1.0",
+            "domelementtype": "1.3.0"
+          }
+        }
+      }
+    },
+    "css-what": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "dev": true
+    },
+    "cuint": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
+      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
+      "dev": true
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "dev": true,
+      "requires": {
+        "array-find-index": "1.0.2"
+      }
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "d": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+      "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.35"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "date-names": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/date-names/-/date-names-0.1.10.tgz",
+      "integrity": "sha1-YvjZMyKVBEZX8852FtijQCH47ys="
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "deep-extend": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz",
+      "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+          "dev": true
+        }
+      }
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "dev": true,
+      "requires": {
+        "globby": "5.0.0",
+        "is-path-cwd": "1.0.0",
+        "is-path-in-cwd": "1.0.0",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
+      "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=",
+      "dev": true
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "dev": true
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "disposables": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/disposables/-/disposables-1.0.1.tgz",
+      "integrity": "sha1-BkcnoltU9QK9griaot+4358bOeM="
+    },
+    "dnd-core": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/dnd-core/-/dnd-core-2.5.4.tgz",
+      "integrity": "sha512-BcI782MfTm3wCxeIS5c7tAutyTwEIANtuu3W6/xkoJRwiqhRXKX3BbGlycUxxyzMsKdvvoavxgrC3EMPFNYL9A==",
+      "requires": {
+        "asap": "2.0.6",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4",
+        "redux": "3.7.2"
+      }
+    },
+    "doctrine": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.3.tgz",
+      "integrity": "sha1-auxrvWLPid1JjK5wwO2fSdqHOmo=",
+      "requires": {
+        "esutils": "2.0.2",
+        "isarray": "1.0.0"
+      }
+    },
+    "dom-converter": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
+      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
+      "dev": true,
+      "requires": {
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
+      "dev": true
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI="
+    },
+    "domhandler": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz",
+      "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=",
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.6.2.tgz",
+      "integrity": "sha1-GVjMC0yUJuntNn+xyOhUiRsPo/8=",
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
+    "dot-prop": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
+      "integrity": "sha1-G3CK8JSknJoOfbyteQq6U52sEXc=",
+      "dev": true,
+      "requires": {
+        "is-obj": "1.0.1"
+      }
+    },
+    "draft-js": {
+      "version": "0.11.0-alpha",
+      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.0-alpha.tgz",
+      "integrity": "sha1-MtshCPkn6bhEbaH3nkR1wrf4aK4=",
+      "requires": {
+        "fbjs": "0.8.16",
+        "immutable": "3.7.6",
+        "object-assign": "4.1.1"
+      }
+    },
+    "draft-js-export-html": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/draft-js-export-html/-/draft-js-export-html-0.6.0.tgz",
+      "integrity": "sha1-zIDwVExD0Kf+28U8DLCRToCQ92k=",
+      "requires": {
+        "draft-js-utils": "1.2.0"
+      }
+    },
+    "draft-js-export-markdown": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/draft-js-export-markdown/-/draft-js-export-markdown-0.3.0.tgz",
+      "integrity": "sha1-hjkOA86vHTR/xhaGerf1Net2v0I=",
+      "requires": {
+        "draft-js-utils": "1.2.0"
+      }
+    },
+    "draft-js-utils": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/draft-js-utils/-/draft-js-utils-1.2.0.tgz",
+      "integrity": "sha1-9csj6xZzJf/tPXmIL9wxdyHS/RI="
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "electron-builder": {
+      "version": "11.7.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-11.7.0.tgz",
+      "integrity": "sha1-1SkS9uhKxSoGXeGXqS3vkxvZ3CU=",
+      "dev": true,
+      "requires": {
+        "7zip-bin": "2.2.7",
+        "asar-electron-builder": "0.13.5",
+        "bluebird-lst-c": "1.0.6",
+        "chalk": "1.1.3",
+        "chromium-pickle-js": "0.2.0",
+        "cuint": "0.2.2",
+        "electron-builder-core": "11.2.1",
+        "electron-builder-http": "11.5.0",
+        "electron-builder-util": "11.6.1",
+        "electron-download-tf": "3.1.0",
+        "electron-macos-sign": "1.5.0",
+        "fs-extra-p": "3.1.0",
+        "hosted-git-info": "2.5.0",
+        "ini": "1.3.4",
+        "is-ci": "1.0.10",
+        "isbinaryfile": "3.0.2",
+        "js-yaml": "3.10.0",
+        "mime": "1.4.1",
+        "minimatch": "3.0.4",
+        "normalize-package-data": "2.4.0",
+        "parse-color": "1.0.0",
+        "plist": "2.1.0",
+        "progress": "1.1.8",
+        "sanitize-filename": "1.6.1",
+        "semver": "5.4.1",
+        "tunnel-agent": "0.4.3",
+        "update-notifier": "1.0.3",
+        "uuid-1345": "0.99.6",
+        "yargs": "6.6.0"
+      },
+      "dependencies": {
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0",
+            "cliui": "3.2.0",
+            "decamelize": "1.2.0",
+            "get-caller-file": "1.0.2",
+            "os-locale": "1.4.0",
+            "read-pkg-up": "1.0.1",
+            "require-directory": "2.1.1",
+            "require-main-filename": "1.0.1",
+            "set-blocking": "2.0.0",
+            "string-width": "1.0.2",
+            "which-module": "1.0.0",
+            "y18n": "3.2.1",
+            "yargs-parser": "4.2.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "dev": true,
+          "requires": {
+            "camelcase": "3.0.0"
+          }
+        }
+      }
+    },
+    "electron-builder-core": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/electron-builder-core/-/electron-builder-core-11.2.1.tgz",
+      "integrity": "sha1-HcqMGhzui1F1C3cIoEkTrv+s+Kg=",
+      "dev": true
+    },
+    "electron-builder-http": {
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/electron-builder-http/-/electron-builder-http-11.5.0.tgz",
+      "integrity": "sha1-t3OWY0kDREMp7aO7zQIyFEDgYDg=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.0",
+        "fs-extra-p": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
+          "integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "electron-builder-squirrel-windows": {
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-11.6.1.tgz",
+      "integrity": "sha1-pRYS0oiDuesK8IQuPrJoRM9aalI=",
+      "dev": true,
+      "requires": {
+        "archiver": "1.3.0",
+        "bluebird-lst-c": "1.0.6",
+        "electron-builder-core": "11.2.1",
+        "electron-builder-util": "11.6.1",
+        "fs-extra-p": "3.1.0"
+      }
+    },
+    "electron-builder-util": {
+      "version": "11.6.1",
+      "resolved": "https://registry.npmjs.org/electron-builder-util/-/electron-builder-util-11.6.1.tgz",
+      "integrity": "sha1-D1VvZ6cOTI11GFVp7yp1ZtsBXsw=",
+      "dev": true,
+      "requires": {
+        "7zip-bin": "2.2.7",
+        "bluebird-lst-c": "1.0.6",
+        "chalk": "1.1.3",
+        "debug": "2.6.0",
+        "electron-builder-http": "11.5.0",
+        "fs-extra-p": "3.1.0",
+        "is-ci": "1.0.10",
+        "node-emoji": "1.8.1",
+        "source-map-support": "0.4.18",
+        "stat-mode": "0.2.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz",
+          "integrity": "sha1-vFlryr52F/Edn6FTYe3tVgi4SZs=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "electron-devtools-installer": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz",
+      "integrity": "sha1-C+tzzL9ly8TQnnBs69pjj4ObjFU=",
+      "dev": true,
+      "requires": {
+        "7zip": "0.0.6",
+        "cross-unzip": "0.0.2",
+        "rimraf": "2.6.2",
+        "semver": "5.4.1"
+      }
+    },
+    "electron-download-tf": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/electron-download-tf/-/electron-download-tf-3.1.0.tgz",
+      "integrity": "sha1-xtYsDgpMY7ZylfV7a2ZRTBO47Y0=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "fs-extra": "1.0.0",
+        "minimist": "1.2.0",
+        "nugget": "2.0.1",
+        "path-exists": "3.0.0",
+        "rc": "1.2.2",
+        "semver": "5.4.1",
+        "sumchecker": "1.3.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+          "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0",
+            "klaw": "1.3.1"
+          }
+        },
+        "path-exists": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "dev": true
+        }
+      }
+    },
+    "electron-macos-sign": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/electron-macos-sign/-/electron-macos-sign-1.5.0.tgz",
+      "integrity": "sha1-/jqKy3VbX1aPH+FE6eZs7kQBlEg=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "compare-version": "0.1.2",
+        "debug": "2.6.9",
+        "isbinaryfile": "3.0.2",
+        "plist": "2.1.0"
+      }
+    },
+    "electron-to-chromium": {
+      "version": "1.3.27",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz",
+      "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=",
+      "dev": true
+    },
+    "emojione": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/emojione/-/emojione-2.2.7.tgz",
+      "integrity": "sha1-RkV89rmy+NoTroouTlR94G7hXpY="
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "encodeurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz",
+      "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=",
+      "dev": true
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "0.4.19"
+      }
+    },
+    "end-of-stream": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
+      "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "engine.io": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
+      "integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.3",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "ws": "1.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
+      "integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "2.3.3",
+        "engine.io-parser": "1.3.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parsejson": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "1.1.2",
+        "xmlhttprequest-ssl": "1.5.3",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
+      "integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "0.0.6",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary": "0.1.7",
+        "wtf-8": "1.0.0"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "memory-fs": "0.2.0",
+        "tapable": "0.1.10"
+      },
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+          "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
+          "dev": true
+        }
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA="
+    },
+    "errno": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz",
+      "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=",
+      "dev": true,
+      "requires": {
+        "prr": "0.0.0"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
+      "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
+      "requires": {
+        "is-arrayish": "0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz",
+      "integrity": "sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.35",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz",
+      "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-set": "0.1.5",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-promise": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz",
+      "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==",
+      "dev": true
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "0.3.5"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35",
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "dev": true,
+      "requires": {
+        "es6-map": "0.1.5",
+        "es6-weak-map": "2.0.2",
+        "esrecurse": "4.2.0",
+        "estraverse": "4.2.0"
+      }
+    },
+    "eslint": {
+      "version": "3.19.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
+      "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "6.26.0",
+        "chalk": "1.1.3",
+        "concat-stream": "1.6.0",
+        "debug": "2.6.9",
+        "doctrine": "2.0.0",
+        "escope": "3.6.0",
+        "espree": "3.5.1",
+        "esquery": "1.0.0",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "file-entry-cache": "2.0.0",
+        "glob": "7.1.2",
+        "globals": "9.18.0",
+        "ignore": "3.3.5",
+        "imurmurhash": "0.1.4",
+        "inquirer": "0.12.0",
+        "is-my-json-valid": "2.16.1",
+        "is-resolvable": "1.0.0",
+        "js-yaml": "3.10.0",
+        "json-stable-stringify": "1.0.1",
+        "levn": "0.3.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "natural-compare": "1.4.0",
+        "optionator": "0.8.2",
+        "path-is-inside": "1.0.2",
+        "pluralize": "1.2.1",
+        "progress": "1.1.8",
+        "require-uncached": "1.0.3",
+        "shelljs": "0.7.8",
+        "strip-bom": "3.0.0",
+        "strip-json-comments": "2.0.1",
+        "table": "3.8.3",
+        "text-table": "0.2.0",
+        "user-home": "2.0.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+          "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+          "dev": true,
+          "requires": {
+            "esutils": "2.0.2",
+            "isarray": "1.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+          "dev": true
+        },
+        "user-home": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
+          "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
+          "dev": true,
+          "requires": {
+            "os-homedir": "1.0.2"
+          }
+        }
+      }
+    },
+    "eslint-config-google": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.7.1.tgz",
+      "integrity": "sha1-VZj4SY6eB4Qg80uASVuNlZ9lH7I=",
+      "dev": true
+    },
+    "eslint-plugin-babel": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-babel/-/eslint-plugin-babel-4.1.2.tgz",
+      "integrity": "sha1-eSAqDjV1fdkngJGbIzbx+i/lPB4=",
+      "dev": true
+    },
+    "eslint-plugin-flowtype": {
+      "version": "2.39.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.39.1.tgz",
+      "integrity": "sha512-RiQv+7Z9QDJuzt+NO8sYgkLGT+h+WeCrxP7y8lI7wpU41x3x/2o3PGtHk9ck8QnA9/mlbNcy/hG0eKvmd7npaA==",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz",
+      "integrity": "sha1-xUNb6wZ3ThLH2y9qut3L+QDNP3g=",
+      "dev": true,
+      "requires": {
+        "array.prototype.find": "2.0.4",
+        "doctrine": "1.2.3",
+        "has": "1.0.1",
+        "jsx-ast-utils": "1.4.1",
+        "object.assign": "4.0.4"
+      }
+    },
+    "espree": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
+      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+      "dev": true,
+      "requires": {
+        "acorn": "5.1.2",
+        "acorn-jsx": "3.0.1"
+      }
+    },
+    "esprima": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+      "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+      "dev": true
+    },
+    "esquery": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "dev": true,
+      "requires": {
+        "estraverse": "4.2.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "dev": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.35"
+      }
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz",
+      "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=",
+      "dev": true
+    },
+    "events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=",
+      "dev": true
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
+      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "dev": true,
+      "requires": {
+        "original": "1.0.0"
+      }
+    },
+    "except": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/except/-/except-0.1.3.tgz",
+      "integrity": "sha1-mCYckZWFUVNrREgiOOl4P7c9KSo=",
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "exit-hook": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+      "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=",
+      "dev": true
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "0.1.1"
+          }
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+          "dev": true,
+          "requires": {
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
+          }
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.3"
+      }
+    },
+    "expect": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-1.20.2.tgz",
+      "integrity": "sha1-1Fj+TFYAQDa64yMkFqP2Nh8E+WU=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "has": "1.0.1",
+        "is-equal": "1.5.5",
+        "is-regex": "1.0.4",
+        "object-inspect": "1.3.0",
+        "object-keys": "1.0.11",
+        "tmatch": "2.0.1"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+          "dev": true
+        }
+      }
+    },
+    "express": {
+      "version": "4.16.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.2.tgz",
+      "integrity": "sha1-41xt/i1kt9ygpc1PIXgb4ymeB2w=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.18.2",
+        "content-disposition": "0.5.2",
+        "content-type": "1.0.4",
+        "cookie": "0.3.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "1.1.1",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "finalhandler": "1.1.0",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "1.1.2",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "2.0.2",
+        "qs": "6.5.1",
+        "range-parser": "1.2.0",
+        "safe-buffer": "5.1.1",
+        "send": "0.16.1",
+        "serve-static": "1.13.1",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.3.1",
+        "type-is": "1.6.15",
+        "utils-merge": "1.0.1",
+        "vary": "1.1.2"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+          "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.17",
+            "negotiator": "0.6.1"
+          }
+        },
+        "finalhandler": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+          "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "1.0.1",
+            "escape-html": "1.0.3",
+            "on-finished": "2.3.0",
+            "parseurl": "1.3.2",
+            "statuses": "1.3.1",
+            "unpipe": "1.0.0"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+          "dev": true
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-text-webpack-plugin": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-0.9.1.tgz",
+      "integrity": "sha1-723FCMs17Q3PikAJq76FP3p2IrU=",
+      "requires": {
+        "async": "1.5.2",
+        "loader-utils": "0.2.17"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
+    },
+    "favico.js": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/favico.js/-/favico.js-0.3.10.tgz",
+      "integrity": "sha1-gFhuJ6EX8kqNUcGKmb3HFNQzkwE="
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+      "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+      "dev": true,
+      "requires": {
+        "websocket-driver": "0.7.0"
+      }
+    },
+    "fbemitter": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-2.1.1.tgz",
+      "integrity": "sha1-Uj4U/a9SSIBbsC9i78M75wP1GGU=",
+      "requires": {
+        "fbjs": "0.8.16"
+      }
+    },
+    "fbjs": {
+      "version": "0.8.16",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz",
+      "integrity": "sha1-XmdDL1UNxBtXK/VYR7ispk5TN9s=",
+      "requires": {
+        "core-js": "1.2.7",
+        "isomorphic-fetch": "2.2.1",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "promise": "7.3.1",
+        "setimmediate": "1.0.5",
+        "ua-parser-js": "0.7.17"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        }
+      }
+    },
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/file/-/file-0.2.2.tgz",
+      "integrity": "sha1-w9/Y+M81Na5FXCtCPC5SY112tNM="
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "dev": true,
+      "requires": {
+        "flat-cache": "1.3.0",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-saver": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz",
+      "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI="
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "filesize": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.6.tgz",
+      "integrity": "sha1-X9mPPqyU7JUW747VeC+thKAaCho="
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
+      "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "1.1.7",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "filled-array": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
+      "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q=",
+      "dev": true
+    },
+    "finalhandler": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz",
+      "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      }
+    },
+    "find-cache-dir": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+      "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+      "dev": true,
+      "requires": {
+        "commondir": "1.0.1",
+        "mkdirp": "0.5.1",
+        "pkg-dir": "1.0.0"
+      }
+    },
+    "find-index": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+      "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=",
+      "dev": true
+    },
+    "find-parent-dir": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
+      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ="
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "requires": {
+        "path-exists": "2.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
+      "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+      "dev": true,
+      "requires": {
+        "circular-json": "0.3.3",
+        "del": "2.2.2",
+        "graceful-fs": "4.1.11",
+        "write": "0.2.1"
+      }
+    },
+    "flux": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/flux/-/flux-2.1.1.tgz",
+      "integrity": "sha1-LGrGUtQzdIiWhInGWG86/yajjqQ=",
+      "requires": {
+        "fbemitter": "2.1.1",
+        "fbjs": "0.1.0-alpha.7",
+        "immutable": "3.7.6"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        },
+        "fbjs": {
+          "version": "0.1.0-alpha.7",
+          "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.1.0-alpha.7.tgz",
+          "integrity": "sha1-rUMIuPIy+zxzYDNJ6nJdHpw5Mjw=",
+          "requires": {
+            "core-js": "1.2.7",
+            "promise": "7.3.1",
+            "whatwg-fetch": "0.9.0"
+          }
+        },
+        "whatwg-fetch": {
+          "version": "0.9.0",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz",
+          "integrity": "sha1-DjaExsuZlbQ+/J3wPkw2XZX9nMA="
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.5",
+        "mime-types": "2.1.17"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "dev": true
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "dev": true
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
+      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
+      "dev": true,
+      "requires": {
+        "null-check": "1.0.0"
+      }
+    },
+    "fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0",
+        "klaw": "1.3.1",
+        "path-is-absolute": "1.0.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fs-extra-p": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-3.1.0.tgz",
+      "integrity": "sha1-7d97uNk4XXkBTeyyH0Wx0MV5ANM=",
+      "dev": true,
+      "requires": {
+        "bluebird-lst-c": "1.0.6",
+        "fs-extra": "2.1.2"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz",
+          "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "jsonfile": "2.4.0"
+          }
+        }
+      }
+    },
+    "fs-readdir-recursive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz",
+      "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=",
+      "dev": true
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz",
+      "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.7.0",
+        "node-pre-gyp": "0.6.36"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ajv": {
+          "version": "4.11.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "dev": true
+        },
+        "aproba": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.2.9"
+          }
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "asynckit": {
+          "version": "0.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "aws4": {
+          "version": "1.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true
+        },
+        "bcrypt-pbkdf": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "tweetnacl": "0.14.5"
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        },
+        "boom": {
+          "version": "2.10.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "brace-expansion": {
+          "version": "1.1.7",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "balanced-match": "0.4.2",
+            "concat-map": "0.0.1"
+          }
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "caseless": {
+          "version": "0.12.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "co": {
+          "version": "4.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "delayed-stream": "1.0.0"
+          }
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "dev": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1"
+          }
+        },
+        "dashdash": {
+          "version": "1.14.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "debug": {
+          "version": "2.6.8",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.4.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "extend": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.15"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "fstream": {
+          "version": "1.0.11",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "graceful-fs": "4.1.11",
+            "inherits": "2.0.3",
+            "mkdirp": "0.5.1",
+            "rimraf": "2.6.1"
+          }
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fstream": "1.0.11",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4"
+          }
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.1.1",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "getpass": {
+          "version": "0.1.7",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.1.11",
+          "bundled": true,
+          "dev": true
+        },
+        "har-schema": {
+          "version": "1.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "har-validator": {
+          "version": "4.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "2.10.1",
+            "cryptiles": "2.0.5",
+            "hoek": "2.16.3",
+            "sntp": "1.0.9"
+          }
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "bundled": true,
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.0",
+            "sshpk": "1.13.0"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "dev": true
+        },
+        "ini": {
+          "version": "1.3.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "dev": true
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsbn": "0.1.1"
+          }
+        },
+        "jsbn": {
+          "version": "0.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-schema": {
+          "version": "0.2.3",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "json-stable-stringify": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "jsonify": "0.0.0"
+          }
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsonify": {
+          "version": "0.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "jsprim": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "extsprintf": "1.0.2",
+            "json-schema": "0.2.3",
+            "verror": "1.3.6"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "mime-db": {
+          "version": "1.27.0",
+          "bundled": true,
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.15",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "mime-db": "1.27.0"
+          }
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "node-pre-gyp": {
+          "version": "0.6.36",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "mkdirp": "0.5.1",
+            "nopt": "4.0.1",
+            "npmlog": "4.1.0",
+            "rc": "1.2.1",
+            "request": "2.81.0",
+            "rimraf": "2.6.1",
+            "semver": "5.3.0",
+            "tar": "2.2.1",
+            "tar-pack": "3.4.0"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.0",
+            "osenv": "0.1.4"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.4",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "performance-now": {
+          "version": "0.2.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "bundled": true,
+          "dev": true
+        },
+        "punycode": {
+          "version": "1.4.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.4.2",
+            "ini": "1.3.4",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.2.9",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "request": {
+          "version": "2.81.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.1.4",
+            "har-validator": "4.2.1",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.15",
+            "oauth-sign": "0.8.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.0.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.2",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.0.1",
+          "bundled": true,
+          "dev": true
+        },
+        "semver": {
+          "version": "5.3.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "2.16.3"
+          }
+        },
+        "sshpk": {
+          "version": "1.13.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.2.3",
+            "assert-plus": "1.0.0",
+            "bcrypt-pbkdf": "1.0.1",
+            "dashdash": "1.14.1",
+            "ecc-jsbn": "0.1.1",
+            "getpass": "0.1.7",
+            "jodid25519": "1.0.2",
+            "jsbn": "0.1.1",
+            "tweetnacl": "0.14.5"
+          },
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "2.2.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "block-stream": "0.0.9",
+            "fstream": "1.0.11",
+            "inherits": "2.0.3"
+          }
+        },
+        "tar-pack": {
+          "version": "3.4.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.8",
+            "fstream": "1.0.11",
+            "fstream-ignore": "1.0.5",
+            "once": "1.4.0",
+            "readable-stream": "2.2.9",
+            "rimraf": "2.6.1",
+            "tar": "2.2.1",
+            "uid-number": "0.0.6"
+          }
+        },
+        "tough-cookie": {
+          "version": "2.3.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.6.0",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
+        "tweetnacl": {
+          "version": "0.14.5",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        },
+        "uuid": {
+          "version": "3.0.1",
+          "bundled": true,
+          "dev": true,
+          "optional": true
+        },
+        "verror": {
+          "version": "1.3.6",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "extsprintf": "1.0.2"
+          }
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "dev": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "fuse.js": {
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-2.7.4.tgz",
+      "integrity": "sha1-luQg/efvARrEnCWKYhMU/ldlNvk="
+    },
+    "gemini-scrollbar": {
+      "version": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "dev": true
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "gfm.css": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/gfm.css/-/gfm.css-1.1.1.tgz",
+      "integrity": "sha1-FrDvCGN/JJW2bITFAkWT1x6+rEY="
+    },
+    "glob": {
+      "version": "5.0.15",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+      "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+      "requires": {
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob2base": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+      "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
+      "dev": true,
+      "requires": {
+        "find-index": "0.1.1"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "dev": true
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "dev": true,
+      "requires": {
+        "array-union": "1.0.2",
+        "arrify": "1.0.1",
+        "glob": "7.1.2",
+        "object-assign": "4.1.1",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "got": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz",
+      "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=",
+      "dev": true,
+      "requires": {
+        "create-error-class": "3.0.2",
+        "duplexer2": "0.1.4",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.0",
+        "node-status-codes": "1.0.0",
+        "object-assign": "4.1.1",
+        "parse-json": "2.2.0",
+        "pinkie-promise": "2.0.1",
+        "read-all-stream": "3.1.0",
+        "readable-stream": "2.3.3",
+        "timed-out": "3.1.3",
+        "unzip-response": "1.0.2",
+        "url-parse-lax": "1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz",
+      "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
+      "dev": true
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "requires": {
+        "ajv": "5.2.3",
+        "har-schema": "2.0.0"
+      }
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "dev": true,
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-binary": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
+      "integrity": "sha1-aOYesWIQyVRaClzOBqhzkS/h5ow=",
+      "dev": true,
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "has-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+      "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
+      "dev": true
+    },
+    "hawk": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+      "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+      "requires": {
+        "boom": "4.3.1",
+        "cryptiles": "3.1.2",
+        "hoek": "4.2.0",
+        "sntp": "2.0.2"
+      }
+    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
+    "highlight.js": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+    },
+    "hoek": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+      "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
+    },
+    "hoist-non-react-statics": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz",
+      "integrity": "sha1-ND24TGAYxlB3iJgkATWhQg7iLOA="
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "hosted-git-info": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
+      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg=="
+    },
+    "html-minifier": {
+      "version": "3.5.6",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.6.tgz",
+      "integrity": "sha512-88FjtKrlak2XjczhxrBomgzV4jmGzM3UnHRBScRkJcmcRum0kb+IwhVAETJ8AVp7j0p3xugjSaw9L+RmI5/QOA==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.9",
+        "commander": "2.11.0",
+        "he": "1.1.1",
+        "ncname": "1.0.0",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.1.4"
+      },
+      "dependencies": {
+        "clean-css": {
+          "version": "4.1.9",
+          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
+          "integrity": "sha1-Nc7ornaHpJuYA09w3gDE7dOCYwE=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7"
+          }
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz",
+      "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "html-minifier": "3.5.6",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.4",
+        "pretty-error": "2.1.1",
+        "toposort": "1.0.6"
+      }
+    },
+    "htmlparser2": {
+      "version": "3.9.2",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
+      "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.4.1",
+        "domutils": "1.6.2",
+        "entities": "1.1.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "http-errors": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
+      "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.1",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.0.3",
+        "statuses": "1.3.1"
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.9.tgz",
+      "integrity": "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=",
+      "dev": true
+    },
+    "http-proxy": {
+      "version": "1.16.2",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz",
+      "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "1.2.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
+      "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+      "dev": true,
+      "requires": {
+        "http-proxy": "1.16.2",
+        "is-glob": "3.1.0",
+        "lodash": "4.17.4",
+        "micromatch": "2.3.11"
+      },
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
+          "requires": {
+            "is-extglob": "2.1.1"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.13.1"
+      }
+    },
+    "https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
+      "dev": true
+    },
+    "iconv-lite": {
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
+      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "dev": true
+    },
+    "ignore": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
+      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
+      "dev": true
+    },
+    "immutable": {
+      "version": "3.7.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "dev": true
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "dev": true,
+      "requires": {
+        "repeating": "2.0.1"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "ini": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+      "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+      "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "1.4.0",
+        "ansi-regex": "2.1.1",
+        "chalk": "1.1.3",
+        "cli-cursor": "1.0.2",
+        "cli-width": "2.2.0",
+        "figures": "1.7.0",
+        "lodash": "4.17.4",
+        "readline2": "1.0.1",
+        "run-async": "0.1.0",
+        "rx-lite": "3.1.2",
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1",
+        "through": "2.3.8"
+      }
+    },
+    "interpret": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.4.tgz",
+      "integrity": "sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA=",
+      "dev": true
+    },
+    "invariant": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+      "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
+      "requires": {
+        "loose-envify": "1.3.1"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "ipaddr.js": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.5.2.tgz",
+      "integrity": "sha1-1LUFvemUaYfM8PxY2QEP+WB+P6A=",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-arrow-function": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-arrow-function/-/is-arrow-function-2.0.3.tgz",
+      "integrity": "sha1-Kb4sLY2UUIUri7r7Y1unuNjofsI=",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.3"
+      }
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.10.0"
+      }
+    },
+    "is-boolean-object": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.0.0.tgz",
+      "integrity": "sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=",
+      "dev": true
+    },
+    "is-buffer": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+      "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=",
+      "dev": true
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "1.1.1"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+      "dev": true
+    },
+    "is-ci": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
+      "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
+      "dev": true,
+      "requires": {
+        "ci-info": "1.1.1"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/is-equal/-/is-equal-1.5.5.tgz",
+      "integrity": "sha1-XoXxlX4FKIMkf+s4aWWju6Ffuz0=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1",
+        "is-arrow-function": "2.0.3",
+        "is-boolean-object": "1.0.0",
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-generator-function": "1.0.6",
+        "is-number-object": "1.0.3",
+        "is-regex": "1.0.4",
+        "is-string": "1.0.4",
+        "is-symbol": "1.0.1",
+        "object.entries": "1.0.4"
+      }
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "dev": true,
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "requires": {
+        "number-is-nan": "1.0.1"
+      }
+    },
+    "is-generator-function": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.6.tgz",
+      "integrity": "sha1-nnFlPNFf/zQcecQVFGChMdMen8Q=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-my-json-valid": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz",
+      "integrity": "sha512-ochPsqWS1WXj8ZnMIV0vnNXooaMhp7cyL4FMSIPKTtnV0Ha/T19G2b9kkhcNsabV9bxYkze7/aLZJb/bYuFduQ==",
+      "dev": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
+      "dev": true
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-number-object": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.3.tgz",
+      "integrity": "sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=",
+      "dev": true
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "dev": true
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "dev": true
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+      "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
+      "dev": true,
+      "requires": {
+        "is-path-inside": "1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
+      "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
+      "dev": true,
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
+      "dev": true
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "dev": true,
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
+      "dev": true,
+      "requires": {
+        "tryit": "1.0.3"
+      }
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-string": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.4.tgz",
+      "integrity": "sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ=",
+      "dev": true
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    },
+    "is-windows": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
+      "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isbinaryfile": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "1.7.3",
+        "whatwg-fetch": "2.0.3"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+          "dev": true
+        }
+      }
+    },
+    "jquery": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz",
+      "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c="
+    },
+    "js-base64": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz",
+      "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
+      "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.9",
+        "esprima": "4.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+          "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
+          "dev": true,
+          "requires": {
+            "sprintf-js": "1.0.3"
+          }
+        },
+        "sprintf-js": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+          "dev": true
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "optional": true
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
+      "dev": true
+    },
+    "json-loader": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "dev": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json3": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
+      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "dev": true
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=",
+      "dev": true
+    },
+    "karma": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
+      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.2",
+        "chokidar": "1.7.0",
+        "colors": "1.1.2",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.5",
+        "core-js": "2.5.1",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.16.2",
+        "isbinaryfile": "3.0.2",
+        "lodash": "3.10.1",
+        "log4js": "0.6.38",
+        "mime": "1.4.1",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.1.5",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.2",
+        "safe-buffer": "5.1.1",
+        "socket.io": "1.7.3",
+        "source-map": "0.5.7",
+        "tmp": "0.0.31",
+        "useragent": "2.2.1"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        }
+      }
+    },
+    "karma-chrome-launcher": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz",
+      "integrity": "sha1-TG1wDRY6nTTGGO/YeRi+SeekqMk=",
+      "dev": true,
+      "requires": {
+        "fs-access": "1.0.1",
+        "which": "1.3.0"
+      }
+    },
+    "karma-cli": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/karma-cli/-/karma-cli-0.1.2.tgz",
+      "integrity": "sha1-ys6oQ3Hs4Zh2JlyPoQLru5/uSow=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.4.0"
+      }
+    },
+    "karma-junit-reporter": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.4.2.tgz",
+      "integrity": "sha1-SSojZyj+TJKqz0GfzQEQpDJ+nX8=",
+      "dev": true,
+      "requires": {
+        "path-is-absolute": "1.0.1",
+        "xmlbuilder": "3.1.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        },
+        "xmlbuilder": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz",
+          "integrity": "sha1-LIaIjy1OrehQ+jjKf3Ij9yCVFuE=",
+          "dev": true,
+          "requires": {
+            "lodash": "3.10.1"
+          }
+        }
+      }
+    },
+    "karma-logcapture-reporter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/karma-logcapture-reporter/-/karma-logcapture-reporter-0.0.1.tgz",
+      "integrity": "sha1-vxsLHJFeDeKVoV/i8BedQoG6zdw=",
+      "dev": true
+    },
+    "karma-mocha": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-0.2.2.tgz",
+      "integrity": "sha1-OI7ZF9oV3LGW0bkVwZNO+AMZP44=",
+      "dev": true
+    },
+    "karma-sourcemap-loader": {
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz",
+      "integrity": "sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "karma-spec-reporter": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/karma-spec-reporter/-/karma-spec-reporter-0.0.31.tgz",
+      "integrity": "sha1-SDDccUihVcfXoYbmMjOaDYD63sM=",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2"
+      }
+    },
+    "karma-summary-reporter": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/karma-summary-reporter/-/karma-summary-reporter-1.3.3.tgz",
+      "integrity": "sha1-nHQKJLYL+RNes59acylsTM0Q2Zs=",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3"
+      }
+    },
+    "karma-webpack": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-1.8.1.tgz",
+      "integrity": "sha1-OdX9Lt7qPMPvW0BZibN9Ww5qO04=",
+      "dev": true,
+      "requires": {
+        "async": "0.9.2",
+        "loader-utils": "0.2.17",
+        "lodash": "3.10.1",
+        "source-map": "0.1.43",
+        "webpack-dev-middleware": "1.12.0"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.5"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "latest-version": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz",
+      "integrity": "sha1-VvjWE5YghHuAF/jx9NeOIRMkFos=",
+      "dev": true,
+      "requires": {
+        "package-json": "2.4.0"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true
+    },
+    "lazy-req": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz",
+      "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=",
+      "dev": true
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
+      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.3"
+      }
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "1.0.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "linkifyjs": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/linkifyjs/-/linkifyjs-2.1.5.tgz",
+      "integrity": "sha512-8FqxPXQDLjI2nNHlM7eGewxE6DHvMbtiW0AiXzm0s4RkTwVZYRDTeVXkiRxLHTd4CuRBQY/JPtvtqJWdS7gHyA==",
+      "requires": {
+        "jquery": "3.2.1",
+        "react": "15.6.2",
+        "react-dom": "15.6.2"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "parse-json": "2.2.0",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1",
+        "strip-bom": "2.0.0"
+      }
+    },
+    "loader-utils": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+      "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+      "requires": {
+        "big.js": "3.2.0",
+        "emojis-list": "2.1.0",
+        "json5": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "lodash": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+      "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+    },
+    "lodash-es": {
+      "version": "4.17.4",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz",
+      "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc="
+    },
+    "lodash.assign": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
+      "dev": true
+    },
+    "lodash.pickby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz",
+      "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=",
+      "dev": true
+    },
+    "lodash.toarray": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
+      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=",
+      "dev": true
+    },
+    "log4js": {
+      "version": "0.6.38",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "integrity": "sha1-LElBFmldb7JUgJQ9P8hy5mKlIv0=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.0.34",
+        "semver": "4.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "loose-envify": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
+      "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
+      "requires": {
+        "js-tokens": "3.0.2"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "dev": true,
+      "requires": {
+        "currently-unhandled": "0.4.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
+    "lowercase-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz",
+      "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
+      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "dev": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "macaddress": {
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
+      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
+      "dev": true
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "dev": true
+    },
+    "matrix-js-sdk": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-0.8.2.tgz",
+      "integrity": "sha1-e7mrVoXrNCFLOFlMiDn++pY2ViE=",
+      "requires": {
+        "another-json": "0.2.0",
+        "bluebird": "3.5.1",
+        "browser-request": "0.3.3",
+        "content-type": "1.0.4",
+        "request": "2.83.0"
+      }
+    },
+    "matrix-mock-request": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/matrix-mock-request/-/matrix-mock-request-1.2.1.tgz",
+      "integrity": "sha1-2aWrqNPYJG6I/3YyWYuZwUE/QjI=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "expect": "1.20.2"
+      }
+    },
+    "matrix-react-sdk": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/matrix-react-sdk/-/matrix-react-sdk-0.10.2.tgz",
+      "integrity": "sha1-TNSwkN1P4Jsl4Yh5Z/XOE17U8q4=",
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "bluebird": "3.5.1",
+        "blueimp-canvas-to-blob": "3.14.0",
+        "browser-encrypt-attachment": "0.3.0",
+        "browser-request": "0.3.3",
+        "classnames": "2.2.5",
+        "commonmark": "0.27.0",
+        "counterpart": "0.18.3",
+        "draft-js": "0.11.0-alpha",
+        "draft-js-export-html": "0.6.0",
+        "draft-js-export-markdown": "0.3.0",
+        "emojione": "2.2.7",
+        "file-saver": "1.3.3",
+        "filesize": "3.5.6",
+        "flux": "2.1.1",
+        "fuse.js": "2.7.4",
+        "glob": "5.0.15",
+        "highlight.js": "8.9.1",
+        "isomorphic-fetch": "2.2.1",
+        "linkifyjs": "2.1.5",
+        "lodash": "4.17.4",
+        "matrix-js-sdk": "0.8.2",
+        "optimist": "0.6.1",
+        "prop-types": "15.6.0",
+        "react": "15.6.2",
+        "react-addons-css-transition-group": "15.3.2",
+        "react-dom": "15.6.2",
+        "react-gemini-scrollbar": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+        "sanitize-html": "1.14.1",
+        "text-encoding-utf-8": "1.0.1",
+        "url": "0.11.0",
+        "velocity-vector": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+        "whatwg-fetch": "1.1.1"
+      },
+      "dependencies": {
+        "highlight.js": {
+          "version": "8.9.1",
+          "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz",
+          "integrity": "sha1-uKnFSTISqTkvAiK2SclhFJfr+4g="
+        },
+        "whatwg-fetch": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-1.1.1.tgz",
+          "integrity": "sha1-rDydOfMgxtzlM5lp0FTvQ90zMxk="
+        }
+      }
+    },
+    "matrix-react-test-utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/matrix-react-test-utils/-/matrix-react-test-utils-0.2.1.tgz",
+      "integrity": "sha1-i2xRAzK54K+XwCuinnMbKdCxF7s=",
+      "dev": true,
+      "requires": {
+        "react": "15.6.2",
+        "react-dom": "15.6.2"
+      }
+    },
+    "mdurl": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+      "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.4",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "dev": true,
+      "requires": {
+        "camelcase-keys": "2.1.0",
+        "decamelize": "1.2.0",
+        "loud-rejection": "1.6.0",
+        "map-obj": "1.0.1",
+        "minimist": "1.2.0",
+        "normalize-package-data": "2.4.0",
+        "object-assign": "4.1.1",
+        "read-pkg-up": "1.0.1",
+        "redent": "1.0.0",
+        "trim-newlines": "1.0.0"
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "dev": true
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
+      }
+    },
+    "mime": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
+      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.30.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
+    },
+    "mime-types": {
+      "version": "2.1.17",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+      "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+      "requires": {
+        "mime-db": "1.30.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "minimist": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        }
+      }
+    },
+    "mocha": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.5.3.tgz",
+      "integrity": "sha1-FhvlvetJZ3HrmzV0UFC2IrWu/Fg=",
+      "dev": true,
+      "requires": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.11",
+        "growl": "1.9.2",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.1",
+        "supports-color": "1.2.0",
+        "to-iso-string": "0.0.2"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+          "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+          "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+          "dev": true
+        },
+        "glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "minimatch": "0.3.0"
+          }
+        },
+        "lru-cache": {
+          "version": "2.7.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+          "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+          "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2.7.3",
+            "sigmund": "1.0.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+          "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+          "dev": true
+        }
+      }
+    },
+    "modernizr": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/modernizr/-/modernizr-3.5.0.tgz",
+      "integrity": "sha1-OWoCIxvcVGKLveLAgTqOiEx+gGA=",
+      "requires": {
+        "doctrine": "1.2.3",
+        "file": "0.2.2",
+        "find-parent-dir": "0.3.0",
+        "lodash": "4.17.4",
+        "mkdirp": "0.5.1",
+        "remarkable": "1.7.1",
+        "requirejs": "2.1.22",
+        "yargs": "7.0.2"
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz",
+      "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+      "dev": true,
+      "optional": true
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
+    },
+    "ncname": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
+      "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=",
+      "dev": true,
+      "requires": {
+        "xml-char-classes": "1.0.0"
+      }
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
+    "node-emoji": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz",
+      "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==",
+      "dev": true,
+      "requires": {
+        "lodash.toarray": "4.4.0"
+      }
+    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "0.1.12",
+        "is-stream": "1.1.0"
+      }
+    },
+    "node-libs-browser": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz",
+      "integrity": "sha1-PicsCBnjCJNeJmdECNevDhSRuDs=",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.1.4",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.3.0",
+        "domain-browser": "1.1.7",
+        "events": "1.1.1",
+        "https-browserify": "0.0.1",
+        "os-browserify": "0.2.1",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.3",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.7.2",
+        "string_decoder": "0.10.31",
+        "timers-browserify": "2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.10.3",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "node-status-codes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz",
+      "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=",
+      "dev": true
+    },
+    "normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "requires": {
+        "hosted-git-info": "2.5.0",
+        "is-builtin-module": "1.0.0",
+        "semver": "5.4.1",
+        "validate-npm-package-license": "3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "dev": true
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0"
+      }
+    },
+    "nugget": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
+      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "minimist": "1.2.0",
+        "pretty-bytes": "1.0.4",
+        "progress-stream": "1.2.0",
+        "request": "2.83.0",
+        "single-line-log": "1.1.2",
+        "throttleit": "0.0.2"
+      }
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
+      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
+      "dev": true
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+      "dev": true
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object-inspect": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz",
+      "integrity": "sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg==",
+      "dev": true
+    },
+    "object-keys": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
+      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
+      "dev": true
+    },
+    "object.assign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz",
+      "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "object-keys": "1.0.11"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+          "dev": true
+        }
+      }
+    },
+    "object.entries": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz",
+      "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.9.0",
+        "function-bind": "1.1.1",
+        "has": "1.0.1"
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "olm": {
+      "version": "https://matrix.org/packages/npm/olm/olm-2.2.1.tgz",
+      "integrity": "sha1-Xl21DQoUK3x6BlDZs9isw9N+aXs=",
+      "optional": true
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz",
+      "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=",
+      "dev": true
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "onetime": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+      "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+      "dev": true
+    },
+    "open": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw=",
+      "dev": true
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "0.0.10",
+        "wordwrap": "0.0.3"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "0.0.10",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
+          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+          "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+          "dev": true
+        }
+      }
+    },
+    "options": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8=",
+      "dev": true
+    },
+    "original": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
+      "integrity": "sha1-kUf5P6FpbQS+YeAb1QuurKZWvTs=",
+      "dev": true,
+      "requires": {
+        "url-parse": "1.0.5"
+      },
+      "dependencies": {
+        "url-parse": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz",
+          "integrity": "sha1-CFSGBCKv3P7+tsllxmLUgAFpkns=",
+          "dev": true,
+          "requires": {
+            "querystringify": "0.0.4",
+            "requires-port": "1.0.0"
+          }
+        }
+      }
+    },
+    "os-browserify": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz",
+      "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=",
+      "dev": true
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "requires": {
+        "lcid": "1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
+      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2",
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "output-file-sync": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "mkdirp": "0.5.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "package-json": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz",
+      "integrity": "sha1-DRW9Z9HLvduyyiIv8u24a8sxqLs=",
+      "dev": true,
+      "requires": {
+        "got": "5.7.1",
+        "registry-auth-token": "3.3.1",
+        "registry-url": "3.1.0",
+        "semver": "5.4.1"
+      }
+    },
+    "pako": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
+    },
+    "parallelshell": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/parallelshell/-/parallelshell-3.0.2.tgz",
+      "integrity": "sha512-aW73W8tmYiFZtQi41pweV3WWT6o/EvSxAVQHbumOhN53H47OuWQwrRc11xQ2i44GFvR5AjtzhD92r8Kv9X+7Iw==",
+      "dev": true
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2"
+      }
+    },
+    "parse-color": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz",
+      "integrity": "sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=",
+      "dev": true,
+      "requires": {
+        "color-convert": "0.5.3"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "1.3.1"
+      }
+    },
+    "parsejson": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
+      "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "dev": true
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=",
+      "dev": true
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+      "requires": {
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+      "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=",
+      "dev": true
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "dev": true
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "pify": "2.3.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "pbkdf2-compat": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz",
+      "integrity": "sha1-tuDI+plJTZTgURV1gCpZpcFC8og=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+      "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+      "dev": true,
+      "requires": {
+        "find-up": "1.1.2"
+      }
+    },
+    "plist": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz",
+      "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=",
+      "dev": true,
+      "requires": {
+        "base64-js": "1.2.0",
+        "xmlbuilder": "8.2.2",
+        "xmldom": "0.1.27"
+      }
+    },
+    "pluralize": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
+      "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=",
+      "dev": true
+    },
+    "pluralizers": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/pluralizers/-/pluralizers-0.1.6.tgz",
+      "integrity": "sha1-GrOLbnYOb5f5hGElCXuGK8l0yB4="
+    },
+    "postcss": {
+      "version": "5.2.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+      "dev": true,
+      "requires": {
+        "chalk": "1.1.3",
+        "js-base64": "2.3.2",
+        "source-map": "0.5.7",
+        "supports-color": "3.2.3"
+      }
+    },
+    "postcss-extend": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-extend/-/postcss-extend-1.0.5.tgz",
+      "integrity": "sha1-XqmL94e6PKz030YJdD+AqDOx0Oc=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-import": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.1.0.tgz",
+      "integrity": "sha1-lf6YdqHnmvSfvcNYnwH+WqfMHoA=",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.1.1",
+        "postcss": "5.2.18",
+        "postcss-value-parser": "3.3.0",
+        "promise-each": "2.2.0",
+        "read-cache": "1.0.0",
+        "resolve": "1.4.0"
+      }
+    },
+    "postcss-js": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-0.2.0.tgz",
+      "integrity": "sha1-VubbDNkQpt/+w9+zRGJpOscuOII=",
+      "dev": true,
+      "requires": {
+        "camelcase-css": "1.0.1",
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-load-config": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
+      "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1",
+        "postcss-load-options": "1.2.0",
+        "postcss-load-plugins": "2.3.0"
+      }
+    },
+    "postcss-load-options": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
+      "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-load-plugins": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
+      "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
+      "dev": true,
+      "requires": {
+        "cosmiconfig": "2.2.2",
+        "object-assign": "4.1.1"
+      }
+    },
+    "postcss-loader": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.3.3.tgz",
+      "integrity": "sha1-piHqH6KQYqg5cqRvVEhncTAZFus=",
+      "dev": true,
+      "requires": {
+        "loader-utils": "1.1.0",
+        "object-assign": "4.1.1",
+        "postcss": "5.2.18",
+        "postcss-load-config": "1.2.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+          "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "json5": "0.5.1"
+          }
+        }
+      }
+    },
+    "postcss-mixins": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-mixins/-/postcss-mixins-5.4.1.tgz",
+      "integrity": "sha1-AEwKzFQyi4a7yzRx+es7Uu1w9Kg=",
+      "dev": true,
+      "requires": {
+        "globby": "6.1.0",
+        "postcss": "5.2.18",
+        "postcss-js": "0.2.0",
+        "postcss-simple-vars": "3.1.0",
+        "sugarss": "0.2.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        }
+      }
+    },
+    "postcss-nested": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-1.0.1.tgz",
+      "integrity": "sha1-kfKPTm4j1WckGsFUVYoM+rTMDY8=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-scss": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz",
+      "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-simple-vars": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-3.1.0.tgz",
+      "integrity": "sha1-YsBlchTvH0OjxYk63oneQU8xtv8=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-strip-inline-comments": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/postcss-strip-inline-comments/-/postcss-strip-inline-comments-0.1.5.tgz",
+      "integrity": "sha1-f/a83BTmM+1M36AguuPt2tT4S5A=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz",
+      "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=",
+      "dev": true
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "pretty-bytes": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
+      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1",
+        "meow": "3.7.0"
+      }
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "2.0.1",
+        "utila": "0.4.0"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "dev": true
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true
+    },
+    "progress-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
+      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
+      "dev": true,
+      "requires": {
+        "speedometer": "0.1.4",
+        "through2": "0.2.3"
+      }
+    },
+    "promise": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+      "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+      "requires": {
+        "asap": "2.0.6"
+      }
+    },
+    "promise-each": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz",
+      "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=",
+      "dev": true,
+      "requires": {
+        "any-promise": "0.1.0"
+      }
+    },
+    "prop-types": {
+      "version": "15.6.0",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz",
+      "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=",
+      "requires": {
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.2.tgz",
+      "integrity": "sha1-ZXFQT0e7mI7IGAJT+F3X4UlSvew=",
+      "dev": true,
+      "requires": {
+        "forwarded": "0.1.2",
+        "ipaddr.js": "1.5.2"
+      }
+    },
+    "prr": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
+      "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=",
+      "dev": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+    },
+    "qjobs": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz",
+      "integrity": "sha1-ZZ3p8s+NzCehSBJ28gU3cnI4LnM=",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+      "dev": true
+    },
+    "querystringify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz",
+      "integrity": "sha1-DPf4T5Rj/wrlHExLFC2VvjdyTZw=",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
+      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "dev": true,
+      "requires": {
+        "is-number": "3.0.0",
+        "kind-of": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "dev": true,
+          "requires": {
+            "kind-of": "3.2.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "dev": true,
+              "requires": {
+                "is-buffer": "1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
+          "requires": {
+            "is-buffer": "1.1.5"
+          }
+        }
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
+      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.2",
+        "iconv-lite": "0.4.19",
+        "unpipe": "1.0.0"
+      }
+    },
+    "rc": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz",
+      "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=",
+      "dev": true,
+      "requires": {
+        "deep-extend": "0.4.2",
+        "ini": "1.3.4",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      }
+    },
+    "react": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
+      "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+      "requires": {
+        "create-react-class": "15.6.2",
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.0"
+      }
+    },
+    "react-addons-css-transition-group": {
+      "version": "15.3.2",
+      "resolved": "https://registry.npmjs.org/react-addons-css-transition-group/-/react-addons-css-transition-group-15.3.2.tgz",
+      "integrity": "sha1-2PpSvsm7Yb396LnkZSuAKXy/9mc="
+    },
+    "react-addons-perf": {
+      "version": "15.4.2",
+      "resolved": "https://registry.npmjs.org/react-addons-perf/-/react-addons-perf-15.4.2.tgz",
+      "integrity": "sha1-EQvc9cRZxPd8uF7WNLzTOXU2ODs=",
+      "dev": true,
+      "requires": {
+        "fbjs": "0.8.16",
+        "object-assign": "4.1.1"
+      }
+    },
+    "react-addons-test-utils": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz",
+      "integrity": "sha1-wStu/cIkfBDae4dw0YUICnsEcVY=",
+      "dev": true
+    },
+    "react-dnd": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/react-dnd/-/react-dnd-2.5.4.tgz",
+      "integrity": "sha512-y9YmnusURc+3KPgvhYKvZ9oCucj51MSZWODyaeV0KFU0cquzA7dCD1g/OIYUKtNoZ+MXtacDngkdud2TklMSjw==",
+      "requires": {
+        "disposables": "1.0.1",
+        "dnd-core": "2.5.4",
+        "hoist-non-react-statics": "2.3.1",
+        "invariant": "2.2.2",
+        "lodash": "4.17.4",
+        "prop-types": "15.6.0"
+      }
+    },
+    "react-dnd-html5-backend": {
+      "version": "2.5.4",
+      "resolved": "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-2.5.4.tgz",
+      "integrity": "sha512-jDqAkm/hI8Tl4HcsbhkBgB6HgpJR1e+ML1SbfxaegXYiuMxEVQm0FOwEH5WxUoo6fmIG4N+H0rSm59POuZOCaA==",
+      "requires": {
+        "lodash": "4.17.4"
+      }
+    },
+    "react-dom": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
+      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+      "requires": {
+        "fbjs": "0.8.16",
+        "loose-envify": "1.3.1",
+        "object-assign": "4.1.1",
+        "prop-types": "15.6.0"
+      }
+    },
+    "react-gemini-scrollbar": {
+      "version": "github:matrix-org/react-gemini-scrollbar#5e97aef7e034efc8db1431f4b0efe3b26e249ae9",
+      "requires": {
+        "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279810d05319ac5ff1bd34910bff32325c7b"
+      }
+    },
+    "read-all-stream": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
+      "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "2.0.1",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dev": true,
+      "requires": {
+        "pify": "2.3.0"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "requires": {
+        "load-json-file": "1.1.0",
+        "normalize-package-data": "2.4.0",
+        "path-type": "1.1.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "requires": {
+        "find-up": "1.1.2",
+        "read-pkg": "1.1.0"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
+      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "1.0.7",
+        "safe-buffer": "5.1.1",
+        "string_decoder": "1.0.3",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.3",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "readline2": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+      "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
+      "dev": true,
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "mute-stream": "0.0.5"
+      }
+    },
+    "rechoir": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
+      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+      "dev": true,
+      "requires": {
+        "resolve": "1.4.0"
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "dev": true,
+      "requires": {
+        "indent-string": "2.1.0",
+        "strip-indent": "1.0.1"
+      }
+    },
+    "redux": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
+      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
+      "requires": {
+        "lodash": "4.17.4",
+        "lodash-es": "4.17.4",
+        "loose-envify": "1.3.1",
+        "symbol-observable": "1.0.4"
+      }
+    },
+    "regenerate": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.3.tgz",
+      "integrity": "sha512-jVpo1GadrDAK59t/0jRx5VxYWQEDkkEKi6+HjE3joFVLfDOh9Xrdh0dF1eSq+BI/SwvTQ44gSscJ8N5zYL61sg==",
+      "dev": true
+    },
+    "regenerator-runtime": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "private": "0.1.8"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "regexp-quote": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz",
+      "integrity": "sha1-Hg9GUMhi3L/tVP1CsUjpuxch/PI="
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "dev": true,
+      "requires": {
+        "regenerate": "1.3.3",
+        "regjsgen": "0.2.0",
+        "regjsparser": "0.1.5"
+      }
+    },
+    "registry-auth-token": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.1.tgz",
+      "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
+      "dev": true,
+      "requires": {
+        "rc": "1.2.2",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "dev": true,
+      "requires": {
+        "rc": "1.2.2"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "dev": true,
+      "requires": {
+        "jsesc": "0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "dev": true
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
+    "remarkable": {
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/remarkable/-/remarkable-1.7.1.tgz",
+      "integrity": "sha1-qspJchALZqZCpjoQIcpLrBvjv/Y=",
+      "requires": {
+        "argparse": "0.1.16",
+        "autolinker": "0.15.3"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "renderkid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
+      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
+      "dev": true,
+      "requires": {
+        "css-select": "1.2.0",
+        "dom-converter": "0.1.4",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "domhandler": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
+          "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1.3.0"
+          }
+        },
+        "domutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1.3.0"
+          }
+        },
+        "htmlparser2": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+          "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1.3.0",
+            "domhandler": "2.1.0",
+            "domutils": "1.1.6",
+            "readable-stream": "1.0.34"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "dev": true,
+      "requires": {
+        "is-finite": "1.0.2"
+      }
+    },
+    "request": {
+      "version": "2.83.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+      "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.6.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.5",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.1",
+        "har-validator": "5.0.3",
+        "hawk": "6.0.2",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.17",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.1",
+        "safe-buffer": "5.1.1",
+        "stringstream": "0.0.5",
+        "tough-cookie": "2.3.3",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "require-from-string": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
+      "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+      "dev": true
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "dev": true,
+      "requires": {
+        "caller-path": "0.1.0",
+        "resolve-from": "1.0.1"
+      }
+    },
+    "requirejs": {
+      "version": "2.1.22",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.1.22.tgz",
+      "integrity": "sha1-3Xj9LTQYDA1ixyS1uK68BmTgNm8="
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "resolve": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
+      "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
+      "dev": true,
+      "requires": {
+        "path-parse": "1.0.5"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
+      "dev": true
+    },
+    "restore-cursor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+      "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+      "dev": true,
+      "requires": {
+        "exit-hook": "1.1.1",
+        "onetime": "1.1.0"
+      }
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "dev": true,
+      "requires": {
+        "align-text": "0.1.4"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "ripemd160": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
+      "integrity": "sha1-K/GYveFnys+lHAqSjoS2i74XH84=",
+      "dev": true
+    },
+    "run-async": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+      "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
+    "rx-lite": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+      "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+    },
+    "sanitize-filename": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
+      "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+      "dev": true,
+      "requires": {
+        "truncate-utf8-bytes": "1.0.2"
+      }
+    },
+    "sanitize-html": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz",
+      "integrity": "sha1-cw/6Ikm98YMz7/5FsoYXPJxa0Lg=",
+      "requires": {
+        "htmlparser2": "3.9.2",
+        "regexp-quote": "0.0.0",
+        "xtend": "4.0.1"
+      }
+    },
+    "semver": {
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
+      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
+    },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "dev": true,
+      "requires": {
+        "semver": "5.4.1"
+      }
+    },
+    "send": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz",
+      "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "1.1.1",
+        "destroy": "1.0.4",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "etag": "1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "1.6.2",
+        "mime": "1.4.1",
+        "ms": "2.0.0",
+        "on-finished": "2.3.0",
+        "range-parser": "1.2.0",
+        "statuses": "1.3.1"
+      }
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "1.0.3",
+        "http-errors": "1.6.2",
+        "mime-types": "2.1.17",
+        "parseurl": "1.3.2"
+      },
+      "dependencies": {
+        "accepts": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.4.tgz",
+          "integrity": "sha1-hiRnWMfdbSGmR0/whKR0DsBesh8=",
+          "dev": true,
+          "requires": {
+            "mime-types": "2.1.17",
+            "negotiator": "0.6.1"
+          }
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz",
+      "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==",
+      "dev": true,
+      "requires": {
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "parseurl": "1.3.2",
+        "send": "0.16.1"
+      }
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
+      "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=",
+      "dev": true
+    },
+    "sha.js": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz",
+      "integrity": "sha1-F93t3F9yL7ZlAWWIlUYZd4ZzFbo=",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
+    },
+    "shell-quote": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "dev": true,
+      "requires": {
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
+      }
+    },
+    "shelljs": {
+      "version": "0.7.8",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz",
+      "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "interpret": "1.0.4",
+        "rechoir": "0.6.2"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        }
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "single-line-log": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
+      "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
+      "dev": true
+    },
+    "slice-ansi": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+      "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=",
+      "dev": true
+    },
+    "slide": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
+      "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=",
+      "dev": true
+    },
+    "sntp": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+      "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+      "requires": {
+        "hoek": "4.2.0"
+      }
+    },
+    "socket.io": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
+      "integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
+      "dev": true,
+      "requires": {
+        "debug": "2.3.3",
+        "engine.io": "1.8.3",
+        "has-binary": "0.1.7",
+        "object-assign": "4.1.0",
+        "socket.io-adapter": "0.5.0",
+        "socket.io-client": "1.7.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
+          "integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-adapter": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
+      "integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
+      "dev": true,
+      "requires": {
+        "debug": "2.3.3",
+        "socket.io-parser": "2.3.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
+      "integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "2.3.3",
+        "engine.io-client": "1.8.3",
+        "has-binary": "0.1.7",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "2.3.1",
+        "to-array": "0.1.4"
+      },
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+          "dev": true
+        },
+        "debug": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
+          "integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.2"
+          }
+        },
+        "ms": {
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
+          "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
+          "dev": true
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
+      "integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.1.2",
+        "debug": "2.2.0",
+        "isarray": "0.0.1",
+        "json3": "3.3.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "dev": true,
+      "requires": {
+        "faye-websocket": "0.10.0",
+        "uuid": "3.1.0"
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "eventsource": "0.1.6",
+        "faye-websocket": "0.11.1",
+        "inherits": "2.0.3",
+        "json3": "3.3.2",
+        "url-parse": "1.1.9"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
+          "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=",
+          "dev": true,
+          "requires": {
+            "websocket-driver": "0.7.0"
+          }
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
+    },
+    "source-map-loader": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.1.6.tgz",
+      "integrity": "sha1-wJkD2m1zueU7ftjuUkVZcFHpjpE=",
+      "dev": true,
+      "requires": {
+        "async": "0.9.2",
+        "loader-utils": "0.2.17",
+        "source-map": "0.1.43"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+      "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
+      "requires": {
+        "spdx-license-ids": "1.2.2"
+      }
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
+    },
+    "speedometer": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
+      "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.1.tgz",
+      "integrity": "sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw="
+    },
+    "sshpk": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
+      "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "stat-mode": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
+      "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+      "dev": true
+    },
+    "statuses": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+      "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+      "dev": true
+    },
+    "stream-browserify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+      "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3"
+      }
+    },
+    "stream-cache": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz",
+      "integrity": "sha1-GsWtaDJCjKVWZ9ve45Xa1ObbEY8=",
+      "dev": true
+    },
+    "stream-http": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
+      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "3.0.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.3",
+        "to-arraybuffer": "1.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "requires": {
+        "code-point-at": "1.1.0",
+        "is-fullwidth-code-point": "1.0.0",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "string.prototype.repeat": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz",
+      "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8="
+    },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "requires": {
+        "is-utf8": "0.2.1"
+      }
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "dev": true,
+      "requires": {
+        "get-stdin": "4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "subarg": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+      "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0"
+      }
+    },
+    "sugarss": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-0.2.0.tgz",
+      "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=",
+      "dev": true,
+      "requires": {
+        "postcss": "5.2.18"
+      }
+    },
+    "sumchecker": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
+      "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "es6-promise": "4.1.1"
+      }
+    },
+    "supports-color": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+      "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+      "dev": true,
+      "requires": {
+        "has-flag": "1.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz",
+      "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0="
+    },
+    "table": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
+      "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
+      "dev": true,
+      "requires": {
+        "ajv": "4.11.8",
+        "ajv-keywords": "1.5.1",
+        "chalk": "1.1.3",
+        "lodash": "4.17.4",
+        "slice-ansi": "0.0.4",
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
+    "tapable": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+      "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+      "dev": true
+    },
+    "tar-stream": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz",
+      "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=",
+      "dev": true,
+      "requires": {
+        "bl": "1.2.1",
+        "end-of-stream": "1.4.0",
+        "readable-stream": "2.3.3",
+        "xtend": "4.0.1"
+      }
+    },
+    "text-encoding-utf-8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.1.tgz",
+      "integrity": "sha1-Uepsen6y+09nRnt2NzVmH1YDSS0="
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
+    },
+    "throttleit": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+      "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "through2": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+      "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "1.1.14",
+        "xtend": "2.1.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "xtend": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
+          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
+          "dev": true,
+          "requires": {
+            "object-keys": "0.4.0"
+          }
+        }
+      }
+    },
+    "time-stamp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz",
+      "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=",
+      "dev": true
+    },
+    "timed-out": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz",
+      "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=",
+      "dev": true
+    },
+    "timers-browserify": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
+      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+      "dev": true,
+      "requires": {
+        "setimmediate": "1.0.5"
+      }
+    },
+    "tmatch": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/tmatch/-/tmatch-2.0.1.tgz",
+      "integrity": "sha1-DFYkbzPzDaG409colauvFmYPOM8=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+      "dev": true
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "dev": true
+    },
+    "to-iso-string": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/to-iso-string/-/to-iso-string-0.0.2.tgz",
+      "integrity": "sha1-TcGeZk38y+Jb2NtQiwDG2hWCVdE=",
+      "dev": true
+    },
+    "toposort": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
+      "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
+      "dev": true
+    },
+    "tough-cookie": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+      "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "dev": true
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
+      "dev": true
+    },
+    "truncate-utf8-bytes": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
+      "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=",
+      "dev": true,
+      "requires": {
+        "utf8-byte-length": "1.0.4"
+      }
+    },
+    "tryit": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
+      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
+      "dev": true
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+      "dev": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.15",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz",
+      "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.17"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "ua-parser-js": {
+      "version": "0.7.17",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz",
+      "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g=="
+    },
+    "uglify-js": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.4.tgz",
+      "integrity": "sha512-DcbkPg11Lw2lAWpwCmQDX+qoR4JiII6ypsQmF6tscZtlxGPFAmSRUGuMoVT3/0EHqypVik/TpkH4ITiMJeQqQA==",
+      "dev": true,
+      "requires": {
+        "commander": "2.11.0",
+        "source-map": "0.6.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true
+    },
+    "ultron": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
+      "integrity": "sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po=",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk="
+    },
+    "underscore.string": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz",
+      "integrity": "sha1-jN2PusTi0uoefi6Al8QvRCKA+Fs="
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "unzip-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz",
+      "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=",
+      "dev": true
+    },
+    "update-notifier": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz",
+      "integrity": "sha1-j5LFFUgr1oMbfJMBPnD4dVLHz1o=",
+      "dev": true,
+      "requires": {
+        "boxen": "0.6.0",
+        "chalk": "1.1.3",
+        "configstore": "2.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "2.0.0",
+        "lazy-req": "1.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "2.0.0"
+      }
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.9.tgz",
+      "integrity": "sha1-xn8dd11R8KGJEd17P/rSe7nlvRk=",
+      "dev": true,
+      "requires": {
+        "querystringify": "1.0.0",
+        "requires-port": "1.0.0"
+      },
+      "dependencies": {
+        "querystringify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz",
+          "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=",
+          "dev": true
+        }
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "dev": true,
+      "requires": {
+        "prepend-http": "1.0.4"
+      }
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.31"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
+      }
+    },
+    "utf8-byte-length": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz",
+      "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
+      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g=="
+    },
+    "uuid-1345": {
+      "version": "0.99.6",
+      "resolved": "https://registry.npmjs.org/uuid-1345/-/uuid-1345-0.99.6.tgz",
+      "integrity": "sha1-sScK4BWnchx63sbEbsFpxgmK7UA=",
+      "dev": true,
+      "requires": {
+        "macaddress": "0.2.8"
+      }
+    },
+    "v8flags": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "dev": true,
+      "requires": {
+        "user-home": "1.1.1"
+      }
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
+      "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
+      "requires": {
+        "spdx-correct": "1.0.2",
+        "spdx-expression-parse": "1.0.4"
+      }
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
+    "velocity-vector": {
+      "version": "github:vector-im/velocity#059e3b2348f1110888d033974d3109fd5a3af00f",
+      "requires": {
+        "jquery": "3.2.1"
+      }
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
+      "dev": true,
+      "requires": {
+        "indexof": "0.0.1"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "walkdir": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.0.11.tgz",
+      "integrity": "sha1-oW0CXrkxvQO1LzCMrtD0D86+lTI=",
+      "dev": true
+    },
+    "watchpack": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
+      "integrity": "sha1-Yuqkq15bo1/fwBgnVibjwPXj+ws=",
+      "dev": true,
+      "requires": {
+        "async": "0.9.2",
+        "chokidar": "1.7.0",
+        "graceful-fs": "4.1.11"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        }
+      }
+    },
+    "webpack": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.15.0.tgz",
+      "integrity": "sha1-T/MfU9sDM55VFkqdRo7gMklo/pg=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0",
+        "async": "1.5.2",
+        "clone": "1.0.2",
+        "enhanced-resolve": "0.9.1",
+        "interpret": "0.6.6",
+        "loader-utils": "0.2.17",
+        "memory-fs": "0.3.0",
+        "mkdirp": "0.5.1",
+        "node-libs-browser": "0.7.0",
+        "optimist": "0.6.1",
+        "supports-color": "3.2.3",
+        "tapable": "0.1.10",
+        "uglify-js": "2.7.5",
+        "watchpack": "0.2.9",
+        "webpack-core": "0.6.9"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "interpret": {
+          "version": "0.6.6",
+          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz",
+          "integrity": "sha1-/s16GOfOXKar+5U+H4YhOknxYls=",
+          "dev": true
+        },
+        "memory-fs": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz",
+          "integrity": "sha1-e8xrYp46Q+hx1+Kaymrop/FcuyA=",
+          "dev": true,
+          "requires": {
+            "errno": "0.1.4",
+            "readable-stream": "2.3.3"
+          }
+        },
+        "uglify-js": {
+          "version": "2.7.5",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
+          "integrity": "sha1-RhLAx7qu4rp8SH3kkErhIgefLKg=",
+          "dev": true,
+          "requires": {
+            "async": "0.2.10",
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "yargs": "3.10.0"
+          },
+          "dependencies": {
+            "async": {
+              "version": "0.2.10",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+              "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+              "dev": true
+            }
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "dev": true,
+          "requires": {
+            "camelcase": "1.2.1",
+            "cliui": "2.1.0",
+            "decamelize": "1.2.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
+      "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=",
+      "dev": true,
+      "requires": {
+        "source-list-map": "0.1.8",
+        "source-map": "0.4.4"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.0.tgz",
+      "integrity": "sha1-007++y7dp+HTtdvgcolRMhllFwk=",
+      "dev": true,
+      "requires": {
+        "memory-fs": "0.4.1",
+        "mime": "1.4.1",
+        "path-is-absolute": "1.0.1",
+        "range-parser": "1.2.0",
+        "time-stamp": "2.0.0"
+      }
+    },
+    "webpack-dev-server": {
+      "version": "1.16.5",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-1.16.5.tgz",
+      "integrity": "sha1-DL1fLSrI1OWTqs1clwLnu9XlmJI=",
+      "dev": true,
+      "requires": {
+        "compression": "1.7.1",
+        "connect-history-api-fallback": "1.4.0",
+        "express": "4.16.2",
+        "http-proxy-middleware": "0.17.4",
+        "open": "0.0.5",
+        "optimist": "0.6.1",
+        "serve-index": "1.9.1",
+        "sockjs": "0.3.19",
+        "sockjs-client": "1.1.4",
+        "stream-cache": "0.0.2",
+        "strip-ansi": "3.0.1",
+        "supports-color": "3.2.3",
+        "webpack-dev-middleware": "1.12.0"
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz",
+      "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=",
+      "dev": true,
+      "requires": {
+        "http-parser-js": "0.4.9",
+        "websocket-extensions": "0.1.2"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.2.tgz",
+      "integrity": "sha1-Dhh4HeYpoYMIzhSBZQ9n/6JpOl0=",
+      "dev": true
+    },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
+    "which": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
+      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "dev": true,
+      "requires": {
+        "isexe": "2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+    },
+    "widest-line": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz",
+      "integrity": "sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw=",
+      "dev": true,
+      "requires": {
+        "string-width": "1.0.2"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "1.0.2",
+        "strip-ansi": "3.0.1"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
+      "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "imurmurhash": "0.1.4",
+        "slide": "1.1.6"
+      }
+    },
+    "ws": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz",
+      "integrity": "sha1-iiRPoFJAHgjJiGz0SoUYnh/UBn8=",
+      "dev": true,
+      "requires": {
+        "options": "0.0.6",
+        "ultron": "1.0.2"
+      }
+    },
+    "wtf-8": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz",
+      "integrity": "sha1-OS2LotDxw00e4tYw8V0O+2jhBIo=",
+      "dev": true
+    },
+    "xdg-basedir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
+      "integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
+      "dev": true,
+      "requires": {
+        "os-homedir": "1.0.2"
+      }
+    },
+    "xml-char-classes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz",
+      "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
+      "dev": true
+    },
+    "xmlbuilder": {
+      "version": "8.2.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz",
+      "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=",
+      "dev": true
+    },
+    "xmldom": {
+      "version": "0.1.27",
+      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
+      "dev": true
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
+      "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=",
+      "dev": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.0.2.tgz",
+      "integrity": "sha1-EVuX3xMhgj6Lhkjolox4JSEiH2c=",
+      "requires": {
+        "camelcase": "3.0.0",
+        "cliui": "3.2.0",
+        "decamelize": "1.2.0",
+        "get-caller-file": "1.0.2",
+        "os-locale": "1.4.0",
+        "read-pkg-up": "1.0.1",
+        "require-directory": "2.1.1",
+        "require-main-filename": "1.0.1",
+        "set-blocking": "2.0.0",
+        "string-width": "1.0.2",
+        "which-module": "1.0.0",
+        "y18n": "3.2.1",
+        "yargs-parser": "5.0.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "requires": {
+        "camelcase": "3.0.0"
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    },
+    "zip-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.2.0.tgz",
+      "integrity": "sha1-qLxF9MG0lpnGuQGYuqyqzbzUugQ=",
+      "dev": true,
+      "requires": {
+        "archiver-utils": "1.3.0",
+        "compress-commons": "1.2.2",
+        "lodash": "4.17.4",
+        "readable-stream": "2.3.3"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index f51290061d..7c48a8fe21 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.11.4",
+  "version": "0.12.7",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {
@@ -28,11 +28,13 @@
   "scripts": {
     "reskindex": "reskindex -h src/header",
     "reskindex:watch": "reskindex -h src/header -w",
+    "i18n": "matrix-gen-i18n",
+    "prunei18n": "matrix-prune-i18n",
     "build:res": "node scripts/copy-res.js",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
     "build:compile": "npm run reskindex && babel --source-maps -d lib src",
-    "build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
-    "build:bundle:dev": "webpack --optimize-occurence-order --progress",
+    "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail",
+    "build:bundle:dev": "webpack --optimize-occurence-order --progress --bail",
     "build:electron": "npm run clean && npm run build && npm run install:electron && build -wml --ia32 --x64",
     "build": "npm run reskindex && npm run build:res && npm run build:bundle",
     "build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
@@ -47,16 +49,17 @@
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib webapp electron_app/dist",
-    "prepublish": "npm run build:compile",
-    "test": "karma start --single-run=true --autoWatch=false --browsers PhantomJS --colors=false",
+    "prepublish": "npm run clean && npm run build:compile",
+    "test": "karma start --single-run=true --autoWatch=false --browsers ChromeHeadless",
     "test-multi": "karma start"
   },
   "dependencies": {
     "babel-polyfill": "^6.5.0",
     "babel-runtime": "^6.11.6",
+    "bluebird": "^3.5.0",
     "browser-request": "^0.3.3",
     "classnames": "^2.1.2",
-    "draft-js": "^0.8.1",
+    "draft-js": "^0.11.0-alpha",
     "extract-text-webpack-plugin": "^0.9.1",
     "favico.js": "^0.3.10",
     "filesize": "3.5.6",
@@ -65,15 +68,15 @@
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.13",
-    "matrix-react-sdk": "0.9.7",
+    "matrix-js-sdk": "0.8.5",
+    "matrix-react-sdk": "0.10.7",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
-    "q": "^1.4.1",
-    "react": "^15.4.0",
+    "prop-types": "^15.5.10",
+    "react": "^15.6.0",
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
-    "react-dom": "^15.4.0",
+    "react-dom": "^15.6.0",
     "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
     "sanitize-html": "^1.11.1",
     "text-encoding-utf-8": "^1.0.1",
@@ -88,7 +91,7 @@
     "babel-eslint": "^6.1.0",
     "babel-loader": "^6.2.5",
     "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-plugin-transform-async-to-generator": "^6.16.0",
+    "babel-plugin-transform-async-to-bluebird": "^1.1.1",
     "babel-plugin-transform-class-properties": "^6.16.0",
     "babel-plugin-transform-object-rest-spread": "^6.16.0",
     "babel-plugin-transform-runtime": "^6.15.0",
@@ -109,23 +112,27 @@
     "eslint-config-google": "^0.7.1",
     "eslint-plugin-babel": "^4.1.1",
     "eslint-plugin-flowtype": "^2.30.0",
-    "eslint-plugin-react": "^6.9.0",
+    "eslint-plugin-react": "^7.4.0",
     "expect": "^1.16.0",
     "fs-extra": "^0.30.0",
     "html-webpack-plugin": "^2.24.0",
     "json-loader": "^0.5.3",
-    "karma": "^0.13.22",
+    "karma": "^1.7.0",
     "karma-chrome-launcher": "^0.2.3",
     "karma-cli": "^0.1.2",
     "karma-junit-reporter": "^0.4.1",
+    "karma-logcapture-reporter": "0.0.1",
     "karma-mocha": "^0.2.2",
-    "karma-phantomjs-launcher": "^1.0.0",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-summary-reporter": "^1.3.3",
     "karma-webpack": "^1.7.0",
+    "matrix-mock-request": "^1.2.0",
+    "matrix-react-test-utils": "^0.2.0",
     "minimist": "^1.2.0",
     "mkdirp": "^0.5.1",
     "mocha": "^2.4.5",
-    "parallelshell": "^1.2.0",
-    "phantomjs-prebuilt": "^2.1.7",
+    "parallelshell": "^3.0.2",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^9.0.0",
     "postcss-loader": "^1.2.2",
@@ -135,7 +142,7 @@
     "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",
+    "react-addons-test-utils": "^15.6.0",
     "rimraf": "^2.4.3",
     "source-map-loader": "^0.1.5",
     "webpack": "^1.12.14",
@@ -147,7 +154,7 @@
   "build": {
     "appId": "im.riot.app",
     "category": "Network",
-    "electronVersion": "1.6.8",
+    "electronVersion": "1.7.9",
     "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
     "asar": false,
     "dereference": true,
diff --git a/release.sh b/release.sh
index 8ae307f7e2..136750181e 100755
--- a/release.sh
+++ b/release.sh
@@ -11,7 +11,7 @@ cd `dirname $0`
 
 for i in matrix-js-sdk matrix-react-sdk
 do
-    depver=`cat package.json | jq -r .dependencies.\"$i\"`
+    depver=`cat package.json | jq -r .dependencies[\"$i\"]`
     latestver=`npm show $i version`
     if [ "$depver" != "$latestver" ]
     then
diff --git a/res/home.html b/res/home.html
index 3ba2e96419..4b8da3daaf 100644
--- a/res/home.html
+++ b/res/home.html
@@ -249,7 +249,7 @@
             <span class="mx_HomePage_desc">_t("Implementing VoIP services with Matrix")</span>
         </div>
         <div class="mx_HomePage_room">
-            <a href="#/room/#identity:matrix.org">
+            <a href="#/room/#matrix-identity:matrix.org">
                 <img class="mx_HomePage_icon" src="home/rooms/identity.jpg">
                 <span class="mx_HomePage_name">Matrix Identity</span>
             </a>
diff --git a/scripts/copy-res.js b/scripts/copy-res.js
index e8f6684d21..b461d030fd 100755
--- a/scripts/copy-res.js
+++ b/scripts/copy-res.js
@@ -9,24 +9,28 @@
 // This could readily be automated, but it's nice to explicitly
 // control when we languages are available.
 const INCLUDE_LANGS = [
+    {'value': 'da', 'label': 'Dansk'},
+    {'value': 'de_DE', 'label': 'Deutsch'},
     {'value': 'en_EN', 'label': 'English'},
     {'value': 'en_US', 'label': 'English (US)'},
-    {'value': 'da', 'label': 'Dansk'},
     {'value': 'el', 'label': 'Ελληνικά'},
     {'value': 'eo', 'label': 'Esperanto'},
-    {'value': 'nl', 'label': 'Nederlands'},
-    {'value': 'de_DE', 'label': 'Deutsch'},
+    {'value': 'es', 'label': 'Español'},
+    {'value': 'eu', 'label': 'Euskal'},
+    {'value': 'fi', 'label': 'Suomi'},
     {'value': 'fr', 'label': 'Français'},
     {'value': 'hu', 'label': 'Magyar'},
     {'value': 'ko', 'label': '한국어'},
+    {'value': 'lv', 'label': 'Latviešu'},
     {'value': 'nb_NO', 'label': 'Norwegian Bokmål'},
+    {'value': 'nl', 'label': 'Nederlands'},
     {'value': 'pl', 'label': 'Polski'},
     {'value': 'pt', 'label': 'Português'},
     {'value': 'pt_BR', 'label': 'Português do Brasil'},
     {'value': 'ru', 'label': 'Русский'},
     {'value': 'sv', 'label': 'Svenska'},
-    {'value': 'es', 'label': 'Español'},
     {'value': 'th', 'label': 'ไทย'},
+    {'value': 'te', 'label': 'తెలుగు'},
     {'value': 'tr', 'label': 'Türk'},
     {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese
     {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese
@@ -153,15 +157,23 @@ function genLangFile(lang, dest) {
     const reactSdkFile = 'node_modules/matrix-react-sdk/src/i18n/strings/' + lang + '.json';
     const riotWebFile = 'src/i18n/strings/' + lang + '.json';
 
-    const translations = {};
+    let translations = {};
     [reactSdkFile, riotWebFile].forEach(function(f) {
         if (fs.existsSync(f)) {
-            Object.assign(
-                translations,
-                JSON.parse(fs.readFileSync(f).toString())
-            );
+            try {
+                Object.assign(
+                    translations,
+                    JSON.parse(fs.readFileSync(f).toString())
+                );
+            } catch (e) {
+                console.error("Failed: "+f, e);
+                throw e;
+            }
         }
     });
+
+    translations = weblateToCounterpart(translations)
+
     fs.writeFileSync(dest + lang + '.json', JSON.stringify(translations, null, 4));
     if (verbose) {
         console.log("Generated language file: " + lang);
@@ -190,5 +202,39 @@ function genLangList() {
     }
 }
 
+/**
+ * Convert translation key from weblate format
+ * (which only supports a single level) to counterpart
+ * which requires object values for 'count' translations.
+ *
+ * eg.
+ *     "there are %(count)s badgers|one": "a badger",
+ *     "there are %(count)s badgers|other": "%(count)s badgers"
+ *   becomes
+ *     "there are %(count)s badgers": {
+ *         "one": "a badger",
+ *         "other": "%(count)s badgers"
+ *     }
+ */
+function weblateToCounterpart(inTrs) {
+    const outTrs = {};
+
+    for (const key of Object.keys(inTrs)) {
+        const keyParts = key.split('|', 2);
+        if (keyParts.length === 2) {
+            let obj = outTrs[keyParts[0]];
+            if (obj === undefined) {
+                obj = {};
+                outTrs[keyParts[0]] = obj;
+            }
+            obj[keyParts[1]] = inTrs[key];
+        } else {
+            outTrs[key] = inTrs[key];
+        }
+    }
+
+    return outTrs;
+}
+
 genLangList();
 next(0);
diff --git a/scripts/deploy.py b/scripts/deploy.py
index c96b46e81f..e8fd9aa455 100755
--- a/scripts/deploy.py
+++ b/scripts/deploy.py
@@ -13,6 +13,8 @@ import os.path
 import subprocess
 import sys
 import tarfile
+import shutil
+import glob
 
 try:
     # python3
@@ -48,11 +50,12 @@ def move_bundles(source, dest):
     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."
+            print (
+                "Skipping bundle. The bundle includes '%s' which we have previously deployed."
                 % f
             )
-        renames[os.path.join(source, f)] = dst
+        else:
+            renames[os.path.join(source, f)] = dst
 
     for (src, dst) in renames.iteritems():
         print ("Move %s -> %s" % (src, dst))
@@ -63,7 +66,8 @@ class Deployer:
         self.packages_path = "."
         self.bundles_path = None
         self.should_clean = False
-        self.config_location = None
+        # filename -> symlink path e.g 'config.localhost.json' => '../localhost/config.json'
+        self.symlink_paths = {}
         self.verify_signature = True
 
     def deploy(self, tarball, extract_path):
@@ -95,19 +99,20 @@ class Deployer:
 
         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.symlink_paths:
+            for link_path, file_path in self.symlink_paths.iteritems():
+                create_relative_symlink(
+                    target=file_path,
+                    linkname=os.path.join(extracted_dir, link_path)
+                )
 
         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)
+            # replace the extracted_bundles dir (which may not be empty if some
+            # bundles were skipped) with a symlink to the common dir.
+            shutil.rmtree(extracted_bundles)
             create_relative_symlink(
                 target=self.bundles_path,
                 linkname=extracted_bundles,
@@ -161,9 +166,10 @@ if __name__ == "__main__":
         )
     )
     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')"
+        "--include", nargs='*', default='./config*.json', help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
         )
     )
     parser.add_argument(
@@ -178,6 +184,8 @@ if __name__ == "__main__":
     deployer.packages_path = args.packages_dir
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
-    deployer.config_location = args.config
+
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
 
     deployer.deploy(args.tarball, args.extract_path)
diff --git a/scripts/electron-package.sh b/scripts/electron-package.sh
index 973ea45e82..f0ba941478 100755
--- a/scripts/electron-package.sh
+++ b/scripts/electron-package.sh
@@ -94,17 +94,20 @@ distdir="$builddir/electron_app/dist"
 pubdir="$projdir/electron_app/pub"
 rm -r "$pubdir" || true
 mkdir -p "$pubdir"
+rm -r "$projdir/electron_app/dist" || true
+mkdir -p "$projdir/electron_app/dist/unsigned/"
 
 # Install packages: what the user downloads the first time,
 # (DMGs for mac, exe installer for windows)
 mkdir -p "$pubdir/install/macos"
 cp $distdir/mac/*.dmg "$pubdir/install/macos/"
 
+# Windows installers go to the dist dir because they need signing
 mkdir -p "$pubdir/install/win32/ia32/"
-cp $distdir/win-ia32/*.exe "$pubdir/install/win32/ia32/"
+cp $distdir/win-ia32/*.exe "$projdir/electron_app/dist/unsigned/"
 
 mkdir -p "$pubdir/install/win32/x64/"
-cp $distdir/win/*.exe "$pubdir/install/win32/x64/"
+cp $distdir/win/*.exe "$projdir/electron_app/dist/unsigned/"
 
 # Packages for auto-update
 mkdir -p "$pubdir/update/macos"
@@ -120,11 +123,11 @@ cp $distdir/win/*.nupkg "$pubdir/update/win32/x64/"
 cp $distdir/win/RELEASES "$pubdir/update/win32/x64/"
 
 # Move the debs to the main project dir's dist folder
-rm -r "$projdir/electron_app/dist" || true
-mkdir -p "$projdir/electron_app/dist"
 cp $distdir/*.deb "$projdir/electron_app/dist/"
 
 rm -rf "$builddir"
 
-echo "Riot Desktop is ready to go in $pubdir: this directory can be hosted on your web server."
+echo "Unsigned Windows installers have been placed in electron_app/dist/unsigned/ - sign them,"
+echo "or just copy them to "$pubdir/install/win32/\<arch\>/""
+echo "Once you've done this, $pubdir can be hosted on your web server."
 echo "deb archives are in electron_app/dist/ - these should be added into your debian repository"
diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 4fa1a4a22c..e2d40341a0 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -49,42 +49,47 @@ function dodep() {
         [ "$curbranch" != 'develop' ] && clone $org $repo develop
     } || return $?
 
-    (
-        cd $repo
-        echo "$repo set to branch "`git rev-parse --abbrev-ref HEAD`
-    )
+    echo "$repo set to branch "`git -C "$repo" rev-parse --abbrev-ref HEAD`
 
     mkdir -p node_modules
     rm -r "node_modules/$repo" 2>/dev/null || true
     ln -sv "../$repo" node_modules/
+
+    (
+        cd $repo
+        npm install
+    )
 }
 
+##############################
+
 echo -en 'travis_fold:start:matrix-js-sdk\r'
 echo 'Setting up matrix-js-sdk'
 
 dodep matrix-org matrix-js-sdk
-(
-    cd node_modules/matrix-js-sdk
-    npm install
-)
 
 echo -en 'travis_fold:end:matrix-js-sdk\r'
 
+##############################
+
 echo -en 'travis_fold:start:matrix-react-sdk\r'
 echo 'Setting up matrix-react-sdk'
 
 dodep matrix-org matrix-react-sdk
 
-mkdir -p node_modules/matrix-react-sdk/node_modules
+# replace the version of js-sdk that got pulled into react-sdk with a symlink
+# to our version. Make sure to do this *after* doing 'npm i' in react-sdk,
+# otherwise npm helpfully moves another-json from matrix-js-sdk/node_modules
+# into matrix-react-sdk/node_modules.
+#
+# (note this matches the instructions in the README.)
+rm -r node_modules/matrix-react-sdk/node_modules/matrix-js-sdk
 ln -s ../../matrix-js-sdk node_modules/matrix-react-sdk/node_modules/
 
-(
-    cd node_modules/matrix-react-sdk
-    npm install
-)
-
 echo -en 'travis_fold:end:matrix-react-sdk\r'
 
+##############################
+
 # Link the reskindex binary in place: if we used npm link,
 # npm would do this for us, but we don't because we'd have
 # to define the npm prefix somewhere so it could put the
diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh
index 4f2e940564..7b5b4c8e2e 100755
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -8,8 +8,11 @@ nvm use 6
 
 set -x
 
-# check out corresponding branches of dependencies
-`dirname $0`/fetch-develop.deps.sh
+# check out corresponding branches of dependencies.
+#
+# clone the deps with depth 1: we know we will only ever need that one
+# commit.
+`dirname $0`/fetch-develop.deps.sh --depth 1
 
 npm install
 
diff --git a/scripts/redeploy.py b/scripts/redeploy.py
index 598f6c5265..2dac2931fa 100755
--- a/scripts/redeploy.py
+++ b/scripts/redeploy.py
@@ -13,7 +13,9 @@
 from __future__ import print_function
 import json, requests, tarfile, argparse, os, errno
 import time
+import traceback
 from urlparse import urljoin
+import glob
 
 from flask import Flask, jsonify, request, abort
 
@@ -124,6 +126,7 @@ def fetch_jenkins_build(job_name, build_num):
     try:
         extracted_dir = deploy_tarball(tar_gz_url, build_dir)
     except DeployException as e:
+        traceback.print_exc()
         abort(400, e.message)
 
     create_symlink(source=extracted_dir, linkname=arg_symlink)
@@ -185,10 +188,13 @@ if __name__ == "__main__":
             to the /vector directory INSIDE the tarball."
         )
     )
+
+    # --include ../../config.json ./localhost.json homepages/*
     parser.add_argument(
-        "--config", dest="config", help=(
-            "Write a symlink to config.json in the extracted tarball. \
-            To this location."
+        "--include", nargs='*', default='./config*.json', help=(
+            "Symlink these files into the root of the deployed tarball. \
+             Useful for config files and home pages. Supports glob syntax. \
+             (Default: '%(default)s')"
         )
     )
     parser.add_argument(
@@ -212,7 +218,10 @@ if __name__ == "__main__":
     deployer = Deployer()
     deployer.bundles_path = args.bundles_dir
     deployer.should_clean = args.clean
-    deployer.config_location = args.config
+
+    for include in args.include:
+        deployer.symlink_paths.update({ os.path.basename(pth): pth for pth in glob.iglob(include) })
+
 
     # 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
@@ -225,13 +234,13 @@ if __name__ == "__main__":
         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" %
+            "Listening on port %s. Extracting to %s%s. Symlinking to %s. Jenkins URL: %s. Include files: %s" %
             (args.port,
              arg_extract_path,
              " (clean after)" if deployer.should_clean else "",
              arg_symlink,
              arg_jenkins_url,
-             deployer.config_location,
+             deployer.symlink_paths,
             )
         )
         app.run(host="0.0.0.0", port=args.port, debug=True)
diff --git a/src/VectorConferenceHandler.js b/src/VectorConferenceHandler.js
index f34a7b732b..933f59937e 100644
--- a/src/VectorConferenceHandler.js
+++ b/src/VectorConferenceHandler.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 "use strict";
 
-var q = require("q");
+import Promise from 'bluebird';
 var Matrix = require("matrix-js-sdk");
 var Room = Matrix.Room;
 var CallHandler = require('matrix-react-sdk/lib/CallHandler');
@@ -53,11 +53,11 @@ ConferenceCall.prototype._joinConferenceUser = function() {
     // Make sure the conference user is in the group chat room
     var groupRoom = this.client.getRoom(this.groupRoomId);
     if (!groupRoom) {
-        return q.reject("Bad group room ID");
+        return Promise.reject("Bad group room ID");
     }
     var member = groupRoom.getMember(this.confUserId);
     if (member && member.membership === "join") {
-        return q();
+        return Promise.resolve();
     }
     return this.client.invite(this.groupRoomId, this.confUserId);
 };
@@ -75,7 +75,7 @@ ConferenceCall.prototype._getConferenceUserRoom = function() {
         }
     }
     if (confRoom) {
-        return q(confRoom);
+        return Promise.resolve(confRoom);
     }
     return this.client.createRoom({
         preset: "private_chat",
diff --git a/src/components/structures/BottomLeftMenu.js b/src/components/structures/BottomLeftMenu.js
index eacc500ae2..4014261caa 100644
--- a/src/components/structures/BottomLeftMenu.js
+++ b/src/components/structures/BottomLeftMenu.js
@@ -19,9 +19,9 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import sdk from 'matrix-react-sdk';
 import dis from 'matrix-react-sdk/lib/dispatcher';
-import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
 import Velocity from 'velocity-vector';
 import 'velocity-vector/velocity.ui';
+import UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 
 const CALLOUT_ANIM_DURATION = 1000;
 
@@ -167,8 +167,12 @@ module.exports = React.createClass({
         const StartChatButton = sdk.getComponent('elements.StartChatButton');
         const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
         const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
+        const GroupsButton = sdk.getComponent('elements.GroupsButton');
         const SettingsButton = sdk.getComponent('elements.SettingsButton');
 
+        const groupsButton =  UserSettingsStore.isFeatureEnabled('feature_groups') ?
+            <GroupsButton tooltip={true} /> : null;
+
         return (
             <div className="mx_BottomLeftMenu">
                 <div className="mx_BottomLeftMenu_options">
@@ -182,6 +186,7 @@ module.exports = React.createClass({
                     <div ref={this._collectCreateRoomButton}>
                         <CreateRoomButton tooltip={true} />
                     </div>
+                    { groupsButton }
                     <span className="mx_BottomLeftMenu_settings">
                         <SettingsButton tooltip={true} />
                     </span>
diff --git a/src/components/structures/HomePage.js b/src/components/structures/HomePage.js
index 2311cc1f30..bdba55eb0e 100644
--- a/src/components/structures/HomePage.js
+++ b/src/components/structures/HomePage.js
@@ -52,6 +52,8 @@ module.exports = React.createClass({
     },
 
     componentWillMount: function() {
+        this._unmounted = false;
+
         if (this.props.teamToken && this.props.teamServerUrl) {
             this.setState({
                 iframeSrc: `${this.props.teamServerUrl}/static/${this.props.teamToken}/home.html`
@@ -67,9 +69,14 @@ module.exports = React.createClass({
             request(
                 { method: "GET", url: src },
                 (err, response, body) => {
+                    if (this._unmounted) {
+                        return;
+                    }
+
                     if (err || response.status < 200 || response.status >= 300) {
-                        console.log(err);
-                        this.setState({ page: "Couldn't load home page" });
+                        console.warn(`Error loading home page: ${err}`);
+                        this.setState({ page: _t("Couldn't load home page") });
+                        return;
                     }
 
                     body = body.replace(/_t\(['"]([\s\S]*?)['"]\)/mg, (match, g1)=>this.translate(g1));
@@ -79,6 +86,10 @@ module.exports = React.createClass({
         }
     },
 
+    componentWillUnmount: function() {
+        this._unmounted = true;
+    },
+
     render: function() {
         if (this.state.iframeSrc) {
             return (
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 77338404fa..60f07a62c8 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -16,64 +16,141 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
-var DragDropContext = require('react-dnd').DragDropContext;
-var HTML5Backend = require('react-dnd-html5-backend');
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher');
+import React from 'react';
+import { DragDropContext } from 'react-dnd';
+import HTML5Backend from 'react-dnd-html5-backend';
+import classNames from 'classnames';
+import KeyCode from 'matrix-react-sdk/lib/KeyCode';
+import sdk from 'matrix-react-sdk';
+import dis from 'matrix-react-sdk/lib/dispatcher';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
-
-var VectorConferenceHandler = require('../../VectorConferenceHandler');
-var CallHandler = require("matrix-react-sdk/lib/CallHandler");
-
+import CallHandler from 'matrix-react-sdk/lib/CallHandler';
 import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+import VectorConferenceHandler from '../../VectorConferenceHandler';
 
 var LeftPanel = React.createClass({
     displayName: 'LeftPanel',
 
+    // NB. If you add props, don't forget to update
+    // shouldComponentUpdate!
     propTypes: {
         collapsed: React.PropTypes.bool.isRequired,
     },
 
     getInitialState: function() {
         return {
-            showCallElement: null,
             searchFilter: '',
         };
     },
 
-    componentDidMount: function() {
-        this.dispatcherRef = dis.register(this.onAction);
+    componentWillMount: function() {
+        this.focusedElement = null;
     },
 
-    componentWillReceiveProps: function(newProps) {
-        this._recheckCallElement(newProps.selectedRoom);
+    shouldComponentUpdate: function(nextProps, nextState) {
+        // MatrixChat will update whenever the user switches
+        // rooms, but propagating this change all the way down
+        // the react tree is quite slow, so we cut this off
+        // here. The RoomTiles listen for the room change
+        // events themselves to know when to update.
+        // We just need to update if any of these things change.
+        if (
+            this.props.collapsed !== nextProps.collapsed ||
+            this.props.disabled !== nextProps.disabled
+        ) {
+            return true;
+        }
+
+        if (this.state.searchFilter !== nextState.searchFilter) {
+            return true;
+        }
+
+        return false;
     },
 
-    componentWillUnmount: function() {
-        dis.unregister(this.dispatcherRef);
+    _onFocus: function(ev) {
+        this.focusedElement = ev.target;
     },
 
-    onAction: function(payload) {
-        switch (payload.action) {
-            // listen for call state changes to prod the render method, which
-            // may hide the global CallView if the call it is tracking is dead
-            case 'call_state':
-                this._recheckCallElement(this.props.selectedRoom);
+    _onBlur: function(ev) {
+        this.focusedElement = null;
+    },
+
+    _onKeyDown: function(ev) {
+        if (!this.focusedElement) return;
+        let handled = false;
+
+        switch (ev.keyCode) {
+            case KeyCode.UP:
+                this._onMoveFocus(true);
+                handled = true;
                 break;
+            case KeyCode.DOWN:
+                this._onMoveFocus(false);
+                handled = true;
+                break;
+        }
+
+        if (handled) {
+            ev.stopPropagation();
+            ev.preventDefault();
         }
     },
 
-    _recheckCallElement: function(selectedRoomId) {
-        // if we aren't viewing a room with an ongoing call, but there is an
-        // active call, show the call element - we need to do this to make
-        // audio/video not crap out
-        var activeCall = CallHandler.getAnyActiveCall();
-        var callForRoom = CallHandler.getCallForRoom(selectedRoomId);
-        var showCall = (activeCall && activeCall.call_state === 'connected' && !callForRoom);
-        this.setState({
-            showCallElement: showCall
-        });
+    _onMoveFocus: function(up) {
+        var element = this.focusedElement;
+
+        // unclear why this isn't needed
+        // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
+        // this.focusDirection = up;
+
+        var descending = false; // are we currently descending or ascending through the DOM tree?
+        var classes;
+
+        do {
+            var child = up ? element.lastElementChild : element.firstElementChild;
+            var sibling = up ? element.previousElementSibling : element.nextElementSibling;
+
+            if (descending) {
+                if (child) {
+                    element = child;
+                }
+                else if (sibling) {
+                    element = sibling;
+                }
+                else {
+                    descending = false;
+                    element = element.parentElement;
+                }
+            }
+            else {
+                if (sibling) {
+                    element = sibling;
+                    descending = true;
+                }
+                else {
+                    element = element.parentElement;
+                }
+            }
+
+            if (element) {
+                classes = element.classList;
+                if (classes.contains("mx_LeftPanel")) { // we hit the top
+                    element = up ? element.lastElementChild : element.firstElementChild;
+                    descending = true;
+                }
+            }
+
+        } while(element && !(
+            classes.contains("mx_RoomTile") ||
+            classes.contains("mx_SearchBox_search") ||
+            classes.contains("mx_RoomSubList_ellipsis")));
+
+        if (element) {
+            element.focus();
+            this.focusedElement = element;
+            this.focusedDescending = descending;
+        }
     },
 
     onHideClick: function() {
@@ -82,55 +159,37 @@ var LeftPanel = React.createClass({
         });
     },
 
-    onCallViewClick: function() {
-        var call = CallHandler.getAnyActiveCall();
-        if (call) {
-            dis.dispatch({
-                action: 'view_room',
-                room_id: call.groupRoomId || call.roomId,
-            });
-        }
-    },
-
     onSearch: function(term) {
         this.setState({ searchFilter: term });
     },
 
     render: function() {
-        var RoomList = sdk.getComponent('rooms.RoomList');
-        var BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
+        const RoomList = sdk.getComponent('rooms.RoomList');
+        const BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
+        const CallPreview = sdk.getComponent('voip.CallPreview');
 
-        var topBox;
+        let topBox;
         if (MatrixClientPeg.get().isGuest()) {
-            var LoginBox = sdk.getComponent('structures.LoginBox');
+            const LoginBox = sdk.getComponent('structures.LoginBox');
             topBox = <LoginBox collapsed={ this.props.collapsed }/>;
-        }
-        else {
-            var SearchBox = sdk.getComponent('structures.SearchBox');
+        } else {
+            const SearchBox = sdk.getComponent('structures.SearchBox');
             topBox = <SearchBox collapsed={ this.props.collapsed } onSearch={ this.onSearch } />;
         }
 
-        var classes = "mx_LeftPanel mx_fadable";
-        if (this.props.collapsed) {
-            classes += " collapsed";
-        }
-
-        var callPreview;
-        if (this.state.showCallElement && !this.props.collapsed) {
-            var CallView = sdk.getComponent('voip.CallView');
-            callPreview = (
-                <CallView
-                    className="mx_LeftPanel_callView" showVoice={true} onClick={this.onCallViewClick}
-                    ConferenceHandler={VectorConferenceHandler} />
-            );
-        }
+        let classes = classNames(
+            "mx_LeftPanel", "mx_fadable",
+            {
+                "collapsed": this.props.collapsed,
+                "mx_fadable_faded": this.props.disabled,
+            }
+        );
 
         return (
-            <aside className={classes} style={{ opacity: this.props.opacity }}>
+            <aside className={classes} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
                 { topBox }
-                { callPreview }
+                <CallPreview ConferenceHandler={VectorConferenceHandler} />
                 <RoomList
-                    selectedRoom={this.props.selectedRoom}
                     collapsed={this.props.collapsed}
                     searchFilter={this.state.searchFilter}
                     ConferenceHandler={VectorConferenceHandler} />
diff --git a/src/components/structures/LoginBox.js b/src/components/structures/LoginBox.js
index c9f8e87a10..7cacc14e8a 100644
--- a/src/components/structures/LoginBox.js
+++ b/src/components/structures/LoginBox.js
@@ -84,7 +84,7 @@ module.exports = React.createClass({
 
         var self = this;
         return (
-            <div className="mx_SearchBox">
+            <div className="mx_SearchBox mx_LoginBox">
                 { loginButton }
                 { toggleCollapse }
             </div>
diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 6c5c1fe1c4..e6bfea83ef 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -1,5 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,77 +16,111 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-'use strict';
-
 import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import sdk from 'matrix-react-sdk';
-import Matrix from "matrix-js-sdk";
 import dis from 'matrix-react-sdk/lib/dispatcher';
-import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+import MatrixClient from 'matrix-js-sdk';
 import Analytics from 'matrix-react-sdk/lib/Analytics';
 import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
-import Modal from 'matrix-react-sdk/lib/Modal';
 import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+import { showGroupInviteDialog, showGroupAddRoomDialog } from 'matrix-react-sdk/lib/GroupAddressPicker';
+import GroupStoreCache from 'matrix-react-sdk/lib/stores/GroupStoreCache';
+
+class HeaderButton extends React.Component {
+    constructor() {
+        super();
+        this.onClick = this.onClick.bind(this);
+    }
+
+    onClick(ev) {
+        Analytics.trackEvent(...this.props.analytics);
+        dis.dispatch({
+            action: 'view_right_panel_phase',
+            phase: this.props.clickPhase,
+        });
+    }
+
+    render() {
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+        const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
+
+        return <AccessibleButton className="mx_RightPanel_headerButton" onClick={this.onClick} >
+            <div className="mx_RightPanel_headerButton_badge">
+                { this.props.badge ? this.props.badge : <span>&nbsp;</span> }
+            </div>
+            <TintableSvg src={this.props.iconSrc} width="25" height="25"/>
+            { this.props.isHighlighted ? <div className="mx_RightPanel_headerButton_highlight"></div> : <div/> }
+        </AccessibleButton>;
+    }
+}
+
+HeaderButton.propTypes = {
+    // Whether this button is highlighted
+    isHighlighted: PropTypes.bool.isRequired,
+    // The phase to swap to when the button is clicked
+    clickPhase: PropTypes.string.isRequired,
+    // The source file of the icon to display
+    iconSrc: PropTypes.string.isRequired,
+
+    // The badge to display above the icon
+    badge: PropTypes.node,
+    // The parameters to track the click event
+    analytics: PropTypes.arrayOf(PropTypes.string).isRequired,
+};
 
 module.exports = React.createClass({
     displayName: 'RightPanel',
 
     propTypes: {
-        userId: React.PropTypes.string, // if showing an orphaned MemberInfo page, this is set
+        // TODO: We're trying to move away from these being props, but we need to know
+        // whether we should be displaying a room or group member list
         roomId: React.PropTypes.string, // if showing panels for a given room, this is set
+        groupId: React.PropTypes.string, // if showing panels for a given group, this is set
         collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel
     },
 
+    contextTypes: {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    },
+
     Phase: {
-        MemberList: 'MemberList',
+        RoomMemberList: 'RoomMemberList',
+        GroupMemberList: 'GroupMemberList',
+        GroupRoomList: 'GroupRoomList',
         FilePanel: 'FilePanel',
         NotificationPanel: 'NotificationPanel',
-        MemberInfo: 'MemberInfo',
+        RoomMemberInfo: 'RoomMemberInfo',
+        GroupMemberInfo: 'GroupMemberInfo',
     },
 
     componentWillMount: function() {
         this.dispatcherRef = dis.register(this.onAction);
-        var cli = MatrixClientPeg.get();
+        const cli = this.context.matrixClient;
         cli.on("RoomState.members", this.onRoomStateMember);
     },
 
     componentWillUnmount: function() {
         dis.unregister(this.dispatcherRef);
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
+        if (this.context.matrixClient) {
+            this.context.matrixClient.removeListener("RoomState.members", this.onRoomStateMember);
         }
     },
 
     getInitialState: function() {
-        if (this.props.userId) {
-            var member = new Matrix.RoomMember(null, this.props.userId);
+        if (this.props.groupId) {
             return {
-                phase: this.Phase.MemberInfo,
-                member: member,
+                phase: this.Phase.GroupMemberList,
             };
         } else {
             return {
-                phase: this.Phase.MemberList
+                phase: this.Phase.RoomMemberList,
             };
         }
     },
 
-    onMemberListButtonClick: function() {
-        Analytics.trackEvent('Right Panel', 'Member List Button', 'click');
-        this.setState({ phase: this.Phase.MemberList });
-    },
-
-    onFileListButtonClick: function() {
-        Analytics.trackEvent('Right Panel', 'File List Button', 'click');
-        this.setState({ phase: this.Phase.FilePanel });
-    },
-
-    onNotificationListButtonClick: function() {
-        Analytics.trackEvent('Right Panel', 'Notification List Button', 'click');
-        this.setState({ phase: this.Phase.NotificationPanel });
-    },
-
     onCollapseClick: function() {
         dis.dispatch({
             action: 'hide_right_panel',
@@ -92,24 +128,32 @@ module.exports = React.createClass({
     },
 
     onInviteButtonClick: function() {
-        if (MatrixClientPeg.get().isGuest()) {
+        if (this.context.matrixClient.isGuest()) {
             dis.dispatch({action: 'view_set_mxid'});
             return;
         }
 
-        // call ChatInviteDialog
-        dis.dispatch({
-            action: 'view_invite',
-            roomId: this.props.roomId,
-        });
+        if (this.state.phase === this.Phase.GroupMemberList) {
+            showGroupInviteDialog(this.props.groupId);
+        } else if (this.state.phase === this.Phase.GroupRoomList) {
+            showGroupAddRoomDialog(this.props.groupId).then(() => {
+                this.forceUpdate();
+            });
+        } else {
+            // call AddressPickerDialog
+            dis.dispatch({
+                action: 'view_invite',
+                roomId: this.props.roomId,
+            });
+        }
     },
 
     onRoomStateMember: function(ev, state, member) {
         // redraw the badge on the membership list
-        if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
+        if (this.state.phase == this.Phase.RoomMemberList && member.roomId === this.props.roomId) {
             this._delayedUpdate();
         }
-        else if (this.state.phase === this.Phase.MemberInfo && member.roomId === this.props.roomId &&
+        else if (this.state.phase === this.Phase.RoomMemberInfo && member.roomId === this.props.roomId &&
                 member.userId === this.state.member.userId) {
             // refresh the member info (e.g. new power level)
             this._delayedUpdate();
@@ -127,62 +171,74 @@ module.exports = React.createClass({
             });
             if (payload.member) {
                 this.setState({
-                    phase: this.Phase.MemberInfo,
+                    phase: this.Phase.RoomMemberInfo,
                     member: payload.member,
                 });
+            } else {
+                if (this.props.roomId) {
+                    this.setState({
+                        phase: this.Phase.RoomMemberList,
+                    });
+                } else if (this.props.groupId) {
+                    this.setState({
+                        phase: this.Phase.GroupMemberList,
+                        groupId: payload.groupId,
+                        member: payload.member,
+                    });
+                }
             }
-            else {
-                this.setState({
-                    phase: this.Phase.MemberList
-                });
-            }
-        }
-        else if (payload.action === "view_room") {
-            if (this.state.phase === this.Phase.MemberInfo) {
-                this.setState({
-                    phase: this.Phase.MemberList
-                });
-            }
+        } else if (payload.action === "view_group") {
+            this.setState({
+                phase: this.Phase.GroupMemberList,
+                groupId: payload.groupId,
+                member: null,
+            });
+        } else if (payload.action === "view_group_user") {
+            this.setState({
+                phase: this.Phase.GroupMemberInfo,
+                groupId: payload.groupId,
+                member: payload.member,
+            });
+        } else if (payload.action === "view_room") {
+            this.setState({
+                phase: this.Phase.RoomMemberList,
+            });
+        } else if (payload.action === "view_right_panel_phase") {
+            this.setState({
+                phase: payload.phase,
+            });
         }
     },
 
     render: function() {
-        var MemberList = sdk.getComponent('rooms.MemberList');
-        var NotificationPanel = sdk.getComponent('structures.NotificationPanel');
-        var FilePanel = sdk.getComponent('structures.FilePanel');
-        var TintableSvg = sdk.getComponent("elements.TintableSvg");
-        var buttonGroup;
-        var inviteGroup;
-        var panel;
+        const MemberList = sdk.getComponent('rooms.MemberList');
+        const MemberInfo = sdk.getComponent('rooms.MemberInfo');
+        const NotificationPanel = sdk.getComponent('structures.NotificationPanel');
+        const FilePanel = sdk.getComponent('structures.FilePanel');
 
-        var filesHighlight;
-        var membersHighlight;
-        var notificationsHighlight;
-        if (!this.props.collapsed) {
-            if (this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) {
-                membersHighlight = <div className="mx_RightPanel_headerButton_highlight"></div>;
-            }
-            else if (this.state.phase == this.Phase.FilePanel) {
-                filesHighlight = <div className="mx_RightPanel_headerButton_highlight"></div>;
-            }
-            else if (this.state.phase == this.Phase.NotificationPanel) {
-                notificationsHighlight = <div className="mx_RightPanel_headerButton_highlight"></div>;
-            }
-        }
+        const GroupMemberList = sdk.getComponent('groups.GroupMemberList');
+        const GroupMemberInfo = sdk.getComponent('groups.GroupMemberInfo');
+        const GroupRoomList = sdk.getComponent('groups.GroupRoomList');
 
-        var membersBadge;
-        if ((this.state.phase == this.Phase.MemberList || this.state.phase === this.Phase.MemberInfo) && this.props.roomId) {
-            var cli = MatrixClientPeg.get();
-            var room = cli.getRoom(this.props.roomId);
-            var user_is_in_room;
+        const TintableSvg = sdk.getComponent("elements.TintableSvg");
+
+        let inviteGroup;
+
+        let membersBadge;
+        if ((this.state.phase == this.Phase.RoomMemberList || this.state.phase === this.Phase.RoomMemberInfo)
+            && this.props.roomId
+        ) {
+            const cli = this.context.matrixClient;
+            const room = cli.getRoom(this.props.roomId);
+            let userIsInRoom;
             if (room) {
                 membersBadge = room.getJoinedMembers().length;
-                user_is_in_room = room.hasMembershipState(
-                    MatrixClientPeg.get().credentials.userId, 'join'
+                userIsInRoom = room.hasMembershipState(
+                    this.context.matrixClient.credentials.userId, 'join',
                 );
             }
 
-            if (user_is_in_room) {
+            if (userIsInRoom) {
                 inviteGroup =
                     <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
                         <div className="mx_RightPanel_icon" >
@@ -191,51 +247,80 @@ module.exports = React.createClass({
                         <div className="mx_RightPanel_message">{ _t('Invite to this room') }</div>
                     </AccessibleButton>;
             }
-
         }
 
+        const isPhaseGroup = [
+            this.Phase.GroupMemberInfo,
+            this.Phase.GroupMemberList
+        ].includes(this.state.phase);
+
+        let headerButtons = [];
         if (this.props.roomId) {
-            buttonGroup =
-                    <div className="mx_RightPanel_headerButtonGroup">
-                        <AccessibleButton className="mx_RightPanel_headerButton"
-                                title={ _t('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={ _t('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={ _t('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={ _t("Hide panel") } onClick={ this.onCollapseClick }>
-                            <TintableSvg src="img/minimise.svg" width="10" height="16"/>
-                        </div>
-                    </div>;
+            headerButtons = [
+                <HeaderButton key="_membersButton" title={_t('Members')} iconSrc="img/icons-people.svg"
+                    isHighlighted={[this.Phase.RoomMemberList, this.Phase.RoomMemberInfo].includes(this.state.phase)}
+                    clickPhase={this.Phase.RoomMemberList}
+                    badge={membersBadge}
+                    analytics={['Right Panel', 'Member List Button', 'click']}
+                />,
+                <HeaderButton key="_filesButton" title={_t('Files')} iconSrc="img/icons-files.svg"
+                    isHighlighted={this.state.phase === this.Phase.FilePanel}
+                    clickPhase={this.Phase.FilePanel}
+                    analytics={['Right Panel', 'File List Button', 'click']}
+                />,
+                <HeaderButton key="_notifsButton" title={_t('Notifications')} iconSrc="img/icons-notifications.svg"
+                    isHighlighted={this.state.phase === this.Phase.NotificationPanel}
+                    clickPhase={this.Phase.NotificationPanel}
+                    analytics={['Right Panel', 'Notification List Button', 'click']}
+                />,
+            ];
+        } else if (this.props.groupId) {
+            headerButtons = [
+                <HeaderButton key="_groupMembersButton" title={_t('Members')} iconSrc="img/icons-people.svg"
+                    isHighlighted={isPhaseGroup}
+                    clickPhase={this.Phase.GroupMemberList}
+                    analytics={['Right Panel', 'Group Member List Button', 'click']}
+                />,
+                <HeaderButton key="_roomsButton" title={_t('Rooms')} iconSrc="img/icons-room.svg"
+                    isHighlighted={this.state.phase === this.Phase.GroupRoomList}
+                    clickPhase={this.Phase.GroupRoomList}
+                    analytics={['Right Panel', 'Group Room List Button', 'click']}
+                />,
+            ];
         }
 
+        if (this.props.roomId || this.props.groupId) {
+            // Hiding the right panel hides it completely and relies on an 'expand' button
+            // being put in the RoomHeader or GroupView header, so only show the minimise
+            // button on these 2 screens or you won't be able to re-expand the panel.
+            headerButtons.push(
+                <div className="mx_RightPanel_headerButton mx_RightPanel_collapsebutton" key="_minimizeButton"
+                    title={ _t("Hide panel") } onClick={ this.onCollapseClick }
+                >
+                    <TintableSvg src="img/minimise.svg" width="10" height="16"/>
+                </div>,
+            );
+        }
+
+        let panel = <div />;
         if (!this.props.collapsed) {
-            if(this.props.roomId && this.state.phase == this.Phase.MemberList) {
-                panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />
-            }
-            else if(this.state.phase == this.Phase.MemberInfo) {
-                var MemberInfo = sdk.getComponent('rooms.MemberInfo');
-                panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.props.userId} />
-            }
-            else if (this.state.phase == this.Phase.NotificationPanel) {
-                panel = <NotificationPanel />
-            }
-            else if (this.state.phase == this.Phase.FilePanel) {
-                panel = <FilePanel roomId={this.props.roomId} />
+            if (this.props.roomId && this.state.phase == this.Phase.RoomMemberList) {
+                panel = <MemberList roomId={this.props.roomId} key={this.props.roomId} />;
+            } else if (this.props.groupId && this.state.phase == this.Phase.GroupMemberList) {
+                panel = <GroupMemberList groupId={this.props.groupId} key={this.props.groupId} />;
+            } else if (this.state.phase === this.Phase.GroupRoomList) {
+                panel = <GroupRoomList groupId={this.props.groupId} key={this.props.groupId} />;
+            } else if (this.state.phase == this.Phase.RoomMemberInfo) {
+                panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />;
+            } else if (this.state.phase == this.Phase.GroupMemberInfo) {
+                panel = <GroupMemberInfo
+                    groupMember={this.state.member}
+                    groupId={this.props.groupId}
+                    key={this.state.member.user_id} />;
+            } else if (this.state.phase == this.Phase.NotificationPanel) {
+                panel = <NotificationPanel />;
+            } else if (this.state.phase == this.Phase.FilePanel) {
+                panel = <FilePanel roomId={this.props.roomId} />;
             }
         }
 
@@ -243,15 +328,40 @@ module.exports = React.createClass({
             panel = <div className="mx_RightPanel_blank"></div>;
         }
 
-        var classes = "mx_RightPanel mx_fadable";
-        if (this.props.collapsed) {
-            classes += " collapsed";
+        if (this.props.groupId &&
+            GroupStoreCache.getGroupStore(this.context.matrixClient, this.props.groupId).isUserPrivileged()
+        ) {
+            inviteGroup = isPhaseGroup ? (
+                <AccessibleButton 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">{ _t('Invite to this community') }</div>
+                </AccessibleButton>
+            ) : (
+                <AccessibleButton className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
+                    <div className="mx_RightPanel_icon" >
+                        <TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
+                    </div>
+                    <div className="mx_RightPanel_message">{ _t('Add rooms to this community') }</div>
+                </AccessibleButton>
+            );
         }
 
+        let classes = classNames(
+            "mx_RightPanel", "mx_fadable",
+            {
+                "collapsed": this.props.collapsed,
+                "mx_fadable_faded": this.props.disabled,
+            }
+        );
+
         return (
-            <aside className={classes} style={{ opacity: this.props.opacity }}>
+            <aside className={classes}>
                 <div className="mx_RightPanel_header">
-                    { buttonGroup }
+                    <div className="mx_RightPanel_headerButtonGroup">
+                        {headerButtons}
+                    </div>
                 </div>
                 { panel }
                 <div className="mx_RightPanel_footer">
@@ -259,5 +369,5 @@ module.exports = React.createClass({
                 </div>
             </aside>
         );
-    }
+    },
 });
diff --git a/src/components/structures/RoomDirectory.js b/src/components/structures/RoomDirectory.js
index 64a53d336d..323af86c5f 100644
--- a/src/components/structures/RoomDirectory.js
+++ b/src/components/structures/RoomDirectory.js
@@ -28,7 +28,7 @@ var linkify = require('linkifyjs');
 var linkifyString = require('linkifyjs/string');
 var linkifyMatrix = require('matrix-react-sdk/lib/linkify-matrix');
 var sanitizeHtml = require('sanitize-html');
-var q = require('q');
+import Promise from 'bluebird';
 
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
@@ -73,6 +73,7 @@ module.exports = React.createClass({
             this.protocols = response;
             this.setState({protocolsLoading: false});
         }, (err) => {
+            console.warn(`error loading thirdparty protocols: ${err}`);
             this.setState({protocolsLoading: false});
             if (MatrixClientPeg.get().isGuest()) {
                 // Guests currently aren't allowed to use this API, so
@@ -81,24 +82,24 @@ module.exports = React.createClass({
                 return;
             }
             const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Failed to get protocol list from Home Server', '', ErrorDialog, {
                 title: _t('Failed to get protocol list from Home Server'),
                 description: _t('The Home Server may be too old to support third party networks'),
             });
         });
 
         // dis.dispatch({
-        //     action: 'ui_opacity',
-        //     sideOpacity: 0.3,
-        //     middleOpacity: 0.3,
+        //     action: 'panel_disable',
+        //     sideDisabled: true,
+        //     middleDisabled: true,
         // });
     },
 
     componentWillUnmount: function() {
         // dis.dispatch({
-        //     action: 'ui_opacity',
-        //     sideOpacity: 1.0,
-        //     middleOpacity: 1.0,
+        //     action: 'panel_disable',
+        //     sideDisabled: false,
+        //     middleDisabled: false,
         // });
         if (this.filterTimeout) {
             clearTimeout(this.filterTimeout);
@@ -116,7 +117,7 @@ module.exports = React.createClass({
     },
 
     getMoreRooms: function() {
-        if (!MatrixClientPeg.get()) return q();
+        if (!MatrixClientPeg.get()) return Promise.resolve();
 
         const my_filter_string = this.state.filterString;
         const my_server = this.state.roomServer;
@@ -177,7 +178,7 @@ module.exports = React.createClass({
             this.setState({ loading: false });
             console.error("Failed to get publicRooms: %s", JSON.stringify(err));
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Failed to get public room list', '', ErrorDialog, {
                 title: _t('Failed to get public room list'),
                 description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
             });
@@ -205,7 +206,7 @@ module.exports = React.createClass({
             desc = _t('Remove %(name)s from the directory?', {name: name});
         }
 
-        Modal.createDialog(QuestionDialog, {
+        Modal.createTrackedDialog('Remove from Directory', '', QuestionDialog, {
             title: _t('Remove from Directory'),
             description: desc,
             onFinished: (should_delete) => {
@@ -226,7 +227,7 @@ module.exports = React.createClass({
                     modal.close();
                     this.refreshRoomList();
                     console.error("Failed to " + step + ": " + err);
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('Remove from Directory Error', '', ErrorDialog, {
                         title: _t('Error'),
                         description: ((err && err.message) ? err.message : _t('The server may be unavailable or overloaded'))
                     });
@@ -265,7 +266,7 @@ module.exports = React.createClass({
     },
 
     onFillRequest: function(backwards) {
-        if (backwards || !this.nextBatch) return q(false);
+        if (backwards || !this.nextBatch) return Promise.resolve(false);
 
         return this.getMoreRooms();
     },
@@ -315,7 +316,7 @@ module.exports = React.createClass({
             const fields = protocolName ? this._getFieldsForThirdPartyLocation(alias, this.protocols[protocolName], instance) : null;
             if (!fields) {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createDialog(ErrorDialog, {
+                Modal.createTrackedDialog('Unable to join network', '', ErrorDialog, {
                     title: _t('Unable to join network'),
                     description: _t('Riot does not know how to join a room on this network'),
                 });
@@ -326,14 +327,14 @@ module.exports = React.createClass({
                     this.showRoomAlias(resp[0].alias);
                 } else {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('Room not found', '', ErrorDialog, {
                         title: _t('Room not found'),
                         description: _t('Couldn\'t find a matching Matrix room'),
                     });
                 }
             }, (e) => {
                 const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                Modal.createDialog(ErrorDialog, {
+                Modal.createTrackedDialog('Fetching third party location failed', '', ErrorDialog, {
                     title: _t('Fetching third party location failed'),
                     description: _t('Unable to look up room ID from server'),
                 });
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 092ed9cca0..8fb7562f64 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -30,6 +30,7 @@ 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');
 import Modal from 'matrix-react-sdk/lib/Modal';
+import KeyCode from 'matrix-react-sdk/lib/KeyCode';
 
 // turn this on for drop & drag console debugging galore
 var debug = false;
@@ -74,8 +75,8 @@ var RoomSubList = React.createClass({
 
         order: React.PropTypes.string.isRequired,
 
-        // undefined if no room is selected (eg we are showing settings)
-        selectedRoom: React.PropTypes.string,
+        // passed through to RoomTile and used to highlight room with `!` regardless of notifications count
+        isInvite: React.PropTypes.bool,
 
         startAsHidden: React.PropTypes.bool,
         showSpinner: React.PropTypes.bool, // true to show a spinner if 0 elements when expanded
@@ -87,6 +88,7 @@ var RoomSubList = React.createClass({
         searchFilter: React.PropTypes.string,
         emptyContent: React.PropTypes.node, // content shown if the list is empty
         headerItems: React.PropTypes.node, // content shown in the sublist header
+        extraTiles: React.PropTypes.arrayOf(React.PropTypes.node), // extra elements added beneath tiles
     },
 
     getInitialState: function() {
@@ -100,7 +102,9 @@ var RoomSubList = React.createClass({
     getDefaultProps: function() {
         return {
             onHeaderClick: function() {}, // NOP
-            onShowMoreRooms: function() {} // NOP
+            onShowMoreRooms: function() {}, // NOP
+            extraTiles: [],
+            isInvite: false,
         };
     },
 
@@ -151,10 +155,11 @@ var RoomSubList = React.createClass({
         }
     },
 
-    onRoomTileClick(roomId) {
+    onRoomTileClick(roomId, ev) {
         dis.dispatch({
             action: 'view_room',
             room_id: roomId,
+            clear_search: (ev && (ev.keyCode == KeyCode.ENTER || ev.keyCode == KeyCode.SPACE)),
         });
     },
 
@@ -244,7 +249,7 @@ var RoomSubList = React.createClass({
         return this.props.list.reduce(function(result, room, index) {
             if (truncateAt === undefined || index >= truncateAt) {
                 var roomNotifState = RoomNotifs.getRoomNotifsState(room.roomId);
-                var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites';
+                var highlight = room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite;
                 var notificationCount = room.getUnreadNotificationCount();
 
                 const notifBadges = notificationCount > 0 && self._shouldShowNotifBadge(roomNotifState);
@@ -364,7 +369,6 @@ var RoomSubList = React.createClass({
         var self = this;
         var DNDRoomTile = sdk.getComponent("rooms.DNDRoomTile");
         return this.state.sortedList.map(function(room) {
-            var selected = room.roomId == self.props.selectedRoom;
             // XXX: is it evil to pass in self as a prop to RoomTile?
             return (
                 <DNDRoomTile
@@ -372,10 +376,9 @@ var RoomSubList = React.createClass({
                     roomSubList={ self }
                     key={ room.roomId }
                     collapsed={ self.props.collapsed || false}
-                    selected={ selected }
                     unread={ Unread.doesRoomHaveUnreadMessages(room) }
-                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.label === 'Invites' }
-                    isInvite={ self.props.label === 'Invites' }
+                    highlight={ room.getUnreadNotificationCount('highlight') > 0 || self.props.isInvite }
+                    isInvite={ self.props.isInvite }
                     refreshSubList={ self._updateSubListCount }
                     incomingCall={ null }
                     onClick={ self.onRoomTileClick }
@@ -407,6 +410,9 @@ var RoomSubList = React.createClass({
         var badge;
         if (subListNotifCount > 0) {
             badge = <div className={badgeClasses}>{ FormattingUtils.formatCount(subListNotifCount) }</div>;
+        } else if (this.props.isInvite) {
+            // no notifications but highlight anyway because this is an invite badge
+            badge = <div className={badgeClasses}>!</div>;
         }
 
         // When collapsed, allow a long hover on the header to show user
@@ -509,10 +515,10 @@ var RoomSubList = React.createClass({
                 if (list[i].tags[self.props.tagName] && list[i].tags[self.props.tagName].order === undefined) {
                     MatrixClientPeg.get().setRoomTag(list[i].roomId, self.props.tagName, {order: (order + 1.0) / 2.0}).finally(function() {
                         // Do any final stuff here
-                    }).fail(function(err) {
+                    }).catch(function(err) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                         console.error("Failed to add tag " + self.props.tagName + " to room" + err);
-                        Modal.createDialog(ErrorDialog, {
+                        Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
                             title: _t('Failed to add tag %(tagName)s to room', {tagName: self.props.tagName}),
                             description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
@@ -530,13 +536,14 @@ var RoomSubList = React.createClass({
         var label = this.props.collapsed ? null : this.props.label;
 
         let content;
-        if (this.state.sortedList.length == 0 && !this.props.searchFilter) {
+        if (this.state.sortedList.length === 0 && !this.props.searchFilter && this.props.extraTiles.length === 0) {
             content = this.props.emptyContent;
         } else {
             content = this.makeRoomTiles();
+            content.push(...this.props.extraTiles);
         }
 
-        if (this.state.sortedList.length > 0 || this.props.editable) {
+        if (this.state.sortedList.length > 0 || this.props.extraTiles.length > 0 || this.props.editable) {
             var subList;
             var classes = "mx_RoomSubList";
 
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 99c4486690..7de3958a59 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -16,12 +16,13 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+import React from 'react';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-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');
+import KeyCode from 'matrix-react-sdk/lib/KeyCode';
+import sdk from 'matrix-react-sdk';
+import dis from 'matrix-react-sdk/lib/dispatcher';
+import rate_limited_func from 'matrix-react-sdk/lib/ratelimitedfunc';
+import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
 
 module.exports = React.createClass({
     displayName: 'SearchBox',
@@ -46,18 +47,19 @@ module.exports = React.createClass({
     },
 
     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) {
+                if (this.refs.search && payload.clear_search) {
                     this._clearSearch();
                 }
                 break;
+            case 'focus_room_filter':
+                if (this.refs.search) {
+                    this.refs.search.focus();
+                    this.refs.search.select();
+                }
+                break;
         }
-*/        
     },
 
     onChange: function() {
@@ -86,6 +88,15 @@ module.exports = React.createClass({
         }
     },
 
+    _onKeyDown: function(ev) {
+        switch (ev.keyCode) {
+            case KeyCode.ESCAPE:
+                this._clearSearch();
+                dis.dispatch({action: 'focus_composer'});
+                break;
+        }
+    },
+
     _clearSearch: function() {
         this.refs.search.value = "";
         this.onChange();
@@ -135,6 +146,7 @@ module.exports = React.createClass({
                         className="mx_SearchBox_search"
                         value={ this.state.searchTerm }
                         onChange={ this.onChange }
+                        onKeyDown={ this._onKeyDown }
                         placeholder={ _t('Filter room names') }
                     />
                 ];
diff --git a/src/vector/updater.js b/src/components/views/context_menus/GenericTextContextMenu.js
similarity index 60%
rename from src/vector/updater.js
rename to src/components/views/context_menus/GenericTextContextMenu.js
index 19d40b4f38..2319fe05a2 100644
--- a/src/vector/updater.js
+++ b/src/components/views/context_menus/GenericTextContextMenu.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 OpenMarket Ltd
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+'use strict';
 
-var POKE_RATE_MS = 10 * 60 * 1000; // 10 min
+import React from 'react';
+import PropTypes from 'prop-types';
 
-module.exports = {
-    start: function() {
-        module.exports.poll();
-        setInterval(module.exports.poll, POKE_RATE_MS);
-    },
+export default class GenericTextContextMenu extends React.Component {
+    static PropTypes = {
+        message: PropTypes.string.isRequired,
+    };
 
-    poll: function() {
-        PlatformPeg.get().pollForUpdate();
+    render() {
+        return <div>{ this.props.message }</div>;
     }
-};
+}
diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js
index bc82778aae..a07d11626d 100644
--- a/src/components/views/context_menus/MessageContextMenu.js
+++ b/src/components/views/context_menus/MessageContextMenu.js
@@ -43,53 +43,67 @@ module.exports = React.createClass({
     getInitialState: function() {
         return {
             canRedact: false,
+            canPin: false,
         };
     },
 
     componentWillMount: function() {
-        MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkCanRedact);
-        this._checkCanRedact();
+        MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkPermissions);
+        this._checkPermissions();
     },
 
     componentWillUnmount: function() {
         const cli = MatrixClientPeg.get();
         if (cli) {
-            cli.removeListener('RoomMember.powerLevel', this._checkCanRedact);
+            cli.removeListener('RoomMember.powerLevel', this._checkPermissions);
         }
     },
 
-    _checkCanRedact: function() {
+    _checkPermissions: function() {
         const cli = MatrixClientPeg.get();
         const room = cli.getRoom(this.props.mxEvent.getRoomId());
+
         const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
-        this.setState({canRedact});
+        let canPin = room.currentState.mayClientSendStateEvent('m.room.pinned_events', cli);
+
+        // HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
+        if (!UserSettingsStore.isFeatureEnabled("feature_pinning")) canPin = false;
+
+        this.setState({canRedact, canPin});
+    },
+
+    _isPinned: function() {
+        const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+        const pinnedEvent = room.currentState.getStateEvents('m.room.pinned_events', '');
+        if (!pinnedEvent) return false;
+        return pinnedEvent.getContent().pinned.includes(this.props.mxEvent.getId());
     },
 
     onResendClick: function() {
         Resend.resend(this.props.mxEvent);
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onViewSourceClick: function() {
         const ViewSource = sdk.getComponent('structures.ViewSource');
-        Modal.createDialog(ViewSource, {
+        Modal.createTrackedDialog('View Event Source', '', ViewSource, {
             content: this.props.mxEvent.event,
         }, 'mx_Dialog_viewsource');
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onViewClearSourceClick: function() {
         const ViewSource = sdk.getComponent('structures.ViewSource');
-        Modal.createDialog(ViewSource, {
+        Modal.createTrackedDialog('View Clear Event Source', '', ViewSource, {
             // FIXME: _clearEvent is private
             content: this.props.mxEvent._clearEvent,
         }, 'mx_Dialog_viewsource');
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onRedactClick: function() {
         const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createDialog(ConfirmRedactDialog, {
+        Modal.createTrackedDialog('Confirm Redact Dialog', '', ConfirmRedactDialog, {
             onFinished: (proceed) => {
                 if (!proceed) return;
 
@@ -99,19 +113,19 @@ module.exports = React.createClass({
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
                     const code = e.errcode || e.statusCode;
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('You cannot delete this message', '', ErrorDialog, {
                         title: _t('Error'),
                         description: _t('You cannot delete this message. (%(code)s)', {code: code})
                     });
                 }).done();
             },
         }, 'mx_Dialog_confirmredact');
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onCancelSendClick: function() {
         Resend.removeFromQueue(this.props.mxEvent);
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onForwardClick: function() {
@@ -122,6 +136,28 @@ module.exports = React.createClass({
         this.closeMenu();
     },
 
+    onPinClick: function() {
+        MatrixClientPeg.get().getStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', '')
+            .catch(e => {
+                // Intercept the Event Not Found error and fall through the promise chain with no event.
+                if (e.errcode === "M_NOT_FOUND") return null;
+                throw e;
+            })
+            .then(event => {
+                const eventIds = (event ? event.pinned : []) || [];
+                if (!eventIds.includes(this.props.mxEvent.getId())) {
+                    // Not pinned - add
+                    eventIds.push(this.props.mxEvent.getId());
+                } else {
+                    // Pinned - remove
+                    eventIds.splice(eventIds.indexOf(this.props.mxEvent.getId()), 1);
+                }
+
+                MatrixClientPeg.get().sendStateEvent(this.props.mxEvent.getRoomId(), 'm.room.pinned_events', {pinned: eventIds}, '');
+            });
+        this.closeMenu();
+    },
+
     closeMenu: function() {
         if (this.props.onFinished) this.props.onFinished();
     },
@@ -130,15 +166,15 @@ module.exports = React.createClass({
         if (this.props.eventTileOps) {
             this.props.eventTileOps.unhideWidget();
         }
-        if (this.props.onFinished) this.props.onFinished();
+        this.closeMenu();
     },
 
     onQuoteClick: function() {
-        console.log(this.props.mxEvent);
         dis.dispatch({
             action: 'quote',
-            event: this.props.mxEvent,
+            text: this.props.eventTileOps.getInnerText(),
         });
+        this.closeMenu();
     },
 
     render: function() {
@@ -147,11 +183,13 @@ module.exports = React.createClass({
         let redactButton;
         let cancelButton;
         let forwardButton;
+        let pinButton;
         let viewSourceButton;
         let viewClearSourceButton;
         let unhidePreviewButton;
         let permalinkButton;
         let externalURLButton;
+        let quoteButton;
 
         if (eventStatus === 'not_sent') {
             resendButton = (
@@ -185,6 +223,14 @@ module.exports = React.createClass({
                         { _t('Forward Message') }
                     </div>
                 );
+
+                if (this.state.canPin) {
+                    pinButton = (
+                        <div className="mx_MessageContextMenu_field" onClick={this.onPinClick}>
+                            {this._isPinned() ? _t('Unpin Message') : _t('Pin Message')}
+                        </div>
+                    );
+                }
             }
         }
 
@@ -220,11 +266,13 @@ module.exports = React.createClass({
             </div>
         );
 
-        const quoteButton = (
-            <div className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
-                { _t('Quote') }
-            </div>
-        );
+        if (this.props.eventTileOps && this.props.eventTileOps.getInnerText) {
+            quoteButton = (
+                <div className="mx_MessageContextMenu_field" onClick={this.onQuoteClick}>
+                    { _t('Quote') }
+                </div>
+            );
+        }
 
         // Bridges can provide a 'external_url' to link back to the source.
         if( typeof(this.props.mxEvent.event.content.external_url) === "string") {
@@ -243,11 +291,12 @@ module.exports = React.createClass({
                 {redactButton}
                 {cancelButton}
                 {forwardButton}
+                {pinButton}
                 {viewSourceButton}
                 {viewClearSourceButton}
                 {unhidePreviewButton}
                 {permalinkButton}
-                {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
+                {quoteButton}
                 {externalURLButton}
             </div>
         );
diff --git a/src/components/views/context_menus/RoomTileContextMenu.js b/src/components/views/context_menus/RoomTileContextMenu.js
index a7b19689fe..1518bb22b4 100644
--- a/src/components/views/context_menus/RoomTileContextMenu.js
+++ b/src/components/views/context_menus/RoomTileContextMenu.js
@@ -17,11 +17,11 @@ limitations under the License.
 
 'use strict';
 
-import q from 'q';
+import Promise from 'bluebird';
 import React from 'react';
 import classNames from 'classnames';
 import sdk from 'matrix-react-sdk';
-import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import { _t, _td } from 'matrix-react-sdk/lib/languageHandler';
 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';
@@ -61,16 +61,16 @@ module.exports = React.createClass({
         const roomId = this.props.room.roomId;
         var cli = MatrixClientPeg.get();
         if (!cli.isGuest()) {
-            q.delay(500).then(function() {
+            Promise.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) {
+                    }).catch(function(err) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        Modal.createDialog(ErrorDialog, {
+                        Modal.createTrackedDialog('Failed to remove tag from room 1', '', ErrorDialog, {
                             title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOff}),
                             description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
@@ -85,9 +85,9 @@ module.exports = React.createClass({
                         if (self.props.onFinished) {
                             self.props.onFinished();
                         };
-                    }).fail(function(err) {
+                    }).catch(function(err) {
                         var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-                        Modal.createDialog(ErrorDialog, {
+                        Modal.createTrackedDialog('Failed to remove tag from room 2', '', ErrorDialog, {
                             title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOn}),
                             description: ((err && err.message) ? err.message : _t('Operation failed')),
                         });
@@ -148,7 +148,7 @@ module.exports = React.createClass({
             };
         }, (err) => {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Failed to set Direct Message status of room', '', ErrorDialog, {
                 title: _t('Failed to set Direct Message status of room'),
                 description: ((err && err.message) ? err.message : _t('Operation failed')),
             });
@@ -185,9 +185,9 @@ module.exports = React.createClass({
         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 errCode = err.errcode || _td("unknown error code");
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Failed to forget room', '', ErrorDialog, {
                 title: _t('Failed to forget room %(errCode)s', {errCode: errCode}),
                 description: ((err && err.message) ? err.message : _t('Operation failed')),
             });
@@ -212,7 +212,7 @@ module.exports = React.createClass({
         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(() => {
+            return Promise.delay(500).then(() => {
                 if (this._unmounted) return;
                 // Close the context menu
                 if (this.props.onFinished) {
diff --git a/src/components/views/dialogs/BugReportDialog.js b/src/components/views/dialogs/BugReportDialog.js
index 0db425e33f..849d32f851 100644
--- a/src/components/views/dialogs/BugReportDialog.js
+++ b/src/components/views/dialogs/BugReportDialog.js
@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import sdk from 'matrix-react-sdk';
 import SdkConfig from 'matrix-react-sdk/lib/SdkConfig';
+import Modal from 'matrix-react-sdk/lib/Modal';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 export default class BugReportDialog extends React.Component {
@@ -64,8 +65,13 @@ export default class BugReportDialog extends React.Component {
                 progressCallback: this._sendProgressCallback,
             }).then(() => {
                 if (!this._unmounted) {
-                    this.setState({ busy: false, progress: null });
                     this.props.onFinished(false);
+                    const QuestionDialog = sdk.getComponent("dialogs.QuestionDialog");
+                    Modal.createTrackedDialog('Bug report sent', '', QuestionDialog, {
+                        title: _t('Bug report sent'),
+                        description: _t('Thank you!'),
+                        hasCancelButton: false,
+                    });
                 }
             }, (err) => {
                 if (!this._unmounted) {
diff --git a/src/components/views/dialogs/DevtoolsDialog.js b/src/components/views/dialogs/DevtoolsDialog.js
new file mode 100644
index 0000000000..7760ea8418
--- /dev/null
+++ b/src/components/views/dialogs/DevtoolsDialog.js
@@ -0,0 +1,350 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+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 { _t } from 'matrix-react-sdk/lib/languageHandler';
+import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
+
+class SendCustomEvent extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onBack: React.PropTypes.func.isRequired,
+
+        eventType: React.PropTypes.string.isRequired,
+        evContent: React.PropTypes.string.isRequired,
+    };
+
+    static defaultProps = {
+        eventType: '',
+        evContent: '{\n\n}',
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this._send = this._send.bind(this);
+        this.onBack = this.onBack.bind(this);
+        this._onChange = this._onChange.bind(this);
+
+        this.state = {
+            message: null,
+            input_eventType: this.props.eventType,
+            input_evContent: this.props.evContent,
+        };
+    }
+
+    onBack() {
+        if (this.state.message) {
+            this.setState({ message: null });
+        } else {
+            this.props.onBack();
+        }
+    }
+
+    _buttons() {
+        return <div className="mx_Dialog_buttons">
+            <button onClick={this.onBack}>{ _t('Back') }</button>
+            { !this.state.message && <button onClick={this._send}>{ _t('Send') }</button> }
+        </div>;
+    }
+
+    send(content) {
+        return MatrixClientPeg.get().sendEvent(this.props.roomId, this.state.input_eventType, content);
+    }
+
+    async _send() {
+        if (this.state.input_eventType === '') {
+            this.setState({ message: _t('You must specify an event type!') });
+            return;
+        }
+
+        let message;
+        try {
+            const content = JSON.parse(this.state.input_evContent);
+            await this.send(content);
+            message = _t('Event sent!');
+        } catch (e) {
+            message = _t('Failed to send custom event.') + ' (' + e.toString() + ')';
+        }
+        this.setState({ message });
+    }
+
+    _additionalFields() {
+        return <div />;
+    }
+
+    _onChange(e) {
+        this.setState({[`input_${e.target.id}`]: e.target.value});
+    }
+
+    render() {
+        if (this.state.message) {
+            return <div>
+                <div className="mx_Dialog_content">
+                    { this.state.message }
+                </div>
+                { this._buttons() }
+            </div>;
+        }
+
+        return <div>
+            <div className="mx_Dialog_content">
+                { this._additionalFields() }
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="eventType"> { _t('Event Type') } </label>
+                </div>
+                <div>
+                    <input id="eventType" onChange={this._onChange} value={this.state.input_eventType} className="mx_TextInputDialog_input" size="64" />
+                </div>
+
+                <div className="mx_TextInputDialog_label">
+                    <label htmlFor="evContent"> { _t('Event Content') } </label>
+                </div>
+                <div>
+                    <textarea id="evContent" onChange={this._onChange} value={this.state.input_evContent} className="mx_TextInputDialog_input" cols="63" rows="5" />
+                </div>
+            </div>
+            { this._buttons() }
+        </div>;
+    }
+}
+
+class SendCustomStateEvent extends SendCustomEvent {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onBack: React.PropTypes.func.isRequired,
+
+        eventType: React.PropTypes.string.isRequired,
+        evContent: React.PropTypes.string.isRequired,
+        stateKey: React.PropTypes.string.isRequired,
+    };
+
+    static defaultProps = {
+        eventType: '',
+        evContent: '{\n\n}',
+        stateKey: '',
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this.state['input_stateKey'] = this.props.stateKey;
+    }
+
+    send(content) {
+        const cli = MatrixClientPeg.get();
+        return cli.sendStateEvent(this.props.roomId, this.state.input_eventType, content, this.state.input_stateKey);
+    }
+
+    _additionalFields() {
+        return <div>
+            <div className="mx_TextInputDialog_label">
+                <label htmlFor="stateKey"> { _t('State Key') } </label>
+            </div>
+            <div>
+                <input id="stateKey" onChange={this._onChange} value={this.state.input_stateKey} className="mx_TextInputDialog_input" size="64" />
+            </div>
+        </div>;
+    }
+}
+
+class RoomStateExplorer extends React.Component {
+    static propTypes = {
+        setMode: React.PropTypes.func.isRequired,
+        roomId: React.PropTypes.string.isRequired,
+        onBack: React.PropTypes.func.isRequired,
+    };
+
+    constructor(props, context) {
+        super(props, context);
+
+        const room = MatrixClientPeg.get().getRoom(this.props.roomId);
+        this.roomStateEvents = room.currentState.events;
+
+        this.onBack = this.onBack.bind(this);
+        this.editEv = this.editEv.bind(this);
+        this.onQuery = this.onQuery.bind(this);
+    }
+
+    state = {
+        query: '',
+        eventType: null,
+        event: null,
+    };
+
+    browseEventType(eventType) {
+        return () => {
+            this.setState({ eventType });
+        };
+    }
+
+    onViewSourceClick(event) {
+        return () => {
+            this.setState({ event });
+        };
+    }
+
+    onBack() {
+        if (this.state.event) {
+            this.setState({ event: null });
+        } else if (this.state.eventType) {
+            this.setState({ eventType: null });
+        } else {
+            this.props.onBack();
+        }
+    }
+
+    editEv() {
+        const ev = this.state.event;
+        this.props.setMode(SendCustomStateEvent, {
+            eventType: ev.getType(),
+            evContent: JSON.stringify(ev.getContent(), null, '\t'),
+            stateKey: ev.getStateKey(),
+        });
+    }
+
+    onQuery(ev) {
+        this.setState({ query: ev.target.value });
+    }
+
+    render() {
+        if (this.state.event) {
+            return <div className="mx_ViewSource">
+                <div className="mx_Dialog_content">
+                    <pre>{ JSON.stringify(this.state.event.event, null, 2) }</pre>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onBack}>{ _t('Back') }</button>
+                    <button onClick={this.editEv}>{ _t('Edit') }</button>
+                </div>
+            </div>;
+        }
+
+        const rows = [];
+
+        if (this.state.eventType === null) {
+            Object.keys(this.roomStateEvents).forEach((evType) => {
+                // Skip this entry if does not contain search query
+                if (this.state.query && !evType.toLowerCase().includes(this.state.query.toLowerCase())) return;
+
+                const stateGroup = this.roomStateEvents[evType];
+                const stateKeys = Object.keys(stateGroup);
+
+                let onClickFn;
+                if (stateKeys.length > 1) {
+                    onClickFn = this.browseEventType(evType);
+                } else if (stateKeys.length === 1) {
+                    onClickFn = this.onViewSourceClick(stateGroup[stateKeys[0]]);
+                }
+
+                rows.push(<button className="mx_DevTools_RoomStateExplorer_button" key={evType} onClick={onClickFn}>
+                    { evType }
+                </button>);
+            });
+        } else {
+            const evType = this.state.eventType;
+            const stateGroup = this.roomStateEvents[evType];
+            Object.keys(stateGroup).forEach((stateKey) => {
+                // Skip this entry if does not contain search query
+                if (this.state.query && !stateKey.toLowerCase().includes(this.state.query.toLowerCase())) return;
+
+                const ev = stateGroup[stateKey];
+                rows.push(<button className="mx_DevTools_RoomStateExplorer_button" key={stateKey}
+                                  onClick={this.onViewSourceClick(ev)}>
+                    { stateKey }
+                </button>);
+            });
+        }
+
+        return <div>
+            <div className="mx_Dialog_content">
+                <input onChange={this.onQuery} placeholder={_t('Filter results')} size="64" className="mx_TextInputDialog_input mx_DevTools_RoomStateExplorer_query" value={this.state.query} />
+                { rows }
+            </div>
+            <div className="mx_Dialog_buttons">
+                <button onClick={this.onBack}>{ _t('Back') }</button>
+            </div>
+        </div>;
+    }
+}
+
+export default class DevtoolsDialog extends React.Component {
+    static propTypes = {
+        roomId: React.PropTypes.string.isRequired,
+        onFinished: React.PropTypes.func.isRequired,
+    };
+
+    state = {
+        mode: null,
+        modeArgs: {},
+    };
+
+    constructor(props, context) {
+        super(props, context);
+        this.onBack = this.onBack.bind(this);
+        this.setMode = this.setMode.bind(this);
+        this.onCancel = this.onCancel.bind(this);
+    }
+
+    componentWillUnmount() {
+        this._unmounted = true;
+    }
+
+    _setMode(mode) {
+        return () => {
+            this.setMode(mode);
+        };
+    }
+
+    setMode(mode, modeArgs={}) {
+        this.setState({ mode, modeArgs });
+    }
+
+    onBack() {
+        this.setState({ mode: null });
+    }
+
+    onCancel() {
+        this.props.onFinished(false);
+    }
+
+    render() {
+        let body;
+
+        if (this.state.mode) {
+            body =
+                <this.state.mode {...this.props} {...this.state.modeArgs} onBack={this.onBack} setMode={this.setMode} />;
+        } else {
+            body = <div>
+                <div className="mx_Dialog_content">
+                    <button onClick={this._setMode(SendCustomEvent)}>{ _t('Send Custom Event') }</button>
+                    <button onClick={this._setMode(SendCustomStateEvent)}>{ _t('Send Custom State Event') }</button>
+                    <button onClick={this._setMode(RoomStateExplorer)}>{ _t('Explore Room State') }</button>
+                </div>
+                <div className="mx_Dialog_buttons">
+                    <button onClick={this.onCancel}>{ _t('Cancel') }</button>
+                </div>
+            </div>;
+        }
+
+        const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
+        return (
+            <BaseDialog className="mx_QuestionDialog" onFinished={this.props.onFinished} title={_t('Developer Tools')}>
+                <div>Room ID: { this.props.roomId }</div>
+                { body }
+            </BaseDialog>
+        );
+    }
+}
diff --git a/src/components/views/directory/NetworkDropdown.js b/src/components/views/directory/NetworkDropdown.js
index c891ee5b29..9c19cdbced 100644
--- a/src/components/views/directory/NetworkDropdown.js
+++ b/src/components/views/directory/NetworkDropdown.js
@@ -150,7 +150,21 @@ export default class NetworkDropdown extends React.Component {
                 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) {
+
+                        const sortedInstances = this.props.protocols[proto].instances;
+                        sortedInstances.sort(function(x, y) {
+                            const a = x.desc
+                            const b = y.desc
+                            if (a < b) {
+                                return -1;
+                            } else if (a > b) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+                        });
+
+                        for (const instance of sortedInstances) {
                             if (!instance.instance_id) continue;
                             options.push(this._makeMenuOption(server, instance, false));
                         }
diff --git a/src/components/views/elements/ImageView.js b/src/components/views/elements/ImageView.js
index dd0490ac0c..bdb9d17f26 100644
--- a/src/components/views/elements/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -66,7 +66,7 @@ module.exports = React.createClass({
 
     onRedactClick: function() {
         const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
-        Modal.createDialog(ConfirmRedactDialog, {
+        Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
             onFinished: (proceed) => {
                 if (!proceed) return;
                 var self = this;
@@ -76,7 +76,7 @@ module.exports = React.createClass({
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     // display error message stating you couldn't delete this.
                     var code = e.errcode || e.statusCode;
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('You cannot delete this image.', '', ErrorDialog, {
                         title: _t('Error'),
                         description: _t('You cannot delete this image. (%(code)s)', {code: code})
                     });
@@ -150,15 +150,23 @@ module.exports = React.createClass({
 
         var eventMeta;
         if(showEventMeta) {
+            // Figure out the sender, defaulting to mxid
+            let sender = this.props.mxEvent.getSender();
+            const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
+            if (room) {
+                const member = room.getMember(sender);
+                if (member) sender = member.name;
+            }
+
             eventMeta = (<div className="mx_ImageView_metadata">
-                { _t('Uploaded on %(date)s by %(user)s', {date: DateUtils.formatDate(new Date(this.props.mxEvent.getTs())), user: this.props.mxEvent.getSender()}) }
+                { _t('Uploaded on %(date)s by %(user)s', {date: DateUtils.formatDate(new Date(this.props.mxEvent.getTs())), user: sender}) }
             </div>);
         }
 
         var eventRedact;
         if(showEventMeta) {
             eventRedact = (<div className="mx_ImageView_button" onClick={this.onRedactClick}>
-                { _t('Redact') }
+                { _t('Remove') }
             </div>);
         }
 
diff --git a/src/components/views/globals/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
index 488b5def47..06bfa36e9e 100644
--- a/src/components/views/globals/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -35,7 +35,7 @@ module.exports = React.createClass({
     render: function() {
         return (
             <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
+                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning"/>
                 <div className="mx_MatrixToolbar_content">
                    { _t('You are not receiving desktop notifications') } <a className="mx_MatrixToolbar_link" onClick={ this.onClick }> { _t('Enable them now') }</a>
                 </div>
diff --git a/src/components/views/globals/NewVersionBar.js b/src/components/views/globals/NewVersionBar.js
index 219ef02a9a..f56d1a51b7 100644
--- a/src/components/views/globals/NewVersionBar.js
+++ b/src/components/views/globals/NewVersionBar.js
@@ -40,7 +40,7 @@ export default React.createClass({
 
     displayReleaseNotes: function(releaseNotes) {
         const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
-        Modal.createDialog(QuestionDialog, {
+        Modal.createTrackedDialog('Display release notes', '', QuestionDialog, {
             title: _t("What's New"),
             description: <pre className="changelog_text">{releaseNotes}</pre>,
             button: _t("Update"),
@@ -54,7 +54,7 @@ export default React.createClass({
 
     displayChangelog: function() {
         const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
-        Modal.createDialog(ChangelogDialog, {
+        Modal.createTrackedDialog('Display Changelog', '', ChangelogDialog, {
             version: this.props.version,
             newVersion: this.props.newVersion,
             onFinished: (update) => {
@@ -96,7 +96,7 @@ export default React.createClass({
         }
         return (
             <div className="mx_MatrixToolbar">
-                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
+                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="Warning"/>
                 <div className="mx_MatrixToolbar_content">
                     {_t("A new version of Riot is available.")}
                 </div>
diff --git a/src/components/views/globals/PasswordNagBar.js b/src/components/views/globals/PasswordNagBar.js
index 37d011a605..bf71fa2c2f 100644
--- a/src/components/views/globals/PasswordNagBar.js
+++ b/src/components/views/globals/PasswordNagBar.js
@@ -20,11 +20,12 @@ import React from 'react';
 import sdk from 'matrix-react-sdk';
 import Modal from 'matrix-react-sdk/lib/Modal';
 import dis from 'matrix-react-sdk/lib/dispatcher';
+import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
 
 export default React.createClass({
     onUpdateClicked: function() {
         const SetPasswordDialog = sdk.getComponent('dialogs.SetPasswordDialog');
-        Modal.createDialog(SetPasswordDialog, {
+        Modal.createTrackedDialog('Set Password Dialog', 'Password Nag Bar', SetPasswordDialog, {
             onFinished: (passwordChanged) => {
                 if (!passwordChanged) {
                     return;
@@ -33,12 +34,11 @@ export default React.createClass({
                 dis.dispatch({
                     action: 'password_changed',
                 });
-            }
+            },
         });
     },
 
     render: function() {
-        const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
         const toolbarClasses = "mx_MatrixToolbar mx_MatrixToolbar_clickable";
         return (
             <div className={toolbarClasses} onClick={this.onUpdateClicked}>
@@ -49,12 +49,16 @@ export default React.createClass({
                     alt="Warning"
                 />
                 <div className="mx_MatrixToolbar_content">
-                    To return to your account in future you need to <u>set a password</u>
+                    { _tJsx(
+                        "To return to your account in future you need to <u>set a password</u>",
+                        /<u>(.*?)<\/u>/,
+                        (sub) => { return <u>{ sub }</u>; },
+                    ) }
                 </div>
                 <button className="mx_MatrixToolbar_action">
-                    Set Password
+                    { _t("Set Password") }
                 </button>
             </div>
         );
-    }
+    },
 });
diff --git a/src/components/views/globals/UpdateCheckBar.js b/src/components/views/globals/UpdateCheckBar.js
new file mode 100644
index 0000000000..926ccbcccf
--- /dev/null
+++ b/src/components/views/globals/UpdateCheckBar.js
@@ -0,0 +1,85 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+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 { _t } from 'matrix-react-sdk/lib/languageHandler';
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import {updateCheckStatusEnum} from '../../../vector/platform/VectorBasePlatform';
+import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
+
+const doneStatuses = [
+    updateCheckStatusEnum.ERROR,
+    updateCheckStatusEnum.NOTAVAILABLE,
+];
+
+export default React.createClass({
+    propTypes: {
+        status: React.PropTypes.oneOf(Object.values(updateCheckStatusEnum)).isRequired,
+        // Currently for error detail but will be usable for download progress
+        // once that is a thing that squirrel passes through electron.
+        detail: React.PropTypes.string,
+    },
+
+    getDefaultProps: function() {
+        return {
+            detail: '',
+        }
+    },
+
+    getStatusText: function() {
+        switch(this.props.status) {
+            case updateCheckStatusEnum.ERROR:
+                return _t('Error encountered (%(errorDetail)s).', { errorDetail: this.props.detail });
+            case updateCheckStatusEnum.CHECKING:
+                return _t('Checking for an update...');
+            case updateCheckStatusEnum.NOTAVAILABLE:
+                return _t('No update available.');
+            case updateCheckStatusEnum.DOWNLOADING:
+                return _t('Downloading update...');
+        }
+    }
+    ,
+
+    hideToolbar: function() {
+        PlatformPeg.get().stopUpdateCheck();
+    },
+
+    render: function() {
+        const message = this.getStatusText();
+        const warning = _t('Warning');
+
+        let image;
+        if (doneStatuses.includes(this.props.status)) {
+            image = <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt={warning}/>;
+        } else {
+            image = <img className="mx_MatrixToolbar_warning" src="img/spinner.gif" width="24" height="23" alt={message}/>;
+        }
+
+        return (
+            <div className="mx_MatrixToolbar">
+                {image}
+                <div className="mx_MatrixToolbar_content">
+                    {message}
+                </div>
+                <AccessibleButton className="mx_MatrixToolbar_close" onClick={this.hideToolbar}>
+                    <img src="img/cancel.svg" width="18" height="18" />
+                </AccessibleButton>
+            </div>
+        );
+    }
+});
diff --git a/src/components/views/login/VectorCustomServerDialog.js b/src/components/views/login/VectorCustomServerDialog.js
index 80cd68006f..8395f1396c 100644
--- a/src/components/views/login/VectorCustomServerDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +32,13 @@ module.exports = React.createClass({
                     { _t('Custom Server Options') }
                 </div>
                 <div className="mx_Dialog_content">
-                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t('customServer_text'))}} />
+                    <span dangerouslySetInnerHTML={{__html: sanitizeHtml(_t(
+                        "You can use the custom server options to sign into other Matrix "+
+                        "servers by specifying a different Home server URL.<br/>This allows "+
+                        "you to use Riot with an existing Matrix account on a different home "+
+                        "server.<br/><br/>You can also set a custom identity server but you won't "+
+                        "be able to invite users by email address, or be invited by email address yourself.",
+                    ))}} />
                 </div>
                 <div className="mx_Dialog_buttons">
                     <button onClick={this.props.onFinished} autoFocus={true}>
diff --git a/src/components/views/login/VectorLoginFooter.js b/src/components/views/login/VectorLoginFooter.js
index e905afc1de..b04dcdb597 100644
--- a/src/components/views/login/VectorLoginFooter.js
+++ b/src/components/views/login/VectorLoginFooter.js
@@ -30,7 +30,7 @@ module.exports = React.createClass({
             <div className="mx_Login_links">
                 <a href="https://medium.com/@RiotChat">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://twitter.com/@RiotChat">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-                <a href="https://github.com/vector-im/vector-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
+                <a href="https://github.com/vector-im/riot-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://matrix.org">{ _t('powered by Matrix') }</a>
             </div>
         );
diff --git a/src/components/views/login/VectorLoginHeader.js b/src/components/views/login/VectorLoginHeader.js
index 1b071c6aca..3aa8811c40 100644
--- a/src/components/views/login/VectorLoginHeader.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -16,10 +16,11 @@ limitations under the License.
 
 'use strict';
 
-var React = require('react');
+import React from 'react';
+import PropTypes from 'prop-types';
 
 const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
-const DEFAULT_LOGO_URI = "img/logos/riot-logo-" + i + ".svg";
+const DEFAULT_LOGO_URI = "img/logos/riot-im-logo-" + i + ".svg";
 
 module.exports = React.createClass({
     displayName: 'VectorLoginHeader',
@@ -27,7 +28,7 @@ module.exports = React.createClass({
         replaces: 'LoginHeader',
     },
     propTypes: {
-        icon: React.PropTypes.string,
+        icon: PropTypes.string,
     },
 
     render: function() {
diff --git a/src/components/views/rooms/DNDRoomTile.js b/src/components/views/rooms/DNDRoomTile.js
index 7857da9dbe..430906d21b 100644
--- a/src/components/views/rooms/DNDRoomTile.js
+++ b/src/components/views/rooms/DNDRoomTile.js
@@ -89,7 +89,7 @@ var roomTileSource = {
                 }, (err) => {
                     const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to set direct chat tag " + err);
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('Failed to set direct chat tag', '', ErrorDialog, {
                         title: _t('Failed to set direct chat tag'),
                         description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
@@ -111,10 +111,10 @@ var roomTileSource = {
                 //component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
                 MatrixClientPeg.get().deleteRoomTag(item.room.roomId, prevTag).finally(function() {
                     //component.state.set({ spinner: component.state.spinner-- });
-                }).fail(function(err) {
+                }).catch(function(err) {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to remove tag " + prevTag + " from room: " + err);
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('Failed to remove tag from room', '', ErrorDialog, {
                         title: _t('Failed to remove tag %(tagName)s from room', {tagName: prevTag}),
                         description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
@@ -130,13 +130,10 @@ var roomTileSource = {
             if (newTag && newTag !== 'im.vector.fake.direct' &&
                 (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() {
-                    //component.state.set({ spinner: component.state.spinner-- });
-                }).fail(function(err) {
+                MatrixClientPeg.get().setRoomTag(item.room.roomId, newTag, newOrder).catch(function(err) {
                     var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                     console.error("Failed to add tag " + newTag + " to room: " + err);
-                    Modal.createDialog(ErrorDialog, {
+                    Modal.createTrackedDialog('Failed to add tag to room', '', ErrorDialog, {
                         title: _t('Failed to add tag %(tagName)s to room', {tagName: newTag}),
                         description: ((err && err.message) ? err.message : _t('Operation failed')),
                     });
diff --git a/src/components/views/settings/Notifications.js b/src/components/views/settings/Notifications.js
index 1b8de52d9d..6e497d6225 100644
--- a/src/components/views/settings/Notifications.js
+++ b/src/components/views/settings/Notifications.js
@@ -17,7 +17,7 @@ limitations under the License.
 'use strict';
 var React = require('react');
 import { _t, _tJsx } from 'matrix-react-sdk/lib/languageHandler';
-var q = require("q");
+import Promise from 'bluebird';
 var sdk = require('matrix-react-sdk');
 var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
 var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore');
@@ -116,6 +116,11 @@ module.exports = React.createClass({
         UserSettingsStore.setEnableNotifications(event.target.checked);
     },
 
+    onEnableDesktopNotificationBodyChange: function(event) {
+        UserSettingsStore.setEnableNotificationBody(event.target.checked);
+        this.forceUpdate();
+    },
+
     onEnableEmailNotificationsChange: function(address, event) {
         var emailPusherPromise;
         if (event.target.checked) {
@@ -131,7 +136,7 @@ module.exports = React.createClass({
             this._refreshFromServer();
         }, (error) => {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Error saving email notification preferences', '', ErrorDialog, {
                 title: _t('Error saving email notification preferences'),
                 description: _t('An error occurred whilst saving your email notification preferences.'),
             });
@@ -175,7 +180,7 @@ module.exports = React.createClass({
         }
 
         var TextInputDialog = sdk.getComponent("dialogs.TextInputDialog");
-        Modal.createDialog(TextInputDialog, {
+        Modal.createTrackedDialog('Keywords Dialog', '', TextInputDialog, {
             title: _t('Keywords'),
             description: _t('Enter keywords separated by a comma:'),
             button: _t('OK'),
@@ -236,12 +241,12 @@ module.exports = React.createClass({
                 }
             }
 
-            q.all(deferreds).done(function() {
+            Promise.all(deferreds).done(function() {
                 self._refreshFromServer();
             }, function(error) {
                 var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
                 console.error("Failed to change settings: " + error);
-                Modal.createDialog(ErrorDialog, {
+                Modal.createTrackedDialog('Failed to change settings', '', ErrorDialog, {
                     title: _t('Failed to change settings'),
                     description: ((error && error.message) ? error.message : _t('Operation failed')),
                     onFinished: self._refreshFromServer
@@ -306,12 +311,12 @@ module.exports = React.createClass({
             }
         }
 
-        q.all(deferreds).done(function(resps) {
+        Promise.all(deferreds).done(function(resps) {
             self._refreshFromServer();
         }, function(error) {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Can't update user notification settings: " + error);
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Can\'t update user notifcation settings', '', ErrorDialog, {
                 title: _t('Can\'t update user notification settings'),
                 description: ((error && error.message) ? error.message : _t('Operation failed')),
                 onFinished: self._refreshFromServer
@@ -353,7 +358,7 @@ module.exports = React.createClass({
         var onError = function(error) {
             var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
             console.error("Failed to update keywords: " + error);
-            Modal.createDialog(ErrorDialog, {
+            Modal.createTrackedDialog('Failed to update keywords', '', ErrorDialog, {
                 title: _t('Failed to update keywords'),
                 description: ((error && error.message) ? error.message : _t('Operation failed')),
                 onFinished: self._refreshFromServer
@@ -361,7 +366,7 @@ module.exports = React.createClass({
         }
 
         // Then, add the new ones
-        q.all(removeDeferreds).done(function(resps) {
+        Promise.all(removeDeferreds).done(function(resps) {
             var deferreds = [];
 
             var pushRuleVectorStateKind = self.state.vectorContentRules.vectorState;
@@ -399,7 +404,7 @@ module.exports = React.createClass({
                 }
             }
 
-            q.all(deferreds).done(function(resps) {
+            Promise.all(deferreds).done(function(resps) {
                 self._refreshFromServer();
             }, onError);
         }, onError);
@@ -431,7 +436,9 @@ module.exports = React.createClass({
                             'global', kind, LEGACY_RULES[rule.rule_id], portLegacyActions(rule.actions)
                         ).then( function() {
                             return cli.deletePushRule('global', kind, rule.rule_id);
-                        })
+                        }).catch( (e) => {
+                            console.warn(`Error when porting legacy rule: ${e}`);
+                        });
                     }(kind, rule));
                 }
             }
@@ -440,7 +447,7 @@ module.exports = React.createClass({
         if (needsUpdate.length > 0) {
             // If some of the rules need to be ported then wait for the porting
             // to happen and then fetch the rules again.
-            return q.allSettled(needsUpdate).then( function() {
+            return Promise.all(needsUpdate).then( function() {
                 return cli.getPushRules();
             });
         } else {
@@ -594,7 +601,7 @@ module.exports = React.createClass({
             self.setState({pushers: resp.pushers});
         });
 
-        q.all([pushRulesPromise, pushersPromise]).then(function() {
+        Promise.all([pushRulesPromise, pushersPromise]).then(function() {
             self.setState({
                 phase: self.phases.DISPLAY
             });
@@ -829,6 +836,21 @@ module.exports = React.createClass({
                         </div>
                     </div>
 
+                    <div className="mx_UserNotifSettings_tableRow">
+                        <div className="mx_UserNotifSettings_inputCell">
+                            <input id="enableDesktopNotificationBody"
+                                ref="enableDesktopNotificationBody"
+                                type="checkbox"
+                                checked={ UserSettingsStore.getEnableNotificationBody() }
+                                onChange={ this.onEnableDesktopNotificationBodyChange } />
+                        </div>
+                        <div className="mx_UserNotifSettings_labelCell">
+                            <label htmlFor="enableDesktopNotificationBody">
+                                { _t('Show message in desktop notification') }
+                            </label>
+                        </div>
+                    </div>
+
                     <div className="mx_UserNotifSettings_tableRow">
                         <div className="mx_UserNotifSettings_inputCell">
                             <input id="enableDesktopAudioNotifications"
diff --git a/src/i18n/strings/ar.json b/src/i18n/strings/ar.json
index 075c0b5957..d5952825af 100644
--- a/src/i18n/strings/ar.json
+++ b/src/i18n/strings/ar.json
@@ -2,5 +2,31 @@
     "All messages": "كل الرسائل",
     "Continue": "استمر",
     "Please set a password!": "يرجى تعيين كلمة مرور!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "سيسمح لك هذا بالعودة إلى حسابك بعد الخروج، وتسجيل الدخول على الأجهزة الأخرى."
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "سيسمح لك هذا بالعودة إلى حسابك بعد الخروج، وتسجيل الدخول على الأجهزة الأخرى.",
+    "Advanced notification settings": "إعدادات متقدمة للرسائل",
+    "A new version of Riot is available.": "نسخة جديدة من رايوت متوفرة.",
+    "All Rooms": "كل الغُرف",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">متصفح سافاري</a> و <a href=\"http://opera.com\">متصفح أوبرا</a> يعملان أيضاً.",
+    "Add an email address above to configure email notifications": "أضف بريداً إلكترونياً أعلاه من أجل تعديل إعدادت تنبيهات البريد الإلكتروني",
+    "All messages (loud)": "كل الرسائل (صوت مرتفع)",
+    "All notifications are currently disabled for all targets.": "كل التنبيهات غير مفعلة حالياً للجميع.",
+    "An error occurred whilst saving your email notification preferences.": "حدث خطأ ما خلال حفظ إعدادات التنبيهات للبريد الإلكتروني.",
+    "Call invitation": "دعوة لمحادثة",
+    "Cancel": "إلغاء",
+    "Cancel Sending": "إلغاء الإرسال",
+    "Can't update user notification settings": "لا يمكن تحديث إعدادات التنبيهات للمستخدم",
+    "Changelog": "سِجل التغييرات",
+    "Close": "إغلاق",
+    "Collapse panel": "طي الجدول",
+    "Collecting app version information": "إستعادة معلومات النسخة للتطبيق",
+    "Collecting logs": "إستعادة السجلات",
+    "Couldn't find a matching Matrix room": "لا يمكن إيجاد غرفة مايتركس متطابقة",
+    "Custom Server Options": "إعدادات السيرفر خاصة",
+    "delete the alias.": "إلغاء المُعرف.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "إلغاء مُعرف الغرفة %(alias)s وحذف %(name)s من الدليل؟",
+    "Describe your problem here.": "صِف مشكلتك هنا.",
+    "Direct Chat": "دردشة مباشرة",
+    "Directory": "دليل",
+    "Dismiss": "صرف النظر",
+    "Download this file": "تحميل هذا الملف"
 }
diff --git a/src/i18n/strings/be.json b/src/i18n/strings/be.json
index 69a6a9233c..479c5c656f 100644
--- a/src/i18n/strings/be.json
+++ b/src/i18n/strings/be.json
@@ -7,7 +7,6 @@
     "Cancel Sending": "Адмяніць адпраўку",
     "Can't update user notification settings": "Немагчыма абнавіць налады апавяшчэнняў карыстальніка",
     "Close": "Зачыніць",
-    "Create new room": "Стварыць новы пакой",
     "Couldn't find a matching Matrix room": "Не атрымалася знайсці адпаведны пакой Matrix",
     "Custom Server Options": "Карыстальніцкія параметры сервера",
     "delete the alias.": "выдаліць псеўданім.",
@@ -16,7 +15,6 @@
     "Directory": "Каталог",
     "Dismiss": "Aдхіліць",
     "Download this file": "Спампаваць гэты файл",
-    "Drop here %(toAction)s": "Перацягнуць сюды %(toAction)s",
     "Enable audible notifications in web client": "Ўключыць гукавыя апавяшчэнні ў вэб-кліенце",
     "Enable desktop notifications": "Ўключыць апавяшчэнні на працоўным стале",
     "Enable email notifications": "Ўключыць паведамлення па электроннай пошце",
@@ -26,14 +24,12 @@
     "Error": "Памылка",
     "Error saving email notification preferences": "Памылка захавання налад апавяшчэнняў па электроннай пошце",
     "#example": "#прыклад",
-    "Failed to": "Не атрымалася",
     "Failed to add tag %(tagName)s to room": "Не атрымалася дадаць %(tagName)s ў пакоі",
     "Failed to change settings": "Не атрымалася змяніць налады",
     "Failed to forget room %(errCode)s": "Не атрымалася забыць пакой %(errCode)s",
     "Failed to update keywords": "Не атрымалася абнавіць ключавыя словы",
     "Failed to get protocol list from Home Server": "Не ўдалося атрымаць спіс пратаколаў ад хатняга сервера",
     "Failed to get public room list": "Не ўдалося атрымаць спіс агульных пакояў",
-    "Failed to join the room": "Не ўдалося далучыцца да пакоя",
     "Failed to remove tag %(tagName)s from room": "Не ўдалося выдаліць %(tagName)s з пакоя",
     "Failed to set direct chat tag": "Не ўдалося ўсталяваць тэг прамога чата",
     "Failed to set Direct Message status of room": "Не ўдалося ўсталяваць статут прамога паведамлення пакою",
@@ -42,9 +38,7 @@
     "Files": "Файлы",
     "Filter room names": "Фільтр iмёнаў пакояў",
     "Forget": "Забыць",
-    " from room": " з пакоя",
     "Guests can join": "Госці могуць далучыцца",
-    "Guest users can't invite users. Please register to invite.": "Госцi не могуць запрашаць карыстальнікаў. Калі ласка, зарэгіструйцеся, каб запрасiць.",
     "Invite to this room": "Запрасіць у гэты пакой",
     "Keywords": "Ключавыя словы",
     "Leave": "Пакінуць",
@@ -63,10 +57,8 @@
     "On": "Уключыць",
     "Operation failed": "Не атрымалася выканаць аперацыю",
     "Permalink": "Пастаянная спасылка",
-    "Please Register": "Калі ласка, зарэгіструйцеся",
     "powered by Matrix": "працуе на Matrix",
     "Quote": "Цытата",
-    "Redact": "Адрэдагаваць",
     "Reject": "Адхіліць",
     "Remove %(name)s from the directory?": "Выдаліць %(name)s з каталога?",
     "Remove": "Выдалiць",
@@ -74,15 +66,10 @@
     "Remove from Directory": "Выдалiць з каталога",
     "Resend": "Паўторна",
     "Riot does not know how to join a room on this network": "Riot не ведае, як увайсці ў пакой у гэтай сетке",
-    "Room directory": "Каталог пакояў",
     "Room not found": "Пакой не знойдзены",
     "Search for a room": "Пошук па пакоі",
-    "Settings": "Налады",
     "Source URL": "URL-адрас крыніцы",
-    "Start chat": "Пачаць чат",
     "The Home Server may be too old to support third party networks": "Хатні сервер можа быць занадта стары для падтрымкі іншых сетак",
     "There are advanced notifications which are not shown here": "Ёсць пашыраныя апавяшчэння, якія не паказаныя тут",
-    "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Гэты пакой недаступны для гасцей. Вы можаце далучыцца, калі вы зарэгіструецеся.",
-    " to room": " ў пакоі"
+    "The server may be unavailable or overloaded": "Сервер можа быць недаступны ці перагружаны"
 }
diff --git a/src/i18n/strings/bn_IN.json b/src/i18n/strings/bn_IN.json
index 9e26dfeeb6..0967ef424b 100644
--- a/src/i18n/strings/bn_IN.json
+++ b/src/i18n/strings/bn_IN.json
@@ -1 +1 @@
-{}
\ No newline at end of file
+{}
diff --git a/src/i18n/strings/ca.json b/src/i18n/strings/ca.json
new file mode 100644
index 0000000000..fe82e8146b
--- /dev/null
+++ b/src/i18n/strings/ca.json
@@ -0,0 +1,113 @@
+{
+    "A new version of Riot is available.": "Hi ha una nova versió del Riot disponible.",
+    "All messages": "Tots els missatges",
+    "Cancel": "Cancel·la",
+    "Close": "Tanca",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s a %(osName)s",
+    "Failed to change password. Is your password correct?": "Hi ha hagut un error al canviar la vostra contrasenya. És correcte la vostra contrasenya?",
+    "Continue": "Continua",
+    "All Rooms": "Totes les sales",
+    "Couldn't find a matching Matrix room": "No s'ha pogut trobar una sala de Matrix que coincideixi",
+    "Failed to add tag %(tagName)s to room": "No s'ha pogut afegir l'etiqueta %(tagName)s a la sala",
+    "Failed to forget room %(errCode)s": "No s'ha pogut oblidar la sala %(errCode)s",
+    "Failed to get public room list": "No s'ha pogut obtenir el llistat de sales públiques",
+    "Failed to remove tag %(tagName)s from room": "No s'ha pogut esborrar l'etiqueta %(tagName)s de la sala",
+    "Filter room names": "Filtra els noms de les sales",
+    "Couldn't load home page": "No s'ha pogut carregar la pàgina d'inici",
+    "All messages (loud)": "Tots els missatges (sorollós)",
+    "Mentions only": "Només mencions",
+    "Mute": "Silenciat",
+    "Direct Chat": "Xat directe",
+    "Directory": "Directori",
+    "Failed to set direct chat tag": "No s'ha pogut establir l'etiqueta del xat directe",
+    "Invite to this room": "Convida a aquesta sala",
+    "No rooms to show": "No hi ha sales a mostrar",
+    "Riot does not know how to join a room on this network": "El Riot no sap com unir-se a una sala en aquesta xarxa",
+    "Room not found": "No s'ha trobat la sala",
+    "Unnamed room": "Sala sense nom",
+    "#example": "#exemple",
+    "Failed to change settings": "No s'han pogut modificar els paràmetres",
+    "Enable audible notifications in web client": "Habilita les notificacions d'àudio al client web",
+    "Enable desktop notifications": "Habilita les notificacions d'escriptori",
+    "Enable email notifications": "Habilita les notificacions per correu electrònic",
+    "Enable notifications for this account": "Habilita les notificacions per aquest compte",
+    "Low Priority": "Baixa prioritat",
+    "Members": "Membres",
+    "Changelog": "Registre de canvis",
+    "Describe your problem here.": "Descriu aquí el teu problema.",
+    "Download this file": "Descarrega aquest fitxer",
+    "Enable them now": "Habilita-ho ara",
+    "Error": "Error",
+    "Favourite": "Favorit",
+    "Files": "Fitxers",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "També funcionen el <a href=\"http://apple.com/safari\">Safari</a> i l'<a href=\"http://opera.com\">Opera</a>.",
+    "Add an email address above to configure email notifications": "Afegiu una adreça de correu electrònic més amunt per configurar les notificacions",
+    "Advanced notification settings": "Paràmetres avançats de notificacions",
+    "All notifications are currently disabled for all targets.": "Actualment totes les notificacions estan inhabilitades per a tots els objectius.",
+    "An error occurred whilst saving your email notification preferences.": "Hi ha hagut un error al desar les vostres preferències de notificació per correu electrònic.",
+    "Bug report sent": "S'ha enviat l'informe d'error",
+    "Call invitation": "Invitació a la trucada",
+    "Can't update user notification settings": "No es poden actualitzar els paràmetres de notificació de l'usuari",
+    "Collecting app version information": "Recol·lectant la informació de la versió de l'aplicació",
+    "Collecting logs": "Recol·lectant els registres",
+    "Custom Server Options": "Opcions de servidor personalitzat",
+    "Dismiss": "Omet",
+    "Enter keywords separated by a comma:": "Introdueix paraules clau separades per una coma:",
+    "Login": "Inicia sessió",
+    "Leave": "Abandona",
+    "Messages containing <span>keywords</span>": "Missatges que contenen <span>paraules clau</span>",
+    "Messages containing my user name": "Missatges que contenen el meu nom d'usuari",
+    "Messages in group chats": "Missatges a xats de grup",
+    "Messages containing my display name": "Missatges que contenen el meu nom",
+    "Messages in one-to-one chats": "Missatges en xats un a un",
+    "Messages sent by bot": "Missatges enviats pel bot",
+    "more": "més",
+    "Noisy": "Sorollós",
+    "Notification targets": "Objectius de notificació",
+    "Notifications": "Notificacions",
+    "Notify me for anything else": "Notifica'm per qualsevol altra cosa",
+    "Notify for all other messages/rooms": "Notifica per a tots els altres missatges/sales",
+    "Off": "Apagat",
+    "On": "Engegat",
+    "Permalink": "Enllaç permanent",
+    "Remove": "Elimina",
+    "remove %(name)s from the directory.": "elimina %(name)s del directori.",
+    "Remove from Directory": "Elimina del directori",
+    "Report a bug": "Informa d'una errada",
+    "Resend": "Reenvia",
+    "Search…": "Cerca…",
+    "Send": "Envia",
+    "Source URL": "URL origen",
+    "The server may be unavailable or overloaded": "El servidor pot no estar disponible o sobrecarregat",
+    "This Room": "Aquesta sala",
+    "Unavailable": "No disponible",
+    "Unknown device": "Dispositiu desconegut",
+    "unknown error code": "codi d'error desconegut",
+    "What's New": "Novetats",
+    "What's new?": "Què hi ha de nou?",
+    "Waiting for response from server": "Esperant una resposta del servidor",
+    "You cannot delete this image. (%(code)s)": "No podeu eliminar aquesta imatge. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "No podeu eliminar aquest missatge. (%(code)s)",
+    "You are not receiving desktop notifications": "No esteu rebent notificacions d'escriptori",
+    "Thank you!": "Gràcies!",
+    "Sunday": "Diumenge",
+    "Monday": "Dilluns",
+    "Tuesday": "Dimarts",
+    "Wednesday": "Dimecres",
+    "Thursday": "Dijous",
+    "Friday": "Divendres",
+    "Saturday": "Dissabte",
+    "Today": "Avui",
+    "Yesterday": "Ahir",
+    "OK": "D'acord",
+    "Warning": "Advertència",
+    "Checking for an update...": "Comprovant si hi ha actualitzacions...",
+    "No update available.": "No hi ha cap actualització disponible.",
+    "Downloading update...": "Descarregant l'actualització...",
+    "Welcome to Riot.im": "Benvingut a Riot.im",
+    "Chat with Riot Bot": "Conversa amb el Bot de Riot",
+    "Back": "Enrere",
+    "Cancel Sending": "Cancel·la l'enviament",
+    "Collapse panel": "Col·lapsa el tauler",
+    "Developer Tools": "Eines de desenvolupador"
+}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
new file mode 100644
index 0000000000..8d9d9305d7
--- /dev/null
+++ b/src/i18n/strings/cs.json
@@ -0,0 +1,206 @@
+{
+    "Close": "Zavřít",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> a <a href=\"http://opera.com\">Opera</a> fungují také.",
+    "A new version of Riot is available.": "Je dostupná nová verze Riotu.",
+    "Notifications": "Upozornění",
+    "Search": "Hledání",
+    "All Rooms": "Všechny místnosti",
+    "Files": "Soubory",
+    "Filter room names": "Filtrovat místnosti dle názvu",
+    "Forward Message": "Přeposlat zprávu",
+    "Invite to this room": "Pozvat do této místnosti",
+    "Members": "Členové",
+    "Permalink": "Trvalý odkaz",
+    "Search…": "Vyhledat…",
+    "This Room": "Tato místnost",
+    "View Source": "Zobrazit zdroj",
+    "Login": "Přihlásit",
+    "Advanced notification settings": "Pokročilé nastavení upozornění",
+    "All messages": "Všechny zprávy",
+    "Cancel": "Storno",
+    "Changelog": "Seznam změn",
+    "Describe your problem here.": "Popište zde svůj problém.",
+    "Direct Chat": "Přímý chat",
+    "Directory": "Adresář",
+    "Download this file": "Stáhnout tento soubor",
+    "Error": "Chyba",
+    "Failed to change settings": "Nepodařilo se změnit nastavení",
+    "Failed to get public room list": "Nepodařilo se získat seznam veřejných místností",
+    "Favourite": "V oblíbených",
+    "Guests can join": "Hosté mohou vstoupit",
+    "Hide panel": "Skrýt panel",
+    "I understand the risks and wish to continue": "Rozumím rizikům a přeji si pokračovat",
+    "Keywords": "Klíčová slova",
+    "Leave": "Opustit",
+    "Loading bug report module": "Nahrává se modul nahlašování chyb",
+    "Low Priority": "Nízká priorita",
+    "Mentions only": "Pouze zmínky",
+    "Messages containing my display name": "Zprávy obsahující mé zobrazované jméno",
+    "Messages containing <span>keywords</span>": "Zprávy obsahující <span>klíčová slova</span>",
+    "Messages containing my user name": "Zprávy obsahující mé uživatelské jméno",
+    "Messages in group chats": "Zprávy ve skupinových chatech",
+    "Messages sent by bot": "Zprávy poslané robotem",
+    "more": "více",
+    "Mute": "Ztlumit",
+    "All messages (loud)": "Všechny zprávy (hlasitě)",
+    "Couldn't load home page": "Nepodařilo se nahrát úvodní stránku",
+    "All notifications are currently disabled for all targets.": "Veškeré notifikace jsou aktuálně pro všechny cíle vypnuty.",
+    "Cancel Sending": "Zrušit odesílání",
+    "Can't update user notification settings": "Nelze aktualizovat uživatelské nastavení upozornění",
+    "delete the alias.": "smazat alias.",
+    "Set Password": "Nastavit heslo",
+    "You have successfully set a password and an email address!": "Úspěšně jste si nastavili heslo a e-mailovou adresu!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Vězte, že kdybyste si to rozmysleli, e-mailovou adresu můžete kdykoliv doplnit v uživatelském nastavení.",
+    "Continue": "Pokračovat",
+    "Please set a password!": "Prosím nastavte si heslo!",
+    "You have successfully set a password!": "Úspěšně jste si nastavili heslo!",
+    "Failed to change password. Is your password correct?": "Nepodařilo se změnit heslo. Je vaše heslo správné?",
+    "No update available.": "Není dostupná žádná aktualizace.",
+    "Downloading update...": "Stahování aktualizace...",
+    "Welcome to Riot.im": "Vítá vás Riot.im",
+    "Enable desktop notifications": "Zapnout upozornění na desktopu",
+    "Enable email notifications": "Zapnout upozornění přes e-mail",
+    "Enable notifications for this account": "Zapnout upozornění na tomto účtu",
+    "#example": "#příklad",
+    "Off": "Vypnout",
+    "On": "Zapnout",
+    "Operation failed": "Chyba operace",
+    "Remove %(name)s from the directory?": "Odebrat %(name)s z adresáře?",
+    "Remove": "Odebrat",
+    "remove %(name)s from the directory.": "odebrat %(name)s z adresáře.",
+    "Remove from Directory": "Odebrat z adresáře",
+    "Report a bug": "Nahlásit chybu",
+    "Resend": "Poslat znovu",
+    "Room not found": "Místnost nenalezena",
+    "Search for a room": "Hledat místnost",
+    "Send": "Odeslat",
+    "Send logs": "Odeslat záznamy",
+    "Source URL": "Zdrojová URL",
+    "The server may be unavailable or overloaded": "Server může být nedostupný nebo přetížený",
+    "Unable to join network": "Nelze se připojit k síti",
+    "Unable to look up room ID from server": "Nelze získat ID místnosti ze serveru",
+    "Unavailable": "Nedostupné",
+    "Unknown device": "Neznámé zařízení",
+    "unknown error code": "neznámý kód chyby",
+    "Unnamed room": "Nepojmenovaná místnost",
+    "Update": "Aktualizace",
+    "What's New": "Co je nového",
+    "What's new?": "Co je nového?",
+    "Waiting for response from server": "Čekám na odezvu ze serveru",
+    "You cannot delete this image. (%(code)s)": "Tento obrázek nemůžete smazat. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Tuto zprávu nemůžete smazat. (%(code)s)",
+    "You are not receiving desktop notifications": "Nedostáváte upozornění na desktopu",
+    "Sunday": "Neděle",
+    "Monday": "Pondělí",
+    "Tuesday": "Úterý",
+    "Wednesday": "Středa",
+    "Thursday": "Čtvrtek",
+    "Friday": "Pátek",
+    "Saturday": "Sobota",
+    "Today": "Dnes",
+    "Yesterday": "Včera",
+    "OK": "OK",
+    "Warning": "Varování",
+    "Checking for an update...": "Kontrola aktualizací...",
+    "An error occurred whilst saving your email notification preferences.": "Při ukládání nastavení e-mailových upozornění nastala chyba.",
+    "Collecting app version information": "Sbírání informací o verzi aplikace",
+    "Collecting logs": "Sbírání logů",
+    "Couldn't find a matching Matrix room": "Odpovídající Matrix místost nenalezena",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Smazat alias místnosti %(alias)s a odstranit %(name)s z adresáře?",
+    "Enable audible notifications in web client": "Povolit zvuková upozornění ve webové aplikaci",
+    "Enable them now": "Povolit nyní",
+    "Enter keywords separated by a comma:": "Vložte klíčová slova oddělená čárkou:",
+    "Error saving email notification preferences": "Chyba při ukládání nastavení e-mailových upozornění",
+    "Failed to add tag %(tagName)s to room": "Nepodařilo se přidat štítek %(tagName)s k místnosti",
+    "Failed to forget room %(errCode)s": "Nepodařilo se zapomenout místnost %(errCode)s",
+    "Failed to update keywords": "Nepodařilo se aktualizovat klíčová slova",
+    "Failed to get protocol list from Home Server": "Z domovského serveru se nepodařilo získat seznam protokolů",
+    "Failed to remove tag %(tagName)s from room": "Nepodařilo se odstranit štítek %(tagName)s z místnosti",
+    "Failed to send report: ": "Nepodařilo se odeslat hlášení: ",
+    "Forget": "Zapomenout",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
+    "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:": "Kvůli diagnostice budou spolu s tímto hlášením o chybě odeslány i záznamy z klienta. Chcete-li odeslat pouze text výše, prosím odškrtněte:",
+    "No rooms to show": "Žádné místnosti k zobrazení",
+    "Notify for all other messages/rooms": "Upozorni na všechny ostatní zprávy/místnosti",
+    "Notify me for anything else": "Upozorni mě na cokoliv jiného",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Prosím popište chybu. Co jste dělal/a? Co jste čekal/a, že se stane? Co se stalo?",
+    "Please describe the bug and/or send logs.": "Prosím popište chybu a/nebo pošlete záznamy.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Prosím nainstalujte si <a href=\"https://www.google.com/chrome\">Chrome</a> nebo <a href=\"https://getfirefox.com\">Firefox</a> pro nejlepší zážitek.",
+    "Quote": "Citace",
+    "Reject": "Odmítnout",
+    "Riot does not know how to join a room on this network": "Riot neví, jak vstoupit do místosti na této síti",
+    "Riot is not supported on mobile web. Install the app?": "Riot není podporovaný na mobilním webu. Nainstalovat aplikaci?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot používá mnoho pokročilých funkcí, z nichž některé jsou ve vašem současném prohlížeči nedostupné nebo experimentální.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Omlouváme se, váš prohlížeč <b>není</b> schopný spustit Riot.",
+    "There are advanced notifications which are not shown here": "Jsou k dispozici pokročilá upozornění, která zde nejsou zobrazena",
+    "Unhide Preview": "Zobrazit náhled",
+    "Uploaded on %(date)s by %(user)s": "Nahráno %(date)s uživatelem %(user)s",
+    "Uploading report": "Nahrávám hlášení",
+    "View Decrypted Source": "Zobrazit dešifrovaný zdroj",
+    "When I'm invited to a room": "Pokud jsem pozván do místnosti",
+    "World readable": "Viditelné pro všechny",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Snad jste je nastavili v jiném klientu než Riot. V Riotu je nemůžete upravit, ale přesto platí",
+    "Error encountered (%(errorDetail)s).": "Nastala chyba (%(errorDetail)s).",
+    "You need to be using HTTPS to place a screen-sharing call.": "Pro uskutečnění hovoru se sdílením obrazovky musíte používat HTTPS.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Vzhled a chování aplikace může být ve vašem aktuální prohlížeči nesprávné a některé nebo všechny funkce mohou být chybné. Chcete-li i přes to pokračovat, nebudeme vám bránit, ale se všemi problémy, na které narazíte, si musíte poradit sami!",
+    "Search the room directory": "Prohledat adresář místností",
+    "Chat with Riot Bot": "Chatujte s Riot Botem",
+    "Get started with some tips from Riot Bot!": "Začněte s radami od Riot Bota!",
+    "General discussion about Matrix and Riot": "Obecná diskuse o Matrixu a Riotu",
+    "Discussion of all things Matrix!": "Diskuse o všem okolo Matrixu!",
+    "Matrix technical discussions": "Technické diskuse o Matrixu",
+    "Running Matrix services": "Provozování Matrix služeb",
+    "Community-run support for Synapse": "Komunitou řízená podpora pro Synapse",
+    "Announcements about Synapse releases": "Oznámení o vydáních Synapse",
+    "Support for those using and running matrix-appservice-irc": "Podpora pro používání matrix-appservice-irc",
+    "Building services on Matrix": "Stavění služeb na Matrixu",
+    "Add an email address above to configure email notifications": "Abyste mohli nastavovat e-mailová upozornění, musíte uvést svoji e-mailovou adresu v kolonce výše",
+    "Call invitation": "Pozvánka k hovoru",
+    "Collapse panel": "Sbalit panel",
+    "Dismiss": "Zahodit",
+    "Expand panel": "Rozbalit panel",
+    "Failed to set direct chat tag": "Nepodařilo se nastavit štítek přímého chatu",
+    "Failed to set Direct Message status of room": "Nepodařilo se přiřadit místnosti status Přímé zprávy",
+    "powered by Matrix": "poháněno Matrixem",
+    "Riot Desktop on %(platformName)s": "Riot Desktop na %(platformName)s",
+    "The Home Server may be too old to support third party networks": "Tento domovský server může být příliš zastaralý na to, aby podporoval sítě třetích stran",
+    "Admin support for Dendrite": "Správcovská podpora pro Dendrite",
+    "Support for those using the Matrix spec": "Podpora pro uživatele Matrix specifikace",
+    "Design and implementation of E2E in Matrix": "Návrh a implementace E2E v Matrixu",
+    "Implementing VR services with Matrix": "Implementace VR služeb v Matrixu",
+    "Implementing VoIP services with Matrix": "Implementace VoIP služeb v Matrixu",
+    "Support for those using, running and writing other bridges": "Podpora pro ty, kteří používají, provozují nebo vyvíjejí ostatní můstky",
+    "Contributing code to Matrix and Riot": "Přispívaní kódem do Matrixu a Riotu",
+    "Dev chat for the Riot/Web dev team": "Chat vývojového týmu Riot/Web",
+    "Dev chat for the Dendrite dev team": "Chat vývojového týmu Dendrite",
+    "Co-ordination for Riot/Web translators": "Součinnost překladatelů Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "V Matrixu je spousta samostatných, nebo s jinými sítěmi (Slack, IRC, Gitter aj.) propojených místností. Prohlédněte si jejich adresář!",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s přes %(browserName)s na %(osName)s",
+    "customServer_text": "Ve vlastních serverových volbách se můžete přihlásit na ostatní Matrix servery, a to tak, že určíte URL jiného domovského serveru.<br/>To znamená, že můžete používat Riot s již existujícím Matrix účtem na jiném domovském serveru.<br/><br/>Taky můžete nastavit vlastní server identity, pak ale nebudete moci zvát ostatní nebo naopak být ostatními zván prostřednictvím e-mailové adresy.",
+    "Custom Server Options": "Vlastní serverové volby",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizovaný, šifrovaný chat a spolupráce na platformě [matrix]",
+    "Riot/Web &amp; Desktop chat": "Riot/Web a Desktop chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS a matrix-ios-sdk chat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android a matrix-android-sdk chat",
+    "To return to your account in future you need to <u>set a password</u>": "Abyste se mohli ke svému účtu v budoucnu vrátit, musíte si <u>nastavit heslo</u>",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Toto vám umožní vrátit se po odhlášení ke svému účtu a používat jej na ostatních zařízeních.",
+    "You can now return to your account after signing out, and sign in on other devices.": "Nyní se můžete ke svému účtu vrátit i po odhlášení a používat jej na ostatních zařízeních.",
+    "Fetching third party location failed": "Nepodařilo se zjistit umístění třetí strany",
+    "Messages in one-to-one chats": "Zprávy v individuálních chatech",
+    "Notification targets": "Cíle upozornění",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Upozornění na následující klíčová slova se řídí pravidly, která zde nelze zobrazit:",
+    "Unable to fetch notification target list": "Nepodařilo se získat seznam cílů upozornění",
+    "Discussion of the Identity Service API": "Diskuze o API služby identity",
+    "Noisy": "Hlučný",
+    "Bug report sent": "Hlášení o chybě bylo odesláno",
+    "Thank you!": "Děkujeme vám!",
+    "Back": "Zpět",
+    "Event Type": "Typ události",
+    "Event Content": "Obsah události",
+    "Developer Tools": "Nástroje pro vývojáře",
+    "Filter results": "Filtrovat výsledky",
+    "You must specify an event type!": "Musíte určit typ události!",
+    "Event sent!": "Událost odeslána!",
+    "Failed to send custom event.": "Nepodařilo se odeslat vlastní událost.",
+    "Send Custom Event": "Odeslat vlastní událost"
+}
diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json
index 4cd6c4b008..bcd3da6f3f 100644
--- a/src/i18n/strings/da.json
+++ b/src/i18n/strings/da.json
@@ -2,17 +2,13 @@
     "Add an email address above to configure email notifications": "Tilføj en emailadresse ovenfor for at konfigurere e-mail-underretninger",
     "All notifications are currently disabled for all targets.": "Alle meddelelser er for øjeblikket deaktiveret for alle mål.",
     "An error occurred whilst saving your email notification preferences.": "Der opstod en fejl under opbevaring af dine e-mail-underretningsindstillinger.",
-    "and remove": "Og fjern",
     "Can't update user notification settings": "Kan ikke opdatere brugermeddelelsesindstillinger",
-    "Create new room": "Opret nyt rum",
     "Couldn't find a matching Matrix room": "Kunne ikke finde et matchende Matrix-rum",
     "Custom Server Options": "Brugerdefinerede serverindstillinger",
     "delete the alias.": "Slet aliaset.",
-    "Delete the room alias": "Slet room alias",
     "Direct Chat": "Personligt Chat",
     "Directory": "Rum fortegnelse",
     "Dismiss": "Afskedige",
-    "Drop here to": "Drop her til",
     "Enable audible notifications in web client": "Aktivér hørbare underretninger i webklienten",
     "Enable desktop notifications": "Aktivér desktop meddelelser",
     "Enable email notifications": "Aktivér e-mail-underretninger",
@@ -22,24 +18,17 @@
     "Error": "Fejl",
     "Error saving email notification preferences": "Fejl ved at gemme e-mail-underretningsindstillinger",
     "#example": "#eksempel",
-    "Failed to": "Var ikke i stand til at",
-    "Failed to add tag ": "Kunne ikke tilføje tag ",
     "Failed to change settings": "Kunne ikke ændre indstillinger",
     "Failed to update keywords": "Kunne ikke opdatere søgeord",
     "Failed to get protocol list from Home Server": "Kunne ikke få protokolliste fra Home Server",
     "Failed to get public room list": "Kunne ikke få offentlig rumliste",
-    "Failed to join the room": "Kunne ikke komme ind i rumet",
-    "Failed to remove tag ": "Kunne ikke fjerne tag ",
     "Failed to set Direct Message status of room": "Kunne ikke indstille direkte beskedstatus for rumet",
     "Favourite": "Favorit",
     "Fetching third party location failed": "Hentning af tredjeparts placering mislykkedes",
     "Files": "Filer",
     "Filter room names": "Filtrer rumnavne",
     "Forget": "Glem",
-    "from the directory": "fra fortegnelsen",
-    " from room": " fra rum",
     "Guests can join": "Gæster kan deltage",
-    "Guest users can't invite users. Please register to invite.": "Gæstebrugere kan ikke invitere brugere. Tilmeld dig venligst for at invitere.",
     "Invite to this room": "Inviter til dette rum",
     "Keywords": "Søgeord",
     "Leave": "Forlade",
@@ -55,23 +44,16 @@
     "Off": "Slukket",
     "On": "Tændt",
     "Operation failed": "Operation mislykkedes",
-    "Please Register": "Vær venlig at registrere",
     "powered by Matrix": "Drevet af Matrix",
     "Reject": "Afvise",
     "Remove": "Fjerne",
-    "remove": "fjerner",
     "Remove from Directory": "Fjern fra fortegnelse",
     "Riot does not know how to join a room on this network": "Riot ved ikke, hvordan man kan deltage i et rum på dette netværk",
-    "Room directory": "Rum fortegnelse",
     "Room not found": "Rumet ikke fundet",
     "Search for a room": "Søg efter et rum",
-    "Settings": "Indstillinger",
-    "Start chat": "Begyndt chat",
     "The Home Server may be too old to support third party networks": "Hjemmeserveren kan være for gammel til at understøtte tredjepartsnetværk",
     "There are advanced notifications which are not shown here": "Der er avancerede meddelelser, som ikke vises her",
     "The server may be unavailable or overloaded": "Serveren kan være utilgængelig eller overbelastet",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Dette rum er utilgængeligt for gæster. Du kan være i stand til at deltage, hvis du registrerer dig.",
-    " to room": " til rum",
     "Unable to fetch notification target list": "Kan ikke hente meddelelsesmålliste",
     "Unable to join network": "Kan ikke deltage i netværket",
     "Unable to look up room ID from server": "Kunne ikke slå op på rum-id fra server",
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index e6ae460ec4..0c1ce7b98c 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1,38 +1,28 @@
 {
-    "Please Register": "Bitte registrieren",
-    "Guest users can't invite users. Please register to invite.": "Gäste können keine Nutzer einladen. Bitte registriere dich, um Nutzer einzuladen.",
     "Members": "Mitglieder",
     "Files": "Dateien",
     "Notifications": "Benachrichtigungen",
     "Invite to this room": "In diesen Raum einladen",
     "Filter room names": "Raum-Namen filtern",
-    "Start chat": "Chat starten",
-    "Room directory": "Raum-Verzeichnis",
-    "Create new room": "Neuen Raum erstellen",
-    "Settings": "Einstellungen",
     "powered by Matrix": "betrieben mit Matrix",
-    "Custom Server Options": "Erweiterte Server-Optionen",
+    "Custom Server Options": "Benutzerdefinierte Server-Optionen",
     "Dismiss": "Ablehnen",
     "Failed to get protocol list from Home Server": "Fehler beim Abrufen der Protokoll-Liste vom Home-Server",
     "The Home Server may be too old to support third party networks": "Der Home-Server ist eventuell zu alt, um Drittanbieter-Netzwerke zu unterstützen",
     "Directory": "Raum-Verzeichnis",
-    "#example:": "#beispiel:",
     "Search for a room": "Nach einem Raum suchen",
-    "No rooms to show": "Keine Räume zum anzeigen",
-    "World readable": "Alle können mitlesen",
+    "No rooms to show": "Keine Räume anzuzeigen",
+    "World readable": "Lesbar für die Welt",
     "Guests can join": "Gäste können beitreten",
     "You are not receiving desktop notifications": "Du erhältst keine Desktop-Benachrichtigungen",
     "Enable them now": "Aktiviere diese jetzt",
     "Add an email address above to configure email notifications": "Füge oben eine E-Mail-Adresse hinzu, um die E-Mail-Benachrichtigungseinstellungen zu konfigurieren",
     "All notifications are currently disabled for all targets.": "Im Moment sind alle Benachrichtigungen für alle Ziele deaktiviert.",
     "An error occurred whilst saving your email notification preferences.": "Beim Speichern deiner E-Mail-Benachrichtigungseinstellungen ist ein Fehler aufgetreten.",
-    "and remove": "und entfernen",
-    "Can't update user notification settings": "Benachrichtigungs-Einstellungen des Nutzers konnten nicht aktualisiert werden",
+    "Can't update user notification settings": "Benachrichtigungs-Einstellungen des Benutzers konnten nicht aktualisiert werden",
     "Couldn't find a matching Matrix room": "Konnte keinen entsprechenden Matrix-Raum finden",
     "delete the alias.": "Lösche den Alias.",
-    "Delete the room alias": "Lösche den Raum Alias",
-    "Direct Chat": "Privater Chat",
-    "Drop here to": "Hier ablegen",
+    "Direct Chat": "Direkt-Chat",
     "Enable audible notifications in web client": "Audio-Benachrichtigungen im Web-Client aktivieren",
     "Enable desktop notifications": "Desktop-Benachrichtigungen aktivieren",
     "Enable email notifications": "E-Mail-Benachrichtigungen aktivieren",
@@ -41,19 +31,13 @@
     "Error": "Fehler",
     "Error saving email notification preferences": "Fehler beim Speichern der E-Mail-Benachrichtigungseinstellungen",
     "#example": "#Beispiel",
-    "Failed to": "Konnte nicht",
-    "Failed to add tag ": "Konnte Tag nicht hinzufügen ",
     "Failed to change settings": "Einstellungen konnten nicht geändert werden",
     "Failed to update keywords": "Schlüsselwörter konnten nicht aktualisiert werden",
     "Failed to get public room list": "Die Liste der öffentlichen Räume konnte nicht geladen werden",
-    "Failed to join the room": "Fehler beim Betreten des Raumes",
-    "Failed to remove tag ": "Konnte Tag nicht entfernen ",
     "Failed to set Direct Message status of room": "Konnte den direkten Benachrichtigungsstatus nicht setzen",
     "Favourite": "Favorit",
     "Fetching third party location failed": "Das Abrufen des Drittanbieterstandorts ist fehlgeschlagen",
     "Forget": "Entfernen",
-    "from the directory": "aus dem Verzeichnis",
-    " from room": " aus dem Raum",
     "Keywords": "Schlüsselwörter",
     "Leave": "Verlassen",
     "Low Priority": "Niedrige Priorität",
@@ -62,15 +46,13 @@
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Die Benachrichtigungen zu den folgenden Schlüsselwörtern folgen Regeln, die hier nicht angezeigt werden können:",
     "Notify for all other messages/rooms": "Benachrichtigungen für alle anderen Mitteilungen/Räume aktivieren",
     "Operation failed": "Aktion fehlgeschlagen",
-    "Reject": "ablehnen",
+    "Reject": "Ablehnen",
     "Remove": "Entfernen",
-    "remove": "Entferner",
     "Remove from Directory": "Aus dem Raum-Verzeichnis entfernen",
     "Riot does not know how to join a room on this network": "Riot weiß nicht, wie es einem Raum auf diesem Netzwerk beitreten soll",
     "Room not found": "Raum nicht gefunden",
     "There are advanced notifications which are not shown here": "Es existieren erweiterte Benachrichtigungen, welche hier nicht angezeigt werden",
     "The server may be unavailable or overloaded": "Der Server ist vermutlich nicht erreichbar oder überlastet",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Dieser Raum ist nicht verfügbar für Gäste. Vermutlich klappt es wenn du dich anmeldest.",
     "Unable to fetch notification target list": "Liste der Benachrichtigungsempfänger konnte nicht abgerufen werden",
     "Unable to join network": "Es ist nicht möglich, dem Netzwerk beizutreten",
     "unknown error code": "Unbekannter Fehlercode",
@@ -78,9 +60,7 @@
     "Notify me for anything else": "Über alles andere benachrichtigen",
     "Off": "Aus",
     "On": "An",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Client als Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
-    " to room": " an Raum",
-    "Drop here %(toAction)s": "Hierher ziehen: %(toAction)s",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du hast sie eventuell auf einem anderen Matrix-Client und nicht in Riot konfiguriert. Sie können in Riot nicht verändert werden, gelten aber trotzdem",
     "All messages": "Alle Nachrichten",
     "All messages (loud)": "Alle Nachrichten (laut)",
     "Cancel Sending": "Senden abbrechen",
@@ -94,8 +74,7 @@
     "Mentions only": "Nur, wenn du erwähnt wirst",
     "Mute": "Stummschalten",
     "Permalink": "Permanenter Link",
-    "Quote": "Zitat",
-    "Redact": "Löschen",
+    "Quote": "Zitieren",
     "Remove %(name)s from the directory?": "Soll der Raum %(name)s  aus dem Verzeichnis entfernt werden?",
     "remove %(name)s from the directory.": "entferne %(name)s aus dem Verzeichnis.",
     "Resend": "Erneut senden",
@@ -116,7 +95,6 @@
     "Sunday": "Sonntag",
     "Monday": "Montag",
     "Yesterday": "Gestern",
-    "Welcome page": "Willkommensseite",
     "Advanced notification settings": "Erweiterte Benachrichtigungs-Einstellungen",
     "Call invitation": "Anruf-Einladung",
     "Messages containing my display name": "Nachrichten, die meinen Anzeigenamen enthalten",
@@ -129,55 +107,53 @@
     "customServer_text": "Du kannst die erweiterten Server-Optionen nutzen, um dich auf anderen Matrix-Servern anzumelden, indem du eine andere Heimserver-URL eingibst. <br/>Dies ermöglicht es dir, Riot mit einem bereits existierenden Matrix-Konto auf einem anderen Heimserver zu nutzen.<br/><br/>Du kannst auch einen benutzerdefinierten Identitäts-Server eingeben, allerdings wirst du dann nicht in der Lage sein, andere Benutzer per E-Mail-Adresse einzuladen oder selbst Einladungen per E-Mail-Adresse zu erhalten.",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> und <a href=\"http://opera.com\">Opera</a> funktionieren ebenfalls.",
     "I understand the risks and wish to continue": "Ich verstehe das Risiko und möchte fortfahren",
-    "Messages containing <span>keywords</span>": "Nachrichten, die definierte <span>Schlüsselwörter</span> enthalten",
+    "Messages containing <span>keywords</span>": "Nachrichten, die <span>Schlüsselwörter</span> enthalten",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bitte installiere <a href=\"https://www.google.com/chrome\">Chrome</a> oder <a href=\"https://getfirefox.com\">Firefox</a> für die beste Erfahrung.",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot nutzt zahlreiche fortgeschrittene Browser-Funktionen, die teilweise in deinem aktuell verwendeten Browser noch nicht verfügbar sind oder sich noch im experimentellen Status befinden.",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Es tut uns leid, aber dein Browser kann Riot <b>nicht</b> ausführen.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "In deinem aktuellen Browser kann das Aussehen und Gefühl der Anwendung komplett inkorrekt sein und einige oder alle Funktionen funktionieren evtl. nicht. Du kannst es trotzdem versuchen und fortfahren, aber du bist alleine mit allen Problemen auf die du stößt!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "In deinem aktuell verwendeten Browser können Aussehen und Handhabung der Anwendung unter Umständen noch komplett fehlerhaft sein, so dass einige bzw. im Extremfall alle Funktionen nicht zur Verfügung stehen. Du kannst es trotzdem versuchen und fortfahren, bist dabei aber bezüglich aller auftretenden Probleme auf dich allein gestellt!",
     "Expand panel": "Panel ausklappen",
     "Collapse panel": "Panel einklappen",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s auf %(osName)s",
     "A new version of Riot is available.": "Eine neue Version von Riot ist verfügbar.",
-    "All Rooms": "Alle Räume",
+    "All Rooms": "In allen Räumen",
     "Cancel": "Abbrechen",
-    "Changelog": "Änderungshistorie",
+    "Changelog": "Änderungsprotokoll",
     "Collecting app version information": "App-Versionsinformationen werden abgerufen",
     "Collecting logs": "Protokolle werden abgerufen",
     "Describe your problem here.": "Beschreibe dein Problem hier.",
     "Failed to send report: ": "Senden des Reports fehlgeschlagen: ",
     "Forward Message": "Nachricht weiterleiten",
-    "Hide panel": "Verberge Feld",
+    "Hide panel": "Panel verbergen",
     "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:": "Um Probleme zu diagnostizieren werden mit diesem Fehlerbericht Protokolle von diesem Client gesendet. Wenn du nur obigen text senden willst, deselektiere folgendes:",
     "Loading bug report module": "Lade Fehlerbericht-Modul",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bitte beschreibe (vorzugsweise auf Englisch) den Fehler. Was tatst du? Was wolltest du, dass es passiert? Was ist passiert?",
-    "Please describe the bug and/or send logs.": "Bitte beschreibe den Fehler und/oder sende Protokolle.",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bitte den Fehler (vorzugsweise auf Englisch) beschreiben. Was hast du gemacht? Was sollte passieren? Was ist tatsächlich passiert?",
+    "Please describe the bug and/or send logs.": "Bitte den Fehler beschreiben und/oder Log-Dateien übermitteln.",
     "Report a bug": "Einen Fehler melden",
     "Riot Desktop on %(platformName)s": "Riot Desktop auf %(platformName)s",
     "Riot is not supported on mobile web. Install the app?": "Riot wird im mobilen Web nicht unterstützt. App installieren?",
     "Search": "Suchen",
     "Search…": "Suchen…",
     "Send": "Sende",
-    "Send logs": "Sende Protokolle",
-    "This Room": "Dieser Raum",
+    "Send logs": "Logdateien übermitteln",
+    "This Room": "In diesem Raum",
     "Unavailable": "Nicht verfügbar",
     "Unknown device": "Unbekanntes Gerät",
-    "Update": "Aktualisiere",
+    "Update": "Aktualisieren",
     "Uploading report": "Lade Bericht hoch",
     "What's New": "Was ist neu",
     "What's new?": "Was ist neu?",
     "Waiting for response from server": "Auf Antwort vom Server warten",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Du verwendest Riot als Gast. <a>Registriere</a> oder <a>melde dich an</a> um Zugang zu mehr Räumen und Funktionen zu bekommen!",
     "You need to be using HTTPS to place a screen-sharing call.": "Du musst HTTPS nutzen um einen Anruf mit Bildschirmfreigabe durchzuführen.",
     "OK": "OK",
     "Login": "Anmeldung",
     "Welcome to Riot.im": "Willkommen bei Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentralisierter, verschlüsselter Chat &amp; Zusammenarbeit unterstützt von [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dezentrale, verschlüsselte Chat- &amp; Kollaborationslösung unterstützt von [matrix]",
     "Search the room directory": "Raum-Verzeichnis durchsuchen",
-    "Chat with Riot Bot": "Chatte mit dem Riot-Bot",
-    "Get started with some tips from Riot Bot!": "Beginne mit einigen Tipps vom Riot-Bot!",
-    "General discussion about Matrix": "Allgemeine Diskussion über Matrix",
+    "Chat with Riot Bot": "Mit dem Riot-Bot chatten",
+    "Get started with some tips from Riot Bot!": "Lass Dir vom Riot-Bot eine Einführung geben!",
     "Discussion of all things Matrix!": "\"Diskussion über alle Dinge\"-Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop-Chat",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-Chat",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; \"matrix-ios-sdk\"-Chat",
     "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk-Chat",
     "Matrix technical discussions": "Technische Diskussion über Matrix",
@@ -186,17 +162,17 @@
     "Admin support for Dendrite": "Admin-Unterstützung für Dendrite",
     "Announcements about Synapse releases": "Ankündigungen über Synapse-Versionen",
     "Support for those using and running matrix-appservice-irc": "Unterstützung für die, die \"matrix-appservice-irc\" betreiben und nutzen",
-    "Building services on Matrix": "Dienste bauen für Matrix",
+    "Building services on Matrix": "Dienste für Matrix entwickeln",
     "Support for those using the Matrix spec": "Unterstützung für die Nutzer der Matrix-Spezification",
     "Design and implementation of E2E in Matrix": "Design und Implementierung von Ende-zu-Ende-Verschlüsselung in Matrix",
     "Implementing VR services with Matrix": "Implementierung von VR-Diensten mit Matrix",
     "Implementing VoIP services with Matrix": "Implementierung von VoIP-Diensten mit Matrix",
     "Discussion of the Identity Service API": "Diskussion der Identitätsdienst-API",
-    "Support for those using, running and writing other bridges": "Unterstützung für die, die andere Brücken nutzen, betreiben oder schreiben",
+    "Support for those using, running and writing other bridges": "Unterstützung für die, die andere Matrix-Bridges nutzen, betreiben oder entwickeln",
     "Contributing code to Matrix and Riot": "Code zu Matrix und Riot beitragen",
-    "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot-Web-Entwickler-Team",
+    "Dev chat for the Riot/Web dev team": "Entwickler-Chat für das Riot/Web-Entwickler-Team",
     "Co-ordination for Riot/Web translators": "Koordination für Riot/Web-Übersetzer",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Im Matrix-Netzwerk gibt es bereits jetzt zahlreiche Räume, die entweder mit bekannten Netzwerken wie Slack, IRC, Gitter, usw. verknüpft sind oder auch komplett eigenständig betrieben werden. Einen genauen Überblick erhältst du im Raum-Verzeichnis!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Im Matrix-Netzwerk existieren bereits jetzt zahlreiche Räume, die entweder mit bekannten Netzwerken wie Slack, IRC, Gitter, usw. verknüpft sind oder auch komplett eigenständig betrieben werden. Einen genauen Überblick erhältst du im Raum-Verzeichnis!",
     "Failed to change password. Is your password correct?": "Passwortänderung fehlgeschlagen. Ist dein Passwort richtig?",
     "You have successfully set a password!": "Du hast erfolgreich ein Passwort gesetzt!",
     "You can now return to your account after signing out, and sign in on other devices.": "Du kannst nun zu deinem Konto zurückkehren nach dem du dich an anderen Geräten ab- und angemeldet hast.",
@@ -207,5 +183,30 @@
     "General discussion about Matrix and Riot": "Allgemeine Diskussion über Matrix und Riot",
     "(HTTP status %(httpStatus)s)": "(HTTP-Status %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Du hast erfolgreich ein Passwort und eine E-Mail-Adresse gesetzt!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Denk daran, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Vergiss nicht, dass du in den Benutzereinstellungen jederzeit eine E-Mail-Adresse setzen kannst, wenn du deine Meinung änderst.",
+    "To return to your account in future you need to <u>set a password</u>": "Um in Zukunft auf dein Benutzerkonto zugreifen zu können, musst du <u>ein Passwort setzen</u>",
+    "Set Password": "Passwort einrichten",
+    "Warning": "Warnung",
+    "Checking for an update...": "Nach Updates suchen...",
+    "Error encountered (%(errorDetail)s).": "Es ist ein Fehler aufgetreten (%(errorDetail)s).",
+    "No update available.": "Kein Update verfügbar.",
+    "Downloading update...": "Update wird heruntergeladen...",
+    "Couldn't load home page": "Startseite konnte nicht geladen werden",
+    "Bug report sent": "Fehlerbericht wurde gesendet",
+    "Thank you!": "Danke!",
+    "Back": "Zurück",
+    "Developer Tools": "Entwicklerwerkzeuge",
+    "Failed to send custom event.": "Senden des benutzerdefinierten Events fehlgeschlagen.",
+    "Send Custom Event": "Benutzerdefiniertes Event senden",
+    "Send Custom State Event": "Benutzerdefiniertes Status-Event senden",
+    "Explore Room State": "Erkunde Raum-Status",
+    "Event sent!": "Event gesendet!",
+    "Event Type": "Event-Typ",
+    "Event Content": "Event-Inhalt",
+    "State Key": "Status-Schlüssel",
+    "Filter results": "Ergebnisse filtern",
+    "You must specify an event type!": "Du musst einen Event-Typ spezifizieren!",
+    "Show message in desktop notification": "Nachricht in der Desktop-Benachrichtigung anzeigen",
+    "Pin Message": "Nachricht anheften",
+    "Unpin Message": "Nachricht losheften"
 }
diff --git a/src/i18n/strings/el.json b/src/i18n/strings/el.json
index c9f9373a5a..a3d72487c9 100644
--- a/src/i18n/strings/el.json
+++ b/src/i18n/strings/el.json
@@ -12,7 +12,6 @@
     "Changelog": "Αλλαγές",
     "Close": "Κλείσιμο",
     "Collapse panel": "Ελαχιστοποίηση καρτέλας",
-    "Create new room": "Δημιουργία νέου δωματίου",
     "Custom Server Options": "Προσαρμοσμένες ρυθμίσεις διακομιστή",
     "Describe your problem here.": "Περιγράψτε το πρόβλημα σας εδώ.",
     "Direct Chat": "Απευθείας συνομιλία",
@@ -36,14 +35,11 @@
     "Dismiss": "Απόρριψη",
     "Failed to add tag %(tagName)s to room": "Δεν ήταν δυνατή η προσθήκη της ετικέτας %(tagName)s στο δωμάτιο",
     "Failed to change settings": "Δεν ήταν δυνατή η αλλαγή των ρυθμίσεων",
-    "Failed to join the room": "Δεν ήταν δυνατή η σύνδεση στο δωμάτιο",
     "Favourite": "Αγαπημένο",
     "Files": "Αρχεία",
     "Filter room names": "Φιλτράρισμα δωματίων",
     "Forward Message": "Προώθηση",
-    " from room": " από το δωμάτιο",
     "Guests can join": "Επισκέπτες μπορούν να συνδεθούν",
-    "Guest users can't invite users. Please register to invite.": "Οι επισκέπτες δεν έχουν τη δυνατότητα να προσκαλέσουν άλλους χρήστες. Παρακαλούμε εγγραφείτε πρώτα.",
     "Hide panel": "Απόκρυψη καρτέλας",
     "I understand the risks and wish to continue": "Κατανοώ του κινδύνους και επιθυμώ να συνεχίσω",
     "Invite to this room": "Πρόσκληση σε αυτό το δωμάτιο",
@@ -66,20 +62,15 @@
     "Notify me for anything else": "Ειδοποίηση  για οτιδήποτε άλλο",
     "Operation failed": "Η λειτουργία απέτυχε",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Παρακαλούμε περιγράψτε το σφάλμα. Τι κάνατε; Τι περιμένατε να συμβεί; Τι έγινε τελικά;",
-    "Please Register": "Παρακαλούμε εγγραφείτε",
-    "Redact": "Ανάκληση",
     "Reject": "Απόρριψη",
     "Remove": "Αφαίρεση",
     "Remove from Directory": "Αφαίρεση από το ευρετήριο",
     "Resend": "Αποστολή ξανά",
     "Riot Desktop on %(platformName)s": "Riot Desktop σε %(platformName)s",
-    "Room directory": "Ευρετήριο",
     "Room not found": "Το δωμάτιο δεν βρέθηκε",
     "Search": "Αναζήτηση",
     "Search…": "Αναζήτηση…",
     "Send": "Αποστολή",
-    "Settings": "Ρυθμίσεις",
-    "Start chat": "Έναρξη συνομιλίας",
     "This Room": "Στο δωμάτιο",
     "Unavailable": "Μη διαθέσιμο",
     "Unknown device": "Άγνωστη συσκευή",
@@ -99,7 +90,6 @@
     "Search for a room": "Αναζήτηση δωματίου",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Λυπούμαστε, αλλά ο περιηγητές σας <b>δεν</b> υποστηρίζεται από το Riot.",
     "There are advanced notifications which are not shown here": "Υπάρχουν προχωρημένες ειδοποιήσεις οι οποίες δεν εμφανίζονται εδώ",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Το δωμάτιο δεν είναι προσβάσιμο σε επισκέπτες. Πιθανόν να μπορέσετε να συνδεθείτε εάν εγγραφείτε.",
     "Unable to join network": "Δεν είναι δυνατή η σύνδεση στο δίκτυο",
     "unknown error code": "άγνωστος κωδικός σφάλματος",
     "Unnamed room": "Ανώνυμο δωμάτιο",
@@ -123,12 +113,10 @@
     "Yesterday": "Χθές",
     "OK": "Εντάξει",
     "You need to be using HTTPS to place a screen-sharing call.": "Απαιτείται η χρήση HTTPS για το διαμοιρασμό της επιφάνειας εργασίας μέσω κλήσης.",
-    "Welcome page": "Αρχική σελίδα",
     "Forget": "Παράλειψη",
     "Riot is not supported on mobile web. Install the app?": "Το Riot δεν υποστηρίζεται από περιηγητές κινητών. Θέλετε να εγκαταστήσετε την εφαρμογή;",
     "Unhide Preview": "Προεπισκόπηση",
     "Waiting for response from server": "Αναμονή απάντησης από τον διακομιστή",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Χρησιμοποιείτε το Riot ως επισκέπτης. <a>Εγγραφείτε</a> ή <a>συνδεθείτε</a> για να αποκτήσετε πρόσβαση σε περισσότερα δωμάτια και χαρακτηριστικά!",
     "Collecting logs": "Συγκέντρωση πληροφοριών",
     "Enable them now": "Ενεργοποίηση",
     "Failed to forget room %(errCode)s": "Δεν ήταν δυνατή η διαγραφή του δωματίου (%(errCode)s)",
@@ -142,15 +130,12 @@
     "Send logs": "Αποστολή πληροφοριών",
     "Source URL": "Πηγαίο URL",
     "The server may be unavailable or overloaded": "Ο διακομιστής είναι μη διαθέσιμος ή υπερφορτωμένος",
-    " to room": " στο δωμάτιο",
     "Unable to fetch notification target list": "Δεν ήταν δυνατή η εύρεση στόχων για τις ειδοποιήσεις",
     "Unable to look up room ID from server": "Δεν είναι δυνατή η εύρεση του ID για το δωμάτιο",
     "View Decrypted Source": "Προβολή του αποκρυπτογραφημένου κώδικα",
     "View Source": "Προβολή κώδικα",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Ισως να έχετε κάνει τις ρυθμίσεις σε άλλη εφαρμογή εκτός του Riot. Δεν μπορείτε να τις αλλάξετε μέσω του Riot αλλά ισχύουν κανονικά",
     "Couldn't find a matching Matrix room": "Δεν βρέθηκε κάποιο δωμάτιο",
-    "Drop here %(toAction)s": "Αποθέστε εδώ %(toAction)s",
-    "Failed to": "Απέτυχε να",
     "Failed to get public room list": "Δεν ήταν δυνατή η λήψη της λίστας με τα δημόσια δωμάτια",
     "Failed to set direct chat tag": "Δεν ήταν δυνατός ο χαρακτηρισμός της συνομιλίας ως 1-προς-1",
     "powered by Matrix": "βασισμένο στο πρωτόκολλο Matrix",
@@ -198,5 +183,12 @@
     "Failed to set Direct Message status of room": "Δεν ήταν δυνατός ο ορισμός της κατάστασης Direct Message του δωματίου",
     "Support for those using, running and writing other bridges": "Υποστήριξη για τους χρήστες που χρησιμοποιούν ή αναπτύσσουν εφαρμογές ενσωμάτωσης για το Matrix",
     "You have successfully set a password and an email address!": "Ο κωδικός πρόσβασης και η διεύθυνση ηλεκτρονικής αλληλογραφίας ορίστηκαν επιτυχώς!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Να θυμάστε ότι μπορείτε πάντα να ορίσετε μια διεύθυνση ηλεκτρονικής αλληλογραφίας στις ρυθμίσεις χρήστη αν αλλάξετε γνώμη.",
+    "To return to your account in future you need to <u>set a password</u>": "Για να επιστρέψετε στον λογαριασμό σας μελλοντικα πρέπει να ορίσετε έναν <u>κωδικό πρόσβασης</u>",
+    "Set Password": "Ορισμός κωδικού πρόσβασης",
+    "Warning": "Προειδοποίηση",
+    "Checking for an update...": "Γίνεται έλεγχος για ενημέρωση...",
+    "Error encountered (%(errorDetail)s).": "Παρουσιάστηκε σφάλμα (%(errorDetail)s).",
+    "No update available.": "Δεν υπάρχει διαθέσιμη ενημέρωση.",
+    "Downloading update...": "Γίνεται λήψη της ενημέρωσης..."
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 4717e267ea..543ee7bbda 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,202 +1,217 @@
 {
-  "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
-  "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.",
-  "A new version of Riot is available.": "A new version of Riot is available.",
-  "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
-  "Advanced notification settings": "Advanced notification settings",
-  "All messages": "All messages",
-  "All messages (loud)": "All messages (loud)",
-  "All Rooms": "All Rooms",
-  "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
-  "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
-  "Call invitation": "Call invitation",
-  "Cancel": "Cancel",
-  "Cancel Sending": "Cancel Sending",
-  "Can't update user notification settings": "Can't update user notification settings",
-  "Changelog": "Changelog",
-  "Close": "Close",
-  "Collapse panel": "Collapse panel",
-  "Collecting app version information": "Collecting app version information",
-  "Collecting logs": "Collecting logs",
-  "Create new room": "Create new room",
-  "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
-  "Custom Server Options": "Custom Server Options",
-  "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
-  "delete the alias.": "delete the alias.",
-  "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
-  "Describe your problem here.": "Describe your problem here.",
-  "Direct Chat": "Direct Chat",
-  "Directory": "Directory",
-  "Dismiss": "Dismiss",
-  "Download this file": "Download this file",
-  "Drop here %(toAction)s": "Drop here %(toAction)s",
-  "Enable audible notifications in web client": "Enable audible notifications in web client",
-  "Enable desktop notifications": "Enable desktop notifications",
-  "Enable email notifications": "Enable email notifications",
-  "Enable notifications for this account": "Enable notifications for this account",
-  "Enable them now": "Enable them now",
-  "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
-  "Error": "Error",
-  "Error saving email notification preferences": "Error saving email notification preferences",
-  "#example": "#example",
-  "Expand panel": "Expand panel",
-  "Failed to": "Failed to",
-  "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
-  "Failed to change settings": "Failed to change settings",
-  "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
-  "Failed to update keywords": "Failed to update keywords",
-  "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
-  "Failed to get public room list": "Failed to get public room list",
-  "Failed to join the room": "Failed to join the room",
-  "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
-  "Failed to send report: ": "Failed to send report: ",
-  "Failed to set direct chat tag": "Failed to set direct chat tag",
-  "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
-  "Favourite": "Favourite",
-  "Fetching third party location failed": "Fetching third party location failed",
-  "Files": "Files",
-  "Filter room names": "Filter room names",
-  "Forget": "Forget",
-  "Forward Message": "Forward Message",
-  " from room": " from room",
-  "Guests can join": "Guests can join",
-  "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
-  "Hide panel": "Hide panel",
-  "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
-  "I understand the risks and wish to continue": "I understand the risks and wish to continue",
-  "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:": "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:",
-  "Invite to this room": "Invite to this room",
-  "Keywords": "Keywords",
-  "Leave": "Leave",
-  "Login": "Login",
-  "Loading bug report module": "Loading bug report module",
-  "Low Priority": "Low Priority",
-  "Members": "Members",
-  "Mentions only": "Mentions only",
-  "Messages containing my display name": "Messages containing my display name",
-  "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
-  "Messages containing my user name": "Messages containing my user name",
-  "Messages in group chats": "Messages in group chats",
-  "Messages in one-to-one chats": "Messages in one-to-one chats",
-  "Messages sent by bot": "Messages sent by bot",
-  "more": "more",
-  "Mute": "Mute",
-  "No rooms to show": "No rooms to show",
-  "Noisy": "Noisy",
-  "Notification targets": "Notification targets",
-  "Notifications": "Notifications",
-  "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
-  "Notify for all other messages/rooms": "Notify for all other messages/rooms",
-  "Notify me for anything else": "Notify me for anything else",
-  "Off": "Off",
-  "On": "On",
-  "Operation failed": "Operation failed",
-  "Permalink": "Permalink",
-  "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Please describe the bug. What did you do? What did you expect to happen? What actually happened?",
-  "Please describe the bug and/or send logs.": "Please describe the bug and/or send logs.",
-  "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.",
-  "Please Register": "Please Register",
-  "powered by Matrix": "powered by Matrix",
-  "Quote": "Quote",
-  "Redact": "Redact",
-  "Reject": "Reject",
-  "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
-  "Remove": "Remove",
-  "remove %(name)s from the directory.": "remove %(name)s from the directory.",
-  "Remove from Directory": "Remove from Directory",
-  "Report a bug": "Report a bug",
-  "Resend": "Resend",
-  "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
-  "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
-  "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
-  "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
-  "Room directory": "Room directory",
-  "Room not found": "Room not found",
-  "Search": "Search",
-  "Search…": "Search…",
-  "Search for a room": "Search for a room",
-  "Send": "Send",
-  "Send logs": "Send logs",
-  "Settings": "Settings",
-  "Source URL": "Source URL",
-  "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
-  "Start chat": "Start chat",
-  "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
-  "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
-  "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
-  "This Room": "This Room",
-  "This room is inaccessible to guests. You may be able to join if you register.": "This room is inaccessible to guests. You may be able to join if you register.",
-  " to room": " to room",
-  "Unable to fetch notification target list": "Unable to fetch notification target list",
-  "Unable to join network": "Unable to join network",
-  "Unable to look up room ID from server": "Unable to look up room ID from server",
-  "Unavailable": "Unavailable",
-  "Unhide Preview": "Unhide Preview",
-  "Unknown device": "Unknown device",
-  "unknown error code": "unknown error code",
-  "Unnamed room": "Unnamed room",
-  "Update": "Update",
-  "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
-  "Uploading report": "Uploading report",
-  "View Decrypted Source": "View Decrypted Source",
-  "View Source": "View Source",
-  "What's New": "What's New",
-  "What's new?": "What's new?",
-  "Waiting for response from server": "Waiting for response from server",
-  "When I'm invited to a room": "When I'm invited to a room",
-  "World readable": "World readable",
-  "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
-  "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
-  "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-  "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
-  "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
-  "Sunday": "Sunday",
-  "Monday": "Monday",
-  "Tuesday": "Tuesday",
-  "Wednesday": "Wednesday",
-  "Thursday": "Thursday",
-  "Friday": "Friday",
-  "Saturday": "Saturday",
-  "Today": "Today",
-  "Yesterday": "Yesterday",
-  "OK": "OK",
-  "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
-  "Welcome page": "Welcome page",
-  "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
-  "Welcome to Riot.im": "Welcome to Riot.im",
-  "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
-  "Search the room directory": "Search the room directory",
-  "Chat with Riot Bot": "Chat with Riot Bot",
-  "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
-  "General discussion about Matrix and Riot": "General discussion about Matrix and Riot",
-  "Discussion of all things Matrix!": "Discussion of all things Matrix!",
-  "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
-  "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
-  "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
-  "Matrix technical discussions": "Matrix technical discussions",
-  "Running Matrix services": "Running Matrix services",
-  "Community-run support for Synapse": "Community-run support for Synapse",
-  "Admin support for Dendrite": "Admin support for Dendrite",
-  "Announcements about Synapse releases": "Announcements about Synapse releases",
-  "Support for those using and running matrix-appservice-irc": "Support for those using and running matrix-appservice-irc",
-  "Building services on Matrix": "Building services on Matrix",
-  "Support for those using the Matrix spec": "Support for those using the Matrix spec",
-  "Design and implementation of E2E in Matrix": "Design and implementation of E2E in Matrix",
-  "Implementing VR services with Matrix": "Implementing VR services with Matrix",
-  "Implementing VoIP services with Matrix": "Implementing VoIP services with Matrix",
-  "Discussion of the Identity Service API": "Discussion of the Identity Service API",
-  "Support for those using, running and writing other bridges": "Support for those using, running and writing other bridges",
-  "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
-  "Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
-  "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
-  "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators",
-  "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
-  "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
-  "You have successfully set a password!": "You have successfully set a password!",
-  "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
-  "Continue": "Continue",
-  "Please set a password!": "Please set a password!",
-  "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
-  "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
-  "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
+    "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
+    "Collecting app version information": "Collecting app version information",
+    "Collecting logs": "Collecting logs",
+    "Uploading report": "Uploading report",
+    "Waiting for response from server": "Waiting for response from server",
+    "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
+    "Unknown device": "Unknown device",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
+    "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
+    "Messages containing my display name": "Messages containing my display name",
+    "Messages containing my user name": "Messages containing my user name",
+    "Messages in one-to-one chats": "Messages in one-to-one chats",
+    "Messages in group chats": "Messages in group chats",
+    "When I'm invited to a room": "When I'm invited to a room",
+    "Call invitation": "Call invitation",
+    "Messages sent by bot": "Messages sent by bot",
+    "Error saving email notification preferences": "Error saving email notification preferences",
+    "An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
+    "Keywords": "Keywords",
+    "Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
+    "OK": "OK",
+    "Failed to change settings": "Failed to change settings",
+    "Operation failed": "Operation failed",
+    "Can't update user notification settings": "Can't update user notification settings",
+    "Failed to update keywords": "Failed to update keywords",
+    "Messages containing <span>keywords</span>": "Messages containing <span>keywords</span>",
+    "Notify for all other messages/rooms": "Notify for all other messages/rooms",
+    "Notify me for anything else": "Notify me for anything else",
+    "Enable notifications for this account": "Enable notifications for this account",
+    "All notifications are currently disabled for all targets.": "All notifications are currently disabled for all targets.",
+    "Add an email address above to configure email notifications": "Add an email address above to configure email notifications",
+    "Enable email notifications": "Enable email notifications",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifications on the following keywords follow rules which can’t be displayed here:",
+    "Unable to fetch notification target list": "Unable to fetch notification target list",
+    "Notification targets": "Notification targets",
+    "Advanced notification settings": "Advanced notification settings",
+    "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
+    "Enable desktop notifications": "Enable desktop notifications",
+    "Show message in desktop notification": "Show message in desktop notification",
+    "Enable audible notifications in web client": "Enable audible notifications in web client",
+    "Off": "Off",
+    "On": "On",
+    "Noisy": "Noisy",
+    "Failed to set direct chat tag": "Failed to set direct chat tag",
+    "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
+    "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
+    "Search…": "Search…",
+    "Search": "Search",
+    "This Room": "This Room",
+    "All Rooms": "All Rooms",
+    "Sunday": "Sunday",
+    "Monday": "Monday",
+    "Tuesday": "Tuesday",
+    "Wednesday": "Wednesday",
+    "Thursday": "Thursday",
+    "Friday": "Friday",
+    "Saturday": "Saturday",
+    "Today": "Today",
+    "Yesterday": "Yesterday",
+    "Custom Server Options": "Custom Server Options",
+    "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
+    "Dismiss": "Dismiss",
+    "powered by Matrix": "powered by Matrix",
+    "You are not receiving desktop notifications": "You are not receiving desktop notifications",
+    "Enable them now": "Enable them now",
+    "What's New": "What's New",
+    "Update": "Update",
+    "What's new?": "What's new?",
+    "A new version of Riot is available.": "A new version of Riot is available.",
+    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
+    "Set Password": "Set Password",
+    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+    "Checking for an update...": "Checking for an update...",
+    "No update available.": "No update available.",
+    "Downloading update...": "Downloading update...",
+    "Warning": "Warning",
+    "Error": "Error",
+    "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
+    "Uploaded on %(date)s by %(user)s": "Uploaded on %(date)s by %(user)s",
+    "Remove": "Remove",
+    "Close": "Close",
+    "Download this file": "Download this file",
+    "Please describe the bug and/or send logs.": "Please describe the bug and/or send logs.",
+    "Loading bug report module": "Loading bug report module",
+    "Bug report sent": "Bug report sent",
+    "Thank you!": "Thank you!",
+    "Failed to send report: ": "Failed to send report: ",
+    "Cancel": "Cancel",
+    "Report a bug": "Report a bug",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Please describe the bug. What did you do? What did you expect to happen? What actually happened?",
+    "Describe your problem here.": "Describe your problem here.",
+    "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:": "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:",
+    "Send logs": "Send logs",
+    "Send": "Send",
+    "Unavailable": "Unavailable",
+    "Changelog": "Changelog",
+    "Back": "Back",
+    "You must specify an event type!": "You must specify an event type!",
+    "Event sent!": "Event sent!",
+    "Failed to send custom event.": "Failed to send custom event.",
+    "Event Type": "Event Type",
+    "Event Content": "Event Content",
+    "State Key": "State Key",
+    "Edit": "Edit",
+    "Filter results": "Filter results",
+    "Send Custom Event": "Send Custom Event",
+    "Send Custom State Event": "Send Custom State Event",
+    "Explore Room State": "Explore Room State",
+    "Developer Tools": "Developer Tools",
+    "You have successfully set a password!": "You have successfully set a password!",
+    "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
+    "You can now return to your account after signing out, and sign in on other devices.": "You can now return to your account after signing out, and sign in on other devices.",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
+    "Continue": "Continue",
+    "Failed to change password. Is your password correct?": "Failed to change password. Is your password correct?",
+    "(HTTP status %(httpStatus)s)": "(HTTP status %(httpStatus)s)",
+    "Please set a password!": "Please set a password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "This will allow you to return to your account after signing out, and sign in on other devices.",
+    "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
+    "Resend": "Resend",
+    "Cancel Sending": "Cancel Sending",
+    "Forward Message": "Forward Message",
+    "Unpin Message": "Unpin Message",
+    "Pin Message": "Pin Message",
+    "View Source": "View Source",
+    "View Decrypted Source": "View Decrypted Source",
+    "Unhide Preview": "Unhide Preview",
+    "Permalink": "Permalink",
+    "Quote": "Quote",
+    "Source URL": "Source URL",
+    "Failed to set Direct Message status of room": "Failed to set Direct Message status of room",
+    "unknown error code": "unknown error code",
+    "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
+    "All messages (loud)": "All messages (loud)",
+    "All messages": "All messages",
+    "Mentions only": "Mentions only",
+    "Mute": "Mute",
+    "Leave": "Leave",
+    "Forget": "Forget",
+    "Reject": "Reject",
+    "Favourite": "Favourite",
+    "Low Priority": "Low Priority",
+    "Direct Chat": "Direct Chat",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "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.": "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
+    "I understand the risks and wish to continue": "I understand the risks and wish to continue",
+    "Couldn't load home page": "Couldn't load home page",
+    "Login": "Login",
+    "Register": "Register",
+    "Invite to this room": "Invite to this room",
+    "Members": "Members",
+    "Files": "Files",
+    "Notifications": "Notifications",
+    "Rooms": "Rooms",
+    "Hide panel": "Hide panel",
+    "Invite to this community": "Invite to this community",
+    "Add rooms to this community": "Add rooms to this community",
+    "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
+    "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
+    "Failed to get public room list": "Failed to get public room list",
+    "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
+    "Unnamed room": "Unnamed room",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Delete the room alias %(alias)s and remove %(name)s from the directory?",
+    "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
+    "Remove from Directory": "Remove from Directory",
+    "remove %(name)s from the directory.": "remove %(name)s from the directory.",
+    "delete the alias.": "delete the alias.",
+    "Unable to join network": "Unable to join network",
+    "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
+    "Room not found": "Room not found",
+    "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
+    "Fetching third party location failed": "Fetching third party location failed",
+    "Unable to look up room ID from server": "Unable to look up room ID from server",
+    "World readable": "World readable",
+    "Guests can join": "Guests can join",
+    "Directory": "Directory",
+    "No rooms to show": "No rooms to show",
+    "Search for a room": "Search for a room",
+    "#example": "#example",
+    "more": "more",
+    "Expand panel": "Expand panel",
+    "Collapse panel": "Collapse panel",
+    "Filter room names": "Filter room names",
+    "Welcome to Riot.im": "Welcome to Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",
+    "Search the room directory": "Search the room directory",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!",
+    "Chat with Riot Bot": "Chat with Riot Bot",
+    "Get started with some tips from Riot Bot!": "Get started with some tips from Riot Bot!",
+    "General discussion about Matrix and Riot": "General discussion about Matrix and Riot",
+    "Discussion of all things Matrix!": "Discussion of all things Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
+    "Matrix technical discussions": "Matrix technical discussions",
+    "Running Matrix services": "Running Matrix services",
+    "Community-run support for Synapse": "Community-run support for Synapse",
+    "Admin support for Dendrite": "Admin support for Dendrite",
+    "Announcements about Synapse releases": "Announcements about Synapse releases",
+    "Support for those using and running matrix-appservice-irc": "Support for those using and running matrix-appservice-irc",
+    "Building services on Matrix": "Building services on Matrix",
+    "Support for those using the Matrix spec": "Support for those using the Matrix spec",
+    "Design and implementation of E2E in Matrix": "Design and implementation of E2E in Matrix",
+    "Implementing VR services with Matrix": "Implementing VR services with Matrix",
+    "Implementing VoIP services with Matrix": "Implementing VoIP services with Matrix",
+    "Discussion of the Identity Service API": "Discussion of the Identity Service API",
+    "Support for those using, running and writing other bridges": "Support for those using, running and writing other bridges",
+    "Contributing code to Matrix and Riot": "Contributing code to Matrix and Riot",
+    "Dev chat for the Riot/Web dev team": "Dev chat for the Riot/Web dev team",
+    "Dev chat for the Dendrite dev team": "Dev chat for the Dendrite dev team",
+    "Co-ordination for Riot/Web translators": "Co-ordination for Riot/Web translators"
 }
diff --git a/src/i18n/strings/en_US.json b/src/i18n/strings/en_US.json
index 2d7a5fa148..012b1f5da1 100644
--- a/src/i18n/strings/en_US.json
+++ b/src/i18n/strings/en_US.json
@@ -18,7 +18,6 @@
     "Collapse panel": "Collapse panel",
     "Collecting app version information": "Collecting app version information",
     "Collecting logs": "Collecting logs",
-    "Create new room": "Create new room",
     "Couldn't find a matching Matrix room": "Couldn't find a matching Matrix room",
     "Custom Server Options": "Custom Server Options",
     "customServer_text": "You can use the custom server options to sign into other Matrix servers by specifying a different Home server URL.<br/>This allows you to use Riot with an existing Matrix account on a different home server.<br/><br/>You can also set a custom identity server but you won't be able to invite users by email address, or be invited by email address yourself.",
@@ -29,7 +28,6 @@
     "Directory": "Directory",
     "Dismiss": "Dismiss",
     "Download this file": "Download this file",
-    "Drop here %(toAction)s": "Drop here %(toAction)s",
     "Enable audible notifications in web client": "Enable audible notifications in web client",
     "Enable desktop notifications": "Enable desktop notifications",
     "Enable email notifications": "Enable email notifications",
@@ -40,14 +38,12 @@
     "Error saving email notification preferences": "Error saving email notification preferences",
     "#example": "#example",
     "Expand panel": "Expand panel",
-    "Failed to": "Failed to",
     "Failed to add tag %(tagName)s to room": "Failed to add tag %(tagName)s to room",
     "Failed to change settings": "Failed to change settings",
     "Failed to forget room %(errCode)s": "Failed to forget room %(errCode)s",
     "Failed to update keywords": "Failed to update keywords",
     "Failed to get protocol list from Home Server": "Failed to get protocol list from Home Server",
     "Failed to get public room list": "Failed to get public room list",
-    "Failed to join the room": "Failed to join the room",
     "Failed to remove tag %(tagName)s from room": "Failed to remove tag %(tagName)s from room",
     "Failed to send report: ": "Failed to send report: ",
     "Failed to set direct chat tag": "Failed to set direct chat tag",
@@ -58,9 +54,7 @@
     "Filter room names": "Filter room names",
     "Forget": "Forget",
     "Forward Message": "Forward Message",
-    " from room": " from room",
     "Guests can join": "Guests can join",
-    "Guest users can't invite users. Please register to invite.": "Guest users can't invite users. Please register to invite.",
     "Hide panel": "Hide panel",
     "I understand the risks and wish to continue": "I understand the risks and wish to continue",
     "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:": "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 uncheck:",
@@ -93,10 +87,8 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Please describe the bug. What did you do? What did you expect to happen? What actually happened?",
     "Please describe the bug and/or send logs.": "Please describe the bug and/or send logs.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.",
-    "Please Register": "Please Register",
     "powered by Matrix": "powered by Matrix",
     "Quote": "Quote",
-    "Redact": "Redact",
     "Reject": "Reject",
     "Remove %(name)s from the directory?": "Remove %(name)s from the directory?",
     "Remove": "Remove",
@@ -108,23 +100,18 @@
     "Riot does not know how to join a room on this network": "Riot does not know how to join a room on this network",
     "Riot is not supported on mobile web. Install the app?": "Riot is not supported on mobile web. Install the app?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.",
-    "Room directory": "Room directory",
     "Room not found": "Room not found",
     "Search": "Search",
     "Search…": "Search…",
     "Search for a room": "Search for a room",
     "Send": "Send",
     "Send logs": "Send logs",
-    "Settings": "Settings",
     "Source URL": "Source URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Sorry, your browser is <b>not</b> able to run Riot.",
-    "Start chat": "Start chat",
     "The Home Server may be too old to support third party networks": "The Home Server may be too old to support third party networks",
     "There are advanced notifications which are not shown here": "There are advanced notifications which are not shown here",
     "The server may be unavailable or overloaded": "The server may be unavailable or overloaded",
     "This Room": "This Room",
-    "This room is inaccessible to guests. You may be able to join if you register.": "This room is inaccessible to guests. You may be able to join if you register.",
-    " to room": " to room",
     "Unable to fetch notification target list": "Unable to fetch notification target list",
     "Unable to join network": "Unable to join network",
     "Unable to look up room ID from server": "Unable to look up room ID from server",
@@ -146,7 +133,6 @@
     "You cannot delete this image. (%(code)s)": "You cannot delete this image. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "You cannot delete this message. (%(code)s)",
     "You are not receiving desktop notifications": "You are not receiving desktop notifications",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply",
     "Sunday": "Sunday",
     "Monday": "Monday",
@@ -159,7 +145,6 @@
     "Yesterday": "Yesterday",
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "You need to be using HTTPS to place a screen-sharing call.",
-    "Welcome page": "Welcome page",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!",
     "Login": "Login",
     "Continue": "Continue",
@@ -198,5 +183,15 @@
     "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
     "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
     "You have successfully set a password and an email address!": "You have successfully set a password and an email address!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Remember, you can always set an email address in user settings if you change your mind.",
+    "Warning": "Warning",
+    "Pin Message": "Pin Message",
+    "Unpin Message": "Unpin Message",
+    "Checking for an update...": "Checking for an update...",
+    "Error encountered (%(errorDetail)s).": "Error encountered (%(errorDetail)s).",
+    "No update available.": "No update available.",
+    "Downloading update...": "Downloading update...",
+    "To return to your account in future you need to <u>set a password</u>": "To return to your account in future you need to <u>set a password</u>",
+    "Set Password": "Set Password",
+    "Couldn't load home page": "Couldn't load home page"
 }
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index a7baa0430b..6dcf080954 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -4,7 +4,6 @@
     "All messages (loud)": "Ĉiuj mesaĝoj (lauta)",
     "All Rooms": "Ĉiuj babilejoj",
     "Cancel": "Nuligi",
-    "Create new room": "Krei novan babilejon",
     "delete the alias.": "Forviŝi la kromnomon.",
     "Describe your problem here.": "Priskribi vian problemon ĉi tie.",
     "Direct Chat": "Rekta babilejo",
@@ -14,9 +13,7 @@
     "#example": "#ekzemplo",
     "Files": "Dosieroj",
     "Forget": "Forgesi",
-    " from room": " el babilejo",
     "Guests can join": "Gastoj povas aliĝi",
-    "Guest users can't invite users. Please register to invite.": "Gasta uzantoj ne povas inviti uzantojn. Bonvolu registri por inviti.",
     "I understand the risks and wish to continue": "Mi komprenas la riskonj kaj volas daŭrigi",
     "Invite to this room": "Inviti en ĉi tiun babilejon",
     "Keywords": "Ŝlosilvortoj",
@@ -29,18 +26,15 @@
     "Mute": "Silentigi",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Bonvolu priskribi la cimon. Kion vi faris? Kion vi atendis okazi? Kion fakte okazis?",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Bonvolu instali <a href=\"https://www.google.com/chrome\">\"Chrome\"</a> aŭ <a href=\"https://getfirefox.com\">\"Firefox\"</a> por la plej bona sperto.",
-    "Please Register": "Bonvolu registri",
     "powered by Matrix": "funkciigata de \"Matrix\"",
     "Quote": "Citu",
     "Reject": "Malakcepti",
     "Resend": "Resendi",
-    "Room directory": "Babileja dosierujo",
     "Room not found": "Babilejo ne trovita",
     "Search": "Serĉi",
     "Search…": "Serĉi…",
     "Search for a room": "Serĉi babilejon",
     "Send": "Sendi",
-    "Start chat": "Komenci babiladon",
     "This Room": "Ĉi tiu Babilejo",
     "Add an email address above to configure email notifications": "Aldonu retadreson supre por agordi retpoŝtajn sciigojn",
     "Advanced notification settings": "Agordoj de sciigoj specialaj",
@@ -67,14 +61,12 @@
     "Error": "Eraro",
     "Error saving email notification preferences": "Eraro konservante agordojn pri retpoŝtaj sciigoj",
     "Expand panel": "Pli grandigi panelon",
-    "Failed to": "Malsukcesis",
     "Failed to add tag %(tagName)s to room": "Malsukcesis aldoni etikedon %(tagName)s al la ejo",
     "Failed to change settings": "Malsukcesis ŝanĝi la agordojn",
     "Failed to forget room %(errCode)s": "Malsukcesis forgesi la ejon %(errCode)s",
     "Failed to update keywords": "Malsukcesis ĝisdatigi la ŝlosilvortojn",
     "Failed to get protocol list from Home Server": "Malsukcesis obteni la liston de protokoloj por la servilo Home",
     "Failed to get public room list": "Malsukcesis obteni la liston de publikaj ejoj",
-    "Failed to join the room": "Malsukcesis aliĝi al la ejo",
     "Failed to remove tag %(tagName)s from room": "Malsukcesis forigi la etikedon %(tagName)s el la ejo",
     "Failed to send report: ": "Malsukcesis sendi raporton: ",
     "Failed to set direct chat tag": "Malsukcesis agordi la etikedon de rekta babilejo",
@@ -102,7 +94,6 @@
     "Operation failed": "La operacio malsukcesis",
     "Permalink": "Konstanta ligilo",
     "Please describe the bug and/or send logs.": "Bonvolu priskribi la cimon kaj/aŭ sendi protokolojn.",
-    "Redact": "Redakti",
     "Remove %(name)s from the directory?": "Forigi %(name)s el la dosierujo?",
     "Remove": "Forigi",
     "remove %(name)s from the directory.": "forigi %(name)s el la dosierujo.",
@@ -113,14 +104,11 @@
     "Riot is not supported on mobile web. Install the app?": "Riot ne estas subtenita je mobile web. Instali la aplikaĵon?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot uzas multajn specialajn trajtojn, kelkaj ne estas disponeblaj aŭ estas eksperimentaj en via nuna retumilo.",
     "Send logs": "Sendi protokolojn",
-    "Settings": "Agordoj",
     "Source URL": "Fonta URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Pardonu, via retumilo <b>ne kapablas</b> funkciigi Riot.",
     "The Home Server may be too old to support third party networks": "La servilo Home povas esti tro malnova por subteni retoj de ekstera liveranto",
     "There are advanced notifications which are not shown here": "Estas specialaj sciigoj kiuj ne estas montritaj ĉi tie",
     "The server may be unavailable or overloaded": "La servilo povas esti maldisponebla aŭ tro ŝarĝita",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Ci tiu ejo estas neenirebla por gastoj. Vi povus aliĝi se vi registriĝas.",
-    " to room": " al ejo",
     "Unable to fetch notification target list": "Ne eblis obteni la liston de celoj por sciigoj",
     "Unable to join network": "Ne eblis kuniĝi kun la reto",
     "Unable to look up room ID from server": "Ne eblis trovi la identigon el la servilo",
@@ -142,7 +130,6 @@
     "You cannot delete this image. (%(code)s)": "Vi ne povas forviŝi tiun ĉi bildon. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Vi ne povas forviŝi tiun ĉi mesaĝon. (%(code)s)",
     "You are not receiving desktop notifications": "Vi ne estas ricevante sciigojn labortablan",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vi uzas Riot kiel gasto. <a>Registriĝu</a> aŭ <a>ensalutu</a> por atingi pli da ejoj kaj funkcioj!",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vi eble agordis ilin en kliento kiu ne estis Riot. Vi ne povas agordi ilin en Riot sed ili ankoraŭ validas",
     "Sunday": "Dimanĉo",
     "Monday": "Lundo",
@@ -155,7 +142,6 @@
     "Yesterday": "Hieraŭ",
     "OK": "Bone",
     "You need to be using HTTPS to place a screen-sharing call.": "Vi devas uzi HTTPS por starigi ekranan vokon.",
-    "Welcome page": "Paĝo de bonveno",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Kun via nuna retumilo, la aspekto kaj funkciado de la aplikaĵo povas esti tute malĝusta, kaj kelkaj aŭ ĉiu funkcioj eble ne funkcios. Se vi volas provi ĉiuokaze vi rajtas daŭrigi, sed ne estos subteno se vi trafas problemojn!",
     "Welcome to Riot.im": "Bonvenon al Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Malcentra, ĉifrita babilejo &amp; kunlaboro povigita de [matrix]",
@@ -195,8 +181,10 @@
     "Remember, you can always set an email address in user settings if you change your mind.": "Memoru, vi ĉiam povas agordi retpoŝtadreson en via uzanta agordo se vi decidas ŝanĝi ĝin poste.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s per %(browserName)s je %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> kaj <a href=\"http://opera.com\">Opera</a> ankaŭ funkcias.",
-    "Drop here %(toAction)s": "Forlasi ĉi tie %(toAction)s",
     "Favourite": "Plej ŝatata",
     "Fetching third party location failed": "Venigado de ekstere liverita loko malsukcesis",
-    "Filter room names": "Filtri nomojn de ejoj"
+    "Filter room names": "Filtri nomojn de ejoj",
+    "Warning": "Averto",
+    "Checking for an update...": "Kontrolanta por ĝisdatigo...",
+    "No update available.": "Ĝisdatigo ne estas disponata."
 }
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index af1efb60e8..b0fbdaa844 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -1,22 +1,20 @@
 {
-    "Add an email address above to configure email notifications": "Añade una dirección de email arriba para configurar las notificaciones por email",
-    "Advanced notification settings": "Configuración de notificaciones avanzada",
+    "Add an email address above to configure email notifications": "Añade una dirección de correo arriba para configurar las notificaciones por correo",
+    "Advanced notification settings": "Configuración avanzada de notificaciones",
     "All messages": "Todos los mensajes",
     "An error occurred whilst saving your email notification preferences.": "Se ha producido un error al guardar las preferencias de notificación por email.",
     "Call invitation": "Invitación a la llamada",
     "Cancel Sending": "Cancelar envío",
-    "Can't update user notification settings": "No se puede actualizar la configuración de notificación de usuario",
+    "Can't update user notification settings": "No se puede actualizar la configuración de notificaciones del usuario",
     "Close": "Cerrar",
-    "Create new room": "Crear nueva sala",
     "Couldn't find a matching Matrix room": "No se encontró una sala Matrix que coincidiera",
     "Custom Server Options": "Opciones de Servidor Personalizado",
-    "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás invitar usuarios por dirección de email, ni ser invitado por email por ti mismo.",
+    "customServer_text": "Puedes utilizar las opciones de servidor personalizadas para iniciar sesión en otros servidores Matrix especificando una URL de Home server distinta.<br/>Esto te permite usar Riot con una cuenta Matrix existente en un Home server distinto.<br/><br/>También puedes configurar un servidor de identidad personalizado, pero no podrás ni invitar usuarios ni ser invitado a través de tu dirección de correo electrónico.",
     "delete the alias.": "borrar el alias.",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar la sala alias %(alias)s y retirar %(name)s del directorio?",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "¿Borrar el alias de la sala %(alias)s y eliminar %(name)s del directorio?",
     "Direct Chat": "Conversación directa",
     "Directory": "Directorio",
     "Download this file": "Descargar este archivo",
-    "Drop here %(toAction)s": "Suelta aquí %(toAction)s",
     "Enable audible notifications in web client": "Habilitar notificaciones audibles en el cliente web",
     "Enable desktop notifications": "Habilitar notificaciones de escritorio",
     "Enable email notifications": "Habilitar notificaciones por email",
@@ -30,9 +28,8 @@
     "Failed to change settings": "Error al cambiar la configuración",
     "Failed to forget room %(errCode)s": "Falló al olvidar la sala %(errCode)s",
     "Failed to update keywords": "Error al actualizar las palabras clave",
-    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos de Home Server",
+    "Failed to get protocol list from Home Server": "Error al obtener la lista de protocolos desde el Home Server",
     "Failed to get public room list": "No se pudo obtener la lista de salas públicas",
-    "Failed to join the room": "Falló al unirse a la sala",
     "Failed to remove tag %(tagName)s from room": "Error al eliminar la etiqueta %(tagName)s de la sala",
     "Failed to set direct chat tag": "Error al establecer la etiqueta de chat directo",
     "Failed to set Direct Message status of room": "No se pudo establecer el estado de Mensaje Directo de la sala",
@@ -41,16 +38,14 @@
     "Files": "Archivos",
     "Filter room names": "Filtrar los nombres de las salas",
     "Forget": "Olvidar",
-    " from room": " de la sala",
     "Guests can join": "Los invitados se pueden unir",
-    "Guest users can't invite users. Please register to invite.": "Los usuarios invitados no pueden invitar usuarios. Por favor, regístrate para poder invitar.",
     "Invite to this room": "Invitar a esta sala",
     "Keywords": "Palabras clave",
     "Leave": "Salir",
     "Low Priority": "Baja Prioridad",
     "Members": "Miembros",
     "Mentions only": "Sólo menciones",
-    "Messages containing my display name": "Mensajes que contienen mi nombre para mostrar",
+    "Messages containing my display name": "Mensajes que contienen mi nombre",
     "Messages containing my user name": "Mensajes que contienen mi nombre de usuario",
     "Messages in group chats": "Mensajes en chats de grupo",
     "Messages in one-to-one chats": "Mensajes en chats uno a uno",
@@ -67,9 +62,7 @@
     "On": "Encendido",
     "Operation failed": "Falló la operación",
     "Permalink": "Enlace permanente",
-    "Please Register": "Por favor, regístrese",
     "Quote": "Citar",
-    "Redact": "Redactar",
     "Reject": "Rechazar",
     "Remove %(name)s from the directory?": "¿Retirar %(name)s del directorio?",
     "Remove": "Eliminar",
@@ -77,17 +70,12 @@
     "Remove from Directory": "Retirar del Directorio",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "Riot no sabe cómo unirse a una sala en esta red",
-    "Room directory": "Directorio de salas",
     "Room not found": "Sala no encontrada",
     "Search for a room": "Buscar sala",
-    "Settings": "Configuración",
     "Source URL": "URL de origen",
-    "Start chat": "Comenzar chat",
     "The Home Server may be too old to support third party networks": "El Home Server puede ser demasiado antiguo para soportar redes de terceros",
     "There are advanced notifications which are not shown here": "Hay notificaciones avanzadas que no se muestran aquí",
     "The server may be unavailable or overloaded": "El servidor puede estar no disponible o sobrecargado",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala es inaccesible para los invitados. Puedes unirse si te registras.",
-    " to room": " a la sala",
     "Unable to fetch notification target list": "No se puede obtener la lista de objetivos de notificación",
     "Unable to join network": "No se puede unir a la red",
     "Unable to look up room ID from server": "No se puede buscar el ID de la sala desde el servidor",
@@ -112,11 +100,10 @@
     "Saturday": "Sábado",
     "Today": "Hoy",
     "Yesterday": "Ayer",
-    "Welcome page": "Página de bienvenida",
     "Continue": "Continuar",
     "Search": "Búsqueda",
     "OK": "Correcto",
-    "Failed to change password. Is your password correct?": "Falló al cambiar la clave, ¿Está correcta tu clave?",
+    "Failed to change password. Is your password correct?": "No se pudo cambiar la contraseña. ¿Está usando la correcta?",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> y <a href=\"http://opera.com\">Opera</a> también funcionan.",
     "A new version of Riot is available.": "Una nueva versión de Riot está disponible.",
     "Cancel": "Cancelar",
@@ -125,54 +112,52 @@
     "Hide panel": "Ocultar panel",
     "(HTTP status %(httpStatus)s)": "(estado HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Entiendo los riesgos y deseo continuar",
-    "Changelog": "Bitácora de cambios",
+    "Changelog": "Registro de cambios",
     "Collapse panel": "Colapsar panel",
     "Remember, you can always set an email address in user settings if you change your mind.": "Recuerde que, si es necesario, puede establecer una dirección de email en las preferencias de usuario.",
     "All Rooms": "Todas las salas",
     "Expand panel": "Expandir panel",
-    "Failed to": "Falló",
-    "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:": "Para diagnosticar los problemas, las trazas de este cliente serán enviadas adjuntas a este informe de defecto. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
-    "Login": "Abrir sesión",
-    "Report a bug": "Informe un defecto",
+    "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:": "Para diagnosticar los problemas, los registros de este cliente serán enviados adjuntos a este informe de fallo. Si quisiera enviar el texto anterior solamente, entonces desmarque:",
+    "Login": "Iniciar sesión",
+    "Report a bug": "Informe de un fallo",
     "Search…": "Buscar…",
     "Send": "Enviar",
-    "Send logs": "Enviar trazas",
+    "Send logs": "Enviar registros",
     "Sorry, your browser is <b>not</b> able to run Riot.": "¡Lo sentimos! Su navegador <b>no puede</b> ejecutar Riot.",
     "This Room": "Esta sala",
     "Unavailable": "No disponible",
     "Unknown device": "Dispositivo desconocido",
     "Update": "Actualizar",
     "Uploading report": "Enviando informe",
-    "What's New": "Lo que hay de nuevo",
+    "What's New": "Novedades",
     "What's new?": "¿Qué hay de nuevo?",
     "Waiting for response from server": "Esperando una respuesta del servidor",
     "You have successfully set a password and an email address!": "¡Ha establecido exitosamente la contraseña y la dirección de email!",
     "You have successfully set a password!": "¡Ha establecido exitosamente una contraseña!",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s en %(osName)s",
     "All messages (loud)": "Todos los mensajes (ruidoso)",
-    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas en todos los objetivos.",
+    "All notifications are currently disabled for all targets.": "Las notificaciones estan desactivadas para todos los objetivos.",
     "Collecting app version information": "Recolectando información de la versión de la aplicación",
     "Collecting logs": "Recolectando registros",
     "Dismiss": "Omitir",
-    "Failed to send report: ": "Error al enviar reporte: ",
+    "Failed to send report: ": "Error al enviar informe: ",
     "Loading bug report module": "Cargando módulo de reporte de errores",
     "Messages containing <span>keywords</span>": "Mensajes que contienen <span>palabras clave</span>",
     "Notify for all other messages/rooms": "Notificar para todos los demás mensajes/salas",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. Qué acción ejecutó? Cuál era el resultado que esperaba? Que pasó realmente?",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa el error. ¿Qué acción ejecutó? ¿Cuál era el resultado que esperaba? ¿Que pasó realmente?",
     "Please describe the bug and/or send logs.": "Por favor describa el error y/o envíe los registros.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Google Chrome</a> o <a href=\"https://getfirefox.com\">Mozilla Firefox</a> para una mejor experiencia.",
     "powered by Matrix": "con el poder de Matrix",
     "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. Quieres instalar la aplicación?",
+    "Riot is not supported on mobile web. Install the app?": "Riot no está soportado en navegadores Web móviles. ¿Quieres instalar la aplicación?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot usa muchas características avanzadas del navegador, algunas de las cuales no están disponibles en su navegador actual.",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está usando Riot como invitado. ¡<a>Regístrese</a> o <a>inicie sesión</a> para acceder más salas y características!",
     "You need to be using HTTPS to place a screen-sharing call.": "Debes usar HTTPS para hacer una llamada con pantalla compartida.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "En su navegador actual, la apariencia y comportamiento de la aplicación puede ser completamente incorrecta, y algunas de las características podrían no funcionar. Si aún desea probarlo puede continuar, pero ¡no podremos ofrecer soporte por cualquier problema que pudiese tener!",
     "Welcome to Riot.im": "Bienvenido a Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Conversaciones &amp; colaboración cifradas y descentralizadas con el poder de [matrix]",
     "Search the room directory": "Buscar en el directorio de salas",
     "Chat with Riot Bot": "Conversar con el Bot de Riot",
-    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos tips de Riot Bot!",
+    "Get started with some tips from Riot Bot!": "¡Comenzar con algunos consejos de Riot Bot!",
     "General discussion about Matrix and Riot": "Discusión general sobre Matrix y Riot",
     "Discussion of all things Matrix!": "¡Discusión sobre todas las cosas de Matrix!",
     "Riot/Web &amp; Desktop chat": "Conversaciones de Riot/Web &amp; Desktop",
@@ -198,5 +183,15 @@
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Muchas salas ya están disponibles en Matrix, enlazadas a redes existentes (Slack, IRC, Gitter, etc) o independientes. ¡Revisa el directorio!",
     "You can now return to your account after signing out, and sign in on other devices.": "Ahora puedes regresar a tu cuenta después de cerrar tu sesión, e iniciar sesión en otros dispositivos.",
     "Please set a password!": "¡Por favor establece una contraseña!",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto le permitirá regresar a su cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos."
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto le permitirá regresar a su cuenta después de cerrar sesión, así como iniciar sesión en otros dispositivos.",
+    "Warning": "Advertencia",
+    "Checking for an update...": "Comprobando actualizaciones...",
+    "No update available.": "No hay actualizaciones disponibles.",
+    "Downloading update...": "Descargando actualizaciones...",
+    "To return to your account in future you need to <u>set a password</u>": "Para regresar a su cuenta en el futuro Ud. debe <u>establecer una contraseña</u>",
+    "Set Password": "Establezca la contraseña",
+    "Error encountered (%(errorDetail)s).": "Error encontrado (%(errorDetail)s).",
+    "Couldn't load home page": "No se puede cargar la página principal",
+    "Bug report sent": "Informe de fallo enviado",
+    "Thank you!": "¡Gracias!"
 }
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
new file mode 100644
index 0000000000..140f349893
--- /dev/null
+++ b/src/i18n/strings/eu.json
@@ -0,0 +1,197 @@
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s bidez %(osName)s ostalarian",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> eta <a href=\"http://opera.com\">Opera</a> badabiltza ere.",
+    "A new version of Riot is available.": "Riot bertsio berri bat dago eskuragarri.",
+    "Add an email address above to configure email notifications": "Gehitu e-mail helbide bat goian e-mail bidezko jakinarazpenak konfiguratzeko",
+    "Advanced notification settings": "Jakinarazpen aurreratuen ezarpenak",
+    "All messages": "Mezu guztiak",
+    "All messages (loud)": "Mezu guztiak (ozen)",
+    "All Rooms": "Gela guztiak",
+    "All notifications are currently disabled for all targets.": "Une honetan jakinarazpen guztiak helburu guztietarako desgaituta daude.",
+    "An error occurred whilst saving your email notification preferences.": "Errore bat gertatu da zure e-mail bidezko jakinarazpenen hobespenak gordetzean.",
+    "Call invitation": "Dei gonbidapena",
+    "Cancel": "Utzi",
+    "Cancel Sending": "Utzi bidaltzeari",
+    "Can't update user notification settings": "Ezin dira erabiltzailearen jakinarazpenen ezarpenak eguneratu",
+    "Changelog": "Aldaketa-egunkaria",
+    "Close": "Itxi",
+    "Collapse panel": "Tolestu panela",
+    "Collecting app version information": "Aplikazioaren bertsio-informazioa biltzen",
+    "Collecting logs": "Egunkariak biltzen",
+    "Couldn't find a matching Matrix room": "Ezin izan da bat datorren Matrix gela bat aurkitu",
+    "Custom Server Options": "Zerbitzari pertsonalizatuaren aukerak",
+    "customServer_text": "Zerbitzari pertsonalizatuaren aukerak erabili ditzakezu beste hasiera zerbitzari baten URLa jarrita beste Matrix zerbitzarietan saioa hasteko.<br/>Honek oraingo Matrix kontuarekin Riot beste hasiera zerbitzari batean erabiltzea ahalbidetzen dizu.<br/><br/>Identitate zerbitzari pertsonalizatu bat jar dezakezu ere baina ezin izango dituzu erabiltzaileak bere e-mail helbidea erabilita gonbidatu, edo besteek zu gonbidatu zure e-mail helbidea erabilita.",
+    "delete the alias.": "ezabatu ezizena.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Ezabatu gelaren %(alias)s  ezizena eta kendu %(name)s direktoriotik?",
+    "Describe your problem here.": "Azaldu zure arazoa hemen.",
+    "Direct Chat": "Txat zuzena",
+    "Directory": "Direktorioa",
+    "Dismiss": "Baztertu",
+    "Download this file": "Deskargatu fitxategi hau",
+    "Enable audible notifications in web client": "Gaitu jakinarazpen entzungarriak web bezeroan",
+    "Enable desktop notifications": "Gaitu mahaigaineko jakinarazpenak",
+    "Enable email notifications": "Gaitu e-mail bidezko jakinarazpenak",
+    "Enable notifications for this account": "Gaitu jakinarazpenak kontu honetarako",
+    "Enable them now": "Gaitu orain",
+    "Enter keywords separated by a comma:": "Idatzi hitz gakoak koma bidez banatuta:",
+    "Error": "Errorea",
+    "Error saving email notification preferences": "Errorea e-mail jakinarazpenen hobespenak gordetzean",
+    "#example": "#adibidea",
+    "Expand panel": "Hedatu panela",
+    "Failed to add tag %(tagName)s to room": "Huts egin du %(tagName)s etiketa gelara gehitzean",
+    "Failed to change settings": "Huts egin du ezarpenak aldatzean",
+    "Failed to forget room %(errCode)s": "Huts egin du %(errCode)s gela ahaztean",
+    "Failed to update keywords": "Huts egin du hitz gakoak eguneratzean",
+    "Failed to get protocol list from Home Server": "Huts egin du protokoloen zerrenda hasiera zerbitzaritik jasotzean",
+    "Failed to get public room list": "Huts egin du gela publikoen zerrenda jasotzean",
+    "Failed to remove tag %(tagName)s from room": "Huts egin du %(tagName)s etiketa gelatik kentzean",
+    "Failed to send report: ": "Huts egin du txostena bidaltzean: ",
+    "Failed to set direct chat tag": "Huts egin du txat zuzeneko etiketa jartzean",
+    "Failed to set Direct Message status of room": "Huts egin du Mezu Zuzena egoera gelan ezartzean",
+    "Favourite": "Gogokoa",
+    "Fetching third party location failed": "Huts egin du hirugarrengoen kokalekua eskuratzean",
+    "Files": "Fitxategiak",
+    "Filter room names": "Iragazi gelen izenak",
+    "Forget": "Ahaztu",
+    "Forward Message": "Birbidali mezua",
+    "Guests can join": "Bisitariak elkartu daitezke",
+    "Hide panel": "Ezkutatu panela",
+    "(HTTP status %(httpStatus)s)": "(HTTP egoera %(httpStatus)s)",
+    "I understand the risks and wish to continue": "Arriskua ulertzen dut eta jarraitu nahi dut",
+    "Invite to this room": "Gonbidatu gela honetara",
+    "Keywords": "Hitz gakoak",
+    "Leave": "Atera",
+    "Login": "Hasi saioa",
+    "Loading bug report module": "Arazte-txosten modulua kargatzen",
+    "Low Priority": "Lehentasun baxua",
+    "Members": "Kideak",
+    "Mentions only": "Aipamenak besterik ez",
+    "Messages containing my display name": "Nire pantaila izena duten mezuak",
+    "Messages containing <span>keywords</span>": "<span>Hitz gakoak</span> dituzten mezuak",
+    "Messages containing my user name": "Nire erabiltzaile-izena duten mezuak",
+    "Messages in group chats": "Talde txatetako mezuak",
+    "Messages in one-to-one chats": "Biren arteko txatetako mezuak",
+    "Messages sent by bot": "botak bidalitako mezuak",
+    "more": "gehiago",
+    "Mute": "Mututu",
+    "No rooms to show": "Ez dago gelarik erakusteko",
+    "Noisy": "Zaratatsua",
+    "Notification targets": "Jakinarazpenen helburuak",
+    "Notifications": "Jakinarazpenak",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Hitz gako hauen jakinarazpenak hemen bistaratu ezin daitezkeen arauak jarraitzen dituzte:",
+    "Notify for all other messages/rooms": "Jakinarazi beste mezu/gela guztiak",
+    "Notify me for anything else": "Jakinarazi beste edozer",
+    "Off": "Ez",
+    "On": "Bai",
+    "Operation failed": "Eragiketak huts egin du",
+    "Permalink": "Esteka iraunkorra",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Deskribatu akatsa. Zer egin duzu? Zer gertatuko zela uste zenuen? Zer gertatu da?",
+    "Please describe the bug and/or send logs.": "Deskribatu akatsa eta/edo bidali egunkariak.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Instalatu <a href=\"https://www.google.com/chrome\">Chrome</a> edo <a href=\"https://getfirefox.com\">Firefox</a> esperientzia on baterako.",
+    "powered by Matrix": "Matrix mamian",
+    "Quote": "Aipua",
+    "Reject": "Baztertu",
+    "Remove %(name)s from the directory?": "Kendu %(name)s direktoriotik?",
+    "Remove": "Kendu",
+    "remove %(name)s from the directory.": "kendu %(name)s direktoriotik.",
+    "Remove from Directory": "Kendu direktoriotik",
+    "Report a bug": "Eman akats baten berri",
+    "Resend": "Birbidali",
+    "Riot Desktop on %(platformName)s": "Riot Desktop %(platformName)s plataforman",
+    "Riot does not know how to join a room on this network": "Riotek ez daki nola elkartu gela batetara sare honetan",
+    "Riot is not supported on mobile web. Install the app?": "Riotek ez du euskarririk mugikorrentzako webean. Instalatu aplikazioa?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riotek nabigatzaileen ezaugarri aurreratu ugari erabiltzen ditu, hauetako batzuk ez daude erabilgarri edo esperimentalak dira zure oraingo nabigatzailean.",
+    "Room not found": "Ez da gela aurkitu",
+    "Search": "Bilatu",
+    "Search…": "Bilatu…",
+    "Search for a room": "Bilatu gela bat",
+    "Send": "Bidali",
+    "Send logs": "Bidali egunkariak",
+    "Source URL": "Iturriaren URLa",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Zure nabigatzaileak <b>ez</b> du Riot erabiltzeko gaitasunik.",
+    "The Home Server may be too old to support third party networks": "Hasiera zerbitzaria zaharregia izan daiteke hirugarrengoen sarean onartzeko",
+    "There are advanced notifications which are not shown here": "Hemen erakusten ez diren jakinarazpen aurreratuak daude",
+    "The server may be unavailable or overloaded": "Zerbitzaria eskuraezin edo gainezka egon daiteke",
+    "This Room": "Gela hau",
+    "Unable to fetch notification target list": "Ezin izan da jakinarazpen helburuen zerrenda eskuratu",
+    "Unable to join network": "Ezin izan da sarera elkartu",
+    "Unable to look up room ID from server": "Ezin izan da gelaren IDa zerbitzarian bilatu",
+    "Unavailable": "Eskuraezina",
+    "Unhide Preview": "Ez ezkutatu aurrebista",
+    "Unknown device": "Gailu ezezaguna",
+    "unknown error code": "errore kode ezezaguna",
+    "Unnamed room": "Izenik gabeko gela",
+    "Update": "Eguneratu",
+    "Uploaded on %(date)s by %(user)s": "%(user)s erabiltzaileak %(date)s (e)an igota",
+    "Uploading report": "Igoera txostena",
+    "View Decrypted Source": "Ikusi deszifratutako iturria",
+    "View Source": "Ikusi iturria",
+    "What's New": "Zer dago berri",
+    "What's new?": "Zer dago berri?",
+    "Waiting for response from server": "Zerbitzariaren erantzunaren zain",
+    "When I'm invited to a room": "Gela batetara gonbidatzen nautenean",
+    "World readable": "Denek irakurtzeko moduan",
+    "You cannot delete this image. (%(code)s)": "Ezin duzu irudi hau ezabatu. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Ezin duzu mezu hau ezabatu. (%(code)s)",
+    "You are not receiving desktop notifications": "Ez dituzu mahaigaineko jakinarazpenak jasotzen",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Agian Riot ez beste bezero batean konfiguratu dituzu. Ezin dituzu Riot bidez doitu, baina aplikagarriak dira",
+    "Sunday": "Igandea",
+    "Monday": "Astelehena",
+    "Tuesday": "Asteartea",
+    "Wednesday": "Asteazkena",
+    "Thursday": "Osteguna",
+    "Friday": "Ostirala",
+    "Saturday": "Larunbata",
+    "Today": "Gaur",
+    "Yesterday": "Atzo",
+    "OK": "Ados",
+    "Warning": "Abisua",
+    "Checking for an update...": "Eguneraketarik dagoen egiaztatzen...",
+    "Error encountered (%(errorDetail)s).": "Errorea aurkitu da (%(errorDetail)s).",
+    "No update available.": "Ez dago eguneraketarik eskuragarri.",
+    "Downloading update...": "Eguneraketa deskargatzen...",
+    "You need to be using HTTPS to place a screen-sharing call.": "HTTPS erabili behar duzu sekretuak partekatzeko dei bat ezartzeko.",
+    "Welcome to Riot.im": "Ongi etorri Riot.im mezularitzara",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Deszentralizatutako eta zifratutako txat eta elkarlana [matrix] sareari esker",
+    "Search the room directory": "Bilatu gelen direktorioa",
+    "Chat with Riot Bot": "Txateatu Riot botarekin",
+    "Get started with some tips from Riot Bot!": "Hasi Riot botaren aholku batzuekin!",
+    "General discussion about Matrix and Riot": "Matrix eta Riot-i buruzko eztabaida orokorra",
+    "Discussion of all things Matrix!": "Matrix-ekin zerikusia duen guztiari buruzko eztabaida!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web eta mahaigaineko txata",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS eta matrix-ios-sdk txata",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android eta matrix-android-sdk txata",
+    "Matrix technical discussions": "Matrix buruzko eztabaida teknikoak",
+    "Running Matrix services": "Matrix zerbitzuak exekutatzea",
+    "Community-run support for Synapse": "Synapse-rako laguntza komunitatea",
+    "Admin support for Dendrite": "Dendrite kudeatzaileentzako laguntza",
+    "Announcements about Synapse releases": "Synapse bertsio berrien iragarkiak",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc exekutatu edo erabiltzen dutenentzako laguntza",
+    "Building services on Matrix": "Matrix-en gaineko zerbitzuak eraikitzea",
+    "Support for those using the Matrix spec": "Matrix espezifikazioa darabilenentzako laguntza",
+    "Design and implementation of E2E in Matrix": "Matrix-en E2E diseinu eta inplementazioa",
+    "Implementing VR services with Matrix": "VR zerbitzuak inplementatzea Matrix erabilita",
+    "Implementing VoIP services with Matrix": "VoIP zerbitzuak inplementatzea Matrix erabilita",
+    "Discussion of the Identity Service API": "Identitate zerbitzuaren APIari buruzko eztabaida",
+    "Support for those using, running and writing other bridges": "Bestelako zubiak erabili, exekutatu eta idazten dituztenentzako laguntza",
+    "Contributing code to Matrix and Riot": "Kodearekin lagundu Matrix eta Riot",
+    "Dev chat for the Riot/Web dev team": "Riot/web garapen taldearen txata",
+    "Dev chat for the Dendrite dev team": "Dendrite garapen taldearen txata",
+    "Co-ordination for Riot/Web translators": "Riot/Web itzultzaileen arteko koordinazioa",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Badauden sareetara lotutako gela ugari daude Matrixen (Slack, IRC, Gitter eta abar), baita independienteak. Begiratu direktorioa!",
+    "Failed to change password. Is your password correct?": "Pasahitza aldatzean huts egin du. Zuzena da pasahitza?",
+    "You have successfully set a password!": "Ongi ezarri duzu pasahitza!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Zure kontura itzuli zaitezke beste gailuetan saioa amaitu eta berriro hastean.",
+    "Continue": "Jarraitu",
+    "Please set a password!": "Ezarri pasahitza mesedez!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Honek zure kontura itzultzea ahalbidetuko dizu, beste gailuetan saioa amaitu eta berriro hasi eta gero.",
+    "You have successfully set a password and an email address!": "Ondo ezarri dituzu pasahitza eta e-mail helbidea!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Gogoratu, e-mail helbide bat ezarri dezakezu erabiltzaile-ezarpenetan iritzia aldatzen baduzu.",
+    "To return to your account in future you need to <u>set a password</u>": "Etorkizunean kontura itzuli ahal izateko <u>pasahitz bat ezarri</u> behar duzu",
+    "Set Password": "Ezarri pasahitza",
+    "Couldn't load home page": "Ezin izan da hasiera orria kargatu",
+    "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:": "Arazoak diagnostikatzeko, bezero honen egunkariak bidaliko dira arazte-txosten honekin. Testua besterik ez baduzu bidali nahi, desmarkatu:",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Zure oraingo nabigatzailearekin aplikazioaren itxura eta portaera guztiz okerra izan daiteke, eta funtzio batzuk ez dira ibiliko. Hala ere aurrera jarraitu dezakezu saiatu nahi baduzu, baina zure erantzukizunaren menpe geratzen dira aurkitu ditzakezun arazoak!",
+    "Bug report sent": "Arazte-txostena bidali da",
+    "Thank you!": "Eskerrik asko!"
+}
diff --git a/src/i18n/strings/fa.json b/src/i18n/strings/fa.json
new file mode 100644
index 0000000000..2ecdd44570
--- /dev/null
+++ b/src/i18n/strings/fa.json
@@ -0,0 +1,190 @@
+{
+    "A new version of Riot is available.": "نسخه‌ی جدید از رایوت موجود است.",
+    "All messages": "همه‌ی پیام‌ها",
+    "All messages (loud)": "همه‌ی پیام‌ها(بلند)",
+    "All Rooms": "همه‌ی گپ‌ها",
+    "Cancel Sending": "فرستادن را لغو کن",
+    "Changelog": "تغییراتِ به‌وجودآمده",
+    "Close": "بستن",
+    "Collecting app version information": "درحال جمع‌آوری اطلاعات نسخه‌ی برنامه",
+    "Couldn't find a matching Matrix room": "گپ‌گاه مورد نظر در ماتریکس یافت نشد",
+    "Direct Chat": "چت مستقیم",
+    "Directory": "فهرست گپ‌گاه‌ها",
+    "Download this file": "بارگیری کن",
+    "Enable audible notifications in web client": "آگاه‌سازی صدادار را در کارگزار وب فعال کن",
+    "Enable email notifications": "آگاه‌سازی با رایانامه را فعال کن",
+    "Enable notifications for this account": "آگاه سازی با رایانامه را برای این اکانت فعال کن",
+    "Enable them now": "همین حالا فعالشان کن",
+    "Enter keywords separated by a comma:": "کلیدواژه‌ها را وارد کنید؛ از کاما(,) برای جدا کردن آنها از یکدیگر استفاده کنید:",
+    "Error": "خطا",
+    "Error saving email notification preferences": "خطا در ذخیره‌سازی ترجیحات آگاهسازی با ایمیل",
+    "#example": "#نمونه",
+    "Expand panel": "پنل را بگشا",
+    "Failed to add tag %(tagName)s to room": "در افزودن تگ %(tagName)s موفقیت‌آمیز نبود",
+    "Failed to change settings": "تغییر تنظیمات موفقیت‌آمیز نبود",
+    "Failed to forget room %(errCode)s": "فراموش کردن گپ‌گاه  %(errCode)s موفقیت‌آمیز نبود",
+    "Failed to update keywords": "به‌روزرسانی کلیدواژه‌ها موفقیت‌آمیز نبود",
+    "Failed to get protocol list from Home Server": "دریافت لیست پروتکل‌ها از کارگزار مبدا موفقیت‌آمیز نبود",
+    "Failed to get public room list": "گرفتن لیست گپ‌گاه‌های عمومی موفقیت‌آمیز نبود",
+    "Failed to remove tag %(tagName)s from room": "خطا در حذف کلیدواژه‌ی %(tagName)s از گپ",
+    "Failed to send report: ": "فرستادن گزارش موفقیت‌آمیز نبود: ",
+    "Favourite": "علاقه‌مندی‌ها",
+    "Files": "فایل‌ها",
+    "Forget": "فراموش کن",
+    "Forward Message": "هدایت پیام",
+    "Guests can join": "میهمان‌ها می‌توانند بپیوندند",
+    "Hide panel": "پنل را پنهان کن",
+    "I understand the risks and wish to continue": "از خطرات این کار آگاهم و مایلم که ادامه بدهم",
+    "Invite to this room": "دعوت به این گپ",
+    "Keywords": "کلیدواژه‌ها",
+    "Leave": "خروج",
+    "Login": "ورود",
+    "Loading bug report module": "درحال بارگذاری و اجرای ماژولِ گزارش باگ",
+    "Low Priority": "کم اهمیت",
+    "Members": "اعضا",
+    "Mentions only": "فقط نام‌بردن‌ها",
+    "Please set a password!": "لطفا یک پسورد اختیار کنید!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "این به شما اجازه خواهد داد که پس از خروج به اکانت خود بازگردید و از سایر دستگاه‌ها وارد شوید.",
+    "You have successfully set a password and an email address!": "تخصیص ایمیل و پسوردتان با موفقیت انجام شد!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "به خاطر داشته باشید که اگر نظرتان عوض شد می‌توانید از بخش تنظیمات یک ایمیل را به اکانتتان متصل کنید.",
+    "To return to your account in future you need to <u>set a password</u>": "برای بازگشتِ دوباره به اکانتان در آینده نیاز به <u> ثبت یک پسورد </u> دارید",
+    "Set Password": "پسوردتان را انتخاب کنید",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">سافاری</a> و <a href=\"http://opera.com\">اپرا</a> نیز کار می‌کنند.",
+    "Add an email address above to configure email notifications": "آدرس ایمیلتان را به بالا بیفزایید تا بتوانید آگاه‌سازی با ایمیل را مدیریت کنید",
+    "Advanced notification settings": "تنظیمات پیشرفته برای آگاه‌سازی‌ها",
+    "Continue": "ادامه",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "بسیاری از گپ‌گاه‌های موجود در فهرستِ گپ‌ها به شبکه‌های موجود(اسلک، آی‌آر‌سی، گلیتر و...) متصل و یا مستقل‌اند؛ به آنها نگاهی بیندازید!",
+    "Failed to change password. Is your password correct?": "خطا در تغییر گذرواژه. آیا از درستی گذرواژه‌تان اطمینان دارید؟",
+    "You can now return to your account after signing out, and sign in on other devices.": "اکنون می‌توانید پس از خروج به اکانتتان بازگردید و با دستگاه‌های دیگری وارد شوید.",
+    "Co-ordination for Riot/Web translators": "هماهنگی برای مترجمان رایوت/وب",
+    "Contributing code to Matrix and Riot": "کمک به برنامه‌نویسی در ماتریکس و رایوت",
+    "(HTTP status %(httpStatus)s)": "(HTTP وضعیت %(httpStatus)s)",
+    "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:": "برای بهبود و رفع مشکلات، گزارش‌هایی از این کارخواه به عنوان مستنداتی از یک باگ ارسال خوهند شد. اگر ترجیح می‌دهید که فقط متن بالا ارسال شود لطفا تیک را بردارید",
+    "Messages containing <span>keywords</span>": "پیا‌م‌های دارای <span> این کلیدواژه‌ها </span>",
+    "Messages containing my user name": "پیام‌های شامل نامِ کاربری من",
+    "Messages in group chats": "پیام‌های درون چت‌های گروهی",
+    "Messages in one-to-one chats": "پیام‌های درون چت‌های یک‌به‌یک",
+    "Messages sent by bot": "پیام‌های ارسال شده توسط ربات",
+    "more": "بیشتر",
+    "Mute": "سکوت",
+    "No rooms to show": "هیچ گپی برای نشان دادن موجود نیست",
+    "Noisy": "پرسروصدا",
+    "Notification targets": "هدف‌های آگاه‌سازی",
+    "Notifications": "آگاه‌سازی‌ها",
+    "Notify me for anything else": "مرا برای هرچیز دیگری باخبر کن",
+    "Off": "خاموش",
+    "On": "روشن",
+    "Operation failed": "عملیات شکست خورد",
+    "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=\"https://www.google.com/chrome\">کروم</a> یا <a href=\"https://getfirefox.com\">فایرفاکس</a> استفاده کنید",
+    "powered by Matrix": "قدرت‌یافته از ماتریکس",
+    "Quote": "گفتآورد",
+    "Reject": "پس زدن",
+    "Remove": "حذف کن",
+    "Remove %(name)s from the directory?": "آیا مطمئنید می‌خواهید %(name)s را از فهرست گپ‌ها حذف کنید؟",
+    "remove %(name)s from the directory.": "%(name)s را از فهرست گپ‌ها حذف کن",
+    "Remove from Directory": "از فهرستِ گپ‌ها حذف کن",
+    "Report a bug": "باگ‌ها را گزارش کنید",
+    "Resend": "بازفرست",
+    "Riot Desktop on %(platformName)s": "رایوت دسکتاپ بر %(platformName)s",
+    "Riot does not know how to join a room on this network": "رایوت از چگونگی ورود به یک گپ در این شبکه اطلاعی ندارد",
+    "Riot is not supported on mobile web. Install the app?": "رایوت در موبایل‌ها پشتیبانی نمیشود؛ تمایلی دارید که اپ را نصب کنید؟",
+    "Room not found": "گپ یافت نشد",
+    "Search": "جستجو",
+    "Search…": "جستجو…",
+    "Search for a room": "جستجوی برای یک گپ",
+    "Send": "ارسال",
+    "Send logs": "ارسال گزارش‌ها",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "متاسفانه مرورگر شما <b>نمی‌تواند</b> رایوت را اجرا کند.",
+    "There are advanced notifications which are not shown here": "آگاه‌سازی‌های پیشرفته‌ای هستند که در اینجا نشان داده نشده‌اند",
+    "The server may be unavailable or overloaded": "این سرور ممکن است ناموجود یا بسیار شلوغ باشد",
+    "This Room": "این گپ",
+    "Unable to join network": "خطا در ورود به شبکه",
+    "Unavailable": "غیرقابل‌دسترسی",
+    "Unknown device": "دستگاه ناشناخته",
+    "unknown error code": "کد خطای ناشناخته",
+    "Unnamed room": "گپ نام‌گذاری نشده",
+    "Update": "به‌روزرسانی",
+    "Uploading report": "در حال بارگذاری گزارش",
+    "Downloading update...": "در حال بارگیریِ به‌روزرسانی...",
+    "Cancel": "لغو",
+    "Call invitation": "دعوت به تماس",
+    "An error occurred whilst saving your email notification preferences.": "خطایی در حین ذخیره‌ی ترجیجات شما درباره‌ی رایانامه رخ داد.",
+    "Describe your problem here.": "مشکلتان را در اینجا توضیح دهید.",
+    "Enable desktop notifications": "آگاه‌سازی دسکتاپ را فعال کن",
+    "Permalink": "پایاپیوند",
+    "Please describe the bug and/or send logs.": "لطفا باگ را توصیف کنید و یا گزارش‌ها را بفرستید",
+    "Unhide Preview": "پیش‌نمایش را نمایان کن",
+    "View Source": "دیدن منبع",
+    "What's New": "تازه‌ها",
+    "World readable": "خواندن جهانی",
+    "You cannot delete this image. (%(code)s)": "شما نمی‌توانید این تصویر را پاک کنید. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "شما نمی‌توانید این پیام را پاک کنید. (%(code)s)",
+    "Sunday": "یکشنبه",
+    "Monday": "دوشنبه",
+    "Tuesday": "سه‌شنبه",
+    "Wednesday": "چهارشنبه",
+    "Thursday": "پنج‌شنبه",
+    "Friday": "آدینه",
+    "Saturday": "شنبه",
+    "Today": "امروز",
+    "Yesterday": "دیروز",
+    "OK": "باشه",
+    "Warning": "هشدار",
+    "No update available.": "هیچ به روزرسانی جدیدی موجود نیست.",
+    "Welcome to Riot.im": "به Riot.im خوش‌آمدید",
+    "Chat with Riot Bot": "با رایوت‌بات چت کنید",
+    "Get started with some tips from Riot Bot!": "با کمی راهنمایی از رایوت‌بات شروع کنید!",
+    "General discussion about Matrix and Riot": "بحث‌های کلی درمورد ماتریکس و رایوت",
+    "Dev chat for the Dendrite dev team": "چت توسعه‌دهندگان برای تیم Dendrite",
+    "Dev chat for the Riot/Web dev team": "چت توسعه‌دهندگان برای تیم رایوت/وب",
+    "Support for those using, running and writing other bridges": "پشتیبانی برای آنان که یک پل را استفاده اجرا کرده و یا می‌نویسند",
+    "Admin support for Dendrite": "پشتیبانی ادمین برای Dendrite",
+    "Community-run support for Synapse": "پشتیبانی سیناپس اداره‌شده توسط جامعه‌ی کاربری",
+    "Matrix technical discussions": "بحث‌های فنی درباره‌ی ماتریکس",
+    "Search the room directory": "در فهرست گپ‌ها جستجو کنید",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "چت مرکزگریز و رمزنگاری‌شده &amp; ارائه‌ای از ماتریکس",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s از طریق %(browserName)s بر %(osName)s",
+    "All notifications are currently disabled for all targets.": "همه‌ی آگاه‌سازی‌ها برای تمام هدف‌ها غیرفعال‌اند.",
+    "Can't update user notification settings": "امکان به‌روزرسانی تنظیمات آگاه‌سازی کاربر وجود ندارد",
+    "Collecting logs": "درحال جمع‌آوری گزارش‌ها",
+    "Custom Server Options": "تنظیمات سفارشی برای سرور",
+    "delete the alias.": "نام مستعار را پاک کن.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "آیا مطمئنید که می‌خواهید نام مستعار گپ %(alias)s را پاک و  %(name)s را از فهرست حذف کنید؟",
+    "Dismiss": "نادیده بگیر",
+    "Failed to set direct chat tag": "تنظیم تگ برای چت مستقیم موفقیت‌آمیز نبود",
+    "Filter room names": "جستجو در گپ‌ها",
+    "Notify for all other messages/rooms": "برای همه‌ی پیام‌ها/گپ‌های دیگر آگاه‌سازی کن",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "لطفا باگ را دقیقا تشریح کنید. چه کار کردید؟ انتظار داشتید چه اتفاقی بیفتد؟ دقیقا چه اتفاقی افتاد؟",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "رایوت از بسیاری از ویژگی‌های پیشرفته در مروگرها استفاده می‌کند، برخی از این ویژگی‌ها در مرورگر کنونی شما موجود نیستند و یا در حالت آزمایشی قرار دارند.",
+    "Source URL": "آدرس مبدا",
+    "Unable to fetch notification target list": "ناتوانی در تطبیق لیست آگاه‌سازی‌های هدف",
+    "Uploaded on %(date)s by %(user)s": "آپلود شده در تاریخ %(date)s توسط %(user)s",
+    "View Decrypted Source": "دیدن منبع رمزگشایی شده",
+    "Waiting for response from server": "در انتظار پاسخی از سمت سرور",
+    "When I'm invited to a room": "وقتی من به گپی دعوت میشوم",
+    "You are not receiving desktop notifications": "شما آگاه‌سازی‌های دسکتاپ را دریافت نمی‌کنید",
+    "Checking for an update...": "درحال بررسی به‌روزرسانی‌ها...",
+    "Error encountered (%(errorDetail)s).": "خطای رخ داده (%(errorDetail)s).",
+    "You need to be using HTTPS to place a screen-sharing call.": "شما باید از ارتباط امن HTTPS برای به‌راه‌اندازی یک چتِ شامل به اشتراک‌گذاری صفحه‌ی کامیپوتر استفاده کنید.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "با مرورگر کنونی شما، ظاهر و حس استفاده از برنامه ممکن است کاملا اشتباه باشد و برخی یا همه‌ی ویژگی‌ها ممکن است کار نکنند. می‌توانید به استفاده ادامه دهید اما مسئولیت هر مشکلی که به آن بربخورید بر عهده‌ی خودتان است!",
+    "Discussion of all things Matrix!": "بحث درمورد تمام چیز‌های مربوط به ماتریکس!",
+    "Riot/Web &amp; Desktop chat": "رایوت/وب &amp; چت دسکتاپ",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "رایوت/آی‌او‌اس &amp; چت در مورد matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "رایوت/اندروید &amp; چت در مورد matrix-android-sdk",
+    "Running Matrix services": "اجرای سرویس‌های ماتریکسی",
+    "Announcements about Synapse releases": "اطلاعیه‌ها درباره‌ی نسخه‌ها و انتشار سیناپس",
+    "Support for those using and running matrix-appservice-irc": "پشتیبانی برای کسانی که matrix-appservice-irc را اجرا و استفاده می‌کنند",
+    "Design and implementation of E2E in Matrix": "طراحی و پیاده‌سازی رمزگذاری E2E در ماتریکس",
+    "Implementing VR services with Matrix": "پیاده‌سازی سرویس‌های VR با ماتریکس",
+    "Implementing VoIP services with Matrix": "پیاده‌سازی سرویس‌های VoIP با ماتریکس",
+    "Discussion of the Identity Service API": "بحث درمورد API سرویس هویت",
+    "You have successfully set a password!": "شما با موفقیت رمزتان را انتخاب کردید!",
+    "Collapse panel": "پنل را ببند",
+    "Failed to set Direct Message status of room": "تنظیم حالت پیام مستقیم برای گپ موفقیت‌آمیز نبود",
+    "Fetching third party location failed": "تطبیق اطلاعات از منابع‌ دسته سوم با شکست مواجه شد",
+    "Messages containing my display name": "پیام‌های حاوی نمای‌نامِ من",
+    "What's new?": "تازه‌ها",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "ممکن است شما این تنظیمات را در کارخواهی به جز رایوت اعمال کرده باشید. شما نمی‌توانید انها را تغییر دهید اما آنها همچنان تاثیر خود را دارند",
+    "Building services on Matrix": "ساخت سرویس بر روی ماتریکس",
+    "Support for those using the Matrix spec": "پشتیبانی برای آنان که از مستندات ماتریکس استفاده می‌کنند"
+}
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index d2e594327d..9b63f9843f 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -1,3 +1,209 @@
 {
-    "Sunday": "Sunnuntai"
+    "Sunday": "Sunnuntai",
+    "A new version of Riot is available.": "Uusi Riot-versio on saatavilla.",
+    "Add an email address above to configure email notifications": "Lisää sähköpostiosoite yllä saadaksesi ilmoituksia sähköpostiisi",
+    "Advanced notification settings": "Lisäasetukset ilmoituksille",
+    "All messages": "Kaikki viestit",
+    "All messages (loud)": "Kaikki viestit (äänekkäästi)",
+    "All Rooms": "Kaikki huoneet",
+    "All notifications are currently disabled for all targets.": "Kaikki ilmoitukset on kytketty pois kaikilta kohteilta.",
+    "An error occurred whilst saving your email notification preferences.": "Sähköposti-ilmoitusasetuksia tallettaessa tapahtui virhe.",
+    "Call invitation": "Puhelukutsu",
+    "Cancel": "Peruuta",
+    "Cancel Sending": "Peruuta lähetys",
+    "Can't update user notification settings": "Käyttäjän ilmoitusasetusten päivittäminen epäonnistui",
+    "Changelog": "Muutosloki",
+    "Close": "Sulje",
+    "Couldn't find a matching Matrix room": "Vastaavaa Matrix-huonetta ei löytynyt",
+    "delete the alias.": "poista alias.",
+    "Describe your problem here.": "Kuvaa ongelmasi tähän.",
+    "Direct Chat": "Suora viestittely",
+    "Directory": "Hakemisto",
+    "Dismiss": "Hylkää",
+    "Download this file": "Lataa tiedosto",
+    "Error": "Virhe",
+    "#example": "#esimerkki",
+    "Favourite": "Suosikki",
+    "Files": "Tiedostot",
+    "Forget": "Unohda",
+    "I understand the risks and wish to continue": "Ymmärrän riskit ja haluan jatkaa",
+    "Invite to this room": "Kutsu tähän huoneeseen",
+    "Keywords": "Avainsanat",
+    "Leave": "Poistu",
+    "Login": "Kirjaudu sisään",
+    "Low Priority": "Matala prioriteetti",
+    "Members": "Jäsenet",
+    "Mentions only": "Vain maininnat",
+    "more": "lisää",
+    "Mute": "Vaimenna",
+    "No rooms to show": "Ei huoneita näytettäväksi",
+    "Noisy": "Äänekäs",
+    "Notifications": "Ilmoitukset",
+    "Off": "Pois päältä",
+    "On": "Päällä",
+    "Operation failed": "Toiminto epäonnistui",
+    "Permalink": "Pysyvä linkki",
+    "Quote": "Lainaa",
+    "Reject": "Hylkää",
+    "Remove": "Poista",
+    "Report a bug": "Ilmoita ongelmasta",
+    "Resend": "Lähetä uudelleen",
+    "Room not found": "Huonetta ei löytynyt",
+    "Search": "Haku",
+    "Search…": "Haku…",
+    "Search for a room": "Hae huonetta",
+    "Send": "Lähetä",
+    "Send logs": "Lähetä lokit",
+    "Source URL": "Lähde URL",
+    "This Room": "Tämä huone",
+    "Unable to join network": "Verkkoon liittyminen epäonnistui",
+    "Unavailable": "Ei saatavilla",
+    "Unknown device": "Tuntematon laite",
+    "unknown error code": "tuntematon virhekoodi",
+    "Unnamed room": "Nimeämätön huone",
+    "Update": "Päivitä",
+    "View Source": "Näytä lähde",
+    "Waiting for response from server": "Odotetaan palvelimen vastausta",
+    "Monday": "Maanantai",
+    "Tuesday": "Tiistai",
+    "Wednesday": "Keskiviikko",
+    "Thursday": "Torstai",
+    "Friday": "Perjantai",
+    "Saturday": "Lauantai",
+    "Today": "Tänään",
+    "Yesterday": "Eilen",
+    "OK": "Selvä",
+    "Warning": "Varoitus",
+    "Checking for an update...": "Tarkistetaan päivityksen saatavuutta...",
+    "No update available.": "Ei päivityksiä saatavilla.",
+    "Downloading update...": "Ladataan päivitystä...",
+    "Welcome to Riot.im": "Tervetuloa Riot.im:ään",
+    "Search the room directory": "Hae huonehakemistosta",
+    "Continue": "Jatka",
+    "Set Password": "Aseta salasana",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> ja <a href=\"http://opera.com\">Opera</a> toimivat myös.",
+    "Collapse panel": "Piilota paneeli",
+    "Collecting app version information": "Kerätään sovelluksen versiotietoja",
+    "Collecting logs": "Kerätään lokitietoja",
+    "Custom Server Options": "Omat palvelinasetukset",
+    "customServer_text": "Voit käyttää palvelinasetuksia muille Matrix-palvelimille kirjautumiseen asettamalla oman kotipalvelinosoitteen.<br/>Näin voit käyttää Riotia toisella kotipalvelimella sijaitsevan Matrix-käyttäjän kanssa. <br/><br/>Voit myös asettaa oman tunnistautumispalvelimen, mutta sinua ei voi kutsua etkä voi kutsua muita sähköpostiosoitteella.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Poista huonetunnus  %(alias)s ja poista %(name)s hakemistosta?",
+    "Enable them now": "Ota käyttöön nyt",
+    "Enter keywords separated by a comma:": "Anna avainsanat eroteltuna pilkuin:",
+    "Expand panel": "Avaa paneeli",
+    "Error saving email notification preferences": "Virhe tallennettaessa sähköposti-ilmoitusasetuksia",
+    "Failed to change settings": "Asetusten muuttaminen epäonnistui",
+    "Failed to forget room %(errCode)s": "Huoneen unohtaminen epäonnistui %(errCode)s",
+    "Failed to update keywords": "Avainsanojen päivittäminen epäonnistui",
+    "Enable audible notifications in web client": "Ota käyttöön äänelliset ilmoitukset webasiakasohjelmassa",
+    "Enable desktop notifications": "Ota käyttöön työpöytäilmoitukset",
+    "Enable email notifications": "Ota käyttöön sähköposti-ilmoitukset",
+    "Enable notifications for this account": "Ota käyttöön ilmoitukset tälle tilille",
+    "Failed to add tag %(tagName)s to room": "Tagin %(tagName)s lisäämineen huoneelle ei onnistunut",
+    "Failed to get protocol list from Home Server": "Protokollalistan hakeminen Kotipalvelimelta ei onnistunut",
+    "Failed to get public room list": "Julkisten huoneiden listan hakeminen epäonnistui",
+    "Failed to remove tag %(tagName)s from room": "Tagin %(tagName)s poistaminen huoneelta epäonnistui",
+    "Failed to send report: ": "Raportin lähettäminen epäonnistui: ",
+    "Failed to set direct chat tag": "Suoran viestittelyn tagin asettaminen epäonnistui",
+    "Fetching third party location failed": "Kolmannen osapuolen paikan haku epäonnistui",
+    "Filter room names": "Suodata huoneiden nimet",
+    "Forward Message": "Edelleenlähetä viesti",
+    "Guests can join": "Vieraat voivat liittyä",
+    "Hide panel": "Piilota paneeli",
+    "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:": "Diagnoosin helpottamiseksi lokitietoja tältä laitteelta lähetetään tämän bugiraportin mukana. Poista ruksi jos haluat lätettää vain ylläolevan tekstin:",
+    "Loading bug report module": "Ladataan bugiraportointimoduuli",
+    "Messages containing my display name": "Näyttönimeni sisältävät viestit",
+    "Messages containing <span>keywords</span>": "<span>Avainsanoja</span> sisältävät viestit",
+    "Messages containing my user name": "Käyttäjänimeni sisältävät viestit",
+    "Messages in group chats": "Viestit ryhmäkeskusteluissa",
+    "Messages in one-to-one chats": "Viestit henkilökohtaisissa keskusteluissa",
+    "Messages sent by bot": "Bottien lähettämät viestit",
+    "Notification targets": "Ilmoituksen kohteet",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Seuraaviin avainsanoihin liittyvät ilmoitukset seuraavat sääntöjä joita ei voida näyttää tässä:",
+    "Notify me for anything else": "Ilmoita minulle kaikesta muusta",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Ole hyvä ja kuvaile virhe. Mitä teit? Mitä oletit tapahtuvan? Mitä itse asiassa tapahtui?",
+    "Please describe the bug and/or send logs.": "Ole hyvä ja kuvaile virhe sekä/tai lähetä lokitiedot.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Ole hyvä ja asenna <a href=\"https://www.google.com/chrome\">Chrome</a> tai <a href=\"https://getfirefox.com\">Firefox</a> parhaan kokemuksen saavuttamiseksi.",
+    "Remove %(name)s from the directory?": "Poista %(name)s hakemistosta?",
+    "remove %(name)s from the directory.": "poista %(name)s hakemistosta.",
+    "Remove from Directory": "Poista hakemistosta",
+    "Riot Desktop on %(platformName)s": "Riot Desktop järjestelmällä %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot ei tiedä miten liittya huoneeseen tässä verkossa",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot käyttää monia selainominaisuuksia, joista osa selaimesi ei tue tai ne ovat kokeellisia.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Valitettavasti Riot <b>ei</b> toimi selaimessasi.",
+    "The Home Server may be too old to support third party networks": "Kotipalvelin saattaa olla liian vanha tukeakseen kolmannen osapuolen verkkoja",
+    "The server may be unavailable or overloaded": "Palvelin saattaa olla saavuttamaton tai ylikuormitettu",
+    "Unable to fetch notification target list": "Ilmoituskohdelistan haku epäonnistui",
+    "Unable to look up room ID from server": "Huone-ID:n haku palvelimelta epäonnistui",
+    "Unhide Preview": "Näytä ennakkokatselu",
+    "Uploaded on %(date)s by %(user)s": "Ladattu %(date)s käyttäjän %(user)s toimesta",
+    "Uploading report": "Ladataan raportti",
+    "View Decrypted Source": "Näytä purettu lähdekoodi",
+    "What's New": "Mikä on uutta",
+    "What's new?": "Mikä on uutta?",
+    "When I'm invited to a room": "Kun minut kutsutaan huoneeseen",
+    "World readable": "Kaikkien luettavissa",
+    "You cannot delete this image. (%(code)s)": "Et voi poistaa tätä kuvaa.  (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Et voi poistaa tätä viestiä.  (%(code)s)",
+    "You are not receiving desktop notifications": "Et vastaanota työpöytäilmoituksia",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Olet saattanut muuttaa niitä toisessa asiakasohjelmassa kuin Riot. Et voi muuttaa niitä Riotissa mutta ne pätevät kuitenkin",
+    "You need to be using HTTPS to place a screen-sharing call.": "Sinun täytyy käyttää HTTPS:ää voidaaksesi soittaa ruudunjakopuhelun.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Nykyisellä selaimellasi ohjelman ulkonäkö voi olla aivan virheellinen, ja jotkut ominaisuudet eivät saata toimia. Voit jatkaa jos haluat kokeilla mutta et voi odottaa saavasi apua mahdollisesti ilmeneviin ongelmiin!",
+    "Chat with Riot Bot": "Keskustele Riot-botin kanssa",
+    "Get started with some tips from Riot Bot!": "Pääse käyntiin Riot-botin vinkkien avulla!",
+    "General discussion about Matrix and Riot": "Yleistä Matrix- ja Riot-keskustelua",
+    "Discussion of all things Matrix!": "Keskustelu kaikesta Matrixiin liittyvästä!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web & Työpöytä-keskustelu",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk -keskustelu",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk -keskustelu",
+    "Matrix technical discussions": "Matrix tekniset keskustelut",
+    "Running Matrix services": "Matrix-palvelujen ylläpito",
+    "Community-run support for Synapse": "Yhteisön tarjoama Synapse-tuki",
+    "Admin support for Dendrite": "Dendrite ylläpitotuki",
+    "Announcements about Synapse releases": "Ilmoitukset uusista Synapse-julkaisuista",
+    "Error encountered (%(errorDetail)s).": "Virhe: %(errorDetail)s.",
+    "Support for those using and running matrix-appservice-irc": "Tuki niille jotka käyttävät ja ajavat matrix-appservice-irc",
+    "Building services on Matrix": "Palvelujen rakentaminen Matrixin avulla",
+    "Support for those using the Matrix spec": "Tuki Matrix-spesifikaation käyttäjille",
+    "Implementing VR services with Matrix": "VR-palvelujen implementointi Matrixin avulla",
+    "Implementing VoIP services with Matrix": "VoIP-palvelujen implementointi Matrixin avulla",
+    "Discussion of the Identity Service API": "Keskustelu Identity Service rajapinnasta",
+    "Support for those using, running and writing other bridges": "Tuki niille jotka käyttävät, ajavat ja ohjelmoivat muita siltoja",
+    "Dev chat for the Riot/Web dev team": "Kehittäjäkeskustelu Riot/Web kehitystiimille",
+    "Dev chat for the Dendrite dev team": "Kehittäjäkeskustelu Dendrite kehitystiimille",
+    "Co-ordination for Riot/Web translators": "Riot/Web kääntäjien koordinointi",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrixissa on jo olemassa monia huoneita jotka on linkitetty olemassa oleviin verkkoihin (Slack, IRC, Gitter, jne) tai itsenäisiin. Tutustu hakemistoon!",
+    "Failed to change password. Is your password correct?": "Salasanan muuttaminen epäonnistui. Onko salasanasi oikein?",
+    "You have successfully set a password!": "Olet onnistuneesti asettanut salasanan!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Voit nyt palata tilillesi kirjauduttua ulos, sekä kirjautua muilla laitteilla.",
+    "Please set a password!": "Ole hyvä ja aseta salasana!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tämä mahdollistaa sinut palamaan tilillesi uloskirjautumisen jälkeen sekä kirjautumaan muilla laitteilla.",
+    "You have successfully set a password and an email address!": "Olet onnistuneesti asettanut salasanan ja sähköpostiosoitteen!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Muista että voit aina asettaa sähköpostiosoitteen käyttäjäasetuksista jos muutat mielesi.",
+    "To return to your account in future you need to <u>set a password</u>": "Voidaksesi tulevaisuudessa palata tilillesi sinut pitää <u>asettaa salasana</u>",
+    "Couldn't load home page": "Kotisivun lataus epäonnistui",
+    "Bug report sent": "Virheraportti lähetetty",
+    "Failed to set Direct Message status of room": "Huoneen suoran viestittelyn tilan asettaminen epäonnistui",
+    "(HTTP status %(httpStatus)s)": "(HTTP tila %(httpStatus)s)",
+    "Notify for all other messages/rooms": "Ilmoita kaikista muista viesteistä/huoneista",
+    "powered by Matrix": "Matrix-pohjainen",
+    "Riot is not supported on mobile web. Install the app?": "Riot ei tue mobiiliselaimia. Asenna sovellus?",
+    "Thank you!": "Kiitos!",
+    "Design and implementation of E2E in Matrix": "Matrix päästä-päähän salauksen suunnittelu ja implementointi",
+    "Contributing code to Matrix and Riot": "Osallistu Matrix ja Riot kehitykseen",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s selaimella %(browserName)s käyttöjärjestelmällä %(osName)s",
+    "There are advanced notifications which are not shown here": "On kehittyneitä ilmoituksia joita ei näytetä tässä",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Matrix-pohjainen hajautettu, salattu viestittely ja yhteistyö",
+    "Back": "Palaa",
+    "Developer Tools": "Kehitystyökalut",
+    "Failed to send custom event.": "Kustomoidun tapahtuman lähettäminen epäonnistui.",
+    "Filter results": "Suodata tuloksia",
+    "Send Custom Event": "Lähetä kustomoitu tapahtuma",
+    "Send Custom State Event": "Lähetä kustomoitu tilatapahtuma",
+    "Explore Room State": "Tutki huoneen tilaa",
+    "You must specify an event type!": "Sinun on määritettävä tapahtuman tyyppi!",
+    "Event sent!": "Tapahtuma lähetetty!",
+    "Event Type": "Tapahtuman tyyppi",
+    "Event Content": "Tapahtuman sisältö",
+    "State Key": "Tila-avain"
 }
diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json
index 13cf15ceaf..44f6a1215f 100644
--- a/src/i18n/strings/fr.json
+++ b/src/i18n/strings/fr.json
@@ -1,53 +1,45 @@
 {
-    "Add an email address above to configure email notifications": "Ajouter une adresse email pour la configuration des notifications par email",
+    "Add an email address above to configure email notifications": "Ajouter une adresse e-mail pour la configuration des notifications par e-mail",
     "All messages": "Tous les messages",
     "All messages (loud)": "Tous les messages (fort)",
     "All notifications are currently disabled for all targets.": "Toutes les notifications sont désactivées pour tous les appareils.",
-    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notifications par e-mail.",
+    "An error occurred whilst saving your email notification preferences.": "Une erreur est survenue lors de la sauvegarde de vos préférences de notification par e-mail.",
     "Cancel Sending": "Annuler l'envoi",
-    "Can't update user notification settings": "Impossible de mettre à jour les notifications utilisateur",
+    "Can't update user notification settings": "Impossible de mettre à jour les paramètres de notification de l'utilisateur",
     "Close": "Fermer",
-    "Create new room": "Créer un nouveau salon",
-    "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix",
+    "Couldn't find a matching Matrix room": "Impossible de trouver un salon Matrix correspondant",
     "Custom Server Options": "Options de serveur personnalisées",
     "delete the alias.": "supprimer l'alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Supprimer l'alias %(alias)s du salon et supprimer %(name)s du répertoire ?",
-    "Direct Chat": "Conversation Directe",
+    "Direct Chat": "Discussion directe",
     "Directory": "Répertoire",
     "Dismiss": "Ignorer",
     "Download this file": "Télécharger ce fichier",
-    "Drop here %(toAction)s": "Déposer ici %(toAction)s",
     "Enable audible notifications in web client": "Activer les notifications sonores pour le client web",
     "Enable desktop notifications": "Activer les notifications de bureau",
     "Enable email notifications": "Activer les notifications par e-mail",
     "Enable notifications for this account": "Activer les notifications pour ce compte",
     "Enable them now": "Les activer maintenant",
-    "Enter keywords separated by a comma:": "Entrez les mots clés séparés par une virgule :",
+    "Enter keywords separated by a comma:": "Entrez les mots-clés séparés par une virgule :",
     "Error": "Erreur",
-    "Error saving email notification preferences": "Erreur lors de la sauvegarde des notifications par email",
+    "Error saving email notification preferences": "Erreur lors de la sauvegarde des préférences de notification par e-mail",
     "#example": "#exemple",
-    "Failed to": "Échec pour",
     "Failed to add tag %(tagName)s to room": "Échec lors de l'ajout de l’étiquette %(tagName)s au salon",
     "Failed to change settings": "Échec de la mise à jour des paramètres",
     "Failed to forget room %(errCode)s": "Échec lors de l'oubli du salon %(errCode)s",
     "Failed to update keywords": "Échec dans la mise à jour des mots-clés",
     "Failed to get protocol list from Home Server": "Échec lors de la récupération de la liste sur le serveur",
     "Failed to get public room list": "Échec lors de la récupération de la liste des salons publics",
-    "Failed to join the room": "Échec de l'adhésion au salon",
     "Failed to remove tag %(tagName)s from room": "Échec dans la suppression de l’étiquette %(tagName)s du salon",
-    "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans le chat direct",
+    "Failed to set direct chat tag": "Échec dans l'attribution d'une étiquette dans la discussion directe",
     "Favourite": "Favoris",
     "Operation failed": "L'opération a échoué",
-    "Please Register": "Veuillez vous enregistrer",
     "powered by Matrix": "propulsé par Matrix",
     "Quote": "Citer",
-    "Redact": "Rédiger",
     "Reject": "Rejeter",
     "Remove %(name)s from the directory?": "Supprimer %(name)s du répertoire ?",
     "Remove": "Supprimer",
     "Resend": "Renvoyer",
-    "Settings": "Paramètres",
-    "Start chat": "Démarrer une discussion",
     "unknown error code": "Code erreur inconnu",
     "View Source": "Voir la source",
     "You cannot delete this image. (%(code)s)": "Vous ne pouvez pas supprimer cette image. (%(code)s)",
@@ -62,33 +54,29 @@
     "Saturday": "Samedi",
     "Today": "Aujourd'hui",
     "Yesterday": "Hier",
-    "Welcome page": "Page d'accueil",
     "Call invitation": "Appel entrant",
-    "Failed to set Direct Message status of room": "Échec de la configuration de l'état de Message Direct du salon",
+    "Failed to set Direct Message status of room": "Échec du réglage de l'état du salon en Discussion directe",
     "Fetching third party location failed": "Échec de la récupération de la localisation tierce",
     "Files": "Fichiers",
     "Filter room names": "Filtrer les salons par nom",
     "Forget": "Oublier",
-    " from room": " du salon",
-    "Guest users can't invite users. Please register to invite.": "Les visiteurs ne peuvent démarrer une discussion. Merci de vous enregistrer pour pouvoir démarrer une discussion.",
     "Invite to this room": "Inviter dans ce salon",
     "Keywords": "Mots-clés",
     "Leave": "Quitter",
-    "Low Priority": "Priorité Basse",
+    "Low Priority": "Priorité basse",
     "Members": "Membres",
     "Mentions only": "Seulement les mentions",
-    "Messages containing my display name": "Messages contenant mon nom",
+    "Messages containing my display name": "Messages contenant mon nom affiché",
     "Messages containing my user name": "Message contenant mon nom d'utilisateur",
-    "Messages in group chats": "Messages dans les conversations de groupe",
-    "Messages in one-to-one chats": "Messages dans les conversations directes",
+    "Messages in group chats": "Messages dans les discussions de groupe",
+    "Messages in one-to-one chats": "Messages dans les discussions directes",
     "Messages sent by bot": "Messages envoyés par des robots",
     "more": "plus",
-    "Mute": "Couper le son",
+    "Mute": "Mettre en sourdine",
     "No rooms to show": "Aucun salon à afficher",
-    "Noisy": "Activer le son",
+    "Noisy": "Bruyant",
     "Notification targets": "Appareils recevant les notifications",
     "Notifications": "Notifications",
-    "Notifications on the following keywords follow rules which can’t be displayed here": "Les mots-clés suivants suivent des règles de notification qui ne peuvent être affichées ici",
     "Notify for all other messages/rooms": "Me notifier pour tous les autres messages/salons",
     "Notify me for anything else": "Me notifier pour tout le reste",
     "Off": "Désactivé",
@@ -97,35 +85,32 @@
     "remove %(name)s from the directory.": "supprimer %(name)s du répertoire.",
     "Remove from Directory": "Supprimer du répertoire",
     "Riot does not know how to join a room on this network": "Riot ne peut pas joindre un salon sur ce réseau",
-    "Room directory": "Répertoire des salons",
     "Room not found": "Salon non trouvé",
-    "Search for a room": "Chercher un salon",
-    "Source URL": "URL source",
-    "The Home Server may be too old to support third party networks": "Le Home Server semble trop ancien pour supporter des réseaux tiers",
+    "Search for a room": "Rechercher un salon",
+    "Source URL": "URL de la source",
+    "The Home Server may be too old to support third party networks": "Le serveur d'accueil semble trop ancien pour supporter des réseaux tiers",
     "There are advanced notifications which are not shown here": "Il existe une configuration avancée des notifications qui ne peut être affichée ici",
     "The server may be unavailable or overloaded": "Le serveur est indisponible ou surchargé",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Ce salon n'est pas ouvert aux visiteurs. Vous pourrez peut-être le rejoindre si vous vous enregistrez.",
     "Unable to fetch notification target list": "Impossible de récupérer la liste des appareils recevant les notifications",
     "Unable to join network": "Impossible de rejoindre le réseau",
     "Unable to look up room ID from server": "Impossible de récupérer l'ID du salon sur le serveur",
     "Unhide Preview": "Dévoiler l'aperçu",
     "Unnamed room": "Salon anonyme",
     "Uploaded on %(date)s by %(user)s": "Téléchargé le %(date)s par %(user)s",
-    "View Decrypted Source": "Voir la source décryptée",
+    "View Decrypted Source": "Voir la source déchiffrée",
     "When I'm invited to a room": "Quand je suis invité dans un salon",
     "World readable": "Visible par tout le monde",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Vous les avez probablement configurées dans un autre client que Riot. Vous ne pouvez pas les configurer dans Riot mais elles s'appliquent quand même",
     "Guests can join": "Ouvert aux visiteurs",
-    " to room": " au salon",
     "Advanced notification settings": "Paramètres de notification avancés",
-    "customServer_text": "Vous pouvez utiliser l'option de serveur personnalisé pour vous connectez à d'autres serveurs Matrix, en spécifiant une adresse de homerserver différente.<br/>Cela permet d'utiliser Riot avec un compte existant sur un homeserver différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnel mais vous ne pourrez plus inviter des utilisateurs par email, ou être invité par email.",
+    "customServer_text": "Vous pouvez utiliser les options de serveur personnalisées pour vous connecter à d'autres serveurs Matrix, en spécifiant une adresse de serveur d'accueil différente.<br/>Cela permet d'utiliser Riot avec un compte Matrix existant sur un serveur d'accueil différent.<br/><br/>Vous pouvez aussi indiquer un serveur d'identité personnalisé mais vous ne pourrez pas inviter d'utilisateurs par e-mail ou être invité par e-mail.",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Les notifications pour les mots-clés suivant répondent à des critères qui ne peuvent pas être affichés ici :",
     "Collapse panel": "Cacher le panneau",
     "Expand panel": "Dévoiler le panneau",
     "I understand the risks and wish to continue": "Je comprends les risques et souhaite continuer",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilise de nombreuses fonctionnalités avancées du navigateur, certaines ne sont pas disponibles ou expérimentales dans votre navigateur actuel.",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Désolé, Riot n'est <b>pas</b> supporté par votre navigateur.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Depuis votre navigateur actuel, le visuel et le ressenti de l'application pourraient être complètement incorrects, et certaines fonctionnalités pourraient ne pas être supportées. Vous pouvez continuer malgré tout, mais vous n'aurez pas de support si vous rencontrez des problèmes !",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Désolé, Riot <b>n'</b>est <b>pas</b> supporté par votre navigateur.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Depuis votre navigateur actuel, le visuel et le ressenti de l'application pourraient être complètement erronés, et certaines fonctionnalités pourraient ne pas être supportées. Vous pouvez continuer malgré tout, mais vous n'aurez aucune aide si vous rencontrez des problèmes !",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Veuillez installer <a href=\"https://www.google.com/chrome\">Chrome</a> ou <a href=\"https://getfirefox.com\">Firefox</a> pour une expérience optimale.",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> et <a href=\"http://opera.com\">Opera</a> fonctionnent aussi.",
     "Messages containing <span>keywords</span>": "Messages contenant des <span>mots-clés</span>",
@@ -133,71 +118,92 @@
     "A new version of Riot is available.": "Une nouvelle version de Riot est disponible.",
     "All Rooms": "Tous les salons",
     "Cancel": "Annuler",
-    "Changelog": "Journal des modif",
-    "Collecting app version information": "Récupération des info de version de l’application",
-    "Collecting logs": "Récupération des traces",
+    "Changelog": "Journal des modifications",
+    "Collecting app version information": "Récupération des informations de version de l’application",
+    "Collecting logs": "Récupération des journaux",
     "Describe your problem here.": "Décrivez votre problème ici.",
     "Failed to send report: ": "Échec de l’envoi du rapport : ",
     "Forward Message": "Transférer le message",
     "Hide panel": "Cacher le panneau",
-    "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:": "Afin de diagnostiquer le problème, les traces de ce client vont être envoyées avec ce rapport d’erreur. Si vous préférez seulement envoyer le texte ci-dessus, décochez la case :",
+    "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:": "Afin de diagnostiquer les problèmes, les journaux de ce client vont être envoyés avec ce rapport d’erreur. Si vous préférez n'envoyer que le texte ci-dessus, décochez la case :",
     "Loading bug report module": "Chargement du module de rapport d’erreur",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Veuillez décrire le problème. Qu’avez-vous fait ? Quel comportement vous attendiez vous à voir ? Que s’est-il effectivement passé ?",
-    "Please describe the bug and/or send logs.": "Veuillez décrire le problème et/ou envoyer les traces.",
-    "Report a bug": "Reporter un problème",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Veuillez décrire l'erreur. Qu'avez-vous fait ? Quel était le comportement attendu ? Que s'est-il réellement passé ?",
+    "Please describe the bug and/or send logs.": "Veuillez décrire le problème et/ou envoyer les journaux.",
+    "Report a bug": "Signaler un problème",
     "Riot Desktop on %(platformName)s": "Version bureau de Riot sur %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot Web n’est pas supporté sur mobile. Installer l’application ?",
+    "Riot is not supported on mobile web. Install the app?": "Riot n’est pas supporté sur les appareils mobiles. Installer l’application ?",
     "Search": "Rechercher",
     "Search…": "Rechercher…",
     "Send": "Envoyer",
-    "Send logs": "Envoyer les traces",
+    "Send logs": "Envoyer les journaux",
     "This Room": "Ce salon",
     "Unavailable": "Indisponible",
     "Unknown device": "Appareil inconnu",
     "Update": "Mettre à jour",
-    "Uploading report": "Téléchargement du rapport",
+    "Uploading report": "Envoi du rapport",
     "What's New": "Nouveautés",
     "What's new?": "Nouveautés ?",
     "Waiting for response from server": "En attente d’une réponse du serveur",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vous utilisez Riot en tant que visiteur. <a>Enregistrez-vous</a> ou <a>identifiez-vous</a> pour accéder à plus de salons et de fonctionnalités !",
     "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel en partage d’écran.",
     "OK": "OK",
     "Failed to change password. Is your password correct?": "Échec du changement de mot de passe. Votre mot de passe est-il correct ?",
-    "You have successfully set a password!": "Vous avez paramétré un mot de passe avec succès !",
+    "You have successfully set a password!": "Vous avez défini un mot de passe avec succès !",
     "Continue": "Continuer",
     "Please set a password!": "Veuillez définir un mot de passe !",
     "You can now return to your account after signing out, and sign in on other devices.": "Vous pouvez maintenant revenir sur votre compte après vous être déconnecté, et vous identifier sur d'autres appareils.",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Cela vous permettra de retourner sur votre compte après vous être déconnecté, et de vous identifier sur d'autres appareils.",
     "Welcome to Riot.im": "Bienvenue sur Riot.im",
-    "(HTTP status %(httpStatus)s)": "(statut HTTP %(httpStatus)s)",
-    "Login": "S'identifier",
+    "(HTTP status %(httpStatus)s)": "(état HTTP %(httpStatus)s)",
+    "Login": "Connexion",
     "Chat with Riot Bot": "Discussion avec Riot Bot",
-    "Search the room directory": "Rechercher dans le répertoire de salon",
+    "Search the room directory": "Rechercher dans le répertoire de salons",
     "Get started with some tips from Riot Bot!": "Démarrer avec quelques astuces de Riot Bot !",
-    "Riot/Android &amp; matrix-android-sdk chat": "Discussions Riot/Android &amp; matrix-android-sd",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Discussions sur Riot/Android &amp; matrix-android-sdk",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Discussions sur Riot/iOS &amp; matrix-ios-sdk",
     "General discussion about Matrix and Riot": "Discussion générale sur Matrix et Riot",
-    "Riot/Web &amp; Desktop chat": "Discussions Riot/Web &amp; Desktop",
-    "Running Matrix services": "Execution de services Matrix",
+    "Riot/Web &amp; Desktop chat": "Discussions sur Riot/Web &amp; Bureau",
+    "Running Matrix services": "Exécution de services Matrix",
     "Admin support for Dendrite": "Support admin pour Dendrite",
     "Announcements about Synapse releases": "Communiqués sur les nouvelles versions de Synapse",
     "Matrix technical discussions": "Discussions techniques sur Matrix",
-    "Community-run support for Synapse": "Support communautaire sur Synape",
+    "Community-run support for Synapse": "Support communautaire sur Synapse",
     "Support for those using and running matrix-appservice-irc": "Support pour ceux qui utilisent et exécutent matrix-appservice-irc",
     "Building services on Matrix": "Développement de services sur Matrix",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et encryptées propulsé par [matrix]",
-    "Discussion of all things Matrix!": "Discussion de tous les sujets Matrix !",
-    "Support for those using the Matrix spec": "Support pour les utilisateurs de la spec Matrix",
-    "Design and implementation of E2E in Matrix": "Définition et implémentation de la crypto dans Matrix",
-    "Implementing VR services with Matrix": "Implémentation de de services de réalité virtuelle avec Matrix",
-    "Implementing VoIP services with Matrix": "Implémentation de de services de voix sur IP avec Matrix",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Discussion &amp; collaboration décentralisées et chiffrées, propulsées par [matrix]",
+    "Discussion of all things Matrix!": "Discussion sur tout ce qui concerne Matrix !",
+    "Support for those using the Matrix spec": "Support pour les utilisateurs de la spécification de Matrix",
+    "Design and implementation of E2E in Matrix": "Définition et implémentation du chiffrement de bout en bout dans Matrix",
+    "Implementing VR services with Matrix": "Implémentation de services de réalité virtuelle avec Matrix",
+    "Implementing VoIP services with Matrix": "Implémentation de services de voix sur IP avec Matrix",
     "Discussion of the Identity Service API": "Discussion sur l’API du Service Identité",
-    "Support for those using, running and writing other bridges": "Support pour les utilisateurs, administrateurs et développeurs de passerelles",
-    "Contributing code to Matrix and Riot": "Contribuer à Matrix et Riot",
-    "Dev chat for the Riot/Web dev team": "Forum pour les discussions sur les développements de Riot/Web",
-    "Dev chat for the Dendrite dev team": "Forum pour les discussion sur les développements de Dendrite",
+    "Support for those using, running and writing other bridges": "Support pour les utilisateurs, administrateurs et développeurs d'autres passerelles",
+    "Contributing code to Matrix and Riot": "Contribuer du code à Matrix et Riot",
+    "Dev chat for the Riot/Web dev team": "Discussions de l'équipe de développeurs de Riot/Web",
+    "Dev chat for the Dendrite dev team": "Discussion pour l'équipe de développeurs de Dendrite",
     "Co-ordination for Riot/Web translators": "Coordination des traducteurs de Riot/Web",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Beaucoup de salons existent déjà dans Matrix, liés à des réseaux existants (Slsck, IRC, Gitter etc) ou indépendants. Jetez un oeil au répertoire !",
-    "You have successfully set a password and an email address!": "Vous avez configuré un mot de passe et une adresse e-mail avec succès !",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans la configuration utilisateur si vous changez d’avis."
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "De nombreux salons existent déjà dans Matrix, liés à des réseaux existants (Slack, IRC, Gitter etc) ou indépendants. Jetez un œil au répertoire !",
+    "You have successfully set a password and an email address!": "Vous avez défini un mot de passe et une adresse e-mail avec succès !",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Souvenez-vous que vous pourrez toujours définir une adresse e-mail dans les paramètres de l'utilisateur si vous changez d’avis.",
+    "Warning": "Attention",
+    "Checking for an update...": "Recherche de mise à jour...",
+    "Error encountered (%(errorDetail)s).": "Erreur rencontrée (%(errorDetail)s).",
+    "No update available.": "Aucune mise à jour disponible.",
+    "Downloading update...": "Mise à jour en cours de téléchargement...",
+    "To return to your account in future you need to <u>set a password</u>": "Pour pouvoir retrouver votre compte dans le futur, vous devez <u>définir un mot de passe</u>",
+    "Set Password": "Définir un mot de passe",
+    "Couldn't load home page": "Impossible de charger la page d'accueil",
+    "Bug report sent": "Rapport d'erreur envoyé",
+    "Thank you!": "Merci !",
+    "Back": "Retour",
+    "Developer Tools": "Outils de développement",
+    "Filter results": "Filtrer les résultats",
+    "You must specify an event type!": "Vous devez spécifier un type d'événement !",
+    "Event sent!": "Événement envoyé !",
+    "Event Type": "Type d'événement",
+    "Event Content": "Contenu de l'événement",
+    "Failed to send custom event.": "Échec de l'envoi de l'événement personnalisé.",
+    "Send Custom Event": "Envoyer l'événement personnalisé",
+    "Send Custom State Event": "Envoyer l'événement d'état personnalisé",
+    "Explore Room State": "Parcourir l'état du salon",
+    "State Key": "Clé d'état"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
new file mode 100644
index 0000000000..700e38ac73
--- /dev/null
+++ b/src/i18n/strings/gl.json
@@ -0,0 +1,209 @@
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s vía %(browserName)s en %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\">Opera</a> tamén serven.",
+    "A new version of Riot is available.": "Está dispoñible unha nova versión de Riot.",
+    "Add an email address above to configure email notifications": "Engada un enderezo de correo electrónico para configurar as notificacións",
+    "Advanced notification settings": "Axustes avanzados de notificación",
+    "All messages": "Todas as mensaxes",
+    "All messages (loud)": "Todas as mensaxes (alto)",
+    "All Rooms": "Todas as Salas",
+    "All notifications are currently disabled for all targets.": "Todas as notificacións están deshabilitadas para todos os destinos.",
+    "An error occurred whilst saving your email notification preferences.": "Algo fallou mentras se gardaban as súas preferencias de notificaicón.",
+    "Back": "Atrás",
+    "Bug report sent": "Enviado o informe de fallo",
+    "Call invitation": "Convite de chamada",
+    "Cancel": "Cancelar",
+    "Cancel Sending": "Cancelar o envío",
+    "Can't update user notification settings": "Non se poden actualizar os axutes de notificación",
+    "Changelog": "Rexistro de cambios",
+    "Close": "Pechar",
+    "Collapse panel": "Agochar panel",
+    "Collecting app version information": "Obtendo información sobre a versión da app",
+    "Collecting logs": "Obtendo rexistros",
+    "Couldn't find a matching Matrix room": "Non coincide con ningunha sala de Matrix",
+    "Custom Server Options": "Axustes do servidor personalizado",
+    "customServer_text": "Pode utilizar os axustes do servidor personalizado para conectarse a outros servidores Matrix indicando un URL de Inicio do servidor.<br/>Esto permítelle utilizar Riot con unha conta existente de Matrix nun servidor diferente.<br/><br/>Tamén pode establecer un servidor personalizado de identidade mais non poderá invitar a usuarias a través de enderezos de correo ou ser vostede invitada do mesmo xeito.",
+    "delete the alias.": "borrar alcume.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminar o alcume da sala %(alias)s e borrar %(name)s do directorio?",
+    "Describe your problem here.": "Describa aquí o seu problema.",
+    "Developer Tools": "Ferramentas para desenvolver",
+    "Direct Chat": "Chat directo",
+    "Directory": "Directorio",
+    "Dismiss": "Desbotar",
+    "Download this file": "Descargue este ficheiro",
+    "Enable audible notifications in web client": "Habilitar notificacións audibles no cliente web",
+    "Enable desktop notifications": "Habilitar notificacións de escritorio",
+    "Enable email notifications": "Habilitar notificacións de correo",
+    "Enable notifications for this account": "Habilitar notificacións para esta conta",
+    "Enable them now": "Habilitalas agora",
+    "Enter keywords separated by a comma:": "Introduza palabras chave separadas por vírgulas:",
+    "Error": "Fallo",
+    "Error saving email notification preferences": "Fallo ao cargar os axustes de notificacións",
+    "#example": "#exemplo",
+    "Expand panel": "Expandir panel",
+    "Failed to add tag %(tagName)s to room": "Fallou ao engadir a etiqueta %(tagName)s a sala",
+    "Failed to change settings": "Fallo ao cambiar os axustes",
+    "Failed to forget room %(errCode)s": "Fallou ao esquecer a sala %(errCode)s",
+    "Failed to update keywords": "Fallo ao actualizar as palabras chave",
+    "Failed to get protocol list from Home Server": "Fallo ao obter a lista de protocolo desde o servidor",
+    "Failed to get public room list": "Fallo ao obter a lista de salas públicas",
+    "Failed to remove tag %(tagName)s from room": "Fallo ao eliminar etiqueta %(tagName)s da sala",
+    "Failed to send custom event.": "Fallo ao enviar evento personalizado.",
+    "Failed to send report: ": "Fallo no envío do informe: ",
+    "Failed to set direct chat tag": "Fallo ao establecer etiqueta do chat directo",
+    "Failed to set Direct Message status of room": "Fallo ao establecer o estado Mensaxe Directa da sala",
+    "Favourite": "Favorito",
+    "Fetching third party location failed": "Fallo ao obter a localización de terceiros",
+    "Files": "Ficheiros",
+    "Filter results": "Filtrar resultados",
+    "Filter room names": "Filtrar nomes de sala",
+    "Forget": "Esquecer",
+    "Forward Message": "Reenviar mensaxe",
+    "Guests can join": "Convidadas pódense unir",
+    "Hide panel": "Agochar panel",
+    "(HTTP status %(httpStatus)s)": "(Estado HTTP %(httpStatus)s)",
+    "I understand the risks and wish to continue": "Entendos os riscos e desexo continuar",
+    "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:": "Para poder diagnosticar o problema, os rexistros de este cliente enviaranse neste informe de fallo. Si prefire enviar só o texto superior, desmarque:",
+    "Invite to this room": "Convidar a esta sala",
+    "Keywords": "Palabras chave",
+    "Leave": "Saír",
+    "Login": "Conectar",
+    "Loading bug report module": "Cargando o módulo de informe de fallos",
+    "Low Priority": "Baixa prioridade",
+    "Members": "Membresía",
+    "Mentions only": "Só mencións",
+    "Messages containing my display name": "Mensaxes que conteñen o meu nome público",
+    "Messages containing <span>keywords</span>": "Mensaxes que conteñen <span>palabras chave</span>",
+    "Messages containing my user name": "Mensaxes que conteñen o meu nome de usuaria",
+    "Messages in group chats": "Mensaxes en grupos de chat",
+    "Messages in one-to-one chats": "Mensaxes en chats un-a-un",
+    "Messages sent by bot": "Mensaxes enviadas por bot",
+    "more": "máis",
+    "Mute": "Calar",
+    "No rooms to show": "Non hai salas que mostrar",
+    "Noisy": "Ruidoso",
+    "Notification targets": "Obxetivos das notificacións",
+    "Notifications": "Notificacións",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notificacións das reglas de seguimento das seguintes palabras que non se mostrarán aquí:",
+    "Notify for all other messages/rooms": "Notificar para todas as outras mensaxes/salas",
+    "Notify me for anything else": "Notificarme todo o demáis",
+    "Off": "Off",
+    "On": "On",
+    "Operation failed": "Fallou a operación",
+    "Permalink": "Ligazón permanente",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Por favor describa a incidencia. Que estaba a facer? Que tiña que pasar? Que aconteceu en realidade?",
+    "Please describe the bug and/or send logs.": "Por favor describa a incidencia e/ou envíe o informe.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Por favor instale <a href=\"https://www.google.com/chrome\">Chrome</a> ou <a href=\"https://getfirefox.com\">Firefox</a> para ter a mellor experiencia de uso.",
+    "powered by Matrix": "funcionando grazas a Matrix",
+    "Quote": "Cita",
+    "Reject": "Rexeitar",
+    "Remove %(name)s from the directory?": "Eliminar %(name)s do directorio?",
+    "Remove": "Eliminar",
+    "remove %(name)s from the directory.": "eliminar %(name)s do directorio.",
+    "Remove from Directory": "Eliminar do directorio",
+    "Report a bug": "Informar de un fallo",
+    "Resend": "Voltar a enviar",
+    "Riot Desktop on %(platformName)s": "Riot Desktop en %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot non sabe cómo conectar con unha sala en esta rede",
+    "Riot is not supported on mobile web. Install the app?": "Riot no se pode executar na web móbil. Instalar a app?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utiliza características avanzadas do navegador, algunhas das cales non están dispoñibles ou son experimentales no seu navegador actual.",
+    "Room not found": "Non se atopou a sala",
+    "Search": "Buscar",
+    "Search…": "Buscar…",
+    "Search for a room": "Buscar unha sala",
+    "Send": "Enviar",
+    "Send logs": "Enviar informes",
+    "Send Custom Event": "Enviar evento personalizado",
+    "Send Custom State Event": "Enviar evento de estado personalizado",
+    "Explore Room State": "Explorar estado da sala",
+    "Source URL": "URL fonte",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Desculpe, o seu navegador <b>non pode</b> executar Riot.",
+    "The Home Server may be too old to support third party networks": "O servidor de inicio podería ser demasiando antigo como para aceptar redes de terceiros",
+    "There are advanced notifications which are not shown here": "Existen notificacións avanzadas que non se mostran aquí",
+    "The server may be unavailable or overloaded": "O servidor podería non estar dispoñible ou sobrecargado",
+    "This Room": "Esta sala",
+    "Unable to fetch notification target list": "Non se puido procesar a lista de obxetivo de notificacións",
+    "Unable to join network": "Non se puido conectar a rede",
+    "Unable to look up room ID from server": "Non se puido atopar o ID da sala do servidor",
+    "Unavailable": "Non dispoñible",
+    "Unhide Preview": "Desagochar a vista previsa",
+    "Unknown device": "Dispositivo descoñecido",
+    "unknown error code": "código de erro descoñecido",
+    "Unnamed room": "Sala sen nome",
+    "Update": "Actualizar",
+    "Uploaded on %(date)s by %(user)s": "Subido a %(date)s por %(user)s",
+    "Uploading report": "Informe da subida",
+    "View Decrypted Source": "Ver a fonte descifrada",
+    "View Source": "Ver fonte",
+    "What's New": "Qué hai de novo",
+    "What's new?": "Qué hai de novo?",
+    "Waiting for response from server": "Agardando pola resposta do servidor",
+    "When I'm invited to a room": "Cando son convidado a unha sala",
+    "World readable": "Visible por todo o mundo",
+    "You cannot delete this image. (%(code)s)": "Non pode eliminar esta imaxe. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Non pode eliminar esta mensaxe. (%(code)s)",
+    "You are not receiving desktop notifications": "Non está a recibir notificacións de escritorio",
+    "You must specify an event type!": "Debe indicar un tipo de evento!",
+    "Thank you!": "Grazas!",
+    "Sunday": "Domingo",
+    "Monday": "Luns",
+    "Tuesday": "Martes",
+    "Wednesday": "Mércores",
+    "Thursday": "Xoves",
+    "Friday": "Venres",
+    "Saturday": "Sábado",
+    "Today": "Hoxe",
+    "Yesterday": "Onte",
+    "OK": "OK",
+    "Warning": "Aviso",
+    "Checking for an update...": "Comprobando as actualizacións...",
+    "Error encountered (%(errorDetail)s).": "Houbo un erro (%(errorDetail)s).",
+    "Event sent!": "Evento enviado!",
+    "Event Type": "Tipo de evento",
+    "Event Content": "Contido do evento",
+    "State Key": "Chave do estado",
+    "No update available.": "Sen actualizacións.",
+    "Downloading update...": "Descargando actualización...",
+    "You need to be using HTTPS to place a screen-sharing call.": "Precisa utilizar HTTPS para establecer unha chamada de pantalla compartida.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Co seu navegador actual a apareciencia e uso do aplicativo poderían estar totalmente falseadas, e algunhas características poderían non funcionar. Se quere pode continuar, pero debe ser consciente de que poden haber fallos!",
+    "Welcome to Riot.im": "Benvida a Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat &amp; colaboración descentralizados e cifrados grazas a [matrix]",
+    "Search the room directory": "Buscar no directorio de salas",
+    "Chat with Riot Bot": "Chat co Bot de Riot",
+    "Get started with some tips from Riot Bot!": "Iníciese con algúns consellos do Bot de Riot!",
+    "General discussion about Matrix and Riot": "Discusión xeral sobre Matrix e Riot",
+    "Discussion of all things Matrix!": "Conversa sobre to o relativo a Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; chat de Escritorio",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; chat matrix-ios-sdk",
+    "Matrix technical discussions": "Discusións técnicas sobre Matrix",
+    "Running Matrix services": "Servizos correndo sobre Matrix",
+    "Community-run support for Synapse": "Axuda da comunidade para Synapse",
+    "Admin support for Dendrite": "Axuda administrador para Dendrite",
+    "Announcements about Synapse releases": "Anuncios sobre lanzamentos de Synapse",
+    "Support for those using and running matrix-appservice-irc": "Axuda para quen usa matrix-appservice-irc",
+    "Building services on Matrix": "Deseñando servizos sobre Matrix",
+    "Support for those using the Matrix spec": "Axuda para quen usa a especificación Matrix",
+    "Design and implementation of E2E in Matrix": "Deseño e implementación de E2E en Matrix",
+    "Implementing VR services with Matrix": "Implementando servizos de RV con Matrix",
+    "Implementing VoIP services with Matrix": "Implementación de servizos VoIP con Matrix",
+    "Discussion of the Identity Service API": "Conversa sobre a Identity Service API",
+    "Support for those using, running and writing other bridges": "Axuda para que utiliza, executa e desenvolve outras pontes",
+    "Contributing code to Matrix and Riot": "Contribuíndo ao código en Matrix e Riot",
+    "Dev chat for the Riot/Web dev team": "Chat para o equipo de desenvolvemento do Riot/Web",
+    "Dev chat for the Dendrite dev team": "Chat para o equipo de desenvolvemento de Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordinación para tradutores de Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Xa existen multitude de salas en Matrix, ligadas a redes existentes (Slack, IRC, Gitter etc) ou independentes. Busque no directorio!",
+    "Failed to change password. Is your password correct?": "Non se mudou o contrasinal. É correcto o contrasinal introducido?",
+    "You have successfully set a password!": "Mudou con éxito o seu contrasinal!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Pode voltar a súa contra tras desconectarse, e conectarse en outros dispositivos.",
+    "Continue": "Continuar",
+    "Please set a password!": "Por favor estableza un contrasinal!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Esto permitiralle voltar a súa conta tras desconectarse, e conectarse en outros dispositivos.",
+    "You have successfully set a password and an email address!": "Estableceu correctamente un contrasinal e enderezo de correo!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre, sempre poderá poñer un enderezo de correo nos axustes de usuario si cambia de idea.",
+    "To return to your account in future you need to <u>set a password</u>": "Para voltar a súa conta no futuro debe <u>establecer un contrasinal>/u>",
+    "Set Password": "Establecer contrasinal",
+    "Couldn't load home page": "Non se cargou a páxina de inicio",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Pode que os configurase nun cliente diferente de Riot. Non pode establecelos desde Riot pero aínda así aplicaranse",
+    "Riot/Android &amp; matrix-android-sdk chat": "Chat para Riot/Android &amp; matrix-android-sdk"
+}
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 22c2de59d1..44363527a7 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -16,7 +16,6 @@
     "Collapse panel": "סגור פאנל",
     "Collecting app version information": "אוסף מידע על גרסת האפליקציה",
     "Collecting logs": "אוסף לוגים",
-    "Create new room": "צור חדר חדש",
     "Couldn't find a matching Matrix room": "לא נמצא חדר כזה ב Matrix",
     "Custom Server Options": "הגדרות שרת מותאמות אישית",
     "customServer_text": "אפשר להשתמש בהגדרות שרת מותאמות אישית בכדי להתחבר לשרתים אחרים באמצעות בחירת כתובת שרת בית שונה.<br/>זה יאפשר לך להשתמש ב Riot עם חשבון קיים ב Matrix אבל אל מול שרת בית שונה. <br/><br/>כמו כן אפשר להגדיר זהות מותאמת אישית אבל אז לא תהיה אפשרות להזמין משתמשים באמצעות כתובת אימייל, או להזמין את עצמך באמצעות כתובת האימייל.",
@@ -37,14 +36,12 @@
     "Error saving email notification preferences": "שגיאה בעת שמירת הגדרות התראה באמצעות הדואר האלקטרוני",
     "#example": "#דוגמא",
     "Expand panel": "הרחב פנאל",
-    "Failed to": "נכשל ב",
     "Failed to add tag %(tagName)s to room": "נכשל בעת הוספת תג %(tagName)s לחדר",
     "Failed to change settings": "נכשל בעת שינוי הגדרות",
     "Failed to forget room %(errCode)s": "נכשל בעת בקשה לשכוח חדר %(errCode)s",
     "Failed to update keywords": "נכשל עדכון מילים",
     "Failed to get protocol list from Home Server": "נכשל בעת נסיון קבלת רשימת פרוטוקולים משרת הבית",
     "Failed to get public room list": "נכשלה קבלת רשימת חדרים ציבוריים",
-    "Failed to join the room": "הצטרפות לחדר נכשלה",
     "Failed to remove tag %(tagName)s from room": "נכשל בעת נסיון הסרת תג %(tagName)s מהחדר",
     "Failed to send report: ": "נכשל בעת שליחת דו\"ח: ",
     "Failed to set direct chat tag": "נכשל בעת סימון תג לשיחה ישירה",
@@ -55,9 +52,7 @@
     "Filter room names": "מיין לפי שמות חדרים",
     "Forget": "שכח",
     "Forward Message": "העבר הודעה",
-    " from room": " מחדר",
     "Guests can join": "אורחים יכולים להצטרף",
-    "Guest users can't invite users. Please register to invite.": "משתמש אורח לא יכול להזמין משתמשים אחרים. נא להרשם בכדי להזמין.",
     "Hide panel": "הסתר פנאל",
     "I understand the risks and wish to continue": "אני מבין את הסיכונים אבל מבקש להמשיך",
     "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:": "בכדי לנתח את הבעיות, ישלח דוח עם פרטי הבעיה. אם ברצונך רק לשלוח את שנאמר למעלה, נא הסר את הסימון:",
@@ -90,7 +85,6 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "נא תאר את הבאג. מה עשית? מה ציפית שיקרה? מה קרה בפועל?",
     "Please describe the bug and/or send logs.": "נא תאר את הבאג ו/או שלח את הלוגים.",
     "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=\"https://www.google.com/chrome\"> כרום</a> או <a href=\"https://getfirefox.com\"> פיירפוקס</a> לשימוש מייטבי.",
-    "Please Register": "נא להרשם",
     "powered by Matrix": "מופעל ע\"י Matrix",
     "Quote": "ציטוט",
     "Reject": "דחה",
@@ -104,23 +98,18 @@
     "Riot does not know how to join a room on this network": "Riot אינו יודע כיצד להצטרף לחדר ברשת זו",
     "Riot is not supported on mobile web. Install the app?": "Riot לא נתמך באמצעות דפדפן במכשיר הסלולארי. האם ברצונך להתקין את האפליקציה?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot משתמש במספר רב של אפשרויות מתקדמות בדפדפן, חלק מהן לא זמינות או בשלבי נסיון בדפדפן שבשימושך כרגע.",
-    "Room directory": "רשימת חדרים",
     "Room not found": "חדר לא נמצא",
     "Search": "חפש",
     "Search…": "חפש…",
     "Search for a room": "חפש חדר",
     "Send": "שלח",
     "Send logs": "שלח לוגים",
-    "Settings": "הגדרות",
     "Source URL": "כתובת אתר המקור",
     "Sorry, your browser is <b>not</b> able to run Riot.": "מצטערים, הדפדפן שלך הוא <b> אינו</b> יכול להריץ את Riot.",
-    "Start chat": "התחל שיחה",
     "The Home Server may be too old to support third party networks": "שרת הבית ישן ואינו יכול לתמוך ברשתות צד שלישי",
     "There are advanced notifications which are not shown here": "ישנן התראות מתקדמות אשר אינן מוצגות כאן",
     "The server may be unavailable or overloaded": "השרת אינו זמין או עמוס",
     "This Room": "החדר הזה",
-    "This room is inaccessible to guests. You may be able to join if you register.": "החדר אינו זמין לאורחים. יש באפשרותך להצטרף רק אחרי רישום.",
-    " to room": " אל חדר",
     "Unable to fetch notification target list": "לא ניתן לאחזר רשימת יעדי התראה",
     "Unable to join network": "לא ניתן להצטרף לרשת",
     "Unable to look up room ID from server": "לא ניתן לאתר מזהה חדר על השרת",
@@ -142,7 +131,6 @@
     "You cannot delete this image. (%(code)s)": "אי אפשר למחוק את התמונה. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "לא ניתן למחוק הודעה זו.  (%(code)s)",
     "You are not receiving desktop notifications": "אתה לא מקבל התראות משולחן העבודה",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "אתה משתמש ב Riot כאורח. <a>הרשם</a> או <a> התחבר</a> בכדי לגשת לחדרים נוספים!",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "יתכן כי בצעת את ההגדרות בצד לקוח ולא ב Riot. לא תוכל לווסת אותם ב Riot אבל הם עדיין תקפים",
     "Sunday": "ראשון",
     "Monday": "שני",
@@ -155,7 +143,6 @@
     "Yesterday": "אתמול",
     "OK": "בסדר",
     "You need to be using HTTPS to place a screen-sharing call.": "עליך להשתמש ב HTTPS בכדי לבצע שיחה משותפת.",
-    "Welcome page": "מסך פתיחה",
     "Welcome to Riot.im": "ברוכים הבאים ל Riot.im",
     "Search the room directory": "חפש ברשימת החדרים",
     "Chat with Riot Bot": "שיחה עם Riot בוט",
@@ -191,9 +178,7 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "זה יאפשר לך לחזור לחשבונך אחרי התנתקות ולהתחבר באמצעות התקנים אחרים.",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s באמצעות הדפדפן %(browserName)s על גבי %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\"> ספארי</a> ו <a href=\"http://opera.com\"> אופרה</a> עובדים גם כן.",
-    "Drop here %(toAction)s": "זרוק כאן %(toAction)s",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "התראה על מילות המפתח הבאות עוקבת אחר החוקים שאינם יכולים להיות מוצגים כאן:",
-    "Redact": "אדום",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "באמצעות הדפדפן הנוכחי שלך המראה של האפליקציה יכול להיות שגוי לחלוטין וחלק מהאפשרויות לא תתפקדנה. אם תרצה לנסות בכל זאת תוכל אבל אז הסיכון חל עליך!",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "צ'ט מוצפן &amp; ושת\"פ נעשה ע\"י ה [matrix]"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index a08a8b8648..81e11fc33a 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -9,7 +9,6 @@
     "Cancel Sending": "Küldés megszakítása",
     "Can't update user notification settings": "Nem sikerül frissíteni az értesítési beállításokat",
     "Close": "Bezár",
-    "Create new room": "Új szoba létrehozása",
     "Couldn't find a matching Matrix room": "Nem található a keresett Matrix szoba",
     "Custom Server Options": "Egyedi szerver beállítások",
     "delete the alias.": "becenév törlése.",
@@ -18,7 +17,6 @@
     "Directory": "Könyvtár",
     "Dismiss": "Eltűntet",
     "Download this file": "Fájl letöltése",
-    "Drop here %(toAction)s": "%(toAction)s -t húzd ide",
     "Enable audible notifications in web client": "Hallható értesítések engedélyezése a webes kliensben",
     "Enable desktop notifications": "Asztali értesítések engedélyezése",
     "Enable email notifications": "E-mail értesítések engedélyezése",
@@ -26,16 +24,14 @@
     "Enable them now": "Engedélyezés most",
     "Enter keywords separated by a comma:": "Kulcsszavak vesszővel elválasztva:",
     "Error": "Hiba",
-    "Error saving email notification preferences": "Hiba email értesítés beállításának mentésénél",
+    "Error saving email notification preferences": "Hiba e-mail értesítés beállításának mentésénél",
     "#example": "#példa",
-    "Failed to": "Nem lehet",
     "Failed to add tag %(tagName)s to room": "Nem lehet a címkét hozzáadni a szobához: %(tagName)s",
     "Failed to change settings": "Nem lehet a beállítást megváltoztatni",
     "Failed to forget room %(errCode)s": "Nem lehet eltávolítani a szobát: %(errCode)s",
     "Failed to update keywords": "Nem lehet a kulcsszavakat frissíteni",
     "Failed to get protocol list from Home Server": "Nem lehet a protokoll listát lekérni a Saját szerverről",
     "Failed to get public room list": "Nem lehet lekérdezni a nyílt szobák listáját",
-    "Failed to join the room": "Nem lehet csatlakozni a szobához",
     "Failed to remove tag %(tagName)s from room": "Nem lehet törölni a(z) %(tagName)s címkét a szobáról",
     "Failed to set direct chat tag": "Nem lehet a címkét beállítani a közvetlen beszélgetéshez",
     "Failed to set Direct Message status of room": "Nem lehet beállítani a Közvetlen beszélgetés státuszt a szobához",
@@ -44,9 +40,7 @@
     "Files": "Fájlok",
     "Filter room names": "Szoba nevek szűrése",
     "Forget": "Elfelejt",
-    " from room": " szobából",
-    "Guests can join": "Vendégek csatlakozhatnak",
-    "Guest users can't invite users. Please register to invite.": "Vendég felhasználó nem küldhet meghívót. Kérlek regisztrálj meghívó küldéshez.",
+    "Guests can join": "Vendégek is csatlakozhatnak",
     "Invite to this room": "Meghívás a szobába",
     "Keywords": "Kulcsszavak",
     "Leave": "Elhagy",
@@ -60,7 +54,7 @@
     "Messages sent by bot": "Botok által küldött üzenetek",
     "more": "további",
     "Mute": "Elnémít",
-    "No rooms to show": "Nincs megjeleníthető szoba",
+    "No rooms to show": "Nincsenek megjelenítendő szobák",
     "Noisy": "Hangos",
     "Notification targets": "Értesítések célpontja",
     "Notifications": "Értesítések",
@@ -77,41 +71,34 @@
     "Operation failed": "Művelet sikertelen",
     "Permalink": "Állandó hivatkozás",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "A legjobb élmény érdekében telepíts <a href=\"https://www.google.com/chrome\">Chrome</a>ot vagy <a href=\"https://getfirefox.com\">Firefox</a>ot.",
-    "Please Register": "Regisztrálj",
     "powered by Matrix": "Matrixon alapul",
     "Quote": "Idézet",
-    "Redact": "Szerkeszt",
     "Reject": "Elutasít",
     "Remove %(name)s from the directory?": "Törlöd a %(name)s szobát a listából?",
-    "Remove": "Töröl",
+    "Remove": "Törlés",
     "remove %(name)s from the directory.": "%(name)s szoba törlése a listából.",
     "Remove from Directory": "Törlés a szobák listájából",
     "Resend": "Újraküld",
     "Riot does not know how to join a room on this network": "Riot nem tudja, hogy csatlakozzon ehhez a szobához ezen a hálózaton",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot sok haladó képességét használja a böngészőnek amik közül lehet, hogy nem mind érhető el a most használt böngészőben vagy még csak kísérleti jellegű.",
-    "Room directory": "Szobák listája",
     "Room not found": "A szoba nem található",
     "Search for a room": "Szoba keresése",
-    "Settings": "Beállítások",
     "Source URL": "Forrás URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Elnézést, a böngésződ <b>nem</b> képes futtatni a Riotot.",
-    "Start chat": "Csevegés indítása",
     "The Home Server may be too old to support third party networks": "A Saját szerver lehet, hogy túl régi ahhoz, hogy más hálózatokhoz tudjon kapcsolódni",
     "There are advanced notifications which are not shown here": "Vannak haladó értesítések amik itt nincsenek megjelenítve",
     "The server may be unavailable or overloaded": "A szerver nem érhető el vagy túl van terhelve",
-    "This room is inaccessible to guests. You may be able to join if you register.": "A szoba vendégek számára elérhetetlen. Csak regisztráció után tudsz csatlakozni.",
-    " to room": " szobába",
     "Unable to fetch notification target list": "Nem sikerült letölteni az értesítési célok listáját",
     "Unable to join network": "Nem sikerült kapcsolódni a hálózathoz",
     "Unable to look up room ID from server": "Nem lehet lekérdezni a szoba ID-ját a szervertől",
     "Unhide Preview": "Előkép felfedése",
     "unknown error code": "ismeretlen hiba kód",
-    "Unnamed room": "Név nélküli szoba",
+    "Unnamed room": "Névtelen szoba",
     "Uploaded on %(date)s by %(user)s": "Feltöltés: %(date)s, %(user)s",
     "View Decrypted Source": "Visszafejtett forrás megjelenítése",
     "View Source": "Forrás megjelenítése",
     "When I'm invited to a room": "Amikor meghívtak a szobába",
-    "World readable": "Mindenki olvashatja",
+    "World readable": "Nyilvános",
     "You cannot delete this image. (%(code)s)": "Nem törölheted ezt a képet. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Nem törölheted ezt az üzenetet. (%(code)s)",
     "You are not receiving desktop notifications": "Nem fogadsz asztali értesítéseket",
@@ -125,12 +112,11 @@
     "Saturday": "Szombat",
     "Today": "Ma",
     "Yesterday": "Tegnap",
-    "Welcome page": "Üdvözlő oldal",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "A jelenlegi bőngésződdel teljesen hibás lehet az alkalmazás kinézete és bizonyos funkciók, ha nem az összes, nem fog működni. Ha mindenképpen ki akarod próbálni, folytathatod de egyedül vagy minden felbukkanó problémával!",
     "Messages containing <span>keywords</span>": "Az üzenet <span>kulcsszavakat</span> tartalmaz",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s alkalmazás %(browserName)s böngészőn %(osName)s rendszeren",
-    "A new version of Riot is available.": "Új verzió érhető el a Riot-ból.",
-    "All Rooms": "Minden szoba",
+    "A new version of Riot is available.": "Elérhető egy új Riot verzió.",
+    "All Rooms": "Minden szobában",
     "Cancel": "Mégse",
     "Changelog": "Változások",
     "Collecting app version information": "Alkalmazás verzió információk összegyűjtése",
@@ -148,7 +134,7 @@
     "Search…": "Keresés…",
     "Send": "Küld",
     "Send logs": "Naplók elküldése",
-    "This Room": "Ez a szoba",
+    "This Room": "Ebben a szobában",
     "Unavailable": "Elérhetetlen",
     "Unknown device": "Ismeretlen eszköz",
     "Update": "Frissítés",
@@ -156,7 +142,6 @@
     "What's New": "Mik az újdonságok",
     "What's new?": "Mik az újdonságok?",
     "Waiting for response from server": "Válasz várása a szervertől",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Vendégként használod a Riot-ot. <a>Regisztrálj</a> vagy <a>jelentkezz be</a> további szobák és lehetőségek eléréséhez!",
     "OK": "Rendben",
     "You need to be using HTTPS to place a screen-sharing call.": "HTTPS-t kell használnod hogy képernyőmegosztásos hívást kezdeményezz.",
     "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:": "A problémák diagnosztizálása érdekében erről a kliensről a hibajelentésben naplók lesznek elküldve. Ha csak az alábbi szöveget szeretnéd elküldeni akkor ezt ne jelöld meg:",
@@ -198,5 +183,30 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Ezzel visszatérhetsz kijelentkezés után a fiókodhoz és más eszközökkel is be tudsz jelentkezni.",
     "(HTTP status %(httpStatus)s)": "(HTTP állapot %(httpStatus)s)",
     "You have successfully set a password and an email address!": "Sikeresen beállítottad a jelszavad és e-mail címed!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Ha meggondolod magad, bármikor beállíthatod az e-mail címed a felhasználói beállításoknál.",
+    "To return to your account in future you need to <u>set a password</u>": "A fiókba való visszalépéshez <u>jelszót</u> kell beállítanod",
+    "Set Password": "Jelszó beállítása",
+    "Warning": "Figyelmeztetés",
+    "Checking for an update...": "Frissítés keresése...",
+    "Error encountered (%(errorDetail)s).": "Hiba történt (%(errorDetail)s).",
+    "No update available.": "Frissítés nem érthető el.",
+    "Downloading update...": "Frissítés letöltése...",
+    "Couldn't load home page": "Kezdőképernyő betöltése sikertelen",
+    "Bug report sent": "Hibajelentés elküldve",
+    "Thank you!": "Köszönjük!",
+    "Back": "Vissza",
+    "Developer Tools": "Fejlesztői eszközök",
+    "Failed to send custom event.": "Egyéni esemény elküldése nem sikerült.",
+    "Send Custom Event": "Egyéni esemény elküldése",
+    "Send Custom State Event": "Egyéni állapot esemény küldése",
+    "Explore Room State": "Szoba állapot felfedezése",
+    "Event sent!": "Esemény elküldve!",
+    "Event Type": "Esemény típusa",
+    "Event Content": "Esemény tartalma",
+    "State Key": "Állapot kulcs",
+    "Filter results": "Találatok szűrése",
+    "You must specify an event type!": "Meg kell határoznod az esemény típusát!",
+    "Show message in desktop notification": "Üzenetek megmutatása az asztali értesítésekben",
+    "Pin Message": "Üzenet kitűzése",
+    "Unpin Message": "Üzenet levétele"
 }
diff --git a/src/i18n/strings/id.json b/src/i18n/strings/id.json
index 9e26dfeeb6..28c65ffd6b 100644
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -1 +1,195 @@
-{}
\ No newline at end of file
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s melalui %(browserName)s di %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> dan <a href=\"http://opera.com\">Opera</a> juga berfungsi.",
+    "A new version of Riot is available.": "Riot versi baru telah tersedia.",
+    "Add an email address above to configure email notifications": "Tambahkan alamat email di atas untuk konfigurasi notifikasi email",
+    "Advanced notification settings": "Pengaturan notifikasi lanjutan",
+    "All messages": "Semua pesan",
+    "All messages (loud)": "Semua pesan (keras)",
+    "All Rooms": "Semua Ruang",
+    "All notifications are currently disabled for all targets.": "Semua notifikasi saat ini dinonaktifkan untuk semua target.",
+    "An error occurred whilst saving your email notification preferences.": "Terjadi kesalahan saat menyimpan preferensi notifikasi email Anda.",
+    "Call invitation": "Undangan panggilan",
+    "Cancel": "Batal",
+    "Cancel Sending": "Batalkan pengiriman",
+    "Can't update user notification settings": "Tidak dapat memperbarui pengaturan notifikasi pengguna",
+    "Changelog": "Daftar perubahan",
+    "Close": "Tutup",
+    "Collapse panel": "Lipat panel",
+    "Collecting app version information": "Mengumpukan informasi versi aplikasi",
+    "Collecting logs": "Mengumpulkan catatan",
+    "Couldn't find a matching Matrix room": "Tidak dapat menemukan ruang Matrix yang sesuai",
+    "Custom Server Options": "Pilihan Server Khusus",
+    "customServer_text": "Anda dapat menggunakan opsi server khusus untuk masuk ke server Matrix lain dengan menyebutkan URL server Home.<br/>Hal ini memperbolehkan Anda untuk menggunakan Riot dengan akun Matrix yang sudah ada di server Home yang berbeda.<br/><br/>Anda juga bisa mengatur server identitas khusus tapi Anda tidak akan dapat mengundang pengguna melalui alamat email, atau diundang dengan alamat email Anda.",
+    "delete the alias.": "hapus alias.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Hapus alias ruang %(alias)s dan hapus %(name)s dari direktori?",
+    "Describe your problem here.": "Jelaskan masalah anda di sini.",
+    "Direct Chat": "Obrolan Langsung",
+    "Directory": "Direktori",
+    "Dismiss": "Abaikan",
+    "Download this file": "Unduh file ini",
+    "Enable audible notifications in web client": "Aktifkan notifikasi suara di klien web",
+    "Enable desktop notifications": "Aktifkan notifikasi desktop",
+    "Enable email notifications": "Aktifkan notifikasi email",
+    "Enable notifications for this account": "Aktifkan notifikasi untuk akun ini",
+    "Enable them now": "Aktifkan sekarang",
+    "Enter keywords separated by a comma:": "Masukkan kata kunci dipisahkan oleh koma:",
+    "Error": "Terjadi Kesalahan",
+    "Error saving email notification preferences": "Terjadi kesalahan saat menyimpan pilihan notifikasi email",
+    "#example": "#contoh",
+    "Expand panel": "Luaskan panel",
+    "Failed to add tag %(tagName)s to room": "Gagal menambahkan tag %(tagName)s ke ruang",
+    "Failed to change settings": "Gagal mengubah pengaturan",
+    "Failed to forget room %(errCode)s": "Gagal melupakan ruang %(errCode)s",
+    "Failed to update keywords": "Gagal memperbarui kata kunci",
+    "Failed to get protocol list from Home Server": "Gagal mendapatkan daftar protokol dari Server Home",
+    "Failed to get public room list": "Gagal mendapatkan daftar ruang publik",
+    "Failed to remove tag %(tagName)s from room": "Gagal menghapus tag %(tagName)s dari ruang",
+    "Failed to send report: ": "Gagal mengirim laporan: ",
+    "Failed to set direct chat tag": "Gagal mengatur tag obrolan langsung",
+    "Failed to set Direct Message status of room": "Gagal mengatur status Pesan Langsung dari ruang",
+    "Favourite": "Favorit",
+    "Fetching third party location failed": "Gagal mengambil lokasi pihak ketiga",
+    "Files": "Files",
+    "Filter room names": "Saring nama ruang",
+    "Forget": "Lupakan",
+    "Forward Message": "Teruskan Pesan",
+    "Guests can join": "Tamu dapat gabung",
+    "Hide panel": "Sembunyikan panel",
+    "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
+    "I understand the risks and wish to continue": "Saya mengerti resikonya dan berharap untuk melanjutkan",
+    "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:": "Untuk diagnosis permasalahannya, catatan dari klien ini akan dikirimkan bersama laporan bug. Jika Anda memilih untuk hanya mengirimkan pesan di atas, mohon hapus centang:",
+    "Invite to this room": "Undang ke ruang ini",
+    "Keywords": "Kata Kunci",
+    "Leave": "Tinggalkan",
+    "Login": "Masuk",
+    "Loading bug report module": "Memuat modul laporan bug",
+    "Low Priority": "Prioritas Rendah",
+    "Members": "Anggota",
+    "Mentions only": "Hanya jika disinggung",
+    "Messages containing my display name": "Pesan mengandung nama tampilan saya",
+    "Messages containing <span>keywords</span>": "Pesan mengandung <span>kata kunci</span>",
+    "Messages containing my user name": "Pesan mengandung nama pengguna saya",
+    "Messages in group chats": "Pesan di obrolan grup",
+    "Messages in one-to-one chats": "Pesan di obrolan satu-ke-satu",
+    "Messages sent by bot": "Pesan dikirim oleh bot",
+    "more": "lagi",
+    "Mute": "Bisu",
+    "No rooms to show": "Tidak ada ruang ditunjukkan",
+    "Noisy": "Berisik",
+    "Notification targets": "Target notifikasi",
+    "Notifications": "Notifikasi",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Notifikasi pada kata kunci berikut mengikuti aturan dimana tidak dapat ditampilkan di sini:",
+    "Notify for all other messages/rooms": "Beritau semua pesan/ruang",
+    "Notify me for anything else": "Beritau saya untuk lainnya",
+    "Off": "Mati",
+    "On": "Nyala",
+    "Operation failed": "Operasi gagal",
+    "Permalink": "Permalink",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Harap jelaskan bug. Apa yang Anda lakukan? Apa yang Anda harap terjadi? Apa yang sebenarnya terjadi?",
+    "Please describe the bug and/or send logs.": "Harap jelaskan bug dan/atau kirim catatan.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Harap install <a href=\"https://www.google.com/chrome\">Chrome</a> atau <a href=\"https://getfirefox.com\">Firefox</a> untuk pengalaman terbaik.",
+    "powered by Matrix": "didukung oleh Matrix",
+    "Quote": "Kutip",
+    "Reject": "Tolak",
+    "Remove %(name)s from the directory?": "Hapus %(name)s dari direktori?",
+    "Remove": "Hapus",
+    "remove %(name)s from the directory.": "hapus %(name)s dari direktori.",
+    "Remove from Directory": "Hapus dari DIrektori",
+    "Report a bug": "Laporkan bug",
+    "Resend": "Kirim Ulang",
+    "Riot Desktop on %(platformName)s": "Riot Desktop di %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot tidak tau bagaimana gabung ruang di jaringan ini",
+    "Riot is not supported on mobile web. Install the app?": "Riot tidak mendukung web seluler. Install aplikasi?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot menggunakan banyak fitur terdepan dari browser, dimana tidak tersedia atau dalam fase eksperimen di browser Anda.",
+    "Room not found": "Ruang tidak ditemukan",
+    "Search": "Cari",
+    "Search…": "Cari…",
+    "Search for a room": "Cari ruang obrolan",
+    "Send": "Kirim",
+    "Send logs": "Kirim catatan",
+    "Source URL": "URL sumber",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Maaf, browser Anda <b>tidak</b> dapat menjalankan Riot.",
+    "The Home Server may be too old to support third party networks": "Server Home mungkin terlalu kuno untuk mendukung jaringan pihak ketiga",
+    "There are advanced notifications which are not shown here": "Ada notifikasi lanjutan yang tidak ditampilkan di sini",
+    "The server may be unavailable or overloaded": "Server mungkin tidak tersedia atau kelebihan muatan",
+    "This Room": "Ruang ini",
+    "Unable to fetch notification target list": "Tidak dapat mengambil daftar notifikasi target",
+    "Unable to join network": "Tidak dapat bergabung di jaringan",
+    "Unable to look up room ID from server": "Tidak dapat mencari ID ruang dari server",
+    "Unavailable": "Tidak Tersedia",
+    "Unhide Preview": "Tampilkan Pratinjau",
+    "Unknown device": "Perangkat Tidak Diketahui",
+    "unknown error code": "kode kesalahan tidak diketahui",
+    "Unnamed room": "Ruang tanpa nama",
+    "Update": "Perbarui",
+    "Uploaded on %(date)s by %(user)s": "Diunggah pada %(date)s oleh %(user)s",
+    "Uploading report": "Unggah laporan",
+    "View Decrypted Source": "Tampilkan Sumber Terdekripsi",
+    "View Source": "Tampilkan Sumber",
+    "What's New": "Apa Yang Baru",
+    "What's new?": "Apa yang baru?",
+    "Waiting for response from server": "Menunggu respon dari server",
+    "When I'm invited to a room": "Ketika Saya diundang ke ruang",
+    "World readable": "Terpublikasi Umum",
+    "You cannot delete this image. (%(code)s)": "Anda tidak dapat menghapus gambar ini. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Anda tidak dapat menghapus pesan ini. (%(code)s)",
+    "You are not receiving desktop notifications": "Anda tidak menerima notifikasi desktop",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Anda mungkin sudah konfigurasi di klien selain Riot. Anda tidak dapat setel di Riot tetap berlaku",
+    "Sunday": "Minggu",
+    "Monday": "Senin",
+    "Tuesday": "Selasa",
+    "Wednesday": "Rabu",
+    "Thursday": "Kamis",
+    "Friday": "Jumat",
+    "Saturday": "Sabtu",
+    "Today": "Hari Ini",
+    "Yesterday": "Kemarin",
+    "OK": "OK",
+    "Warning": "Peringatan",
+    "Checking for an update...": "Cek pembaruan...",
+    "Error encountered (%(errorDetail)s).": "Terjadi kesalahan (%(errorDetail)s).",
+    "No update available.": "Tidak ada pembaruan.",
+    "Downloading update...": "Unduh pembaruan...",
+    "You need to be using HTTPS to place a screen-sharing call.": "Anda perlu menggunakan HTTPS untuk melakukan panggilan berbagi-layar.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Dengan browser ini, tampilan dari aplikasi mungkin tidak sesuai, dan beberapa atau bahkan semua fitur mungkin tidak berjalan. Jika Anda ingin tetap mencobanya, Anda bisa melanjutkan, tapi Anda tanggung sendiri jika muncul masalah yang terjadi!",
+    "Welcome to Riot.im": "Selamat datang di Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Obrolan terenkripsi, terdesentralisasi &amp; kolaborasi didukung oleh [matrix]",
+    "Search the room directory": "Cari di direktori ruang",
+    "Chat with Riot Bot": "Mengobrol dengan bot Riot",
+    "Get started with some tips from Riot Bot!": "Mulai dengan beberapa tip dari Bot Riot!",
+    "General discussion about Matrix and Riot": "Diskusi umum tentang Matrix dan Riot",
+    "Discussion of all things Matrix!": "Diskusi semua tentang Matrix!",
+    "Riot/Web &amp; Desktop chat": "Obrolan Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Obrolan Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Obrolan Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Diskusi teknis Matrix",
+    "Running Matrix services": "Mengoperasikan layanan Matrix",
+    "Community-run support for Synapse": "Dukungan komunitas untuk Synapse",
+    "Admin support for Dendrite": "Dukungan Admin untuk Dendrite",
+    "Announcements about Synapse releases": "Pengumuman tentang rilis Synapse",
+    "Support for those using and running matrix-appservice-irc": "Dukungan untuk pengguna dan penyedia matrix-appservice-irc",
+    "Building services on Matrix": "Membangun layanan dengan Matrix",
+    "Support for those using the Matrix spec": "Dukungan untuk pengguna Matrix spec",
+    "Design and implementation of E2E in Matrix": "Desain dan implementasi E2E di Matrix",
+    "Implementing VR services with Matrix": "Implementasi layanan VR dengan Matrix",
+    "Implementing VoIP services with Matrix": "Implementasi layanan VoIP dengan Matrix",
+    "Discussion of the Identity Service API": "Diskusi tentang API Identity Service",
+    "Support for those using, running and writing other bridges": "Dukungan untuk pengguna, penyedia dan penulis jembatan lainnya",
+    "Contributing code to Matrix and Riot": "Kontribusi kode untuk Matrix dan Riot",
+    "Dev chat for the Riot/Web dev team": "Obrolan Developer untuk tim developer Riot/Web",
+    "Dev chat for the Dendrite dev team": "Obrolan Developer untuk tim developer Dendrite",
+    "Co-ordination for Riot/Web translators": "Koordinasi untuk penerjemah Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Banyak ruang sudah tersedia di Matrix, terhubung ke jaringan yang sudah ada (Slack, IRC, Gitter dls) atau independen. Cek direktori!",
+    "Failed to change password. Is your password correct?": "Gagal untuk mengubah password. Apakah password Anda benar?",
+    "You have successfully set a password!": "Anda berhasil mengubah password!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Anda dapat kembali ke akun setelah keluar dan masuk kembali di perangkat lain.",
+    "Continue": "Lanjut",
+    "Please set a password!": "Mohon isi password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Hal ini akan memperbolehkan anda kembali ke akun setelah keluar dan masuk kembali di perangkat lain.",
+    "You have successfully set a password and an email address!": "Anda telah berhasil mengubah password dan alamat email!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Ingat, Anda selalu dapat mengubah alamat email di pengaturan pengguna jika anda berubah pikiran.",
+    "To return to your account in future you need to <u>set a password</u>": "Untuk kembali ke akun di lain waktu, Anda perlu <u>mengisi password</u>",
+    "Set Password": "Ubah Password",
+    "Couldn't load home page": "Tidak dapat memuat halaman utama"
+}
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index 8dcc298406..096366c60e 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -1,12 +1,12 @@
 {
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "Anche <a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\"> Opera</a> funzionano.",
     "A new version of Riot is available.": "È disponibile una nuova versione di Riot.",
-    "Add an email address above to configure email notifications": "Specifica un indirizzo email per configurazione le notifiche via email",
-    "Advanced notification settings": "Impostazioni notifiche avanzate",
+    "Add an email address above to configure email notifications": "Aggiungi un indirizzo email sopra per configurare le notifiche via email",
+    "Advanced notification settings": "Impostazioni di notifica avanzate",
     "All messages": "Tutti i messaggi",
     "All messages (loud)": "Tutti i messaggi (rumoroso)",
     "All Rooms": "Tutte le stanze",
-    "An error occurred whilst saving your email notification preferences.": "È avvenuto un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
+    "An error occurred whilst saving your email notification preferences.": "Si è verificato un errore durante il salvataggio delle tue preferenze sulle notifiche email.",
     "Call invitation": "Invito ad una chiamata",
     "Cancel": "Annulla",
     "Cancel Sending": "Annulla invio",
@@ -14,20 +14,19 @@
     "Changelog": "Cambiamenti",
     "Close": "Chiudi",
     "Collapse panel": "Riduci pannello",
-    "Collecting app version information": "Raccolta delle informazioni sulla versione dell'applicazione",
-    "Collecting logs": "Raccolta del registro",
-    "Create new room": "Crea una nuova stanza",
+    "Collecting app version information": "Raccolta di informazioni sulla versione dell'applicazione",
+    "Collecting logs": "Sto recuperando i log",
     "Couldn't find a matching Matrix room": "Impossibile trovare una stanza Matrix corrispondente",
-    "Custom Server Options": "Opzioni server personale",
-    "customServer_text": "Puoi utilizzare un server personale per entrare in altri server Matrix specificando un diverso indirizzo per il server Home.<br/>Questo ti permetterà di usare Riot con un account Matrix già esistente su un altro server.<br/><br/>Puoi anche specificare un diverso server di identità ma non sarai in grado di invitare utenti o di essere invitato tramite indirizzo email.",
-    "delete the alias.": "Elimina gli alias.",
+    "Custom Server Options": "Opzioni Server Personalizzate",
+    "customServer_text": "Puoi utilizzare un server personale per accedere su altri server Matrix specificando un diverso indirizzo URL per il server Home.<br/>Questo ti permetterà di usare Riot con un account Matrix già esistente su un altro server.<br/><br/>Puoi anche specificare un diverso server di identità ma non sarai in grado di invitare utenti, o di essere invitato tramite indirizzo email.",
+    "delete the alias.": "elimina l'alias.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Eliminare l'alias %(alias)s e rimuovere %(name)s dalla lista?",
     "Describe your problem here.": "Descrivi qui il tuo problema.",
-    "Direct Chat": "Chat diretta",
+    "Direct Chat": "Chat Diretta",
     "Directory": "Lista",
     "Dismiss": "Scarta",
     "Download this file": "Scarica questo file",
-    "Enable audible notifications in web client": "Abilita notifiche audio nel client Web",
+    "Enable audible notifications in web client": "Abilita notifiche audio nel client web",
     "Enable desktop notifications": "Abilita le notifiche desktop",
     "Enable email notifications": "Abilita le notifiche email",
     "Enable notifications for this account": "Abilita le notifiche per questo account",
@@ -37,29 +36,174 @@
     "Error saving email notification preferences": "Errore nel salvataggio delle preferenze di notifica email",
     "#example": "#esempio",
     "Expand panel": "Espandi il pannello",
-    "Failed to": "Non si è riuscito a",
-    "Failed to add tag %(tagName)s to room": "Non si è riuscito ad aggiungere l'etichetta %(tagName)s alla stanza",
-    "Failed to change settings": "Non si è riuscito ad aggiornare le impostazioni",
-    "Failed to update keywords": "Non si è riuscito ad aggiornare le parole chiave",
-    "Failed to get protocol list from Home Server": "Non si è riuscito ad ottenere la lista protocollo dal server Home",
-    "Failed to get public room list": "Non si è riuscito ad ottenere la lista delle stanze pubbliche",
-    "Failed to join the room": "Non si è riuscito a entrare nella stanza",
-    "Failed to remove tag %(tagName)s from room": "Non si è riuscito a rimuovere il tag %(tagName)s dalla stanza",
-    "Failed to send report: ": "Non si è riuscito ad inviare il resoconto: ",
-    "Failed to set direct chat tag": "Non si è riuscito a impostare l'etichetta di chat diretta",
-    "Failed to set Direct Message status of room": "Non si è riuscito ad impostare lo stato di Messaggio Diretto alla stanza",
+    "Failed to add tag %(tagName)s to room": "Impossibile aggiungere l'etichetta %(tagName)s alla stanza",
+    "Failed to change settings": "Impossibile modificare le impostazioni",
+    "Failed to update keywords": "Impossibile aggiornare le parole chiave",
+    "Failed to get protocol list from Home Server": "Impossibile ottenere la lista di protocolli dal server Home",
+    "Failed to get public room list": "Impossibile ottenere la lista delle stanze pubbliche",
+    "Failed to remove tag %(tagName)s from room": "Impossibile rimuovere l'etichetta %(tagName)s dalla stanza",
+    "Failed to send report: ": "Impossibile inviare il resoconto: ",
+    "Failed to set direct chat tag": "Impossibile impostare l'etichetta di chat diretta",
+    "Failed to set Direct Message status of room": "Impossibile impostare lo stato di Messaggio Diretto alla stanza",
     "Favourite": "Preferito",
     "Files": "File",
     "Filter room names": "Filtra i nomi delle stanze",
     "Forget": "Dimentica",
     "Forward Message": "Inoltra messaggio",
-    " from room": " dalla stanza",
     "Guests can join": "Gli ospiti sono ammessi",
-    "Guest users can't invite users. Please register to invite.": "Gli utenti ospite non possono invitare  altri utenti. Registrati per invitare.",
     "Hide panel": "Nascondi pannello",
     "I understand the risks and wish to continue": "Sono consapevole dei rischi e vorrei continuare",
-    "Invite to this room": "Invita a entrare in questa stanza",
+    "Invite to this room": "Invita in questa stanza",
     "Keywords": "Parole chiave",
     "Leave": "Abbandona",
-    "Login": "Entra"
+    "Login": "Entra",
+    "All notifications are currently disabled for all targets.": "Tutte le notifiche sono disabilitate per tutti gli obbiettivi.",
+    "Failed to forget room %(errCode)s": "Impossibile dimenticare la stanza %(errCode)s",
+    "Fetching third party location failed": "Rilevazione posizione di terze parti fallita",
+    "(HTTP status %(httpStatus)s)": "(stato HTTP %(httpStatus)s)",
+    "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:": "Per diagnosticare i problemi, i log da questo client verranno inviati con questo bug report. Se vuoi solo mandare il testo sopra, togli la spunta a:",
+    "Loading bug report module": "Caricamento modulo di segnalazione errori",
+    "Low Priority": "Priorità bassa",
+    "Members": "Membri",
+    "Mentions only": "Solo le citazioni",
+    "Messages containing my display name": "Messaggi contenenti il mio nome visualizzato",
+    "Messages containing my user name": "Messaggi contenenti il mio nome utente",
+    "Messages in group chats": "Messaggi nelle chat di gruppo",
+    "Messages in one-to-one chats": "Messaggi in chat uno-a-uno",
+    "Messages sent by bot": "Messaggi inviati dai bot",
+    "more": "altro",
+    "Mute": "Silenzia",
+    "No rooms to show": "Nessuna stanza da mostrare",
+    "Noisy": "Rumoroso",
+    "Notifications": "Notifiche",
+    "Notify for all other messages/rooms": "Notifica per tutti gli altri messaggi/stanze",
+    "Notify me for anything else": "Notificami per qualsiasi altra cosa",
+    "Off": "Spento",
+    "On": "Acceso",
+    "Operation failed": "Operazione fallita",
+    "Permalink": "Link permanente",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Per favore descrivi l'errore. Cosa hai fatto? Cosa ti aspettavi accadesse? Cos'è successo invece?",
+    "Please describe the bug and/or send logs.": "Per favore descrivi l'errore e/o invia i log.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Per favore installa<a href=\"https://www.google.com/chrome\">Chrome</a> o <a href=\"https://getfirefox.com\">Firefox</a> per un'esperienza migliore.",
+    "powered by Matrix": "offerto da Matrix",
+    "Quote": "Cita",
+    "Reject": "Rifiuta",
+    "Remove %(name)s from the directory?": "Rimuovere %(name)s dalla lista?",
+    "Remove": "Rimuovi",
+    "remove %(name)s from the directory.": "rimuovi %(name)s dalla lista.",
+    "Remove from Directory": "Rimuovi dalla lista",
+    "Report a bug": "Segnala un errore",
+    "Resend": "Reinvia",
+    "Riot Desktop on %(platformName)s": "Riot Desktop su %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot non sa come entrare nella stanza su questa rete",
+    "Riot is not supported on mobile web. Install the app?": "Riot non è supportato sul web mobile. Vuoi installare l'applicazione?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot utilizza molte funzioni avanzate del browser, alcune delle quali non sono disponibili o sono sperimentali nel tuo browser attuale.",
+    "Room not found": "Stanza non trovata",
+    "Search": "Cerca",
+    "Search…": "Cerca…",
+    "Search for a room": "Cerca una stanza",
+    "Send": "Invia",
+    "Send logs": "Invia i log",
+    "Source URL": "URL d'origine",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Spiacenti, ma il tuo browser <b>non</b>  è in grado di utilizzare Riot.",
+    "Messages containing <span>keywords</span>": "Messaggi contenenti <span>parole chiave</span>",
+    "Notification targets": "Obiettivi di notifica",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Le notifiche alle seguenti parole chiave seguono regole che non possono essere mostrate qui:",
+    "The Home Server may be too old to support third party networks": "Il server Home potrebbe essere troppo vecchio per supportare reti di terze parti",
+    "There are advanced notifications which are not shown here": "Ci sono notifiche avanzate che non sono mostrate qui",
+    "The server may be unavailable or overloaded": "Il server potrebbe essere non disponibile o sovraccarico",
+    "This Room": "Questa stanza",
+    "Unable to join network": "Impossibile collegarsi alla rete",
+    "Unable to look up room ID from server": "Impossibile consultare l'ID stanza dal server",
+    "Unavailable": "Non disponibile",
+    "Unhide Preview": "Mostra anteprima",
+    "Unknown device": "Dispositivo sconosciuto",
+    "unknown error code": "codice errore sconosciuto",
+    "Unnamed room": "Stanza senza nome",
+    "Update": "Aggiornamento",
+    "Uploaded on %(date)s by %(user)s": "Caricato il %(date)s da %(user)s",
+    "Uploading report": "Sto caricando il report",
+    "View Decrypted Source": "Visualizza sorgente decifrato",
+    "View Source": "Visualizza sorgente",
+    "What's New": "Novità",
+    "What's new?": "Cosa c'è di nuovo?",
+    "Waiting for response from server": "In attesa di una risposta dal server",
+    "When I'm invited to a room": "Quando vengo invitato/a in una stanza",
+    "You cannot delete this image. (%(code)s)": "Non puoi eliminare quest'immagine. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Non puoi eliminare questo messaggio. (%(code)s)",
+    "You are not receiving desktop notifications": "Non stai ricevendo le notifiche sul desktop",
+    "World readable": "Leggibile da tutti",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Potresti averli configurati in un client diverso da Riot. Non puoi cambiarli in Riot ma sono comunque applicati",
+    "Sunday": "Domenica",
+    "Monday": "Lunedì",
+    "Tuesday": "Martedì",
+    "Wednesday": "Mercoledì",
+    "Thursday": "Giovedì",
+    "Friday": "Venerdì",
+    "Saturday": "Sabato",
+    "Today": "Oggi",
+    "Yesterday": "Ieri",
+    "OK": "OK",
+    "Warning": "Attenzione",
+    "Checking for an update...": "Controllo aggiornamenti...",
+    "Error encountered (%(errorDetail)s).": "Errore riscontrato (%(errorDetail)s).",
+    "No update available.": "Nessun aggiornamento disponibile.",
+    "Downloading update...": "Scaricamento aggiornamento...",
+    "You need to be using HTTPS to place a screen-sharing call.": "Devi usare HTTPS per utilizzare una chiamata con condivisione schermo.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Con il tuo attuale browser, l'aspetto e la sensazione generale dell'applicazione potrebbero essere completamente sbagliati e alcune delle funzionalità potrebbero non funzionare. Se vuoi provare comunque puoi continuare, ma non riceverai aiuto per qualsiasi problema tu possa riscontrare!",
+    "Welcome to Riot.im": "Benvenuto/a su Riot.im",
+    "Search the room directory": "Cerca nella lista delle stanze",
+    "Chat with Riot Bot": "Chatta con Riot Bot",
+    "Get started with some tips from Riot Bot!": "Inizia con alcuni consigli di Riot Bot!",
+    "General discussion about Matrix and Riot": "Discussioni generali riguardo Matrix e Riot",
+    "Couldn't load home page": "Impossibile caricare la pagina principale",
+    "Riot/Web &amp; Desktop chat": "Chat su Riot/Web &amp; Desktop",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Chat su Riot/iOS &amp; matrix-ios-sdk",
+    "Riot/Android &amp; matrix-android-sdk chat": "Chat su Riot/Android &amp; matrix-android-sdk",
+    "Matrix technical discussions": "Discussioni tecniche su Matrix",
+    "Running Matrix services": "Esecuzione servizi Matrix",
+    "Community-run support for Synapse": "Supporto per Synapse dalla comunità",
+    "Admin support for Dendrite": "Supporto amministrativo per Dendrite",
+    "Announcements about Synapse releases": "Annunci riguardo i rilasci di Synapse",
+    "Support for those using and running matrix-appservice-irc": "Supporto per chi usa e amministra matrix-appservice-irc",
+    "Building services on Matrix": "Costruzione servizi su Matrix",
+    "Support for those using the Matrix spec": "Supporto per chi utilizza le specifiche Matrix",
+    "Design and implementation of E2E in Matrix": "Design e implementazione di E2E in Matrix",
+    "Implementing VR services with Matrix": "Implementazione servizi VR con Matrix",
+    "Implementing VoIP services with Matrix": "Implementazione servizi VoIP con Matrix",
+    "Discussion of the Identity Service API": "Discussione sull'Identity Service API",
+    "Support for those using, running and writing other bridges": "Supporto per chi usa, amministra e scrive altri bridge",
+    "Contributing code to Matrix and Riot": "Contributi al codice di Matrix e Riot",
+    "Co-ordination for Riot/Web translators": "Coordinamento per i traduttori di Riot/Web",
+    "Failed to change password. Is your password correct?": "Modifica password fallita. La tua password è corretta?",
+    "You have successfully set a password!": "Hai impostato una password con successo!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Ora puoi tornare al tuo account dopo esserti disconnesso e accedere su altri dispositivi.",
+    "Continue": "Continua",
+    "Please set a password!": "Imposta una password!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Questo ti permetterà di ritornare al tuo account dopo esserti disconnesso e accedere in altri dispositivi.",
+    "You have successfully set a password and an email address!": "Hai impostato con successo una password e un indirizzo email!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Ricorda, puoi sempre specificare un indirizzo email nelle impostazioni utente se cambi idea.",
+    "To return to your account in future you need to <u>set a password</u>": "Per tornare nel tuo account in futuro devi <u>impostare una password</u>",
+    "Set Password": "Imposta Password",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s su %(osName)s",
+    "Unable to fetch notification target list": "Impossibile ottenere la lista di obiettivi notifiche",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat &amp; collaborazione decentralizzata e criptata offerta da [matrix]",
+    "Discussion of all things Matrix!": "Discussione su tutto quanto riguardi Matrix!",
+    "Dev chat for the Riot/Web dev team": "Chat per gli sviluppatori di Riot/Web",
+    "Dev chat for the Dendrite dev team": "Chat per gli sviluppatori di Dendrite",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Esistono già molte stanze in Matrix, collegate a reti già esistenti (Slack, IRC, Gitter ecc) o indipendenti. Dai un'occhiata all'elenco!",
+    "Thank you!": "Grazie!",
+    "Bug report sent": "Rapporto inviato",
+    "Back": "Indietro",
+    "Developer Tools": "Strumenti per Sviluppatori",
+    "Failed to send custom event.": "Impossibile inviare evento personalizzato.",
+    "Filter results": "Filtra risultati",
+    "Send Custom Event": "Invia Evento Personalizzato",
+    "Send Custom State Event": "Invia Evento di Stato Personalizzato",
+    "Explore Room State": "Esplora Stato Stanza",
+    "You must specify an event type!": "Devi specificare un tipo di evento!",
+    "Event sent!": "Evento inviato!",
+    "Event Type": "Tipo di Evento",
+    "Event Content": "Contenuto dell'Evento",
+    "State Key": "Chiave dello Stato"
 }
diff --git a/src/i18n/strings/ja.json b/src/i18n/strings/ja.json
new file mode 100644
index 0000000000..97a0640e0f
--- /dev/null
+++ b/src/i18n/strings/ja.json
@@ -0,0 +1,56 @@
+{
+    "All messages": "全ての発言",
+    "All messages (loud)": "全ての発言(通知音あり)",
+    "Cancel": "取消",
+    "Close": "閉じる",
+    "Direct Chat": "対話",
+    "Favourite": "お気に入り",
+    "Hide panel": "右欄を非表示",
+    "Invite to this room": "この部屋へ招待",
+    "Low Priority": "低優先度",
+    "Members": "参加者",
+    "Mentions only": "呼び掛けられた時のみ",
+    "Mute": "通知しない",
+    "Notifications": "通知",
+    "Report a bug": "バグを報告",
+    "Resend": "再送信",
+    "Riot is not supported on mobile web. Install the app?": "Riotはスマートフォンでの表示に対応していません。できればアプリをインストールして頂けませんでしょうか?",
+    "Room not found": "部屋が見つかりません",
+    "Search": "検索",
+    "Search…": "検索…",
+    "Send": "送信",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "申し訳ありません。あなたのブラウザではRiotは<b>動作できません</b>。",
+    "This Room": "この部屋",
+    "Waiting for response from server": "サーバからの応答を待っています",
+    "You cannot delete this message. (%(code)s)": "あなたはこの発言を削除できません (%(code)s)",
+    "Sunday": "日曜日",
+    "Monday": "月曜日",
+    "Tuesday": "火曜日",
+    "Wednesday": "水曜日",
+    "Thursday": "木曜日",
+    "Friday": "金曜日",
+    "Saturday": "土曜日",
+    "Today": "今日",
+    "Yesterday": "昨日",
+    "Warning": "警告",
+    "No update available.": "更新はありません。",
+    "Welcome to Riot.im": "Riot.imへようこそ",
+    "Search the room directory": "部屋一覧を検索",
+    "Failed to change password. Is your password correct?": "パスワード変更に失敗しました。パスワードは正しいですか?",
+    "Set Password": "パスワードを設定",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>と<a href=\"http://opera.com\">Opera</a>でも動作します。",
+    "A new version of Riot is available.": "新しいバージョンのRiotが利用可能です。",
+    "All Rooms": "全ての部屋",
+    "Changelog": "変更履歴",
+    "Directory": "部屋一覧",
+    "Download this file": "この添付ファイルをダウンロード",
+    "Enable desktop notifications": "デスクトップ画面に通知を行う",
+    "Enable email notifications": "電子メールでの通知を行う",
+    "Enable notifications for this account": "このアカウントで通知を行う",
+    "Failed to change settings": "設定の変更に失敗しました",
+    "Failed to get public room list": "公開部屋一覧の取得に失敗しました",
+    "Filter room names": "部屋名検索",
+    "Forget": "忘れる",
+    "Leave": "退室",
+    "Files": "添付ファイル"
+}
diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json
index 862fbc0aa5..62bea2ebd6 100644
--- a/src/i18n/strings/ko.json
+++ b/src/i18n/strings/ko.json
@@ -16,7 +16,6 @@
     "Collapse panel": "패널 접기",
     "Collecting app version information": "앱 버전 정보를 수집하는 중",
     "Collecting logs": "로그 수집 중",
-    "Create new room": "새 방 만들기",
     "Couldn't find a matching Matrix room": "일치하는 매트릭스 방을 찾을 수 없어요",
     "Custom Server Options": "사용자 지정 서버 설정",
     "delete the alias.": "가명을 지울게요.",
@@ -25,7 +24,7 @@
     "Directory": "목록",
     "Dismiss": "없애기",
     "Download this file": "이 파일 받기",
-    "Enable desktop notifications": "데스크탑에서 알림 받기",
+    "Enable desktop notifications": "컴퓨터에서 알림 받기",
     "Enable email notifications": "이메일로 알림 받기",
     "Enable notifications for this account": "이 계정의 알림 받기",
     "Error": "오류",
@@ -34,7 +33,6 @@
     "Expand panel": "확장 패널",
     "Forget": "잊기",
     "Hide panel": "패널 숨기기",
-    "Guest users can't invite users. Please register to invite.": "손님은 사용자를 초대할 수 없어요. 초대하려면 계정을 등록해주세요.",
     "I understand the risks and wish to continue": "위험할 수 있는 걸 알고 계속하기를 바라요",
     "Invite to this room": "이 방에 초대하기",
     "Leave": "떠나기",
@@ -51,10 +49,8 @@
     "On": "켜기",
     "Permalink": "고유주소",
     "Please describe the bug and/or send logs.": "오류를 적어주시거나 로그를 보내주세요.",
-    "Please Register": "계정을 등록해주세요",
     "powered by Matrix": "매트릭스의 지원을 받고 있어요",
     "Quote": "인용하기",
-    "Redact": "지우기",
     "Reject": "거절하기",
     "Remove %(name)s from the directory?": "목록에서 %(name)s을 지우시겠어요?",
     "Remove": "지우기",
@@ -62,19 +58,16 @@
     "Remove from Directory": "목록에서 지우기",
     "Report a bug": "오류 보고하기",
     "Resend": "다시 보내기",
-    "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 데스크탑",
+    "Riot Desktop on %(platformName)s": "%(platformName)s에서 라이엇 컴퓨터판",
     "Riot is not supported on mobile web. Install the app?": "라이엇은 모바일 사이트를 지원하지 않아요. 앱을 설치하시겠어요?",
-    "Room directory": "방 목록",
     "Room not found": "방을 찾지 못했어요",
     "Search": "찾기",
     "Search…": "찾기…",
     "Search for a room": "방에서 찾기",
     "Send": "보내기",
     "Send logs": "로그 보내기",
-    "Settings": "설정",
-    "Source URL": "출처 주소",
+    "Source URL": "출처 URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "죄송해요. 브라우저에서 라이엇을 켤 수가 <b>없어요</b>.",
-    "Start chat": "이야기하기",
     "This Room": "방",
     "Unavailable": "이용할 수 없음",
     "Unknown device": "알 수 없는 장치",
@@ -87,7 +80,7 @@
     "Waiting for response from server": "서버에서 응답을 기다리는 중",
     "You cannot delete this image. (%(code)s)": "이 사진을 지우실 수 없어요. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "이 메시지를 지우실 수 없어요. (%(code)s)",
-    "You are not receiving desktop notifications": "데스크탑 알림을 받지 않고 있어요",
+    "You are not receiving desktop notifications": "컴퓨터 알림을 받지 않고 있어요",
     "Sunday": "일요일",
     "Monday": "월요일",
     "Tuesday": "화요일",
@@ -98,7 +91,6 @@
     "Today": "오늘",
     "Yesterday": "어제",
     "OK": "알았어요",
-    "Welcome page": "환영 화면",
     "Welcome to Riot.im": "라이엇에 오신 걸 환영해요",
     "Chat with Riot Bot": "Riot 봇과 이야기하기",
     "You have successfully set a password!": "비밀번호를 설정했어요!",
@@ -106,20 +98,17 @@
     "Please set a password!": "비밀번호를 설정해주세요!",
     "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s의 %(browserName)s을 통한 %(appName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">사파리</a>와 <a href=\"http://opera.com\">오페라</a>에서도 작동해요.",
-    "customServer_text": "사용자 지정 서버 설정에서 다른 홈 서버 주소를 지정해 다른 매트릭스 서버에 로그인할 수 있어요.<br/>이를 통해 라이엇과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.<br/><br/>사용자 지정 ID 서버를 설정할 수도 있지만 이메일 주소로 사용자를 초대하거나 초대받을 수는 없답니다.",
+    "customServer_text": "사용자 지정 서버 설정에서 다른 홈 서버 URL을 지정해 다른 매트릭스 서버에 로그인할 수 있어요.<br/>이를 통해 라이엇과 다른 홈 서버의 기존 매트릭스 계정을 함께 쓸 수 있죠.<br/><br/>사용자 지정 ID 서버를 설정할 수도 있지만 이메일 주소로 사용자를 초대하거나 초대받을 수는 없답니다.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "방 가명 %(alias)s 을 지우고 목록에서 %(name)s를 지우시겠어요?",
-    "Drop here %(toAction)s": "여기에 놓아주세요 %(toAction)s",
     "Enable audible notifications in web client": "웹 클라이언트에서 알림 소리 켜기",
     "Enable them now": "지금 켜기",
     "Enter keywords separated by a comma:": "키워드를 쉼표로 구분해 입력해주세요:",
-    "Failed to": "실패했어요",
     "Failed to add tag %(tagName)s to room": "방에 %(tagName)s로 지정하지 못했어요",
     "Failed to change settings": "설정을 바꾸지 못했어요",
     "Failed to forget room %(errCode)s": "방 %(errCode)s를 잊지 못했어요",
     "Failed to update keywords": "키워드를 갱신하지 못했어요",
     "Failed to get protocol list from Home Server": "홈 서버에서 프로토콜 목록을 얻지 못했어요",
     "Failed to get public room list": "공개한 방 목록을 얻지 못했어요",
-    "Failed to join the room": "방에 들어가지 못했어요",
     "Failed to remove tag %(tagName)s from room": "방에서 %(tagName)s 지정을 지우지 못했어요",
     "Failed to send report: ": "보고를 보내지 못했어요: ",
     "Failed to set direct chat tag": "직접 이야기 지정을 설정하지 못했어요",
@@ -129,7 +118,6 @@
     "Files": "파일",
     "Filter room names": "방 이름 거르기",
     "Forward Message": "메시지 전달",
-    " from room": " 방에서",
     "Guests can join": "손님이 들어올 수 있어요",
     "(HTTP status %(httpStatus)s)": "(HTTP 상태 %(httpStatus)s)",
     "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:": "문제를 진단하기 위해서, 이 클라이언트의 로그를 오류 보고서와 같이 보낼 거에요. 위 내용만 보내시려면, 체크를 해제하세요:",
@@ -153,8 +141,6 @@
     "The Home Server may be too old to support third party networks": "타사 네트워크를 지원하기에는 홈 서버가 너무 오래된 걸 수 있어요",
     "There are advanced notifications which are not shown here": "여기 보이지 않는 고급 알림이 있어요",
     "The server may be unavailable or overloaded": "서버를 쓸 수 없거나 과부하일 수 있어요",
-    "This room is inaccessible to guests. You may be able to join if you register.": "이 방은 손님이 들어가실 수 없어요. 계정을 등록하시면 들어가실 수 있을 거에요.",
-    " to room": " 방에서",
     "Unable to fetch notification target list": "알림 대상 목록을 불러올 수 없어요",
     "Unable to join network": "네트워크에 들어갈 수 없어요",
     "Unable to look up room ID from server": "서버에서 방 ID를 찾아볼 수 없어요",
@@ -171,7 +157,7 @@
     "Get started with some tips from Riot Bot!": "라이엇 봇에게 조언을 받고 시작하세요!",
     "General discussion about Matrix and Riot": "매트릭스와 라이엇에 대한 일반 논의",
     "Discussion of all things Matrix!": "매트릭스의 모든 것에 대한 토론!",
-    "Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 데스크탑 대화",
+    "Riot/Web &amp; Desktop chat": "라이엇/웹 &amp; 컴퓨터 이야기",
     "Riot/iOS &amp; matrix-ios-sdk chat": "라이엇/IOS &amp; matrix-ios-sdk 대화",
     "Riot/Android &amp; matrix-android-sdk chat": "매트릭스/안드로이드 &amp; matrix-ios-sdk 대화",
     "Matrix technical discussions": "매트릭스 기술 논의",
@@ -197,6 +183,13 @@
     "This will allow you to return to your account after signing out, and sign in on other devices.": "이런 식으로 로그아웃한 뒤 계정으로 돌아가, 다른 장치에서 로그인하실 수 있어요.",
     "You have successfully set a password and an email address!": "비밀번호와 이메일 주소를 설정했어요!",
     "Remember, you can always set an email address in user settings if you change your mind.": "잊지마세요, 마음이 바뀌면 언제라도 사용자 설정에서 이메일 주소를 바꾸실 수 있다는 걸요.",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "손님으로 라이엇에 들어오셨네요. <a>계정을 등록하거나</a> <a>로그인하시고</a> 더 많은 방과 기능을 즐기세요!",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "라이엇이 아닌 다른 클라이언트에서 구성하셨을 수도 있어요. 라이엇에서 조정할 수는 없지만 여전히 적용되있을 거에요"
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "라이엇이 아닌 다른 클라이언트에서 구성하셨을 수도 있어요. 라이엇에서 조정할 수는 없지만 여전히 적용되있을 거에요",
+    "To return to your account in future you need to <u>set a password</u>": "나중에 계정으로 돌아가려면 <u>비밀번호 설정</u>을 해야만 해요",
+    "Set Password": "비밀번호 설정",
+    "Warning": "주의",
+    "Checking for an update...": "업데이트를 확인하는 중...",
+    "Error encountered (%(errorDetail)s).": "오류가 일어났어요 (%(errorDetail)s).",
+    "No update available.": "업데이트가 없어요.",
+    "Downloading update...": "업데이트를 받는 중...",
+    "Couldn't load home page": "중심 화면을 불러올 수 없어요"
 }
diff --git a/src/i18n/strings/lv.json b/src/i18n/strings/lv.json
new file mode 100644
index 0000000000..7114e9d5e3
--- /dev/null
+++ b/src/i18n/strings/lv.json
@@ -0,0 +1,195 @@
+{
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s caur %(browserName)s un %(osName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "darbojas arī <a href=\"http://apple.com/safari\">Safari</a> un <a href=\"http://opera.com\">Opera</a>.",
+    "A new version of Riot is available.": "Ir pieejama jauna Riot versija.",
+    "Add an email address above to configure email notifications": "Pievieno augšā epasta adresi, lai konfigurētu epasta notifikāciju paziņojumus",
+    "Advanced notification settings": "Īpašie notifikāciju uzstādījumi",
+    "All messages": "Visas ziņas",
+    "All messages (loud)": "Visas ziņas (skaļi)",
+    "All Rooms": "Visas istabas",
+    "All notifications are currently disabled for all targets.": "Visi notifikāciju paziņojumi ir atspējoti visiem saņēmējiem.",
+    "An error occurred whilst saving your email notification preferences.": "Radās kļūda saglabājot tavus epasta notifikāciju ziņu uzstādījumus.",
+    "Call invitation": "Ielūguma zvans",
+    "Cancel": "Atcelt",
+    "Cancel Sending": "Atcelt sūtīšanu",
+    "Can't update user notification settings": "Nav iespējams atjaunot lietotāja notifikāciju ziņu uzstādījumus",
+    "Changelog": "Izmaiņu saraksts",
+    "Close": "Aizvērt",
+    "Collapse panel": "Aizvērt apgabalu",
+    "Collecting app version information": "Tiek apkopota programmas versijas informācija",
+    "Collecting logs": "Tiek apkopoti logfaili",
+    "Couldn't find a matching Matrix room": "Nav iespējams noteikt atbilstošo Matrix istabu",
+    "Custom Server Options": "Īpaši servera uzstādījumi",
+    "customServer_text": "Tu vari izmantot īpašus servera uzstādījumus, lai pierakstītos citos Matrix serveros, norādot atšķirīgu servera URL adresi.<br/>Tas atļaus Tev izmantot Riot ar jau eksistējošu Matrix kontu citā serverī.<br/><br/>Tu vari norādīt arī īpašu identitātes serveri, bet tad nevarēsi uzaicināt lietotājus pēc epasta adreses,kā arī pēc tās tikt uzaicināts/a.",
+    "Discussion of the Identity Service API": "Diskusija par identitātes servisa API",
+    "delete the alias.": "dzēst aizstājējvārdu.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Dzēst istabas aizstājējvārdu %(alias)s un dzēst %(name)s no kataloga?",
+    "Describe your problem here.": "Apraksti savu problēmu šeit.",
+    "Direct Chat": "Tiešais čats",
+    "Directory": "Katalogs",
+    "Dismiss": "Noņemt",
+    "Download this file": "Lejupielādēt šo failu",
+    "Enable audible notifications in web client": "Iespējot skaņas paziņojumus web klienta programmā",
+    "Enable desktop notifications": "Iespējot darbvirsmas notifikāciju paziņojumus",
+    "Enable email notifications": "Iespējot epasta notifikāciju paziņojumus",
+    "Enable notifications for this account": "Iespējot notifikāciju paziņojumus šim kontam",
+    "Enable them now": "Iespējot tos tagad",
+    "Enter keywords separated by a comma:": "Ievadi atslēgvārdus, atdalītus ar komatu:",
+    "Error": "Kļūda",
+    "Error saving email notification preferences": "Kļūda saglabājot epasta notifikāciju paziņojumu uzstādījumus",
+    "#example": "#piemērs",
+    "Expand panel": "Izvērst apgabalu",
+    "Failed to add tag %(tagName)s to room": "Neizdevās pievienot birku %(tagName)s istabai",
+    "Failed to change settings": "Neizdevās mainīt uzstādījumus",
+    "Failed to forget room %(errCode)s": "Neizdevās \"aizmirst\" istabu %(errCode)s",
+    "Failed to update keywords": "Neizdevās atjaunot atslēgvārdus",
+    "Failed to get protocol list from Home Server": "Neizdevās iegūt protokolu sarakstu no mājas servera",
+    "Failed to get public room list": "Neizdevās iegūt publisko istabu sarakstu",
+    "Failed to remove tag %(tagName)s from room": "Neizdevās dzēst istabas birku %(tagName)s",
+    "Failed to send report: ": "Neizdevās nosūtīt atskaiti: ",
+    "Failed to set direct chat tag": "Neizdevās uzstādīt birku tiešajam čatam",
+    "Continue": "Turpināt",
+    "Failed to change password. Is your password correct?": "Neizdevās mainīt paroli. Vai tava parole ir pareiza?",
+    "Favourite": "Favorīts",
+    "Mute": "Apklusināt",
+    "Notifications": "Paziņojumi",
+    "OK": "LABI",
+    "Operation failed": "Darbība neizdevās",
+    "Remove": "Dzēst",
+    "Search": "Meklēt",
+    "unknown error code": "nezināms kļūdas kods",
+    "Monday": "Pirmdiena",
+    "Tuesday": "Otrdiena",
+    "Wednesday": "Trešdiena",
+    "Thursday": "Ceturtdiena",
+    "Friday": "Piektdiena",
+    "Saturday": "Sestdiena",
+    "Sunday": "Svētdiena",
+    "powered by Matrix": "spēcināts ar Matrix",
+    "Failed to set Direct Message status of room": "Neizdevās iestatīt istabas tiešo ziņu statusu",
+    "Fetching third party location failed": "Neizdevās iegūt trešās puses atrašanās vietu",
+    "Files": "Faili",
+    "Filter room names": "Filtrēt pēc istabu nosaukuma",
+    "Forget": "\"Aizmirst\"",
+    "Forward Message": "Pārsūtīt ziņu",
+    "Guests can join": "Viesi var pievienoties",
+    "Hide panel": "Slēpt apgabalu",
+    "(HTTP status %(httpStatus)s)": "(HTTP statuss %(httpStatus)s)",
+    "I understand the risks and wish to continue": "Es saprotu riskus un vēlos turpināt",
+    "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:": "Problēmu diagnosticēšanas ietvaros, šī klienta logfaili tiks nosūtīti kopā ar šo kļūdas paziņojumu. Ja vēlies nosūtīt vienīgi zemākesošo tekstu, lūdzu atķeksē:",
+    "Invite to this room": "Uzaicināt uz šo istabu",
+    "Keywords": "Atslēgvārdi",
+    "Leave": "Atstāt",
+    "Login": "Pierakstīties",
+    "Loading bug report module": "Ielādējas kļūdas ziņojumu modulis",
+    "Low Priority": "Zema prioritāte",
+    "Members": "Biedri",
+    "Mentions only": "Vienīgi atsauces",
+    "Messages containing my display name": "Ziņas, kuras satur manu redzamo vārdu",
+    "Messages containing <span>keywords</span>": "Ziņas,kuras satur <span>atslēgvārdus</span>",
+    "Messages containing my user name": "Ziņas, kuras satur manu lietotājvārdu",
+    "Messages in group chats": "Ziņas grupas čatos",
+    "Messages in one-to-one chats": "Ziņas viens-pret-vienu čatos",
+    "Messages sent by bot": "Botu nosūtītās ziņas",
+    "more": "vairāk",
+    "No rooms to show": "Nav istabu, ko parādīt",
+    "Noisy": "Trokšņains",
+    "Notification targets": "Notifikācijas paziņojuma mērķi",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Paziņojumi par šādiem atslēgvārdiem atbilst noteikumiem, kurus šeit nevar parādīt:",
+    "Notify for all other messages/rooms": "Paziņot par visām citām ziņām/istabām",
+    "Notify me for anything else": "Paziņot man par jebko citu",
+    "Off": "Izslēgts",
+    "On": "Ieslēgts",
+    "Permalink": "Pastāvīgā saite",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Lūdzu, apraksti kļūdu. Ko Tu darīji? Kas tika gaidīts, lai notiktu? Kas rezultātā notika?",
+    "Please describe the bug and/or send logs.": "Lūdzu apraksti kļūdu un/vai nosūti logfailus.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Lūdzu instalē <a href=\"https://www.google.com/chrome\">Chrome</a> vai <a href=\"https://getfirefox.com\">Firefox</a> pārlūku labākai pārlūkošanas pieredzei.",
+    "Quote": "Citāts",
+    "Reject": "Noraidīt",
+    "Remove %(name)s from the directory?": "Dzēst %(name)s no kataloga?",
+    "remove %(name)s from the directory.": "dzēst %(name)s no kataloga.",
+    "Remove from Directory": "Dzēst no kataloga",
+    "Report a bug": "Paziņot par kļūdu",
+    "Resend": "Nosūtīt atkārtoti",
+    "Riot Desktop on %(platformName)s": "Riot darbvirsma %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot neatpazina iespēju pievienoties istabai šajā tīklā",
+    "Riot is not supported on mobile web. Install the app?": "Riot netiek atbalstīts mobilajā versijā. Instalēt aplikāciju?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot izmanto daudzas īpašās pārlūka iespējas, no kurām dažas var nebūt pieejamas vai ir eksperimentālas tavā pašreizējā pārlūkā.",
+    "Room not found": "Istaba nav atrasta",
+    "Search…": "Meklēt…",
+    "Search for a room": "Meklēt istabu",
+    "Send": "Nosūtīt",
+    "Send logs": "Nosūtīt logfailus",
+    "Source URL": "Avota URL adrese",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "Atvaino, diemžēl tavs pārlūks <b>nespēj</b> darboties ar Riot.",
+    "The Home Server may be too old to support third party networks": "Mājas serveris var būt pārāk novecojis, lai atbalstītu trešo pušu tīmekļa resurursus",
+    "There are advanced notifications which are not shown here": "Ir īpašie notifikāciju paziņojumi, kuri šeit nav redzami",
+    "The server may be unavailable or overloaded": "Serveris var nebūt pieejams vai ir pārslogots",
+    "This Room": "Šī istaba",
+    "Unable to fetch notification target list": "Nav iespējams iegūt notifikāciju paziņojumu mērķu sarakstu",
+    "Unable to join network": "Nav iespējams pievienoties tīmeklim",
+    "Unable to look up room ID from server": "Nav iespējams iegūt istabas ID no servera",
+    "Unavailable": "Nav pieejams",
+    "Unhide Preview": "Nerādīt priekšskatījumu",
+    "Unknown device": "Nezināma ierīce",
+    "Unnamed room": "Nezināma istaba",
+    "Update": "Atjaunot",
+    "Uploaded on %(date)s by %(user)s": "Augšuplādēts %(date)s no %(user)s",
+    "Uploading report": "Augšuplādē atskaiti",
+    "View Decrypted Source": "Skatīt atšifrētu avotu",
+    "View Source": "Skatīt avotu",
+    "What's New": "Kas jauns",
+    "What's new?": "Kas jauns?",
+    "Waiting for response from server": "Gaida atbildi no servera",
+    "When I'm invited to a room": "Kad esmu uzaicināts/a istabā",
+    "World readable": "Lasāms pasaulei",
+    "You cannot delete this image. (%(code)s)": "Tu nevari dzēst šo attēlu. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Tu nevari dzēst šo ziņu. (%(code)s)",
+    "You are not receiving desktop notifications": "Tu nesaņem darbvirsmas notifikāciju paziņojumus",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Tu, iespējams, konfigurēji tās kādā citā klientā, nevis Riot. Tu nevari pielāgot tos Riot, bet tie joprojām ir spēkā",
+    "Today": "Šodien",
+    "Yesterday": "Vakar",
+    "Warning": "Brīdinājums",
+    "Checking for an update...": "Lūkojamies pēc atjauninājuma...",
+    "Error encountered (%(errorDetail)s).": "Notika kļūda (%(errorDetail)s).",
+    "No update available.": "Atjauninājumi nav pieejami.",
+    "Downloading update...": "Lejupielādējam atjauninājumus...",
+    "You need to be using HTTPS to place a screen-sharing call.": "Tev ir nepieciešams izmantot HTTPS savienojumu, lai izmantotu ekrāna kopīgošanas zvanu.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Tavā pašreizējā pārlūkā aplikācijas izskats un uzvedība var būt pilnīgi neatbilstoša, kā arī dažas no visām funkcijām var nedarboties. Ja vēlies turpināt izmantot šo pārlūku, Tu vari arī turpināt, apzinoties, ka šajā gadījumā esi viens/a ar iespējamo problēmu!",
+    "Welcome to Riot.im": "Laipni lūdzam Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralizēta, šifrēta čata &amp; sistēma, spēcināta ar [matrix]",
+    "Search the room directory": "Meklēt istabu katalogu",
+    "Chat with Riot Bot": "Pačatot ar Riot botu",
+    "Get started with some tips from Riot Bot!": "Iepazīsties ar dažiem knifiem no Riot bota!",
+    "General discussion about Matrix and Riot": "Galvenā diskusija par Matrix un Riot",
+    "Discussion of all things Matrix!": "Diskusija par visām ar Matrix saistītajām lietām!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; darbvirsmas čats",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk čats",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk čats",
+    "Matrix technical discussions": "Matrix tehniskās diskusijas",
+    "Running Matrix services": "Izmantot Matrix pakalpojumus",
+    "Community-run support for Synapse": "Komūnas atbalsts Synapse",
+    "Admin support for Dendrite": "Administrācijas atbalsts Dendrite",
+    "Announcements about Synapse releases": "Paziņojumi par Synapse izlaidumiem",
+    "Support for those using and running matrix-appservice-irc": "Atbalsts tiem, kuri izmanto matrix-appservice-irc",
+    "Building services on Matrix": "Pakalpojumu būvēšana uz Matrix",
+    "Support for those using the Matrix spec": "Atbalsts tiem, kuri izmanto Matrix specifikācijas",
+    "Design and implementation of E2E in Matrix": "Dizains un E2E implementācija Matrix",
+    "Implementing VR services with Matrix": "VR servisu implementācija Matrix",
+    "Implementing VoIP services with Matrix": "VoIP pakalpojumu implementācija Matrix",
+    "Support for those using, running and writing other bridges": "Atbalsts tiem, kuri izmanto un raksta citus \"tilta\" risinājumus",
+    "Contributing code to Matrix and Riot": "Dot ieguldījumu  Matrix and Riot kodā",
+    "Dev chat for the Riot/Web dev team": "Riot/Web izstrādātāju komandas čats",
+    "Dev chat for the Dendrite dev team": "Dendrite izstrādatāju komandas čats",
+    "Co-ordination for Riot/Web translators": "Riot/Web tulkotāju koordinācija",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix sistēmā pastāv neskaitāmas neatkarīgas vai eksistējošiem tīmekļa resursiem (Slack, IRC, Gitter utml.) piesaistītas istabas. Ar tām vari iepazīties katalogā!",
+    "You have successfully set a password!": "Tu veiksmīgi nomainīji paroli!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Tu vari tagad atgriezties savā kontā pēc izrakstīšanās, un pierakstīties no citām ierīcēm.",
+    "Please set a password!": "Lūdzu iestati paroli!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Tas atļaus Tev atgriezties savā kontā pēc izrakstīšanās, un pierakstīties no citām ierīcēm.",
+    "You have successfully set a password and an email address!": "Tu veiksmīgi iestatīji paroli un epasta adresi!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Atceries, ka Tu vienmēr vari iestatīt epasta adresi lietotāja uzstādījumos, ja mainīsi domas.",
+    "To return to your account in future you need to <u>set a password</u>": "Lai nākotnē atgrieztos savā kontā, tev būs nepieciešams <u>iestatīt paroli</u>",
+    "Set Password": "Iestatīt paroli",
+    "Couldn't load home page": "Neizdevās ielādēt sākumlapu"
+}
diff --git a/src/i18n/strings/ml.json b/src/i18n/strings/ml.json
index 9f2ad64a24..47bdfd8e98 100644
--- a/src/i18n/strings/ml.json
+++ b/src/i18n/strings/ml.json
@@ -2,5 +2,195 @@
     "Add an email address above to configure email notifications": "ഇ മെയില്‍ അറിയിപ്പുകൾ ലഭിക്കാന്‍ മുകളില്‍ ഇ-മെയില്‍ വിലാസം നല്‍കൂ",
     "All messages": "എല്ലാ സന്ദേശങ്ങളും",
     "All messages (loud)": "എല്ലാ സന്ദേശങ്ങളും (ഉച്ചത്തിൽ)",
-    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)sല്‍  %(browserName)s വഴി %(appName)s"
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)sല്‍  %(browserName)s വഴി %(appName)s",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">സഫാരിയിലും</a>പിന്നെ <a href=\"http://opera.com\">ഓപ്പേറയിലും</a>പ്രവര്‍ത്തിക്കുന്നു.",
+    "A new version of Riot is available.": "റയട്ടിന്റെ ഒരു പുതിയ പതിപ്പ് ലഭ്യമാണ്.",
+    "Advanced notification settings": "അറിയപ്പുകളുടെ സങ്കീര്‍ണമായ സജ്ജീകരണങ്ങള്‍",
+    "All Rooms": "എല്ലാ മുറികളും കാണുക",
+    "All notifications are currently disabled for all targets.": "അറിയിപ്പുകളെല്ലാം നിര്‍ത്തിയിരിയ്ക്കുന്നു.",
+    "An error occurred whilst saving your email notification preferences.": "ഇ-മെയില്‍ വഴി അറിയിയ്ക്കാനുള്ള നിങ്ങളുടെ സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കുന്നതില്‍ ഒരു പ്രശ്നമുണ്ടായി.",
+    "Call invitation": "വിളിയ്ക്കുന്നു",
+    "Cancel": "റദ്ദാക്കുക",
+    "Cancel Sending": "അയയ്ക്കുന്നത് റദ്ദാക്കുക",
+    "Can't update user notification settings": "ഉപയോക്താവിനെ അറിയിയ്ക്കാനുള്ള സജ്ജീകരണം പുതുക്കാനായില്ല",
+    "Changelog": "മാറ്റങ്ങളുടെ നാള്‍വഴി",
+    "Close": "അടയ്ക്കുക",
+    "Collapse panel": "പാനല്‍ കൊളാപ്സ് ചെയ്യുക",
+    "Collecting app version information": "ആപ്പ് പതിപ്പു വിവരങ്ങള്‍ ശേഖരിക്കുന്നു",
+    "Collecting logs": "നാള്‍വഴി ശേഖരിക്കുന്നു",
+    "Couldn't find a matching Matrix room": "ആവശ്യപ്പെട്ട മാട്രിക്സ് റൂം കണ്ടെത്താനായില്ല",
+    "Custom Server Options": "കസ്റ്റം സെര്‍വര്‍ ഓപ്ഷനുകള്‍",
+    "delete the alias.": "ഏലിയാസ് നീക്കം ചെയ്യുക.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "റൂം ഏലിയാസ് %(alias)s നീക്കം ചെയ്യുകയും %(name)s കള്‍ ഡയറക്ടറിയില്‍ നിന്നും നീക്കം ചെയ്യുകയും ചെയ്യുക ?",
+    "Describe your problem here.": "നിങ്ങള്‍ നേരിട്ട പ്രശ്നം ഇവിടെ വിവരിക്കാം.",
+    "Direct Chat": "നേരിട്ടുള്ള ചാറ്റ്",
+    "Directory": "ഡയറക്ടറി",
+    "Dismiss": "ഒഴിവാക്കുക",
+    "Download this file": "ഈ ഫയല്‍ ഡൌണ്‍ലോഡ് ചെയ്യുക",
+    "Enable audible notifications in web client": "വെബ് പതിപ്പിലെ അറിയിപ്പുകള്‍ കേള്‍ക്കാവുന്നതാക്കുക",
+    "Enable desktop notifications": "ഡെസ്ക്ടോപ്പ് നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
+    "Enable email notifications": "ഇമെയില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
+    "Enable notifications for this account": "ഈ അക്കൌണ്ടില്‍ നോട്ടിഫിക്കേഷനുകള്‍ ഇനേബിള്‍ ചെയ്യുക",
+    "Enable them now": "ഇപ്പോള്‍ ഇനേബിള്‍ ചെയ്യുക",
+    "Enter keywords separated by a comma:": "കീവേഡുകളെ കോമ കൊണ്ട് വേര്‍ത്തിരിച്ച് ടൈപ്പ് ചെയ്യുക :",
+    "Error": "എറര്‍",
+    "Error saving email notification preferences": "ഇമെയില്‍ നോട്ടിഫിക്കേഷന്‍ സജ്ജീകരണങ്ങള്‍ സൂക്ഷിക്കവേ എറര്‍ നേരിട്ടു",
+    "#example": "#ഉദാഹരണം",
+    "Expand panel": "പാനല്‍ വലുതാക്കുക",
+    "Failed to add tag %(tagName)s to room": "റൂമിന് %(tagName)s എന്ന ടാഗ് ആഡ് ചെയ്യുവാന്‍ സാധിച്ചില്ല",
+    "Failed to change settings": "സജ്ജീകരണങ്ങള്‍ മാറ്റുന്നവാന്‍ സാധിച്ചില്ല",
+    "Failed to forget room %(errCode)s": "%(errCode)s റൂം ഫോര്‍ഗെറ്റ് ചെയ്യുവാന്‍ സാധിച്ചില്ല",
+    "Failed to update keywords": "കീവേഡുകള്‍ പുതുക്കുവാന്‍ സാധിച്ചില്ല",
+    "Failed to get protocol list from Home Server": "ഹോം സെര്‍വറില്‍ നിന്ന് പ്രോട്ടോക്കോള്‍ ലിസ്റ്റ് നേടാന്‍ സാധിച്ചില്ല",
+    "Failed to get public room list": "പബ്ലിക്ക് റൂം ലിസ്റ്റ് നേടാന്‍ സാധിച്ചില്ല",
+    "Failed to remove tag %(tagName)s from room": "റൂമില്‍ നിന്നും %(tagName)s ടാഗ് നീക്കം ചെയ്യുവാന്‍ സാധിച്ചില്ല",
+    "Failed to send report: ": "റിപ്പോര്‍ട്ട് അയക്കുവാന്‍ സാധിച്ചില്ല : ",
+    "Failed to set direct chat tag": "ഡയറക്റ്റ് ചാറ്റ് ടാഗ് സെറ്റ് ചെയ്യാനായില്ല",
+    "Failed to set Direct Message status of room": "റൂമില്‍ നിന്നും ഡയറക്റ്റ് മെസേജ് സ്റ്റാറ്റസ് സജ്ജീകരിക്കാന്‍ കഴിഞ്ഞില്ല",
+    "Favourite": "പ്രിയപ്പെട്ടവ",
+    "Fetching third party location failed": "തേഡ് പാര്‍ട്ടി ലൊക്കേഷന്‍ ഫെച്ച് ചെയ്യാന്‍ കഴിഞ്ഞില്ല",
+    "Files": "ഫയലുകള്‍",
+    "Filter room names": "റൂം പേരുകള്‍ ഫില്‍ട്ടര്‍ ചെയ്യുക",
+    "Forget": "മറക്കുക",
+    "Forward Message": "സന്ദേശം ഫോര്‍വേഡ് ചെയ്യുക",
+    "Guests can join": "അതിഥികള്‍ക്കും പ്രവേശിക്കാം",
+    "Hide panel": "പാനല്‍ ഒളിപ്പിക്കുക",
+    "(HTTP status %(httpStatus)s)": "(HTTP സ്റ്റാറ്റസ് %(httpStatus)s)",
+    "I understand the risks and wish to continue": "കുഴപ്പമാകാന്‍ സാധ്യതയുണ്ടെന്നെനിയ്ക്കു് മനസ്സിലായി, എന്നാലും മുന്നോട്ട് പോകുക",
+    "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:": "നേരിട്ട പ്രശ്നം മനസ്സിലാക്കാന്‍, ഈ ക്ലയന്റില്‍ നിന്നുള്ള നാള്‍വഴികള്‍ ബഗ് റിപ്പോര്‍ട്ടിനൊപ്പം അയയ്ക്കും. അതിനു പകരം ഈ എഴുത്ത് മാത്രം അയച്ചാല്‍ മതിയെങ്കില്‍ ദയവായി ശരിച്ഛിഹ്നം ഒഴിവാക്കുക:",
+    "Invite to this room": "ഈ റൂമിലേക്ക് ക്ഷണിക്കുക",
+    "Keywords": "കീവേഡുകള്‍",
+    "Leave": "വിടവാങ്ങുക",
+    "Login": "ലോഗിന്‍",
+    "Loading bug report module": "പിഴവുകള്‍ അറിയിയ്ക്കാനുള്ള ഘടകം ചേര്‍ക്കുന്നു",
+    "Low Priority": "താഴ്ന്ന പരിഗണന",
+    "Members": "അംഗങ്ങള്‍",
+    "Mentions only": "മെന്‍ഷനുകള്‍ മാത്രം",
+    "Messages containing my display name": "എന്റെ പേര് അടങ്ങിയിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്ക്",
+    "Messages containing <span>keywords</span>": "<span>കീവേഡുകള്‍</span>അടങ്ങിയ സന്ദേശങ്ങള്‍ക്ക്",
+    "Messages containing my user name": "എന്റെ യൂസര്‍ നെയിം അടങ്ങിയിരിക്കുന്ന സന്ദേശങ്ങള്‍ക്ക്",
+    "Messages in group chats": "ഗ്രൂപ്പ് ചാറ്റുകളിലെ സന്ദേശങ്ങള്‍ക്ക്",
+    "Messages in one-to-one chats": "നേര്‍ക്കുനേര്‍ ചാറ്റിലെ സന്ദേശങ്ങള്‍ക്ക്",
+    "Messages sent by bot": "ബോട്ട് അയയ്ക്കുന്ന സന്ദേശങ്ങള്‍ക്ക്",
+    "more": "കൂടുതല്‍",
+    "Mute": "നിശ്ശബ്ദം",
+    "No rooms to show": "കാണിക്കാന്‍ റൂമുകളില്ല",
+    "Noisy": "ഉച്ചത്തില്‍",
+    "Notification targets": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റുകള്‍",
+    "Notifications": "നോട്ടിഫിക്കേഷനുകള്‍",
+    "Operation failed": "ശ്രമം പരാജയപ്പെട്ടു",
+    "Permalink": "പെര്‍മാലിങ്ക്",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "ബഗ് വിശദീകരിക്കുക. എന്ത് ചെയ്തപ്പോഴാണ് വന്നത് ? എന്തായിരുന്നു പ്രതീക്ഷിച്ചിരുന്നത് ? ശരിക്കും എന്താണ് സംഭവിച്ചത് ?",
+    "Please describe the bug and/or send logs.": "ബഗ് വിശദീകരിക്കുക , കൂടെ / അല്ലെങ്കില്‍ നാള്‍വഴികളും അയക്കുക.",
+    "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=\"https://www.google.com/chrome\">ഗൂഗിള്‍ ക്രോം</a>ബ്രൌസറോ അല്ലെങ്കില്‍ <a href=\"https://getfirefox.com\">ഫയര്‍ഫോക്സ്</a> ബ്രൌസറോ ഇന്‍സ്റ്റാള്‍ ചെയ്യൂ.",
+    "powered by Matrix": "മാട്രിക്സില്‍ പ്രവര്‍ത്തിക്കുന്നു",
+    "Quote": "ഉദ്ധരിക്കുക",
+    "Reject": "നിരസിക്കുക",
+    "Remove %(name)s from the directory?": "%(name)s കള്‍ ഡയറക്റ്ററിയില്‍ നിന്നും മാറ്റണോ ?",
+    "Remove": "നീക്കം ചെയ്യുക",
+    "Remove from Directory": "ഡയറക്റ്ററിയില്‍ നിന്നും നീക്കം ചെയ്യുക",
+    "Report a bug": "ബഗ് റിപ്പോര്‍ട്ട് ചെയ്യുക",
+    "Resend": "വീണ്ടും അയയ്ക്കുക",
+    "Riot Desktop on %(platformName)s": "%(platformName)s ലെ റയട്ട് ഡെസ്ക്ടോപ്പ്",
+    "Riot does not know how to join a room on this network": "ഈ നെറ്റ്‍വര്‍ക്കിലെ ഒരു റൂമില്‍ എങ്ങനെ അംഗമാകാമെന്ന് റയട്ടിന് അറിയില്ല",
+    "Riot is not supported on mobile web. Install the app?": "മൊബൈലില്‍ റയട്ട് വെബ് പിന്തുണ ഇല്ല. ആപ്പ് ഇന്‍സ്റ്റാള്‍ ചെയ്യാം ?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "റയട്ട് നൂതന ബ്രൌസര്‍ ഫീച്ചറുകള്‍ ഉപയോഗിക്കുന്നു. നിങ്ങളുടെ ബ്രൌസറില്‍ അവയില്‍ പലതും ഇല്ല / പൂര്‍ണ്ണമല്ല .",
+    "Room not found": "റൂം കണ്ടെത്താനായില്ല",
+    "Search": "തിരയുക",
+    "Search…": "തിരയുക…",
+    "Search for a room": "ഒരു റൂം തിരയുക",
+    "Send": "അയയ്ക്കുക",
+    "Send logs": "നാള്‍വഴി അയയ്ക്കുക",
+    "Source URL": "സോഴ്സ് യു ആര്‍ എല്‍",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "ക്ഷമിക്കണം, നിങ്ങളുടെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ <b>പര്യാപ്തമല്ല</b>.",
+    "The Home Server may be too old to support third party networks": "തേഡ് പാര്‍ട്ടി നെറ്റ്‍വര്‍ക്കുകളെ പിന്തുണക്കാത്ത വളരെ പഴയ ഹോം സെര്‍വര്‍ ആയേക്കാം",
+    "There are advanced notifications which are not shown here": "ഇവിടെ കാണിക്കാത്ത നൂതന നോട്ടിഫിക്കേഷനുകള്‍ ഉണ്ട്",
+    "The server may be unavailable or overloaded": "സെര്‍വര്‍ ലഭ്യമല്ല അല്ലെങ്കില്‍ ഓവര്‍ലോഡഡ് ആണ്",
+    "This Room": "ഈ മുറി",
+    "Unable to fetch notification target list": "നോട്ടിഫിക്കേഷന്‍ ടാര്‍ഗെറ്റ് ലിസ്റ്റ് നേടാനായില്ല",
+    "Unable to join network": "നെറ്റ്‍വര്‍ക്കില്‍ ജോയിന്‍ ചെയ്യാന്‍ കഴിയില്ല",
+    "Unable to look up room ID from server": "സെര്‍വറില്‍ നിന്നും റൂം ഐഡി കണ്ടെത്താനായില്ല",
+    "Unavailable": "ലഭ്യമല്ല",
+    "Unhide Preview": "പ്രിവ്യു കാണിക്കുക",
+    "Unknown device": "അപരിചിത ഡിവൈസ്",
+    "unknown error code": "അപരിചിത എറര്‍ കോഡ്",
+    "Unnamed room": "പേരില്ലാത്ത റൂം",
+    "Update": "പുതുക്കുക",
+    "Uploaded on %(date)s by %(user)s": "%(date)s ല്‍ %(user)s അപ്ലോഡ് ചെയ്തത്",
+    "Uploading report": "റിപ്പോര്‍ട്ട് അപ്ലോഡ് ചെയ്യുന്നു",
+    "View Decrypted Source": "ഡീക്രിപ്റ്റ് ചെയ്ത സോഴ്സ് കാണുക",
+    "View Source": "സോഴ്സ് കാണുക",
+    "What's New": "പുതിയ വിശേഷങ്ങള്‍",
+    "What's new?": "എന്തൊക്കെ പുതിയ വിശേഷങ്ങള്‍ ?",
+    "Waiting for response from server": "സെര്‍വറില്‍ നിന്നുള്ള പ്രതികരണത്തിന് കാക്കുന്നു",
+    "When I'm invited to a room": "ഞാന്‍ ഒരു റൂമിലേക്ക് ക്ഷണിക്കപ്പെടുമ്പോള്‍",
+    "You cannot delete this image. (%(code)s)": "നിങ്ങള്‍ക്ക് ഈ ചിത്രം നീക്കം ചെയ്യാനാകില്ല. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "നിങ്ങള്‍ക്ക് ഈ സന്ദേശം നീക്കം ചെയ്യാനാകില്ല. (%(code)s)",
+    "You are not receiving desktop notifications": "നിങ്ങള്‍ക്ക് ഇപ്പോള്‍ ഡെസ്ക്ടോപ്പ് നോട്ടിഫിക്കേഷനുകള്‍ ലഭിക്കുന്നില്ല",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "ഇവ റയട്ടല്ലാതെ മറ്റൊരു ക്ലയന്റില്‍ വച്ച് കോണ്‍ഫിഗര്‍ ചെയ്തതാകാം. റയട്ടില്‍ അവ ലഭിക്കില്ല, എങ്കിലും അവ നിലവിലുണ്ട്",
+    "Sunday": "ഞായര്‍",
+    "Monday": "തിങ്കള്‍",
+    "Tuesday": "ചൊവ്വ",
+    "Wednesday": "ബുധന്‍",
+    "Thursday": "വ്യാഴം",
+    "Friday": "വെള്ളി",
+    "Saturday": "ശനി",
+    "Today": "ഇന്ന്",
+    "Yesterday": "ഇന്നലെ",
+    "OK": "ശരി",
+    "Warning": "മുന്നറിയിപ്പ്",
+    "Checking for an update...": "അപ്ഡേറ്റ് ഉണ്ടോ എന്ന് തിരയുന്നു...",
+    "Error encountered (%(errorDetail)s).": "എറര്‍ നേരിട്ടു (%(errorDetail)s).",
+    "No update available.": "അപ്ഡേറ്റുകള്‍ ലഭ്യമല്ല.",
+    "Downloading update...": "അപ്ഡേറ്റ് ഡൌണ്‍ലോഡ് ചെയ്യുന്നു...",
+    "You need to be using HTTPS to place a screen-sharing call.": "സ്ക്രീന്‍ ഷെയറിങ്ങ് കോള്‍ നടത്തണമെങ്കില്‍ https ഉപയോഗിക്കണം.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "നിങ്ങളുടെ ഇപ്പോളത്തെ ബ്രൌസര്‍ റയട്ട് പ്രവര്‍ത്തിപ്പിക്കാന്‍ പൂര്‍ണമായും പര്യാപത്മല്ല. പല ഫീച്ചറുകളും പ്രവര്‍ത്തിക്കാതെയിരിക്കാം. ഈ ബ്രൌസര്‍ തന്നെ ഉപയോഗിക്കണമെങ്കില്‍ മുന്നോട്ട് പോകാം. പക്ഷേ നിങ്ങള്‍ നേരിടുന്ന പ്രശ്നങ്ങള്‍ നിങ്ങളുടെ ഉത്തരവാദിത്തത്തില്‍ ആയിരിക്കും!",
+    "Welcome to Riot.im": "റയട്ടിലേക്ക് സ്വാഗതം",
+    "Search the room directory": "റൂം ഡയറക്റ്ററിയില്‍ പരതുക",
+    "Chat with Riot Bot": "റയട്ട് ബോട്ടുമായി ചാറ്റ് ചെയ്യുക",
+    "Get started with some tips from Riot Bot!": "റയട്ട് ബോട്ടില്‍ നിന്നുള്ള നിര്‍ദേശങ്ങള്‍ സ്വീകരിച്ച് കൊണ്ട് തുടങ്ങൂ!",
+    "General discussion about Matrix and Riot": "മാട്രിക്സിനേയും റയട്ടിനേയും കുറിച്ചുള്ള പൊതു ചര്‍ച്ച",
+    "Discussion of all things Matrix!": "മാട്രിക്സിനെ കുറിച്ചുള്ള ചര്‍ച്ച!",
+    "Riot/Web &amp; Desktop chat": "റയട്ട്/വെബ് &amp; ഡെസ്ക്ടോപ്പ് ചാറ്റ്",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "റയട്ട്/iOS&amp; matrix-ios-sdk ചാറ്റ്",
+    "Riot/Android &amp; matrix-android-sdk chat": "റയട്ട്/ആന്‍ഡ്രോയ്ഡ്&amp; matrix-android-sdk ചാറ്റ്",
+    "Matrix technical discussions": "മാട്രിക്സ് സാങ്കേതിക ചര്‍ച്ച",
+    "Running Matrix services": "മാട്രിക്സ് സര്‍വീസുകള്‍ റണ്‍ ചെയ്യുന്നു",
+    "Community-run support for Synapse": "സിനാപ്സിനുള്ള കമ്യൂണിറ്റി-നേതൃത്വത്തലുള്ള പിന്തുണ",
+    "Admin support for Dendrite": "ഡെന്‍ഡ്രൈറ്റിനുള്ള അഡ്മിന്‍ പിന്തുണ",
+    "Announcements about Synapse releases": "സിനാപ്സ് റിലീസുകളെ കുറിച്ചുള്ള അറിയിപ്പുകള്‍",
+    "Support for those using and running matrix-appservice-irc": "matrix-appservice-irc ഉപയോഗിക്കുന്നവര്‍ക്കും റണ്‍ ചെയ്യുന്നവര്‍ക്കുമുള്ള സപ്പോര്‍ട്ട്",
+    "Support for those using the Matrix spec": "Matrix spec ഉപയോഗിക്കുന്നവര്‍ക്കുള്ള പിന്തുണ",
+    "Design and implementation of E2E in Matrix": "മാട്രിക്സിലെ e2eയുടെ ഡിസൈനും ഇമ്പ്ലിമെന്റേഷനും",
+    "remove %(name)s from the directory.": "%(name)s ഡയറക്റ്ററിയില്‍ നിന്ന് നീക്കം ചെയ്യുക.",
+    "World readable": "ആർക്കും വായിക്കാവുന്നത്",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "വികേന്ദ്രീകൃത , എന്‍ക്രിപ്റ്റഡ് ചാറ്റ് &amp; മാട്രിക്സ് നല്‍കുന്ന കൊളാബൊറേഷന്‍",
+    "Support for those using, running and writing other bridges": "മറ്റ് ബ്രിഡ്ജുകള്‍ ഉപയോഗിക്കുന്ന, റണ്‍ ചെയ്യുന്ന, എഴുതുന്നവര്‍ക്കുള്ള പിന്തുണ",
+    "Contributing code to Matrix and Riot": "മാട്രിക്സിലേക്കും റയട്ടിലേക്കും കോഡ് സംഭാവന ചെയ്യാം",
+    "Dev chat for the Riot/Web dev team": "റയട്ട്/വെബ് ഡെവലപ്പര്‍ ടീമിനുള്ള dev chat",
+    "Dev chat for the Dendrite dev team": "ഡെന്‍ഡ്രൈറ്റ് ഡെവലപ്പര്‍ ടീമിനുള്ള dev chat",
+    "Co-ordination for Riot/Web translators": "റയട്ട്/വെബ് പരിഭാഷകരുടെ കൂട്ടായ്മ",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "മാട്രിക്സിലുള്ളതും പഴയ നെറ്റ്‍വര്‍ക്കുകളിലേക്ക് ( സ്ലാക്ക്, IRC, ഗിറ്റര്‍ മുതലായവ ) ലിങ്ക് ചെയ്തതുമൊക്കെയായ ധാരാളം റൂമുകളുണ്ട്. ഡയറക്റ്ററി പരിശാധിക്കൂ!",
+    "Failed to change password. Is your password correct?": "രഹസ്യവാക്ക് മാറ്റാന്‍ സാധിച്ചില്ല. രഹസ്യവാക്ക് ശരിയാണോ ?",
+    "You have successfully set a password!": "രഹസ്യവാക്ക് സജ്ജീകരിച്ചിരിക്കുന്നു!",
+    "You can now return to your account after signing out, and sign in on other devices.": "നിങ്ങള്‍ക്ക് ഇപ്പോള്‍ സൈന്‍ ഔട്ട് ചെയ്ത ശേഷവും നിങ്ങളുടെ അക്കൌണ്ടിലേക്ക് തിരികെ വരാം, അതു പോലെ മറ്റ് ഡിവൈസുകളില്‍ സൈന്‍ ഇന്‍ ചെയ്യുകയുമാവാം.",
+    "Continue": "മുന്നോട്ട്",
+    "Please set a password!": "ദയവായി ഒരു രഹസ്യവാക്ക് ക്രമീകരിക്കുക!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "സൈന്‍ ഔട്ട് ചെയ്ത ശേഷം വീണ്ടും നിങ്ങളുടെ അക്കൌണ്ടിലേക്ക് മടങ്ങി വരാനും, മറ്റ് ഡിവൈസുകളില്‍ സൈന്‍ ഇന്‍ ചെയ്യാനും ഇത് സഹായിക്കും.",
+    "You have successfully set a password and an email address!": "ഇമെയില്‍ വിലാസവും രഹസ്യവാക്കും വിജയകരമായി ക്രമീകരിച്ചിരിക്കുന്നു!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "ഓര്‍ക്കുക, വേണ്ട സമയത്ത് യൂസര്‍ സെറ്റിങ്സില്‍ ഒരു ഇമെയില്‍ വിലാസം നല്‍കാം.",
+    "To return to your account in future you need to <u>set a password</u>": "വീണ്ടും ഈ അക്കൌണ്ട് ഉപയോഗിക്കണമെങ്കില്‍ <u>ഒരു രഹസ്യവാക്ക് സെറ്റ് ചെയ്യുക</u>",
+    "Set Password": "രഹസ്യവാക്ക് സജ്ജീകരിക്കുക",
+    "customServer_text": "മറ്റ് മാട്രിക്സ് സെര്‍വറുകളില്‍ ലോഗിന്‍ ചെയ്യാന്‍ കസ്റ്റം സെര്‍വര്‍ ഓപ്ഷനില്‍ ഹോം സെര്‍വര്‍ യു ആര്‍ എല്‍ വ്യക്തമാക്കുക.<br/>ഇത് വഴി മറ്റൊരു ഹോം സെര്‍വറില്‍ ഉള്ള മാട്രിക്സ് അക്കൌണ്ട് റയട്ടില്‍ ഉപയോഗിക്കാം.<br/><br/>അതു പോലെ, നിങ്ങള്‍ക്ക് കസ്റ്റം ഐഡന്റിറ്റി സെര്‍വറും ക്രമീകരിക്കാം. പക്ഷേ അപ്പോള്‍ നിങ്ങള്‍ക്ക് ആരേയും ഇമെയില്‍ വഴി ക്ഷണിക്കാനോ തിരിച്ചോ സാധിക്കില്ല.",
+    "Off": "ഓഫ്",
+    "On": "ഓണ്‍",
+    "Notify me for anything else": "ബാക്കി ഏതിനും എനിക്ക് അറിയിപ്പു നൽകുക",
+    "Notify for all other messages/rooms": "ബാക്കി എല്ലാ സന്ദേശങ്ങൾക്കും/റൂമുകൾക്കും അറിയിപ്പു നൽകുക",
+    "Building services on Matrix": "മട്രിക്സിന്മേൽ സർവീസുകൾ പണിയുന്നു",
+    "Implementing VR services with Matrix": "മട്രിക്സ് ഉപയോഗിച്ചു വി.അർ. സർവീസുകൾ നടപ്പിലാക്കുന്നു",
+    "Implementing VoIP services with Matrix": "മേട്രിക്സിന്മേൽ VoIP സർവീസുകൾ നടപ്പിലാക്കുന്നു",
+    "Discussion of the Identity Service API": "ഐഡൻടിറ്റി സർവീസ് എപിഐ യെ പറ്റിയുള്ള ചർച്ച",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "ഈ പറയുന്ന കീവേർഡുകളെ പറ്റിയുള്ള അറിയിപ്പുകൾ പിൻതുടരുന്ന നിയമങ്ങൾ ഇവിടെ കാണിക്കുവാൻ സാധ്യമല്ല:",
+    "Back": "തിരികെ",
+    "Bug report sent": "ബഗ് റിപ്പോർട്ട് അയയ്ക്കുക"
 }
diff --git a/src/i18n/strings/nb_NO.json b/src/i18n/strings/nb_NO.json
index 813abc6efb..91bb33d848 100644
--- a/src/i18n/strings/nb_NO.json
+++ b/src/i18n/strings/nb_NO.json
@@ -8,7 +8,6 @@
     "Cancel Sending": "Avbryt sending",
     "Can't update user notification settings": "Kan ikke oppdatere brukervarsel innstillinger",
     "Close": "Lukk",
-    "Create new room": "Opprett nytt rom",
     "Couldn't find a matching Matrix room": "Kunne ikke finne et samsvarende Matrix rom",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> og <a href=\"http://opera.com\">Opera</a> fungerer også.",
     "Call invitation": "Anropsinvitasjon",
@@ -20,7 +19,6 @@
     "Direct Chat": "Direkte Chat",
     "Directory": "Katalog",
     "Download this file": "Last ned filen",
-    "Drop here %(toAction)s": "Dra hit %(toAction)s",
     "Enable audible notifications in web client": "Aktiver lyd-varsel i webklient",
     "Enable desktop notifications": "Aktiver skrivebordsvarsler",
     "Enable email notifications": "Aktiver e-postvarsler",
@@ -31,14 +29,12 @@
     "Error saving email notification preferences": "Feil ved lagring av e-postvarselinnstillinger",
     "#example": "#eksempel",
     "Expand panel": "Utvid panel",
-    "Failed to": "Feilet å",
     "Failed to add tag %(tagName)s to room": "Kunne ikke legge til tagg %(tagName)s til rom",
     "Failed to change settings": "Kunne ikke endre innstillingene",
     "Failed to forget room %(errCode)s": "Kunne ikke glemme rommet %(errCode)s",
     "Failed to update keywords": "Kunne ikke oppdatere nøkkelord",
     "Failed to get protocol list from Home Server": "Kunne ikke hente protokolliste fra Hjemme-Server",
     "Failed to get public room list": "Kunne ikke hente offentlig romliste",
-    "Failed to join the room": "Kunne ikke bli med på rommet",
     "Failed to remove tag %(tagName)s from room": "Kunne ikke fjerne tagg %(tagName)s fra rommet",
     "Failed to set direct chat tag": "Kunne ikke angi direkte chat-tagg",
     "Failed to set Direct Message status of room": "Kunne ikke angi status for direkte melding i rommet",
@@ -47,9 +43,7 @@
     "Files": "Filer",
     "Filter room names": "Filtrer romnavn",
     "Forget": "Glem",
-    " from room": " fra rommet",
     "Guests can join": "Gjester kan bli med",
-    "Guest users can't invite users. Please register to invite.": "Gjester kan ikke invitere brukere. Vennligst registrer deg for å invitere.",
     "I understand the risks and wish to continue": "Jeg forstår risikoen og ønsker å fortsette",
     "Invite to this room": "Inviter til dette rommet",
     "Keywords": "Nøkkelord",
@@ -73,10 +67,8 @@
     "On": "På",
     "Permalink": "Permanent lenke",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Vennligst installer <a href=\"https://www.google.com/chrome\">Chrome</a> eller <a href=\"https://getfirefox.com\">Firefox</a> for den beste opplevelsen.",
-    "Please Register": "Vennligst registrer deg",
     "powered by Matrix": "benytter seg av Matrix",
     "Quote": "Sitat",
-    "Redact": "Maskere",
     "Reject": "Avvis",
     "Remove %(name)s from the directory?": "Fjern %(name)s fra katalogen?",
     "Remove": "Fjern",
@@ -85,18 +77,13 @@
     "Resend": "Send på nytt",
     "Riot does not know how to join a room on this network": "Riot vet ikke hvordan man kan komme inn på et rom på dette nettverket",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot benytter mange avanserte nettleserfunksjoner, og noen av disse er ikke tilgjengelige eller er eksperimentelle på din nåværende nettleser.",
-    "Room directory": "Rom katalog",
     "Room not found": "Rommet ble ikke funnet",
     "Search for a room": "Søk etter et rom",
-    "Settings": "Innstillinger",
     "Source URL": "Kilde URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Beklager, din nettleser er <b>ikke</b> i stand til å kjøre Riot.",
-    "Start chat": "Start chat",
     "The Home Server may be too old to support third party networks": "Hjemme-serveren kan være for gammel til å støtte tredjeparts-nettverk",
     "There are advanced notifications which are not shown here": "Det er avanserte varsler som ikke vises her",
     "The server may be unavailable or overloaded": "Serveren kan være utilgjengelig eller overbelastet",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Dette rommet er ikke tilgjengelig for gjester. Du kan kanskje komme inn om du registrerer deg.",
-    " to room": " til rom",
     "Unable to fetch notification target list": "Kunne ikke hente varsel-mål liste",
     "Unable to join network": "Kunne ikke bli med i nettverket",
     "Unable to look up room ID from server": "Kunne ikke slå opp rom-ID fra serveren",
@@ -107,7 +94,7 @@
     "View Decrypted Source": "Vis dekryptert kilde",
     "View Source": "Vis kilde",
     "When I'm invited to a room": "Når jeg blir invitert til et rom",
-    "World readable": "Verden lesbar",
+    "World readable": "Lesbar for alle",
     "You cannot delete this image. (%(code)s)": "Du kan ikke slette dette bildet. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Du kan ikke slette denne meldingen. (%(code)s)",
     "You are not receiving desktop notifications": "Du mottar ikke skrivebords varsler",
@@ -120,6 +107,5 @@
     "Friday": "Fredag",
     "Saturday": "Lørdag",
     "Today": "I dag",
-    "Yesterday": "I går",
-    "Welcome page": "Velkomst side"
+    "Yesterday": "I går"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index d3d9483c3f..558f9c681d 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -9,7 +9,6 @@
     "Cancel Sending": "Versturen annuleren",
     "Can't update user notification settings": "Het is niet gelukt om de meldingsinstellingen van de gebruiker bij te werken",
     "Close": "Sluiten",
-    "Create new room": "Een nieuwe kamer maken",
     "Couldn't find a matching Matrix room": "Het is niet gelukt om een bijbehorende Matrix-kamer te vinden",
     "Custom Server Options": "Aangepaste serverinstellingen",
     "customServer_text": "U kunt de aangepaste serverinstellingen gebruiken om in te loggen bij andere Matrix-servers door een andere homeserver-URL in te voeren.<br/>Dit maakt het mogelijk om Riot te gebruiken met een bestaand Matrix-account op een andere homeserver.<br/><br/>U kunt ook een aangepaste identiteitsserver instellen, maar het is dan niet mogelijk om gebruikers uit te nodigen met behulp van een e-mailadres of zelf uitgenodigd te worden met een e-mailadres.",
@@ -28,14 +27,12 @@
     "Error": "Fout",
     "Error saving email notification preferences": "Fout bij het opslaan van de meldingsvoorkeuren voor e-mail",
     "#example": "#voorbeeld",
-    "Failed to": "Mislukt om",
     "Failed to add tag %(tagName)s to room": "Mislukt om de label %(tagName)s aan de kamer toe te voegen",
     "Failed to change settings": "Instellingen wijzigen mislukt",
     "Failed to forget room %(errCode)s": "Ruimte vergeten mislukt %(errCode)s",
     "Failed to update keywords": "Trefwoorden bijwerken mislukt",
     "Failed to get protocol list from Home Server": "Protocollijst ophalen van de homeserver mislukt",
     "Failed to get public room list": "Lijst met publieke kamers ophalen mislukt",
-    "Failed to join the room": "Kamer binnengaan mislukt",
     "Failed to remove tag %(tagName)s from room": "Label %(tagName)s van de kamer verwijderen mislukt",
     "Failed to set direct chat tag": "Het is mislukt om het privéchatlabel weg te halen",
     "Favourite": "Favoriet",
@@ -43,9 +40,7 @@
     "Files": "Bestanden",
     "Filter room names": "Filter kamernamen",
     "Forget": "Vergeten",
-    " from room": " van kamer",
     "Guests can join": "Gasten kunnen deelnemen",
-    "Guest users can't invite users. Please register to invite.": "Gasten kunnen geen gebruikers uitnodigen. Om anderen uit te nodigen zult u zich moeten registreren.",
     "Invite to this room": "Uitnodigen voor deze kamer",
     "Keywords": "Trefwoorden",
     "Leave": "Verlaten",
@@ -70,7 +65,6 @@
     "On": "Aan",
     "Operation failed": "Actie mislukt",
     "Permalink": "Permanente link",
-    "Please Register": "Registreer Alstublieft",
     "powered by Matrix": "mogelijk gemaakt door Matrix",
     "Quote": "Citeer",
     "Reject": "Afwijzen",
@@ -80,17 +74,12 @@
     "Remove from Directory": "Uit de kamerlijst verwijderen",
     "Resend": "Opnieuw verzenden",
     "Riot does not know how to join a room on this network": "Riot weet niet hoe het moet deelnemen in een kamer op dit netwerk",
-    "Room directory": "Kamerlijst",
     "Room not found": "De kamer is niet gevonden",
     "Search for a room": "Een kamer opzoeken",
-    "Settings": "Instellingen",
     "Source URL": "Bron-URL",
-    "Start chat": "Gesprek starten",
-    "The Home Server may be too old to support third party networks": "De home server is misschien te oud om netwerken van derde partijen te ondersteunen",
+    "The Home Server may be too old to support third party networks": "De thuisserver is misschien te oud om netwerken van derde partijen te ondersteunen",
     "There are advanced notifications which are not shown here": "Er zijn geavanceerde notificaties die hier niet getoond worden",
     "The server may be unavailable or overloaded": "De server is misschien niet beschikbaar of overbelast",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Deze kamer is niet toegankelijk voor gasten. Je zou misschien kunnen deelnemen als je geregistreerd bent.",
-    " to room": " naar kamer",
     "Unable to fetch notification target list": "Het is mislukt om de lijst van notificatiedoelen op te halen",
     "Unable to join network": "Het is mislukt om toe te treden tot dit netwerk",
     "Unable to look up room ID from server": "Het is mislukt om de kamer-ID op te halen van de server",
@@ -115,10 +104,7 @@
     "Saturday": "Zaterdag",
     "Today": "Vandaag",
     "Yesterday": "Gisteren",
-    "Welcome page": "Welkomstpagina",
-    "Drop here %(toAction)s": "%(toAction)s hier naartoe verplaatsen",
     "Failed to set Direct Message status of room": "Het is mislukt om de directe-berichtenstatus van de kamer in te stellen",
-    "Redact": "Redigeren",
     "A new version of Riot is available.": "Er is een nieuwe versie van Riot beschikbaar.",
     "All Rooms": "Alle kamers",
     "Cancel": "Annuleren",
@@ -154,7 +140,6 @@
     "What's New": "Wat is er nieuw",
     "What's new?": "Wat is er nieuw?",
     "Waiting for response from server": "Wachten op antwoord van de server",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "U gebruikt Riot als gast. <a>Registreren</a> of <a>aanmelden</a> om voor meer kamers en functies!",
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "U moet HTTPS gebruiken om een oproep met schermdelen te kunnen starten.",
     "Welcome to Riot.im": "Welkom bij Riot.im",
@@ -196,7 +181,29 @@
     "Discussion of the Identity Service API": "Discussie over de Identity Service API",
     "Support for those using, running and writing other bridges": "Ondersteuning voor het gebruiken, draaien en ontwikkelen aan andere bruggen",
     "Dev chat for the Riot/Web dev team": "Dev-chat voor het Riot/Web ontwikkelteam",
-    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite ontwikkelteam",
+    "Dev chat for the Dendrite dev team": "Dev-chat voor het Dendrite-ontwikkelteam",
     "You have successfully set a password and an email address!": "Het instellen van een wachtwoord en e-mailadres is geslaagd!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Onthoud dat u altijd een e-mailadres in kan stellen in de gebruikersinstellingen als u zich bedenkt.",
+    "Warning": "Waarschuwing",
+    "Checking for an update...": "Aan het kijken voor een update...",
+    "Error encountered (%(errorDetail)s).": "Fout ondervonden (%(errorDetail)s).",
+    "No update available.": "Geen update beschikbaar.",
+    "Downloading update...": "Update aan het downloaden...",
+    "To return to your account in future you need to <u>set a password</u>": "Om in de toekomst naar je account terug te gaan moet je <u>een wachtwoord instellen</u>",
+    "Set Password": "Wachtwoord instellen",
+    "Couldn't load home page": "Kon de home pagina niet laden",
+    "Bug report sent": "Bug report verzonden",
+    "Thank you!": "Bedankt!",
+    "Back": "Terug",
+    "Failed to send custom event.": "Aangepast Event verzenden mislukt.",
+    "Send Custom Event": "Verzend aangepast evenement",
+    "Send Custom State Event": "Verzend aangepast State Event",
+    "Developer Tools": "Ontwikkelaarsgereedschap",
+    "Filter results": "Resultaten filteren",
+    "Explore Room State": "Verken Ruimtetoestand",
+    "You must specify an event type!": "Je moet een event-type specificeren!",
+    "Event sent!": "Event verstuurd!",
+    "Event Type": "Event-type",
+    "Event Content": "Event-inhoud",
+    "State Key": "Toestandssleutel"
 }
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 2941f4b568..04868a0c42 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -14,29 +14,24 @@
     "Cancel Sending": "Anuluj wysyłanie",
     "Can't update user notification settings": "Nie można zaktualizować ustawień powiadomień użytkownika",
     "Changelog": "Dziennik zmian",
-    "Close": "Blisko",
+    "Close": "Zamknij",
     "Collecting app version information": "Zbieranie informacji o wersji aplikacji",
     "Collecting logs": "Zbieranie dzienników",
-    "Create new room": "Utwórz nowy pokój",
     "Couldn't find a matching Matrix room": "Nie można znaleźć pasującego pokoju Matrix",
     "Custom Server Options": "Niestandardowe opcje serwera",
     "delete the alias.": "usunąć alias.",
     "Describe your problem here.": "Opisz swój problem tutaj.",
     "Directory": "Księga adresowa",
     "Download this file": "Pobierz plik",
-    "Welcome page": "Strona powitalna",
     "Riot is not supported on mobile web. Install the app?": "Riot nie jest obsługiwany przez przeglądarki mobilne. Zainstaluj aplikację?",
-    "Room directory": "Spis pokojów",
     "Search": "Szukaj",
     "Search…": "Szukaj…",
     "Search for a room": "Szukaj pokoju",
     "Send": "Wyślij",
-    "Settings": "Ustawienia",
     "Collapse panel": "Ukryj panel",
-    "customServer_text": "Możesz używać opcji serwera niestandardowego do logowania się na inne serwery Matrix, określając inny adres URL serwera domowego.<br/>Pozwala to na wykorzystanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Można również ustawić niestandardowy serwer tożsamości, ale nie będzie można zapraszać użytkowników adresem e-mail, ani być zaproszony przez adres e-mailowy.",
+    "customServer_text": "Możesz używać opcji serwera niestandardowego do logowania się na inne serwery Matrix, określając inny adres URL serwera domowego.<br/>Pozwala to na wykorzystanie Riot z istniejącym kontem Matrix na innym serwerze domowym.<br/><br/>Można również ustawić niestandardowy serwer tożsamości, ale nie będzie można zapraszać użytkowników adresem e-mail, ani być zaproszonym przez adres e-mailowy.",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Usuń alias %(alias)s i usuń %(name)s z katalogu?",
-    "Dismiss": "Zdymisjonować",
-    "Drop here %(toAction)s": "Upuść tutaj %(toAction)s",
+    "Dismiss": "Zamknij",
     "Enable audible notifications in web client": "Włącz dźwiękowe powiadomienia w kliencie internetowym",
     "Enable email notifications": "Włącz powiadomienia e-mailowe",
     "Enable notifications for this account": "Włącz powiadomienia na tym koncie",
@@ -46,14 +41,12 @@
     "Error saving email notification preferences": "Wystąpił błąd podczas zapisywania ustawień powiadomień e-mailowych",
     "#example": "#przykład",
     "Expand panel": "Rozwiń panel",
-    "Failed to": "Nie udało się",
     "Failed to add tag %(tagName)s to room": "Nie można dodać tagu %(tagName)s do pokoju",
     "Failed to change settings": "Nie udało się zmienić ustawień",
     "Failed to forget room %(errCode)s": "Nie mogłem zapomnieć o pokoju %(errCode)s",
     "Failed to update keywords": "Nie udało się zaktualizować słów kluczowych",
     "Failed to get protocol list from Home Server": "Nie można pobrać listy protokołów z serwera domowego",
     "Failed to get public room list": "Nie udało się uzyskać publicznej listy pokojowej",
-    "Failed to join the room": "Nie udało się dołączyć do pokoju",
     "Failed to remove tag %(tagName)s from room": "Nie udało się usunąć tagu %(tagName)s z pokoju",
     "Failed to send report: ": "Nie udało się wysłać raportu: ",
     "Favourite": "Ulubiony",
@@ -61,7 +54,6 @@
     "Filter room names": "Filtruj nazwy pokojów",
     "Forget": "Zapomnij",
     "Forward Message": "Przekaż wiadomość",
-    " from room": " z pokoju",
     "Guests can join": "Goście mogą dołączyć",
     "Hide panel": "Ukryj panel",
     "I understand the risks and wish to continue": "Rozumiem ryzyko i chęć kontynuować",
@@ -76,7 +68,6 @@
     "Messages sent by bot": "Wiadomości wysłane przez bota",
     "more": "więcej",
     "Enable desktop notifications": "Włącz powiadomienia",
-    "Guest users can't invite users. Please register to invite.": "Gość nie ma uprawnień dow wysyłania zaproszeń. Proszę się zarejestrować.",
     "(HTTP status %(httpStatus)s)": "(status HTTP %(httpStatus)s)",
     "Leave": "Opuść",
     "Login": "Logowanie",
@@ -94,7 +85,6 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Proszę opisz problem (w miarę możliwości po angielsku). Co doprowadziło do błędu? Jakie było Twoje oczekiwanie, a co stało się zamiast tego?",
     "Please describe the bug and/or send logs.": "Proszę opisz błąd i/lub wyślij logi.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Zainstaluj proszę <a href=\"https://www.google.com/chrome\">Chrome</a> lub <a href=\"https://getfirefox.com\">Firefox</a>.",
-    "Please Register": "Proszę się zarejestrować",
     "Quote": "Cytat",
     "Remove %(name)s from the directory?": "Usunąć %(name)s z katalogu?",
     "Remove from Directory": "Usuń z katalogu",
@@ -106,9 +96,7 @@
     "Room not found": "Pokój nie znaleziony",
     "Send logs": "Wyślij logi",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Przepraszamy, Twoja przeglądarka <b>nie jest w stanie</b> uruchomić Riot.",
-    "Start chat": "Rozpocznij rozmowę",
-    "powered by Matrix": "zbudowane na Matrix",
-    "Redact": "Zredaguj",
+    "powered by Matrix": "napędzany przez Matrix",
     "Reject": "Odrzuć",
     "Remove": "Usuń",
     "remove %(name)s from the directory.": "usuń %(name)s z katalogu.",
@@ -116,7 +104,6 @@
     "There are advanced notifications which are not shown here": "Masz zaawansowane powiadomienia, nie pokazane tutaj",
     "The server may be unavailable or overloaded": "Serwer jest nieosiągalny lub jest przeciążony",
     "This Room": "Ten pokój",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Ten pokój jest niedostępny dla gości. Możliwe, że będziesz mógł dołączyć po rejestracji.",
     "Unable to join network": "Nie można dołączyć do sieci",
     "Unable to look up room ID from server": "Nie można wyszukać ID pokoju na serwerze",
     "Unavailable": "Niedostępny",
@@ -135,7 +122,6 @@
     "Off": "Wyłącz",
     "On": "Włącz",
     "Source URL": "Źródłowy URL",
-    " to room": " do pokoju",
     "Unable to fetch notification target list": "Nie można pobrać listy docelowej dla powiadomień",
     "View Decrypted Source": "Pokaż zdeszyfrowane źródło",
     "View Source": "Pokaż źródło",
@@ -147,7 +133,6 @@
     "You cannot delete this image. (%(code)s)": "Nie możesz usunąć tego obrazka. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Nie możesz usunąć tej wiadomości. (%(code)s)",
     "You are not receiving desktop notifications": "Nie otrzymujesz powiadomień na pulpit",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "You are Rioting jako gość. <a>Zarejestruj się</a> albo <a>zaloguj się</a> aby uzyskać dostęp do pokojów lub dodatkowych możliwości!",
     "Sunday": "Niedziela",
     "Monday": "Poniedziałek",
     "Tuesday": "Wtorek",
@@ -198,5 +183,27 @@
     "Please set a password!": "Proszę, ustaw hasło!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "To pozwoli Ci powrócić do Twojego konta po wylogowaniu i ponownym zalogowaniu się na innych urządzeniach.",
     "You have successfully set a password and an email address!": "Z powodzeniem ustawiono hasło i adres e-mail dla Twojego konta!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika."
+    "Remember, you can always set an email address in user settings if you change your mind.": "Pamiętaj, że zawsze możesz zmienić swój e-mail lub hasło w panelu ustawień użytkownika.",
+    "To return to your account in future you need to <u>set a password</u>": "Aby wrócić do swojego konta w przyszłości musisz <u> ustawić hasło </u>",
+    "Set Password": "Ustaw hasło",
+    "No update available.": "Brak aktualizacji.",
+    "Warning": "Ostrzeżenie",
+    "Error encountered (%(errorDetail)s).": "Wystąpił błąd (%(errorDetail)s).",
+    "Downloading update...": "Pobieranie aktualizacji...",
+    "Checking for an update...": "Sprawdzanie aktualizacji...",
+    "Couldn't load home page": "Nie można załadować strony startowej",
+    "Bug report sent": "Raport błędu wysłany",
+    "Thank you!": "Dziękujemy!",
+    "Back": "Powrót",
+    "Developer Tools": "Narzędzia programistyczne",
+    "Failed to send custom event.": "Wysyłanie niestandardowego wydarzenia nie powiodło się.",
+    "Filter results": "Filtruj wyniki",
+    "Send Custom Event": "Wyślij niestandardowe wydarzenie",
+    "Send Custom State Event": "Wyślij wydarzenie o niestandardowym stanie",
+    "Explore Room State": "Przeglądaj stan pokoju",
+    "You must specify an event type!": "Musisz określić typ wydarzenia!",
+    "Event sent!": "Wydarzenie wysłane!",
+    "Event Type": "Typ wydarzenia",
+    "Event Content": "Zawartość wydarzenia",
+    "State Key": "Klucz stanu"
 }
diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json
index 63f8500c9c..6d4274f1ea 100644
--- a/src/i18n/strings/pt.json
+++ b/src/i18n/strings/pt.json
@@ -7,7 +7,6 @@
     "Cancel Sending": "Cancelar o envio",
     "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
     "Close": "Fechar",
-    "Create new room": "Criar nova sala",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "Custom Server Options": "Opções para Servidor Personalizado",
     "delete the alias.": "apagar o apelido da sala.",
@@ -16,7 +15,6 @@
     "Directory": "Diretório",
     "Dismiss": "Descartar",
     "Download this file": "Transferir este ficheiro",
-    "Drop here %(toAction)s": "Arraste aqui para %(toAction)s",
     "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
     "Enable desktop notifications": "Ativar notificações no desktop",
     "Enable email notifications": "Ativar notificações por e-mail",
@@ -25,16 +23,12 @@
     "Enter keywords separated by a comma:": "Insira palavras-chave separadas por vírgula:",
     "Error": "Erro",
     "Error saving email notification preferences": "Erro ao guardar as preferências de notificação por e-mail",
-    "#example:": "#exemplo",
-    "Failed to": "Falha ao",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
     "Failed to change settings": "Falha ao alterar as configurações",
     "Failed to forget room %(errCode)s": "Falha ao esquecer a sala %(errCode)s",
     "Failed to update keywords": "Falha ao atualizar as palavras-chave",
     "Failed to get protocol list from Home Server": "Falha ao obter a lista de protocolos do servidor padrão",
     "Failed to get public room list": "Falha ao obter a lista de salas públicas",
-    "Failed to join the room": "Falha ao entrar na sala",
-    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
     "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
     "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
     "Favourite": "Favorito",
@@ -43,9 +37,7 @@
     "Filter room names": "Filtrar salas por título",
     "Forget": "Esquecer",
     "Forward Message": "Encaminhar",
-    " from room": " da sala",
     "Guests can join": "Convidados podem entrar",
-    "Guest users can't invite users. Please register to invite.": "Utilizadores convidados não podem convidar utilizadores. Por favor registe-se para convidar.",
     "Invite to this room": "Convidar para esta sala",
     "Keywords": "Palavras-chave",
     "Leave": "Sair",
@@ -70,10 +62,8 @@
     "On": "Ativado",
     "Operation failed": "A operação falhou",
     "Permalink": "Link permanente",
-    "Please Register": "Por favor registe-se",
     "powered by Matrix": "rodando a partir do Matrix",
     "Quote": "Citar",
-    "Redact": "Remover",
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
@@ -81,17 +71,12 @@
     "Remove from Directory": "Remover da lista pública de salas",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "O Riot não sabe como entrar numa sala nesta rede",
-    "Room directory": "Lista de salas públicas",
     "Room not found": "Sala não encontrada",
     "Search for a room": "Pesquisar por uma sala",
-    "Settings": "Configurações",
     "Source URL": "URL fonte",
-    "Start chat": "Iniciar conversa",
     "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
     "There are advanced notifications which are not shown here": "Existem notificações avançadas que não são exibidas aqui",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala é inacessível para convidados. Poderá conseguir entrar caso se registe.",
-    " to room": " para sala",
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Unable to join network": "Não foi possível juntar-se à rede",
     "Unable to look up room ID from server": "Não foi possível obter a identificação da sala do servidor",
@@ -99,7 +84,7 @@
     "unknown error code": "código de erro desconhecido",
     "Unnamed room": "Sala sem nome",
     "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
-    "View Decrypted Source": "Ver a fonte decifrada",
+    "View Decrypted Source": "Ver a fonte desencriptada",
     "View Source": "Ver a fonte",
     "When I'm invited to a room": "Quando sou convidado para uma sala",
     "World readable": "Público",
@@ -118,7 +103,6 @@
     "Yesterday": "Ontem",
     "#example": "#exemplo",
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
-    "Welcome page": "Página de boas-vindas",
     "Advanced notification settings": "Configurações avançadas de notificação",
     "customServer_text": "Pode usar as opções de servidor personalizado para entrar noutros servidores Matrix especificando para isso um URL de outro Servidor de Base.<br/> Isto permite que use o Riot com uma conta Matrix que exista noutro Servidor de Base.<br/> <br/> Também pode configurar um servidor de Identidade personalizado mas não poderá convidar utilizadores através do endereço de e-mail, ou ser convidado pelo seu endereço de e-mail.",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\">Opera</a> também funcionam.",
@@ -160,7 +144,66 @@
     "What's New": "Novidades",
     "What's new?": "O que há de novo?",
     "Waiting for response from server": "À espera de resposta do servidor",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Está a usar o Riot como convidado. <a>Registe-se</a> ou <a>faça login</a> para aceder a mais salas e funcionalidades!",
     "OK": "Ok",
-    "You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã."
+    "You need to be using HTTPS to place a screen-sharing call.": "Necessita de estar a usar HTTPS para poder iniciar uma chamada com partilha de ecrã.",
+    "No update available.": "Nenhuma atualização disponível.",
+    "Welcome to Riot.im": "Bem-vindo ao Riot.im",
+    "Login": "Entrar",
+    "Warning": "Aviso",
+    "Checking for an update...": "A procurar uma atualização...",
+    "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
+    "Downloading update...": "A transferir atualização...",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, encriptado &amp; colaborativo alimentado por [matrix]",
+    "Back": "Voltar",
+    "Bug report sent": "Relatório de erros enviado",
+    "Developer Tools": "Ferramentas de desenvolvedor",
+    "Failed to send custom event.": "Falha ao enviar evento personalizado.",
+    "(HTTP status %(httpStatus)s)": "(Estado HTTP %(httpStatus)s)",
+    "Send Custom Event": "Enviar evento personalizado",
+    "Send Custom State Event": "Enviar evento personalizado de estado",
+    "Explore Room State": "Explorar estado da sala",
+    "Thank you!": "Obrigado!",
+    "Event sent!": "Evento enviado!",
+    "Event Type": "Tipo de evento",
+    "Event Content": "Conteúdo do evento",
+    "State Key": "Chave de estado",
+    "Search the room directory": "Procurar o diretório de salas",
+    "Chat with Riot Bot": "Falar com o Bot do Riot",
+    "Get started with some tips from Riot Bot!": "Comece com algumas dicas do Bot do Riot",
+    "General discussion about Matrix and Riot": "Discussão geral acerca do Matrix e do Riot",
+    "Discussion of all things Matrix!": "Discussão de tudo o que envolva o Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop chat",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk chat",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk chat",
+    "Matrix technical discussions": "Discussões técnicas do Matrix",
+    "Running Matrix services": "Correr serviços do Matrix",
+    "Community-run support for Synapse": "Suporte da comunidade para o Synapse",
+    "Admin support for Dendrite": "Suporte de administração para o Dendrite",
+    "Announcements about Synapse releases": "Anúncios acerca de lançamentos do Synapse",
+    "Support for those using and running matrix-appservice-irc": "Suporte para aqueles a correr e a utilizar o matrix-appservice-irc",
+    "Building services on Matrix": "Construir serviços no Matrix",
+    "Support for those using the Matrix spec": "Suporte para os utilizadores da especificação do Matrix",
+    "Design and implementation of E2E in Matrix": "Design e implementação de encriptação ponto-a-ponto (E2E) no Matrix",
+    "Implementing VR services with Matrix": "Implementar serviços de realidade virtual (VR) com o Matrix",
+    "Implementing VoIP services with Matrix": "Implementar serviços VoIP com o Matrix",
+    "Discussion of the Identity Service API": "Discussão da API do serviço de identidade",
+    "Support for those using, running and writing other bridges": "Suporte para aqueles a usar, correr e desenvolver outras pontes (bridges)",
+    "Contributing code to Matrix and Riot": "Contribuir código para o Matrix e para o Riot",
+    "Dev chat for the Riot/Web dev team": "Conversa de desenvolvimento para a equipa do Riot/Web",
+    "Dev chat for the Dendrite dev team": "Conversa de desenvolvimento para a equipa do Dendrite",
+    "Co-ordination for Riot/Web translators": "Coordenação para a equipa de tradutores do Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Já existem muitas salas no Matrix, ligadas a redes já existentes (Slack, IRC, Gitter, etc) ou independentes. Dê uma vista de olhos no diretório!",
+    "Failed to change password. Is your password correct?": "Falha ao alterar a palavra-passe. A sua palavra-passe está correta?",
+    "You have successfully set a password!": "Palavra-passe definida com sucesso!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Pode agora voltar à sua conta no fim de terminar sessão, e iniciar sessão noutros dispositivos.",
+    "Continue": "Continuar",
+    "Please set a password!": "Por favor, defina uma palavra-passe!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Isto irá permitir-lhe voltar à sua conta depois de terminar sessão, assim como iniciar sessão noutros dispositivos.",
+    "You have successfully set a password and an email address!": "Palavra passe e endereço de e-mail definidos com sucesso!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se, pode sempre definir um endereço de e-mail nas definições de utilizador se mudar de ideias.",
+    "To return to your account in future you need to <u>set a password</u>": "Para voltar à sua conta no futuro, necessita de <u>definir uma palavra-passe</u>",
+    "Set Password": "Definir palavra-passe",
+    "Couldn't load home page": "Não foi possível carregar a página inicial",
+    "Filter results": "Filtrar resultados",
+    "You must specify an event type!": "Tem que especificar um tipo de evento!"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 17e3eaa778..681339d1e2 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -7,7 +7,6 @@
     "Cancel Sending": "Cancelar o envio",
     "Can't update user notification settings": "Não é possível atualizar as preferências de notificação",
     "Close": "Fechar",
-    "Create new room": "Criar nova sala",
     "Couldn't find a matching Matrix room": "Não foi possível encontrar uma sala correspondente no servidor Matrix",
     "Custom Server Options": "Opções para Servidor Personalizado",
     "delete the alias.": "apagar o apelido da sala.",
@@ -16,7 +15,6 @@
     "Directory": "Diretório",
     "Dismiss": "Descartar",
     "Download this file": "Baixar este arquivo",
-    "Drop here %(toAction)s": "Arraste aqui %(toAction)s",
     "Enable audible notifications in web client": "Ativar notificações de áudio no cliente web",
     "Enable desktop notifications": "Ativar notificações no desktop",
     "Enable email notifications": "Ativar notificações por email",
@@ -25,16 +23,12 @@
     "Enter keywords separated by a comma:": "Coloque cada palavras-chave separada por vírgula:",
     "Error": "Erro",
     "Error saving email notification preferences": "Erro ao salvar as preferências de notificação por email",
-    "#example:": "#exemplo",
-    "Failed to": "Falha ao",
     "Failed to add tag %(tagName)s to room": "Falha ao adicionar %(tagName)s à sala",
     "Failed to change settings": "Falhou ao mudar as preferências",
     "Failed to forget room %(errCode)s": "Falhou ao esquecer a sala %(errCode)s",
-    "Failed to update keywords": "Falhou ao alterar as palavras-chave",
+    "Failed to update keywords": "Falha ao alterar as palavras-chave",
     "Failed to get protocol list from Home Server": "Falha em acessar a lista de protocolos do servidor padrão",
     "Failed to get public room list": "Falha ao acessar a lista pública de salas",
-    "Failed to join the room": "Falhou ao entrar na sala",
-    "Failed to remove tag %(tag)s from room": "Falha ao remover a palavra-chave %(tag)s da sala",
     "Failed to set direct chat tag": "Falha ao definir conversa como pessoal",
     "Failed to set Direct Message status of room": "Falha em definir a mensagem de status da sala",
     "Favourite": "Favorito",
@@ -43,9 +37,7 @@
     "Filter room names": "Filtrar salas por título",
     "Forget": "Esquecer",
     "Forward Message": "Encaminhar",
-    " from room": " da sala",
     "Guests can join": "Convidados podem entrar",
-    "Guest users can't invite users. Please register to invite.": "Usuários convidados não podem convidar outros usuários. Por gentileza se registre para enviar convites.",
     "Invite to this room": "Convidar para esta sala",
     "Keywords": "Palavras-chave",
     "Leave": "Sair",
@@ -70,10 +62,8 @@
     "On": "Ativado",
     "Operation failed": "A operação falhou",
     "Permalink": "Link permanente",
-    "Please Register": "Por favor, cadastre-se",
     "powered by Matrix": "rodando a partir do Matrix",
     "Quote": "Citar",
-    "Redact": "Remover",
     "Reject": "Rejeitar",
     "Remove": "Remover",
     "Remove %(name)s from the directory?": "Remover %(name)s da lista pública de salas?",
@@ -81,21 +71,16 @@
     "Remove from Directory": "Remover da lista pública de salas",
     "Resend": "Reenviar",
     "Riot does not know how to join a room on this network": "O sistema não sabe como entrar na sala desta rede",
-    "Room directory": "Lista pública de salas",
     "Room not found": "Sala não encontrada",
     "Search for a room": "Procurar por uma sala",
-    "Settings": "Configurações",
     "Source URL": "URL fonte",
-    "Start chat": "Iniciar conversa pessoal",
     "The Home Server may be too old to support third party networks": "O servidor pode ser muito antigo para suportar redes de terceiros",
     "There are advanced notifications which are not shown here": "Existem opções avançadas que não são exibidas aqui",
     "The server may be unavailable or overloaded": "O servidor pode estar inacessível ou sobrecarregado",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Esta sala é inacessível para convidados. Você poderá entrar caso se registre.",
-    " to room": " para sala",
     "Unable to fetch notification target list": "Não foi possível obter a lista de alvos de notificação",
     "Unable to join network": "Não foi possível conectar na rede",
     "Unable to look up room ID from server": "Não foi possível buscar identificação da sala no servidor",
-    "Unhide Preview": "Mostrar a pré-visualização novamente",
+    "Unhide Preview": "Mostrar a pré-visualização",
     "unknown error code": "código de erro desconhecido",
     "Unnamed room": "Sala sem nome",
     "Uploaded on %(date)s by %(user)s": "Enviada em %(date)s por %(user)s",
@@ -118,7 +103,6 @@
     "Yesterday": "Ontem",
     "#example": "#exemplo",
     "Failed to remove tag %(tagName)s from room": "Não foi possível remover a marcação %(tagName)s desta sala",
-    "Welcome page": "Página de boas vindas",
     "Advanced notification settings": "Configurações avançadas de notificação",
     "customServer_text": "Você pode usar as opções de servidor personalizado para entrar em outros servidores Matrix, especificando uma URL de outro Servidor de Base.<br/> Isso permite que você use Riot com uma conta Matrix que exista em outro Servidor de Base.<br/> <br/> Você também pode configurar um servidor de Identidade personalizado, mas neste caso não poderá convidar usuárias(os) pelo endereço de e-mail, ou ser convidado(a) pelo seu endereço de e-mail.",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> e <a href=\"http://opera.com\">Opera</a> funcionam também.",
@@ -160,12 +144,10 @@
     "What's New": "Novidades",
     "What's new?": "O que há de novidades?",
     "Waiting for response from server": "Esperando por resposta do servidor",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Você está usando o Riot como visitante. <a>Registre-se</a> ou <a>faça login</a> para acessar mais salas e funcionalidades!",
     "OK": "Ok",
     "You need to be using HTTPS to place a screen-sharing call.": "Você precisa estar usando HTTPS para poder iniciar uma chamada com compartilhamento de tela.",
     "Login": "Fazer login",
     "Welcome to Riot.im": "Seja bem-vinda(o) a Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by": "Colaboração descentralizada e criptografada impulsada por",
     "Search the room directory": "Buscar na lista pública de salas",
     "Chat with Riot Bot": "Conversar com o Bot do Riot",
     "Get started with some tips from Riot Bot!": "Comece com algumas dicas do Bot do Riot!",
@@ -199,5 +181,29 @@
     "Please set a password!": "Por favor, defina uma senha!",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Isso permitirá que você possa retornar à sua conta após fazer logout, e também fazer login em outros dispositivos.",
     "(HTTP status %(httpStatus)s)": "(Status HTTP %(httpStatus)s)",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]"
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Chat descentralizado, criptografado e colaborativo impulsionado por [matrix]",
+    "You have successfully set a password and an email address!": "Você definiu uma senha e um endereço de e-mail com sucesso!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Lembre-se: você pode sempre definir um endereço de e-mail nas configurações de usuário, se mudar de ideia.",
+    "To return to your account in future you need to <u>set a password</u>": "Para poder, futuramente, retornar à sua conta, você precisa <u>definir uma senha</u>",
+    "Set Password": "Definir senha",
+    "Warning": "Atenção",
+    "Checking for an update...": "Verificando se há atualizações...",
+    "Error encountered (%(errorDetail)s).": "Erro encontrado (%(errorDetail)s).",
+    "No update available.": "Não há atualizações disponíveis.",
+    "Downloading update...": "Baixando atualização...",
+    "Couldn't load home page": "Não foi possível carregar a página inicial",
+    "Back": "Voltar",
+    "Bug report sent": "Relatório do bug enviado",
+    "Developer Tools": "Ferramentas do desenvolvedor",
+    "Failed to send custom event.": "Falha ao enviar evento personalizado.",
+    "Filter results": "Filtrar resultados",
+    "Send Custom Event": "Enviar Evento Customizado",
+    "Send Custom State Event": "Enviar Evento de Estado Personalizado",
+    "Explore Room State": "Explorar Estado da Sala",
+    "You must specify an event type!": "Você precisa especificar um tipo do evento!",
+    "Thank you!": "Obrigado!",
+    "Event sent!": "Evento enviado!",
+    "Event Type": "Tipo do Evento",
+    "Event Content": "Conteúdo do Evento",
+    "State Key": "Chave do Estado"
 }
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index aac71dfd9f..658fab9712 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -1,102 +1,83 @@
 {
     "Add an email address above to configure email notifications": "Добавьте email адрес для оповещений",
-    "All notifications are currently disabled for all targets.": "Все оповещения отключены.",
-    "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по электронной почте.",
-    "and remove": "и удалить",
-    "Can't update user notification settings": "Не возможно обновить пользовательские настройки оповещения",
-    "Create new room": "Создать новую комнату",
-    "Couldn't find a matching Matrix room": "Не возможно найти подходящую комнату Matrix",
-    "Custom Server Options": "Собственные настройки сервера",
+    "All notifications are currently disabled for all targets.": "Все оповещения для всех устройств отключены.",
+    "An error occurred whilst saving your email notification preferences.": "Возникла ошибка при сохранении настроек оповещения по email.",
+    "Can't update user notification settings": "Не удается обновить пользовательские настройки оповещения",
+    "Couldn't find a matching Matrix room": "Не удалось найти подходящую комнату Matrix",
+    "Custom Server Options": "Настраиваемые параметры сервера",
     "delete the alias.": "удалить псевдоним.",
-    "Delete the room alias": "Удалить привязку комнаты",
-    "Direct Chat": "Приватный чат",
+    "Direct Chat": "Прямой чат",
     "Directory": "Каталог",
     "Dismiss": "Отказ",
-    "Drop here to": "Перетащите сюда",
-    "Enable audible notifications in web client": "Включить звуковые оповещения в веб клиенте",
+    "Enable audible notifications in web client": "Включить звуковые уведомления в веб клиенте",
     "Enable desktop notifications": "Включить оповещения на рабочем столе",
-    "Enable email notifications": "Включить оповещения по электронной почте",
-    "Enable notifications for this account": "Включить оповещения для этого аккаунта",
+    "Enable email notifications": "Включить уведомления по email",
+    "Enable notifications for this account": "Включить уведомления для этой учетной записи",
     "Enable them now": "Включить сейчас",
     "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой:",
     "Error": "Ошибка",
-    "Error saving email notification preferences": "Ошибка сохранения настроек оповещений по электронной почте",
+    "Error saving email notification preferences": "Ошибка при сохранении настроек уведомлений по email",
     "#example": "#пример",
-    "Failed to": "Не удалось",
-    "Failed to add tag ": "Не удалось добавить тег ",
     "Failed to change settings": "Не удалось изменить настройки",
     "Failed to update keywords": "Не удалось обновить ключевые слова",
-    "Failed to get protocol list from Home Server": "Не удалось получить список протоколов с Пользовательского Сервера",
-    "Failed to get public room list": "Не удалось получить список открытых комнат",
-    "Failed to join the room": "Не удалось войти в комнату",
-    "Failed to remove tag ": "Не удалось удалить тег ",
+    "Failed to get protocol list from Home Server": "Не удалось получить список протоколов с домашнего сервера",
+    "Failed to get public room list": "Не удалось получить список общедоступных комнат",
     "Failed to set Direct Message status of room": "Не удалось установить статус прямого сообщения в комнате",
     "Favourite": "Избранное",
-    "Fetching third party location failed": "Не удалось получить другую локацию",
+    "Fetching third party location failed": "Не удалось извлечь местоположение третьей стороны",
     "Files": "Файлы",
     "Filter room names": "Фильтр по названию комнат",
-    "Forget": "Удалить",
-    "from the directory": "из каталога",
-    " from room": " из комнаты",
-    "Guests can join": "Гость может присоединиться",
-    "Guest users can't invite users. Please register to invite.": "Гость не может приглашать пользователей. Пожалуйста зарегистрируйтесь.",
-    "Invite to this room": "Пригласить",
+    "Forget": "Забыть",
+    "Guests can join": "Гости могут присоединиться",
+    "Invite to this room": "Пригласить в комнату",
     "Keywords": "Ключевые слова",
     "Leave": "Покинуть",
     "Low Priority": "Низкий приоритет",
-    "Members": "Пользователи",
+    "Members": "Участники",
     "No rooms to show": "Нет комнат для отображения",
-    "Noisy": "Звук",
+    "Noisy": "Громко",
     "Notification targets": "Цели уведомления",
     "Notifications": "Уведомления",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "Уведомления по следующим ключевым словам соответствуют правилам, которые нельзя отобразить здесь:",
-    "Notify for all other messages/rooms": "Уведомить обо всех других сообщениях/комнатах",
-    "Notify me for anything else": "Уведомить меня о чем либо еще",
+    "Notify for all other messages/rooms": "Уведомлять обо всех других сообщениях/комнатах",
+    "Notify me for anything else": "Уведомлять во всех остальных случаях",
     "Off": "Выключить",
     "On": "Включить",
-    "Operation failed": "Действие не удалось",
-    "Please Register": "Пожалуйста, зарегистрируйтесь",
+    "Operation failed": "Сбой операции",
     "powered by Matrix": "Основано на Matrix",
     "Reject": "Отклонить",
     "Remove": "Удалить",
-    "remove": "удалить",
     "Remove from Directory": "Удалить из каталога",
-    "Riot does not know how to join a room on this network": "Riot не знает как войти в комнату в этой сети",
-    "Room directory": "Каталог комнат",
+    "Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
     "Room not found": "Комната не найдена",
-    "Search for a room": "Искать комнату",
-    "Settings": "Настройки",
-    "Start chat": "Начать чат",
-    "The Home Server may be too old to support third party networks": "Home Server может быть слишком старым для поддержки сторонних сетей",
-    "There are advanced notifications which are not shown here": "Существуют расширенные уведомления, которые здесь не показаны",
-    "The server may be unavailable or overloaded": "Возможно сервер недоступен или перегружен",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Эта комната недоступна для гостей. Вы можете присоединиться, если зарегистрируетесь.",
-    " to room": " к комнате",
+    "Search for a room": "Поиск комнаты",
+    "The Home Server may be too old to support third party networks": "Домашний сервер может быть слишком старым для поддержки сетей сторонних производителей",
+    "There are advanced notifications which are not shown here": "Существуют дополнительные уведомления, которые не показаны здесь",
+    "The server may be unavailable or overloaded": "Сервер, вероятно, недоступен или перегружен",
     "Unable to fetch notification target list": "Не удалось получить список целей уведомления",
-    "Unable to join network": "Не возможно присоединиться к сети",
-    "Unable to look up room ID from server": "Не возможно найти ID комнаты на сервере",
-    "unknown error code": "неизвестная ошибка",
+    "Unable to join network": "Не удается подключиться к сети",
+    "Unable to look up room ID from server": "Не удалось найти ID комнаты на сервере",
+    "unknown error code": "неизвестный код ошибки",
     "Unnamed room": "Комната без названия",
     "World readable": "Доступно всем",
     "You are not receiving desktop notifications": "Вы не получаете уведомления на рабочем столе",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Вы могли настроить их в клиенте, отличном от Riot. Вы не можете настроить их в Riot, но они все еще применяются",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Возможно вы настроили их не в Riot, а в другом Matrix-клиенте. Настроить их в Riot не удастся, но они будут в нем применяться",
     "All messages": "Все сообщения",
     "All messages (loud)": "Все сообщения (громко)",
-    "Cancel Sending": "Отмена отправки",
+    "Cancel Sending": "Отменить отправку",
     "Close": "Закрыть",
     "Download this file": "Скачать этот файл",
-    "Drop here %(toAction)s": "Вставить сюда: %(toAction)s",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и удалить %(name)s из каталога?",
     "Failed to add tag %(tagName)s to room": "Не удалось добавить тег %(tagName)s в комнату",
     "Failed to forget room %(errCode)s": "Не удалось удалить комнату %(errCode)s",
-    "Failed to remove tag %(tagName)s from room": "Не удалось убрать пометку %(tagName)s из комнаты",
+    "Failed to remove tag %(tagName)s from room": "Не удалось удалить тег %(tagName)s из комнаты",
     "Failed to set direct chat tag": "Не удалось установить тег прямого чата",
-    "Unhide Preview": "Показать  анонс",
-    "Uploaded on %(date)s by %(user)s": "Загружено %(date)s  %(user)s",
+    "Unhide Preview": "Показать предварительный просмотр",
+    "Uploaded on %(date)s by %(user)s": "Отправлено %(date)s для %(user)s",
     "View Decrypted Source": "Просмотр расшифрованного источника",
     "View Source": "Просмотр источника",
-    "You cannot delete this image. (%(code)s)": "Вы не можете удалить это изображение. (%(code)s)",
-    "You cannot delete this message. (%(code)s)": "Вы не можете удалить это сообщение. (%(code)s)",
+    "You cannot delete this image. (%(code)s)": "Это изображение нельзя удалить. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "Это сообщение нельзя удалить. (%(code)s)",
     "Sunday": "Воскресенье",
     "Monday": "Понедельник",
     "Tuesday": "Вторник",
@@ -106,104 +87,126 @@
     "Saturday": "Суббота",
     "Today": "Сегодня",
     "Yesterday": "Вчера",
-    "Mentions only": "Только упоминание",
+    "Mentions only": "Только при упоминаниях",
     "Mute": "Беззвучный",
     "Permalink": "Постоянная ссылка",
     "Quote": "Цитата",
-    "Redact": "Удалить",
     "Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
     "remove %(name)s from the directory.": "удалить %(name)s из каталога.",
-    "Resend": "Отправить снова",
-    "Source URL": "Исходный URL",
-    "Welcome page": "Домашняя страница",
-    "Advanced notification settings": "Настройки уведомлений",
+    "Resend": "Переотправить",
+    "Source URL": "Исходный URL-адрес",
+    "Advanced notification settings": "Дополнительные параметры уведомлений",
     "Call invitation": "Пригласительный звонок",
-    "customServer_text": "Вы можете войти с помощью вашего сервера.<br/>Это позволяет вам использовать Riot с уже существующей учетной записью на другом сервере.<br/><br/>Вы также можете задать свой сервер идентификации, но тогда вы не можете приглашать пользователей с помощью email-адреса и не можете быть приглашены по нему.",
+    "customServer_text": "Вы можете использовать настраиваемые параметры сервера для входа на другие серверы Matrix, указав другой URL-адрес домашнего сервера.<br/>Это позволяет использовать это приложение с существующей учетной записью Matrix на другом домашнем сервере.<br/><br/>Вы также можете установить другой сервер идентификации, но это, как правило, будет препятствовать взаимодействию с пользователями на основе адреса электронной почты.",
     "Messages containing my display name": "Сообщения, содержащие мое имя",
     "Messages containing my user name": "Сообщение, содержащие мое имя пользователя",
     "Messages in group chats": "Сообщения в групповых чатах",
-    "Messages in one-to-one chats": "Сообщения в приватных чатах",
+    "Messages in one-to-one chats": "Сообщения в индивидуальных чатах",
     "Messages sent by bot": "Сообщения, отправленные ботом",
     "more": "больше",
-    "When I'm invited to a room": "Когда я приглашен в комнату",
+    "When I'm invited to a room": "Когда меня приглашают в комнату",
     "A new version of Riot is available.": "Доступна новая версия Riot.",
     "All Rooms": "Все комнаты",
     "Cancel": "Отмена",
     "Changelog": "История изменений",
     "Collapse panel": "Свернуть панель",
     "Collecting app version information": "Сбор информации о версии приложения",
-    "Collecting logs": "Сбор протоколов",
+    "Collecting logs": "Сбор журналов",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s с %(browserName)s на %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> и <a href=\"http://opera.com\">Opera</a> работают тоже.",
-    "Describe your problem here.": "Опиши здесь свою проблему.",
+    "Describe your problem here.": "Опишите вашу проблему здесь.",
     "Expand panel": "Развернуть панель",
-    "Failed to send report: ": "Не удалось отослать отчет: ",
+    "Failed to send report: ": "Не удалось отправить отчет: ",
     "Forward Message": "Переслать сообщение",
     "Hide panel": "Скрыть панель",
-    "I understand the risks and wish to continue": "Я понимаю риск и хочу продолжить",
-    "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:": "Чтобы диагностировать проблемы, логи этого клиента будут отправляться с этим сообщением об ошибке. Если вы предпочитаете отправить только текст выше, пожалуйста, отключите:",
-    "Loading bug report module": "Загрузка Модуля отчета об ошибках",
-    "Messages containing <span>keywords</span>": "Сообщения, которые содержат определенные <span>ключевые слова</span>",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Пожалуйста опишите (на Английском) ошибку. Что Вы делали? Что Вы ожидали получить? Что произошло?",
-    "Please describe the bug and/or send logs.": "Пожалуйста опишите ошибку и/или перешлите логи.",
-    "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=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a> для корректной работы чата.",
-    "Report a bug": "Отчет об ошибке",
+    "I understand the risks and wish to continue": "Я понимаю риски и желаю продолжить",
+    "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:": "Чтобы диагностировать проблемы, логи этого клиента будут отправлены вместе с этим сообщением об ошибке. Если вы предпочитаете отправить только текст выше, пожалуйста, отключите:",
+    "Loading bug report module": "Загрузка модуля Отчет об ошибках",
+    "Messages containing <span>keywords</span>": "Сообщения, содержащие определенные <span>ключевые слова</span>",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Опишите ошибку. Что вы сделали? Чего вы ожидали? Что на самом деле произошло?",
+    "Please describe the bug and/or send logs.": "Опишите ошибку и/или отправьте журналы.",
+    "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Для получения наилучшего опыта при работе с Riot, пожалуйста, установите <a href=\"https://www.google.com/chrome\">Chrome</a> или <a href=\"https://getfirefox.com\">Firefox</a>.",
+    "Report a bug": "Сообщить об ошибке",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
-    "Riot is not supported on mobile web. Install the app?": "Riot может некорректно работать в мобильном браузере. Установить мобильное приложение?",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует много расширенных функции интернет-браузера - некоторые из них отсутствуют или экспериментальные в этом браузере.",
+    "Riot is not supported on mobile web. Install the app?": "Riot не поддерживает версию веб-сайта для мобильных устройств. Установить приложение?",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot использует многие передовые возможности браузера, некоторые из которых недоступны или являются экспериментальным в вашем текущем браузере.",
     "Search": "Поиск",
     "Search…": "Поиск.…",
     "Send": "Отослать",
-    "Send logs": "Отослать логи",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "Извините, ваш браузер <b>не может</b> запустить Riot.",
+    "Send logs": "Отправить журналы",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "К сожалению, ваш браузер <b>не способен</b> запустить Riot.",
     "This Room": "Эта комната",
     "Unavailable": "Недоступен",
     "Unknown device": "Неизвестное устройство",
     "Update": "Обновление",
-    "Uploading report": "Отчет загружается",
+    "Uploading report": "Отправка отчета",
     "What's New": "Что нового",
     "What's new?": "Что нового?",
-    "Waiting for response from server": "Подождите ответа от сервера",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Вы вошли в Riot как гость.  <a>Зарегистрируйтесь</a> или <a>войдите в систему</a> и получите доступ к огромному количеству комнат и функций!",
-    "OK": "ОК",
-    "You need to be using HTTPS to place a screen-sharing call.": "Используйте протокол HTTPS чтобы совершать видео вызов.",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Если Ваш браузер не корректно отображает информацию и все или некоторые функции отключены, Вы можете и дальше этим браузером пользоваться но ваши проблемы останутся с вами!",
+    "Waiting for response from server": "Ожидание ответа от сервера",
+    "OK": "OK",
+    "You need to be using HTTPS to place a screen-sharing call.": "Требуется использование HTTPS для совместного использования рабочего стола.",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "В текущем браузере внешний вид приложения может быть полностью неверным, а некоторые или все функции могут не работать. Если вы хотите попробовать в любом случае, то можете продолжить, но с теми проблемами, с которыми вы можете столкнуться вам придется разбираться самостоятельно!",
     "Login": "Войти",
-    "Welcome to Riot.im": "Добро пожаловать в Riot.im",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованное, шифрованное общение и сотрудничество на основе [matrix]",
-    "Search the room directory": "Поиск по директории комнат",
+    "Welcome to Riot.im": "Добро пожаловать на Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентрализованный, зашифрованный чат и совместная работа при поддержке [matrix]",
+    "Search the room directory": "Поиск в каталоге комнат",
     "Chat with Riot Bot": "Пообщаться с ботом Riot",
-    "Get started with some tips from Riot Bot!": "Начните с некоторых советов от Riot бота!",
+    "Get started with some tips from Riot Bot!": "Начните с некоторых советов от бота Riot!",
     "General discussion about Matrix and Riot": "Общая дискуссия о Matrix и Riot",
-    "Discussion of all things Matrix!": "Дискуссия обо всем Matrix!",
-    "Riot/Web &amp; Desktop chat": "Riot-Web &amp; Desktop чат",
-    "Matrix technical discussions": "Техническая дискуссия о Matrix",
-    "Running Matrix services": "Запуск сервиса Matrix",
+    "Discussion of all things Matrix!": "Дискуссия обо всем, что связано с Matrix!",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-чат",
+    "Matrix technical discussions": "Технические дискуссии о Matrix",
+    "Running Matrix services": "Запуск сервисов Matrix",
     "Community-run support for Synapse": "Поддержка Synapse от сообщества",
-    "Admin support for Dendrite": "Админ. помощь для Dendrite",
+    "Admin support for Dendrite": "Административная поддержка Dendrite",
     "Building services on Matrix": "Разработка сервисов на Matrix",
-    "Implementing VoIP services with Matrix": "Внедрение услуги VoIP с Matrix",
-    "(HTTP status %(httpStatus)s)": "(HTTP-статус %(httpStatus)s)",
-    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot-iOS &amp; matrix-ios-sdk чат",
-    "Riot/Android &amp; matrix-android-sdk chat": "Riot-Android &amp; matrix-android-sdk чат",
-    "Announcements about Synapse releases": "Объявления релизов Synapse",
-    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто использует matrix-appservice-irc",
+    "Implementing VoIP services with Matrix": "Внедрение VoIP-услуг с помощью Matrix",
+    "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk чат",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk чат",
+    "Announcements about Synapse releases": "Объявления о выпусках Synapse",
+    "Support for those using and running matrix-appservice-irc": "Поддержка тех, кто использует и работает с matrix-appservice-irc",
     "You have successfully set a password!": "Вы успешно установили пароль!",
     "Continue": "Продолжить",
-    "Please set a password!": "Задайте пароль!",
-    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, связанных с существующими сетями (Slack, IRC, Gitter и т.д.) Или независимыми. Ищите в каталоге!",
+    "Please set a password!": "Пожалуйста, установите пароль!",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "В Matrix существует множество комнат, как связанных с существующими сетями (Slack, IRC, Gitter и пр.), так и независимых. Ищите в каталоге!",
     "Failed to change password. Is your password correct?": "Не удалось сменить пароль. Вы правильно ввели текущий пароль?",
-    "You can now return to your account after signing out, and sign in on other devices.": "Теперь Вы можете вернуться в свою учетную запись после выхода из системы, и войти в систему на других устройствах.",
-    "Support for those using the Matrix spec": "Поддержка для тех, кто использует спецификацию Matrix",
-    "Design and implementation of E2E in Matrix": "Разработка и внедрение E2E в Matrix",
-    "Implementing VR services with Matrix": "Внедрение служб VR с помощью Matrix",
-    "Discussion of the Identity Service API": "Обсуждение службы идентификации API",
-    "Support for those using, running and writing other bridges": "Поддержка тех, кто использует, работает и пишет другие мосты (bridges)",
-    "Contributing code to Matrix and Riot": "Взаимодействующий код для Matrix и Riot",
-    "Dev chat for the Riot/Web dev team": "Dev chat для группы разработчиков Riot/Web",
-    "Dev chat for the Dendrite dev team": "Dev chat для группы разработчиков Dendrite",
-    "Co-ordination for Riot/Web translators": "Координирование для переводчиков Riot / Web",
-    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит Вам вернуться в свою учетную запись после выхода, и войти в систему на других устройствах.",
-    "You have successfully set a password and an email address!": "Пароль и адрес электронной почты успешно сохранены!",
-    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, Вы всегда можете указать адрес электронной почты в пользовательских настройках, если передумаете."
+    "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учетной записи после выхода из системы и войти на других устройствах.",
+    "Support for those using the Matrix spec": "Поддержка пользователей, использующих Matrix spec",
+    "Design and implementation of E2E in Matrix": "Разработка и внедрение сквозного шифрования (E2E) в Matrix",
+    "Implementing VR services with Matrix": "Внедрение сервисов виртуальной реальности (VR) с помощью Matrix",
+    "Discussion of the Identity Service API": "Обсуждение API службы идентификации",
+    "Support for those using, running and writing other bridges": "Поддержка для тех, кто использует, разрабатывает и внедряет приложения интеграции для Matrix",
+    "Contributing code to Matrix and Riot": "Внести свой вклад в разработку кода Matrix и Riot",
+    "Dev chat for the Riot/Web dev team": "Чат с командой разработчиков Riot/Web",
+    "Dev chat for the Dendrite dev team": "Чат с командой разработчиков Dendrite",
+    "Co-ordination for Riot/Web translators": "Координация для переводчиков Riot/Web",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит вам вернуться к учетной записи после выхода из системы и войти на других устройствах.",
+    "You have successfully set a password and an email address!": "Вы успешно установили пароль и адрес email!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Помните, что вы всегда сможете задать адрес email в настройках пользователя, если передумаете.",
+    "Set Password": "Задать пароль",
+    "To return to your account in future you need to <u>set a password</u>": "Чтобы вернуться к учетной записи в будущем, необходимо <u>задать пароль</u>",
+    "Warning": "Предупреждение",
+    "Checking for an update...": "Проверка обновлений...",
+    "Error encountered (%(errorDetail)s).": "Обнаружена ошибка (%(errorDetail)s).",
+    "No update available.": "Нет доступных обновлений.",
+    "Downloading update...": "Загрузка обновления...",
+    "Couldn't load home page": "Не удалось загрузить домашнюю страницу",
+    "Bug report sent": "Отчет об ошибке отправлен",
+    "Thank you!": "Спасибо!",
+    "Back": "Назад",
+    "Developer Tools": "Инструменты разработчика",
+    "Failed to send custom event.": "Не удалось отправить индивидуальное мероприятие.",
+    "Send Custom Event": "Отправить индивидуальное мероприятие",
+    "Send Custom State Event": "Отправить статус индивидуального мероприятия",
+    "Explore Room State": "Просмотр статуса комнаты",
+    "Event sent!": "Мероприятие отправлено!",
+    "Event Type": "Тип мероприятия",
+    "Event Content": "Содержание мероприятия",
+    "State Key": "Ключ состояния",
+    "Filter results": "Фильтрация результатов",
+    "You must specify an event type!": "Необходимо указать тип мероприятия!",
+    "Show message in desktop notification": "Показывать сообщение в уведомлении на рабочем столе",
+    "Pin Message": "Закрепить сообщение",
+    "Unpin Message": "Открепить сообщение"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 146e237d6a..75b060c287 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -9,7 +9,6 @@
     "Cancel Sending": "Avbryt sändning",
     "Can't update user notification settings": "Kan inte uppdatera aviseringsinställningarna",
     "Close": "Stäng",
-    "Create new room": "Nytt rum",
     "Couldn't find a matching Matrix room": "Kunde inte hitta ett matchande Matrix-rum",
     "Custom Server Options": "Egna serverinställningar",
     "customServer_text": "Du kan använda serverinställningarna för att logga in i en annan Matrix-server genom att specifiera en URL till en annan hemserver.<br/>Så här kan du använda Riot med ett existerande Matrix-konto på en annan hemserver.<br/><br/>Du kan också specifiera en egen identitetsserver, men du kommer inte att kunna bjuda in andra via epostadress, eller bli inbjuden via epostadress.",
@@ -18,7 +17,6 @@
     "Directory": "Katalog",
     "Dismiss": "Avvisa",
     "Download this file": "Ladda ner filen",
-    "Drop here %(toAction)s": "Dra hit för att %(toAction)s",
     "Enable audible notifications in web client": "Sätt på högljudda aviseringar i webbklienten",
     "Enable desktop notifications": "Sätt på skrivbordsaviseringar",
     "Enable email notifications": "Sätt på epostaviseringar",
@@ -27,14 +25,12 @@
     "Enter keywords separated by a comma:": "Skriv in nyckelord, separerade med kommatecken:",
     "Error": "Fel",
     "Error saving email notification preferences": "Ett fel uppstod då epostaviseringsinställningarna sparades",
-    "Failed to": "Det gick inte att",
     "Failed to add tag %(tagName)s to room": "Det gick inte att lägga till \"%(tagName)s\" till rummet",
     "Failed to change settings": "Det gick inte att spara inställningarna",
     "Failed to forget room %(errCode)s": "Det gick inte att glömma bort rummet %(errCode)s",
     "Failed to update keywords": "Det gick inte att uppdatera nyckelorden",
     "Failed to get protocol list from Home Server": "Det gick inte att hämta protokollistan från hemservern",
     "Failed to get public room list": "Det gick inte att hämta listan över offentliga rum",
-    "Failed to join the room": "Det gick inte att gå med i rummet",
     "Failed to remove tag %(tagName)s from room": "Det gick inte att radera taggen %(tagName)s från rummet",
     "Failed to set direct chat tag": "Det gick inte att markera rummet som direkt chatt",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s på %(osName)s",
@@ -53,9 +49,7 @@
     "Filter room names": "Filtrera rumsnamn",
     "Forget": "Glöm bort",
     "Forward Message": "Vidarebefordra meddelande",
-    " from room": " från rum",
     "Guests can join": "Gäster kan bli medlem i rummet",
-    "Guest users can't invite users. Please register to invite.": "Gäster kan inte skicka inbjudningar. Registrera dig för att bjuda in andra.",
     "Hide panel": "Göm panel",
     "I understand the risks and wish to continue": "Jag förstår riskerna och vill fortsätta",
     "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:": "För att diagnostisera problem kommer loggar från den här klienten att sändas med rapporten. Om du bara vill sända texten ovan, kryssa av rutan:",
@@ -82,14 +76,12 @@
     "Notify me for anything else": "Avisera för allt annat",
     "Off": "Av",
     "On": "På",
-    "Permalink": "Permalink",
+    "Permalink": "Permanent länk",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Beskriv buggen. Vad gjorde du? Vad förväntade du dig att ska hända? Vad hände?",
     "Please describe the bug and/or send logs.": "Beskriv buggen och/eller sänd loggar.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Installera <a href=\"https://www.google.com/chrome\">Chrome</a> eller <a href=\"https://getfirefox.com\">Firefox</a> för den bästa upplevelsen.",
-    "Please Register": "Registrera dig",
     "powered by Matrix": "drivs av Matrix",
     "Quote": "Citera",
-    "Redact": "Dra tillbaka",
     "Reject": "Avvisa",
     "Remove %(name)s from the directory?": "Ta bort %(name)s från katalogen?",
     "Remove": "Ta bort",
@@ -101,23 +93,18 @@
     "Riot does not know how to join a room on this network": "Riot kan inte gå med i ett rum på det här nätverket",
     "Riot is not supported on mobile web. Install the app?": "Riot stöds inte på mobil-webb. Installera appen?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot använder flera avancerade webbläsaregenskaper, av vilka alla inte stöds eller är experimentella i din nuvarande webbläsare.",
-    "Room directory": "Rumskatalog",
     "Room not found": "Rummet hittades inte",
     "Search": "Sök",
     "Search…": "Sök…",
     "Search for a room": "Sök efter rum",
     "Send": "Sänd",
     "Send logs": "Sänd loggar",
-    "Settings": "Inställningar",
     "Source URL": "Käll-URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Beklagar, din webbläsare kan <b>inte</b> köra Riot.",
-    "Start chat": "Starta chatt",
     "The Home Server may be too old to support third party networks": "Hemservern kan vara för gammal för stöda tredje parters nätverk",
     "There are advanced notifications which are not shown here": "Det finns avancerade aviseringar som inte visas här",
     "The server may be unavailable or overloaded": "Servern kan vara överbelastad eller inte tillgänglig",
     "This Room": "Det här rummet",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Det här rummet är inte tillgängligt till gäster. Du kan möjligtvis gå med i rummet om du registrerar dig.",
-    " to room": " till rum",
     "Unable to fetch notification target list": "Det gick inte att hämta aviseringsmållistan",
     "Unable to join network": "Det gick inte att ansluta till nätverket",
     "Unable to look up room ID from server": "Det gick inte att hämta rums-ID:t från servern",
@@ -139,7 +126,6 @@
     "You cannot delete this image. (%(code)s)": "Du kan inte radera den här bilden. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Du kan inte radera det här meddelandet. (%(code)s)",
     "You are not receiving desktop notifications": "Du får inte skrivbordsaviseringar",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Du använder Riot som en gäst. <a>Registrera dig</a> eller <a>logga in</a> för att få tillgång till flera rum och egenskaper!",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Du kan ha konfigurerat dem i en annan klient än Riot. Du kan inte ändra dem i Riot men de tillämpas ändå",
     "Sunday": "söndag",
     "Monday": "måndag",
@@ -153,9 +139,62 @@
     "OK": "OK",
     "You need to be using HTTPS to place a screen-sharing call.": "Du måste använda HTTPS för att dela din skärm.",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Med din nuvarande webbläsare kan appens utseende vara helt fel, och vissa eller alla egenskaper kommer nödvändigtvis inte att fungera. Om du ändå vill försöka så kan du fortsätta, men gör det på egen risk!",
-    "Welcome page": "Välkomstsida",
     "Delete the room alias %(alias)s and remove %(name)s from the directory?": "Radera rumsadressen %(alias)s och ta bort %(name)s från katalogen?",
     "Collecting logs": "Samlar in loggar",
     "Collecting app version information": "Samlar in appversionsinformation",
-    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aviseringar för följande nyckelord följer regler som inte kan visas här:"
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Aviseringar för följande nyckelord följer regler som inte kan visas här:",
+    "Continue": "Fortsätt",
+    "Failed to change password. Is your password correct?": "Det gick inte att byta lösenord. Är lösenordet rätt?",
+    "Operation failed": "Handlingen misslyckades",
+    "#example": "#exempel",
+    "Fetching third party location failed": "Det gick inte att hämta platsdata från tredje part",
+    "Login": "Logga in",
+    "Warning": "Varning",
+    "Downloading update...": "Laddar ned uppdatering...",
+    "Welcome to Riot.im": "Välkommen till Riot.im",
+    "Chat with Riot Bot": "Chatta med Riot Bot",
+    "Get started with some tips from Riot Bot!": "Kom igång med några tips från Riot Bot!",
+    "General discussion about Matrix and Riot": "Allmän diskussion om Matrix och Riot",
+    "Discussion of all things Matrix!": "Diskussion om allt gällande Matrix!",
+    "Matrix technical discussions": "Teknisk diskussion om Matrix",
+    "Running Matrix services": "Driva Matrix-tjänster",
+    "Community-run support for Synapse": "Gemenskapsdriven användarhjälp för Synapse",
+    "Announcements about Synapse releases": "Meddelanden om Synapse-versioner",
+    "Support for those using and running matrix-appservice-irc": "Hjälp för de som använder och driver matrix-appservice-irc",
+    "Support for those using the Matrix spec": "Hjälp för de som använder Matrix specifikation",
+    "Design and implementation of E2E in Matrix": "Design och implementation av E2E i Matrix",
+    "Implementing VR services with Matrix": "Implementation av VR-tjänster med Matrix",
+    "Implementing VoIP services with Matrix": "Implementation av VoIP-tjänster med Matrix",
+    "Discussion of the Identity Service API": "Diskussion om Identity Service API:n",
+    "Support for those using, running and writing other bridges": "Hjälp för de som använder, driver och utvecklar andra bryggor",
+    "Contributing code to Matrix and Riot": "Bidra med kod till Matrix och Riot",
+    "Dev chat for the Riot/Web dev team": "Chatt för utvecklare av Riot/Web",
+    "Dev chat for the Dendrite dev team": "Chatt för utvecklare av Dendrite",
+    "Co-ordination for Riot/Web translators": "Koordination för översättare av Riot/Web",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Många rum finns redan i Matrix, länkade till andra nätverk (Slack, IRC, Gitter etc.) eller fristående. Kolla in katalogen!",
+    "You have successfully set a password!": "Du har valt ett nytt lösenord!",
+    "You can now return to your account after signing out, and sign in on other devices.": "Du kan nu återgå till ditt konto efter att ha loggat ut och logga in på andra enheter.",
+    "Please set a password!": "Vänligen välj ett lösenord!",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "Detta kommer tillåta dig att återgå till ditt konto efter att ha loggat ut, och logga in på andra enheter.",
+    "You have successfully set a password and an email address!": "Du har framgångsrikt valt ett lösenord och en e-postadress!",
+    "Remember, you can always set an email address in user settings if you change your mind.": "Kom ihåg att du alltid kan välja en e-postadress i dina användarinställningar om du ändrar dig.",
+    "To return to your account in future you need to <u>set a password</u>": "För att återgå till ditt konto i framtiden måste du <u>välja ett lösenord</u>",
+    "Set Password": "Välj lösenord",
+    "Couldn't load home page": "Kunde inte ladda startsidan",
+    "(HTTP status %(httpStatus)s)": "(HTTP-status %(httpStatus)s)",
+    "Checking for an update...": "Letar efter uppdateringar...",
+    "Error encountered (%(errorDetail)s).": "Fel påträffat (%(errorDetail)s).",
+    "No update available.": "Ingen uppdatering tillgänglig.",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentraliserad, krypterad chatt &amp; samarbete möjliggjort med [matrix]",
+    "Search the room directory": "Sök i rumskatalogen",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; Desktop-chatt",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk-chatt",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk-chatt",
+    "Admin support for Dendrite": "Hjälp för administratörer av Dendrite",
+    "Building services on Matrix": "Bygga tjänster med Matrix",
+    "Bug report sent": "Buggraporten skickades",
+    "Thank you!": "Tack!",
+    "Back": "Tillbaka",
+    "Filter results": "Filtrera resultaten",
+    "Explore Room State": "Utforska rumläget"
 }
diff --git a/src/i18n/strings/ta.json b/src/i18n/strings/ta.json
new file mode 100644
index 0000000000..2d3c512036
--- /dev/null
+++ b/src/i18n/strings/ta.json
@@ -0,0 +1,137 @@
+{
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>மற்றும்<a href=\"http://opera.com\">Opera</a>விலும் செயல்படும்.",
+    "A new version of Riot is available.": "Riot-ன் புதிய பதிப்பு உள்ளது.",
+    "Add an email address above to configure email notifications": "மின்னஞ்சல் மூலம் அறிவிப்புகளை பெற உங்கள் மின்னஞ்சல் முகவரியை மேலே இணைக்கவும்",
+    "Advanced notification settings": "மேம்பட்ட அறிவிப்பிற்கான அமைப்புகள்",
+    "All messages": "அனைத்து செய்திகள்",
+    "All messages (loud)": "அனைத்து செய்திகள் (உரக்க)",
+    "All Rooms": "அனைத்து அறைகள்",
+    "All notifications are currently disabled for all targets.": "அனைத்து இலக்குகளுக்கான அனைத்து அறிவுப்புகளும் தற்போது முடக்கி வைக்கப்பட்டுள்ளது.",
+    "An error occurred whilst saving your email notification preferences.": "உங்கள் மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் ஏதோ பிழை ஏற்பட்டுள்ளது.",
+    "Cancel": "ரத்து",
+    "Cancel Sending": "அனுப்புதலை ரத்து செய்",
+    "Changelog": "மாற்றப்பதிவு",
+    "Close": "மூடு",
+    "Collapse panel": "பலகத்தை மாற்று",
+    "Collecting app version information": "செயலியின் பதிப்பு தகவல்கள் சேகரிக்கப்படுகிறது",
+    "Collecting logs": "பதிவுகள் சேகரிக்கப்படுகிறது",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s -ல் %(browserName)s -ன் வழியாக %(appName)s",
+    "Call invitation": "அழைப்பிற்கான விண்ணப்பம்",
+    "Can't update user notification settings": "பயனர் அறிவிப்பு அமைப்புகளை மாற்ற முடியவில்லை",
+    "Couldn't find a matching Matrix room": "பொருத்தமான Matrix அறை புலப்படவில்லை",
+    "Custom Server Options": "விருப்பிற்கேற்ற வழங்கி இடப்புகள்",
+    "delete the alias.": "மாற்றை அழி.",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "அறை மாற்று %(alias)s -ஐ அழித்து, %(name)s -ஐ அடைவிலிருந்து நீக்க வேண்டுமா?",
+    "Describe your problem here.": "உங்கள் பிரச்சனையை இங்கு விவரிக்கவும்.",
+    "Direct Chat": "நேரடி அரட்டை",
+    "Directory": "அடைவு",
+    "Dismiss": "நீக்கு",
+    "Download this file": "இந்த கோப்பைத் தரவிறக்கு",
+    "Enable audible notifications in web client": "இணைய வாங்கியில் ஒலி அறிவிப்புகளை ஏதுவாக்கு",
+    "Enable desktop notifications": "திரை அறிவிப்புகளை ஏதுவாக்கு",
+    "Enable email notifications": "மின்னஞ்சல் அறிவிப்புகளை ஏதுவாக்கு",
+    "Enable notifications for this account": "இந்த கணக்கிற்கான அறிவிப்புகளை ஏதுவாக்கு",
+    "Enable them now": "இப்போது அவற்றை ஏதுவாக்கு",
+    "Error": "கோளாறு",
+    "Expand panel": "பலகத்தை விரிவாக்கு",
+    "Failed to add tag %(tagName)s to room": "%(tagName)s எனும் குறிச்சொல்லை அறையில் சேர்ப்பதில் தோல்வி",
+    "Failed to change settings": "அமைப்புகள் மாற்றத்தில் தோல்வி",
+    "Failed to forget room %(errCode)s": "அறையை மறப்பதில் தோல்வி %(errCode)s",
+    "Failed to update keywords": "முக்கிய வார்த்தைகளை புதுப்பித்தலில் தோல்வி",
+    "Failed to get public room list": "பொது அறைப் பட்டியலை பெறுவதில் தோல்வி",
+    "Failed to send report: ": "அறிக்கை அனுப்புதலில் தோல்வி ",
+    "Favourite": "விருப்பமான",
+    "Files": "கோப்புகள்",
+    "Filter room names": "அறை பெயர்களை வடிகட்டு",
+    "Forget": "மறத்தல்",
+    "Guests can join": "விருந்தினர்கள் சேரலாம்",
+    "Hide panel": "பலகத்தை மறை",
+    "Invite to this room": "இந்த அறைக்கு அழை",
+    "Keywords": "முக்கிய வார்த்தைகள்",
+    "Leave": "வெளியேறு",
+    "Login": "உள்நுழை",
+    "Low Priority": "குறைந்த முன்னுரிமை",
+    "Members": "உறுப்பினர்கள்",
+    "Mentions only": "குறிப்பிடுகள் மட்டும்",
+    "#example": "#உதாரணமாக",
+    "Enter keywords separated by a comma:": "ஒரு comma மூலம் முக்கிய வார்த்தைகளை உள்ளிடவும்:",
+    "Error saving email notification preferences": "மின்னஞ்சல் அறிவிப்பு விருப்பங்களை சேமிப்பதில் கோளாறு",
+    "Failed to get protocol list from Home Server": "முகப்பு சேவையகத்திலிருந்து நெறிமுறை பட்டியலைப் பெறுவதில் தோல்வி",
+    "Failed to remove tag %(tagName)s from room": "அறையில் இருந்து குறிச்சொல் %(tagName)s களை அகற்றுவது தோல்வியடைந்தது",
+    "Failed to set direct chat tag": "நேரடி அரட்டை குறியை அமைப்பதில் தோல்வி",
+    "Failed to set Direct Message status of room": "அறையின் நேரடி செய்தி நிலையை அமைக்க தவறிவிட்டது",
+    "Fetching third party location failed": "மூன்றாம் இடத்தில்  உள்ள  இடம் தோல்வி",
+    "Forward Message": "முன்னோடி செய்தி",
+    "(HTTP status %(httpStatus)s)": "(HTTP நிலைகள் %(httpStatus)s)",
+    "customServer_text": "நீங்கள் மற்ற Matrix வழங்கிகள் உள்நுழைய உங்கள் விருப்பமான வழங்கி இடப்புகளை உபயோகப்படுத்தலாம்.<br/>இது மற்ற வழங்கியில் உங்கள் Matrix கணக்கிணை Riot மூலம் பயன்படுத்த உதவும்.<br/><br/>நீங்கள் மற்ற அடையாள வழங்கியையும் பயன்படுத்தலாம், ஆனால் நீங்கள் மற்ற பயனர்களை மின்னஞ்சல் மூலம் அழைக்கவோ, நீங்கள் அழைக்கப்படவோ இயலாது.",
+    "I understand the risks and wish to continue": "நான் அபாயங்களைப் புரிந்துகொண்டு தொடர விரும்புகிறேன்",
+    "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:": "சிக்கல்களைக் கண்டறியும் பொருட்டு, இந்த கிளையிலிருந்து வரும் பதிவுகள் இந்த பிழை அறிக்கையுடன் அனுப்பப்படும். மேலே உள்ள உரையை மட்டுமே அனுப்ப விரும்பினால், தயவுசெய்து தட்டச்சு செய்க:",
+    "Loading bug report module": "பிழை அறிக்கை தொகுதி ஏற்றுகிறது",
+    "Messages containing my display name": "என் காட்சி பெயர் கொண்ட செய்திகள்",
+    "more": "அதிகம்",
+    "Mute": "முடக்கு",
+    "No rooms to show": "காண்பதற்கான அறை இல்லை",
+    "Messages containing <span>keywords</span>": "<span>முக்கிய</span> கொண்ட செய்திகள்",
+    "Messages containing my user name": "என் பயனர் பெயர் கொண்ட செய்திகள்",
+    "Messages in group chats": "குழு அரட்டைகளில் உள்ள செய்திகள்",
+    "Messages in one-to-one chats": "ஒரு-க்கு-ஒரு அரட்டைகளில் உள்ள செய்திகள்",
+    "Messages sent by bot": "bot மூலம் அனுப்பிய செய்திகள்",
+    "Noisy": "சத்தம்",
+    "Notification targets": "அறிவிப்பு இலக்குகள்",
+    "Notifications": "அறிவிப்புகள்",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "பின்வரும் முக்கிய வார்த்தைகளில் அறிவிப்புகள் இங்கே காட்டப்பட முடியாத விதிகள் பின்பற்றப்படுகின்றன:",
+    "Notify for all other messages/rooms": "மற்ற எல்லா செய்திகளுக்கும் அறைகளுக்கும் தெரிவிக்கவும்",
+    "Notify me for anything else": "வேறு எதையும் எனக்கு தெரிவி",
+    "Off": "அமை",
+    "On": "மீது",
+    "Operation failed": "செயல்பாடு தோல்வியுற்றது",
+    "Permalink": "நிரந்தரத் தொடுப்பு",
+    "powered by Matrix": "Matrix-ஆல் ஆனது",
+    "Quote": "மேற்கோள்",
+    "Reject": "நிராகரி",
+    "Remove %(name)s from the directory?": "அடைவிலிருந்து %(name)s-ஐ நீக்கலாமா?",
+    "Remove": "நீக்கு",
+    "remove %(name)s from the directory.": "அடைவிலிருந்து %(name)s-ஐ நீக்கு.",
+    "Remove from Directory": "அடைவிலிருந்து நீக்கு",
+    "Report a bug": "வழுவைத் தெரியப்படுத்து",
+    "Resend": "மீண்டும் அனுப்பு",
+    "Riot is not supported on mobile web. Install the app?": "கைபேசி உலாவியில் Riot இயங்காது. செயலியை நிறுவ வேண்டுமா?",
+    "Room not found": "அறை காணவில்லை",
+    "Search": "தேடு",
+    "Search…": "தேடு…",
+    "Search for a room": "அறையைத் தேடு",
+    "Send": "அனுப்பு",
+    "Send logs": "பதிவுகளை அனுப்பு",
+    "Source URL": "மூல முகவரி",
+    "This Room": "இந்த அறை",
+    "Unable to join network": "முனையங்களில் சேர இயலவில்லை",
+    "Unavailable": "இல்லை",
+    "Unknown device": "தெரியாத கருவி",
+    "unknown error code": "தெரியாத பிழை குறி",
+    "Unnamed room": "பெயரிடப்படாத அறை",
+    "Update": "புதுப்பி",
+    "Uploaded on %(date)s by %(user)s": "%(date)s அன்று %(user)s ஆல் பதிவேற்றப்பட்டது",
+    "Uploading report": "அறிக்கை பதிவேற்றப்படுகிறது",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "வழுவைப் பற்றி விளக்கவும். நீங்கள் என்ன செய்தீர்கள்? என்ன நடக்க வேண்டி எதிர்ப்பார்த்தீர்கள்? என்ன நடந்தது?",
+    "Please describe the bug and/or send logs.": "வழுவைப் பற்றி விளக்கவும் மேலும்/அல்லது பதிவுகளை அனுப்பவும்.",
+    "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=\"https://www.google.com/chrome\">Chrome</a>அல்லது<a href=\"https://getfirefox.com\">Firefox</a>ஐ பயன்படுத்தவும்.",
+    "Riot Desktop on %(platformName)s": "%(platformName)s ற்க்கான Riot",
+    "Riot does not know how to join a room on this network": "இந்த வலையமைப்பில் உள்ள அறையில் எப்படி சேர்வதென்று Riotற்க்கு தெரியவில்லை",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot பல மேம்பட்ட உலாவி வசதிகளைப் பயன்படுத்துகிறது, அதில் சிலவற்றைக் காணவில்லை அல்லது உங்கள் உலாவியில் பரிசோதனைக்காக உள்ளது.",
+    "There are advanced notifications which are not shown here": "இங்கு காண்பிக்கப்படாத மேம்பட்ட அறிவிப்புகள் உள்ளது",
+    "The server may be unavailable or overloaded": "வழங்கி அளவுமீறிய சுமையில் உள்ளது அல்லது செயல்பாட்டில் இல்லை",
+    "Unable to fetch notification target list": "அறிவிப்பு பட்டியலை பெற முடியவில்லை",
+    "Unable to look up room ID from server": "வழங்கியிலிருந்து அறை ID யை காண முடியவில்லை",
+    "Unhide Preview": "முன்னோட்டத்தைக் காண்பி",
+    "View Decrypted Source": "மறையீடு நீக்கப்பட்ட மூலத்தைக் காண்பி",
+    "View Source": "மூலத்தைக் காட்டு",
+    "What's New": "புதிதாக வந்தவை",
+    "What's new?": "புதிதாக என்ன?",
+    "Waiting for response from server": "வழங்கியின் பதிலுக்காக காத்திருக்கிறது",
+    "When I'm invited to a room": "நான் அறைக்கு அழைக்கப்பட்ட போது",
+    "World readable": "உலகமே படிக்கும்படி",
+    "You cannot delete this image. (%(code)s)": "இந்த படத்தை நீங்கள் அழிக்க முடியாது. (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "இந்த செய்தியை நீங்கள் அழிக்க முடியாது. (%(code)s)",
+    "You are not receiving desktop notifications": "திரை அறிவிப்புகளை நீங்கள் பெறவில்லை",
+    "Bug report sent": "வழு அறிக்கை அனுப்பப்பட்டது"
+}
diff --git a/src/i18n/strings/te.json b/src/i18n/strings/te.json
index 9e26dfeeb6..b7af70a2ca 100644
--- a/src/i18n/strings/te.json
+++ b/src/i18n/strings/te.json
@@ -1 +1,121 @@
-{}
\ No newline at end of file
+{
+    "Close": "ముసివెయండి",
+    "Continue": "కొనసాగించు",
+    "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s %(browserName)s ద్వర %(osName)s కి",
+    "Friday": "శుక్రువారం",
+    "Cancel": "రద్దు",
+    "Monday": "సోమవారం",
+    "Tuesday": "మంగళవారం",
+    "Wednesday": "బుధవారం",
+    "Thursday": "గురువారం",
+    "Saturday": "శనివారం",
+    "Sunday": "ఆదివారం",
+    "Failed to forget room %(errCode)s": "గది మర్చిపోవడం విఫలమైంది %(errCode)s",
+    "unknown error code": "తెలియని కోడ్ లోపం",
+    "A new version of Riot is available.": "కొత్త రిమోట్ వివరణము అందుబాటులో ఉంది.",
+    "Add an email address above to configure email notifications": "ఇమెయిల్ ప్రకటనలను రూపశిల్పం చేయడానికి ఎగువ ఇమెయిల్ చిరునామాను జోడించండి",
+    "Advanced notification settings": "ఆధునిక తాఖీదు అమరిక",
+    "All messages": "అన్ని సందేశాలు",
+    "All messages (loud)": "అన్ని సందేశాలు (గట్టిగ)",
+    "All Rooms": "అన్ని గదులు",
+    "Call invitation": "మాట్లాడడానికి ఆహ్వానం",
+    "Cancel Sending": "పంపడాన్ని ఆపేయండి",
+    "Can't update user notification settings": "వినియోగదారు ప్రకటన ప్రాదాన్యాలు నవీకరించదడానేకి రాదు",
+    "Changelog": "మార్పు వివరణ",
+    "Collapse panel": "ప్యానెల్ కుదించు",
+    "Collecting app version information": "అనువర్తన సంస్కరణ సమాచారాన్ని సేకరించడం",
+    "Collecting logs": "నమోదు సేకరించడం",
+    "Couldn't find a matching Matrix room": "సరిపోలిక మ్యాట్రిక్స్ గదిని కనుగొనలేకపోయాము",
+    "Custom Server Options": "మలచిన  సేవిక ఎంపికలు",
+    "delete the alias.": "అలియాస్ తొలగించండి.",
+    "Describe your problem here.": "ఇక్కడ మీ సమస్యను వివరించండి.",
+    "Direct Chat": "ప్రత్యక్ష మాటామంతి",
+    "Directory": "వివరం",
+    "Dismiss": "రద్దుచేసే",
+    "Download this file": "ఈ దస్త్రం దిగుమతి చేయండి",
+    "Enable audible notifications in web client": "వెబ్ బంట్రౌతు వినిపించే నోటిఫికేషన్లను ప్రారంభించండి",
+    "Enable desktop notifications": "రంగస్థల తాఖీదు ప్రారంభించండి",
+    "Enable email notifications": "ఇమెయిల్ ప్రకటనలను ప్రారంభించండి",
+    "Enable notifications for this account": "ఈ ఖాతా కోసం తాఖీదు ప్రారంభించండి",
+    "Enable them now": "ఇప్పుడే వాటిని ప్రారంభించండి",
+    "Enter keywords separated by a comma:": "కామాతో వేరు చేయబడిన కీలక పదాలను నమోదు చేయండి:",
+    "Error": "లోపం",
+    "Error saving email notification preferences": "ఇమెయిల్ ప్రకటనలను ప్రాధాన్యతలను దాచు చేయడంలో లోపం",
+    "#example": "#ఉదాహరణ",
+    "Expand panel": "ప్యానెల్ను విస్తరింపజేయండి",
+    "Failed to add tag %(tagName)s to room": "%(tagName)s ను బొందు జోడించడంలో విఫలమైంది",
+    "Failed to change settings": "అమరిక మార్చడం విఫలమైంది",
+    "Failed to update keywords": "కీలక పదాలను నవీకరించడంలో విఫలమైంది",
+    "Failed to get protocol list from Home Server": "హోమ్ సర్వర్ నుండి ప్రోటోకాల్ జాబితాను పొందడం విఫలమైంది",
+    "Failed to get public room list": "ప్రజా గది జాబితాను పొందడం విఫలమైంది",
+    "Failed to remove tag %(tagName)s from room": "గది నుండి బొందు %(tagName)s తొలగించడంలో విఫలమైంది",
+    "Failed to send report: ": "నివేదికను పంపడంలో విఫలమైంది: ",
+    "Failed to set direct chat tag": "ప్రత్యక్ష మాటామంతి బొందు సెట్ చేయడంలో విఫలమైంది",
+    "Failed to set Direct Message status of room": "గది యొక్క ప్రత్యక్ష సందేశ స్థితి సెట్ చేయడంలో విఫలమైంది",
+    "Favourite": "గుర్తుంచు",
+    "Fetching third party location failed": "మూడవ పార్టీ స్థానాన్ని పొందడం విఫలమైంది",
+    "Files": "దస్ర్తాలు",
+    "Filter room names": "గది పేర్లను ఫిల్టర్ చేయండి",
+    "Forget": "మర్చిపో",
+    "Forward Message": "సందేశాన్ని మునుముందుకు చేయండి",
+    "Guests can join": "అతిథులు చేరవచ్చు",
+    "Hide panel": "ప్యానెల్ను దాచు",
+    "(HTTP status %(httpStatus)s)": "(HTTP స్థితి %(httpStatus)s)",
+    "I understand the risks and wish to continue": "నేను నష్టాలను అర్థం చేసుకుంటాను మరియు కొనసాగించాలని కోరుకుంటున్నాను",
+    "Invite to this room": "ఈ గదికి ఆహ్వానించండి",
+    "Keywords": "ముఖ్యపదాలు",
+    "Leave": "వదిలి",
+    "Login": "ప్రవేశ ద్వారం",
+    "Loading bug report module": "దోష నివేదిక అధిభాగం లోడ్ చేస్తోంది",
+    "Low Priority": "తక్కువ ప్రాధాన్యత",
+    "Members": "సభ్యులు",
+    "Mentions only": "మాత్రమే ప్రస్తావిస్తుంది",
+    "Messages containing my display name": "నా ప్రదర్శన పేరును కలిగి ఉన్న సందేశాలు",
+    "Messages containing <span>keywords</span>": "కీలక పదాలను</span>కలిగి ఉన్న సందేశం<span>",
+    "Messages containing my user name": "నా వినియోగదారు పేరు కలిగి ఉన్న సందేశాలు",
+    "Messages in group chats": "సమూహ మాటామంతిలో సందేశాలు",
+    "Messages in one-to-one chats": "సందేశాలు నుండి ఒకరికి ఒకటి మాటామంతి",
+    "Messages sent by bot": "బాట్ పంపిన సందేశాలు",
+    "more": "మరింత",
+    "Mute": "నిశబ్ధము",
+    "No rooms to show": "చూపించడానికి గదులు లేవు",
+    "Noisy": "శబ్దం",
+    "Notification targets": "తాఖీదు లక్ష్యాలు",
+    "Notifications": "ప్రకటనలు",
+    "Notify for all other messages/rooms": "అన్ని ఇతర సందేశాలు / గదులు కోసం తెలియజేయండి",
+    "Off": "ఆపు",
+    "On": "వేయుము",
+    "Operation failed": "కార్యం విఫలమైంది",
+    "Reject": "తిరస్కరించు",
+    "Remove %(name)s from the directory?": "వివరము నుండి %(name)s తొలిగించు?",
+    "Remove": "తొలగించు",
+    "remove %(name)s from the directory.": "వివరము నుండి %(name)s ను తొలిగించు.",
+    "Remove from Directory": "`వివరము నుండి తొలిగించు",
+    "Report a bug": "లోపమును నివేదించు",
+    "Resend": "మళ్ళి  పంపుము",
+    "Riot Desktop on %(platformName)s": "రియట్ రంగస్థలం లో %(platformName)s",
+    "Room not found": "గది కనుగొనబడలేదు",
+    "Search": "శోధన",
+    "Search…": "శోధన…",
+    "Search for a room": "గది కోసం శోధించండి",
+    "Send": "పంపండి",
+    "Send logs": "నమోదును పంపు",
+    "Source URL": "మూల URL",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "క్షమించండి, మీ బ్రౌజర్ <b>రియట్ని అమలు చేయలేరు</b>.",
+    "Today": "ఈ రోజు",
+    "Yesterday": "నిన్న",
+    "Warning": "హెచ్చరిక",
+    "Checking for an update...": "నవీకరణ కోసం చూస్తోంది...",
+    "Error encountered (%(errorDetail)s).": "లోపం సంభవించింది (%(errorDetail)s).",
+    "No update available.": "ఏ నవీకరణ అందుబాటులో లేదు.",
+    "Downloading update...": "నవీకరణను దిగుమతి చేస్తోంది...",
+    "Welcome to Riot.im": "రిమోట్.ఇం కి స్వగతం",
+    "Search the room directory": "గది వివరాన్ని శోధించండి",
+    "Chat with Riot Bot": "రియోట్ బొట్తో మాటామంతి చేయండి",
+    "Please set a password!": "దయచేసి మీ రహస్యపదాన్నీ అమర్చండి!",
+    "Set Password": "రహస్యపదాన్నీ  అమర్చండి",
+    "Couldn't load home page": "హోమ్ పేజీని లోడ్ చేయలేకపోయాము",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">సఫరి</a>ఇంక<a href=\"http://opera.com\">ఒపెర</a>కుద పని చెసతయి.",
+    "All notifications are currently disabled for all targets.": "ప్రస్తుతానికి అన్ని చోట్లనుంచి అన్ని ప్రకటనలు ఆగి వున్నాయి.",
+    "An error occurred whilst saving your email notification preferences.": "మీ ఇమెయిల్ ప్రకటన ప్రాధాన్యాలు బద్రపరిచేతప్పుడు ఎదో తప్పు జరిగింది."
+}
diff --git a/src/i18n/strings/th.json b/src/i18n/strings/th.json
index 27483243a0..973f4319a2 100644
--- a/src/i18n/strings/th.json
+++ b/src/i18n/strings/th.json
@@ -7,7 +7,6 @@
     "#example": "#example",
     "Files": "ไฟล์",
     "Forward Message": "ส่งต่อข้อความ",
-    " from room": " จากห้อง",
     "Low Priority": "ความสำคัญต่ำ",
     "Members": "สมาชิก",
     "more": "เพิ่มเติม",
@@ -21,7 +20,6 @@
     "All Rooms": "ทุกห้อง",
     "Cancel Sending": "ยกเลิกการส่ง",
     "Changelog": "บันทึกการเปลี่ยนแปลง",
-    "Create new room": "สร้างห้องใหม่",
     "Describe your problem here.": "อธิบายปัญหาที่นี่",
     "Download this file": "ดาวน์โหลดไฟล์นี้",
     "Dismiss": "ไม่สนใจ",
@@ -35,8 +33,6 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "กรุณาอธิบายจุดบกพร่อง คุณทำอะไร? ควรจะเกิดอะไรขึ้น? แล้วอะไรคือสิ่งที่เกิดขึ้นจริง?",
     "Please describe the bug and/or send logs.": "กรุณาอธิบายจุดบกพร่อง และ/หรือ ส่งล็อก",
     "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=\"https://www.google.com/chrome\">Chrome</a> หรือ <a href=\"https://getfirefox.com\">Firefox</a> เพื่อประสบการณ์ที่ดีที่สุด",
-    "Please Register": "กรุณาลงทะเบียน",
-    "Redact": "ลบ",
     "Reject": "ปฏิเสธ",
     "Remove": "ลบ",
     "Messages containing <span>keywords</span>": "ข้อความที่มี<span>คีย์เวิร์ด</span>",
@@ -47,10 +43,8 @@
     "Search for a room": "ค้นหาห้อง",
     "Send": "ส่ง",
     "Send logs": "ส่งล็อก",
-    "Settings": "การตั้งค่า",
     "Sorry, your browser is <b>not</b> able to run Riot.": "ขออภัย เบราว์เซอร์ของคุณ<b>ไม่</b>สามารถ run Riot ได้",
     "This Room": "ห้องนี้",
-    " to room": " ไปยังห้อง",
     "Unavailable": "ไม่มี",
     "Unknown device": "อุปกรณ์ที่ไม่รู้จัก",
     "unknown error code": "รหัสข้อผิดพลาดที่ไม่รู้จัก",
@@ -77,15 +71,12 @@
     "Collapse panel": "ซ่อนหน้าต่าง",
     "Collecting app version information": "กำลังรวบรวมข้อมูลเวอร์ชันแอป",
     "OK": "ตกลง",
-    "Welcome page": "หน้าต้อนรับ",
     "You need to be using HTTPS to place a screen-sharing call.": "คุณต้องใช้ HTTPS เพื่อเริ่มติดต่อแบบแบ่งปันหน้าจอ",
     "You are not receiving desktop notifications": "การแจ้งเตือนบนเดสก์ทอปถูกปิดอยู่",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "คุณกำลังใช้ Riot ในฐานะแขก <a>ลงทะเบียน</a>หรือ<a>เข้าสู่ระบบ</a>เพื่อเข้าถึงห้องและคุณสมบัติอื่น ๆ เพิ่มเติม!",
     "Waiting for response from server": "กำลังรอการตอบสนองจากเซิร์ฟเวอร์",
     "View Decrypted Source": "ดูซอร์สที่ถอดรหัสแล้ว",
     "Unnamed room": "ห้องที่ไม่มีชื่อ",
     "Source URL": "URL ต้นฉบับ",
-    "Start chat": "เริ่มแชท",
     "Riot Desktop on %(platformName)s": "Riot เดสก์ทอปบน %(platformName)s",
     "Riot is not supported on mobile web. Install the app?": "Riot ไม่รองรับเว็บบนอุปกรณ์พกพา ติดตั้งแอป?",
     "Riot does not know how to join a room on this network": "Riot ไม่รู้วิธีเข้าร่วมห้องในเครือข่ายนี้",
@@ -101,7 +92,6 @@
     "Enter keywords separated by a comma:": "กรอกคีย์เวิร์ดทั้งหมด คั่นด้วยเครื่องหมายจุลภาค:",
     "Expand panel": "ขยายหน้าต่าง",
     "Failed to update keywords": "การอัปเดตคีย์เวิร์ดล้มเหลว",
-    "Failed to join the room": "การเข้าร่วมห้องล้มเหลว",
     "Failed to remove tag %(tagName)s from room": "การลบแท็ก %(tagName)s จากห้องล้มเหลว",
     "Failed to send report: ": "การส่งรายงานล้มเหลว: ",
     "Filter room names": "กรองชื่อห้อง",
@@ -125,9 +115,7 @@
     "remove %(name)s from the directory.": "ถอด %(name)s ออกจากไดเรกทอรี",
     "Remove from Directory": "ถอดออกจากไดเรกทอรี",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot ใช้คุณสมบัติขั้นสูงในเบราว์เซอร์หลายประการ คุณสมบัติบางอย่างอาจยังไม่พร้อมใช้งานหรืออยู่ในขั้นทดลองในเบราว์เซอร์ปัจจุบันของคุณ",
-    "Room directory": "ไดเรกทอรีห้อง",
     "There are advanced notifications which are not shown here": "มีการแจ้งเตือนขั้นสูงที่ไม่ได้แสดงที่นี่",
-    "This room is inaccessible to guests. You may be able to join if you register.": "แขกไม่มีสิทธิ์เข้าถึงห้องนี้ หากคุณลงทะเบียนคุณอาจเข้าร่วมได้",
     "Unable to join network": "ไม่สามารถเข้าร่วมเครือข่ายได้",
     "Unable to look up room ID from server": "ไม่สามารถหา ID ห้องจากเซิร์ฟเวอร์ได้",
     "Unhide Preview": "แสดงตัวอย่าง",
@@ -140,7 +128,6 @@
     "Couldn't find a matching Matrix room": "ไม่พบห้อง Matrix ที่ตรงกับคำค้นหา",
     "customServer_text": "คุณสามารถกำหนดเซิร์ฟเวอร์บ้านเองได้โดยใส่ URL ของเซิร์ฟเวอร์นั้น เพื่อเข้าสู่ระบบของเซิร์ฟเวอร์ Matrix อื่น<br/>ทั้งนี่เพื่อให้คุณสามารถใช้ Riot กับบัญชี Matrix ที่มีอยู่แล้วบนเซิร์ฟเวอร์บ้านอื่น ๆ ได้<br/><br/>คุณอาจเลือกเซิร์ฟเวอร์ระบุตัวตนเองด้วยก็ได้ แต่คุณจะไม่สามารถเชิญผู้ใช้อื่นด้วยที่อยู่อีเมล หรือรับคำเชิญจากผู้ใช้อื่นทางที่อยู่อีเมลได้",
     "delete the alias.": "ลบนามแฝง",
-    "Drop here %(toAction)s": "ปล่อยที่นี่%(toAction)s",
     "Error saving email notification preferences": "การบันทึกการตั้งค่าการแจ้งเตือนทางอีเมลผิดพลาด",
     "Failed to add tag %(tagName)s to room": "การเพิ่มแท็ก %(tagName)s ของห้องนี้ล้มเหลว",
     "Failed to change settings": "การแก้ไขการตั้งค่าล้มเหลว",
@@ -149,9 +136,7 @@
     "Failed to set direct chat tag": "การติดแท็กแชทตรงล้มเหลว",
     "Failed to set Direct Message status of room": "การตั้งสถานะข้อความตรงของห้องล้มเหลว",
     "Favourite": "รายการโปรด",
-    "Failed to": "ล้มเหลวในการ",
     "Fetching third party location failed": "การเรียกข้อมูลตำแหน่งจากบุคคลที่สามล้มเหลว",
-    "Guest users can't invite users. Please register to invite.": "แขกไม่สามารถเชิญผู้ใช้ได้ กรุณาลงทะเบียนเพื่อเชิญผู้อื่น",
     "The Home Server may be too old to support third party networks": "เซิร์ฟเวอร์บ้านอาจเก่าเกินกว่าจะรองรับเครือข่ายของบุคคลที่สาม",
     "The server may be unavailable or overloaded": "เซิร์ฟเวอร์อาจไม่พร้อมใช้งานหรือทำงานหนักเกินไป",
     "Unable to fetch notification target list": "ไม่สามารถรับรายชื่ออุปกรณ์แจ้งเตือน",
@@ -166,12 +151,11 @@
     "Search the room directory": "ค้นหาในไดเรกทอรีห้อง",
     "Chat with Riot Bot": "แชทกับบอท Riot",
     "Get started with some tips from Riot Bot!": "มาเริ่มกันด้วยเคล็ดลับเล็กน้อยจากบอท Riot!",
-    "General discussion about Matrix": "พูดคุยเรื่องทั่วไปเกี่ยวกับ Matrix",
     "Discussion of all things Matrix!": "พูดคุยทุกเรื่อง เรื่อง Matrix!",
     "Riot/Web &amp; Desktop chat": "แชทเกี่ยวกับ Riot บนเว็บและเดสก์ทอป",
     "Riot/iOS &amp; matrix-ios-sdk chat": "แชทเกี่ยวกับ Riot บน iOS และ matrix-ios-sdk",
     "Riot/Android &amp; matrix-android-sdk chat": "แชทเกี่ยวกับ Riot บน Android และ matrix-android-sdk",
-    "Matrix technical discussions": "พูดคุยเรื่อง Matrix ทางเทคนิค",
+    "Matrix technical discussions": "พูดคุยเรื่อง Matrix เชิงเทคนิค",
     "Running Matrix services": "การติดตั้งบริการ Matrix",
     "Community-run support for Synapse": "ฝ่ายสนับสนุน Synapse โดยชุมชนผู้ใช้",
     "Admin support for Dendrite": "ฝ่ายสนับสนุน Dendrite จากผู้ดูแล",
@@ -182,7 +166,7 @@
     "Implementing VR services with Matrix": "การอิมพลีเมนต์บริการ VR ด้วย Matrix",
     "Implementing VoIP services with Matrix": "การอิมพลีเมนต์บริการ VoIP ด้วย Matrix",
     "Support for those using, running and writing other bridges": "ฝ่ายสนับสนุนสำหรับผู้ใช้หรือพัฒนาตัวเชื่อมอื่น ๆ",
-    "Contributing code to Matrix and Riot": "สมทบโค๊ดกับ Matrix และ Riot",
+    "Contributing code to Matrix and Riot": "สมทบโค๊ดให้ Matrix และ Riot",
     "Dev chat for the Riot/Web dev team": "แชทสำหรับทีมพัฒนา Riot บนเว็บ",
     "Dev chat for the Dendrite dev team": "แชทสำหรับทีมพัฒนา Dendrite",
     "Co-ordination for Riot/Web translators": "แชทสำหรับประสานงานการแปล Riot บนเว็บ",
@@ -199,5 +183,12 @@
     "General discussion about Matrix and Riot": "พูดคุยเรื่องทั่วไป ทั้ง Matrix และ Riot",
     "(HTTP status %(httpStatus)s)": "(สถานะ HTTP %(httpStatus)s)",
     "Remember, you can always set an email address in user settings if you change your mind.": "อย่าลืม คุณสามารถตั้งที่อยู่อีเมลในการตั้งค่าผู้ใช้ได้ทุกเมื่อหากคุณเปลี่ยนใจ",
-    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!"
+    "You have successfully set a password and an email address!": "ตั้งรหัสผ่านและที่อยู่อีเมลสำเร็จแล้ว!",
+    "Warning": "คำเตือน",
+    "Checking for an update...": "กำลังตรวจหาอัปเดต...",
+    "Error encountered (%(errorDetail)s).": "เกิดข้อผิดพลาด (%(errorDetail)s)",
+    "No update available.": "ไม่มีอัปเดตที่ใหม่กว่า",
+    "Downloading update...": "กำลังดาวน์โหลดอัปเดต...",
+    "To return to your account in future you need to <u>set a password</u>": "คุณต้อง<u>ตั้งรหัสผ่าน</u>เพื่อจะกลับมาที่บัญชีนี้ในอนาคต",
+    "Set Password": "ตั้งรหัสผ่าน"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 9d97d7cbbe..23537b9919 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -18,7 +18,6 @@
     "Collapse panel": "Katlanır panel",
     "Collecting app version information": "Uygulama sürümü bilgileri toplanıyor",
     "Collecting logs": "Kayıtlar toplanıyor",
-    "Create new room": "Yeni oda oluştur",
     "Couldn't find a matching Matrix room": "Eşleşen bir Matrix odası bulunamadı",
     "Custom Server Options": "Özel Sunucu Seçenekleri",
     "customServer_text": "Farklı bir Ana Sunucu URL'si belirleyerek başka bir Matrix sunucusunda oturum açmak için Özel Sunucu Seçeneklerini kullanabilirsiniz. <br/> Bu , Riot'u mevcut Matrix hesabı ile farklı bir Ana Sunucuda kullanmanıza olanak tanır.<br/> <br/> Ayrıca Özel Kimlik Sunucu'da ayarlayabilirsiniz ama kullanıcıları e-posta adresleriyle veya kendi e-posta adresinizle davet edemezsiniz.",
@@ -27,9 +26,8 @@
     "Describe your problem here.": "Probleminizi burada açıklayın.",
     "Direct Chat": "Doğrudan Sohbet",
     "Directory": "Dizin",
-    "Dismiss": "Reddet",
+    "Dismiss": "Uzaklaştır",
     "Download this file": "Bu dosyayı indir",
-    "Drop here %(toAction)s": "Burayı terket %(toAction)s",
     "Enable audible notifications in web client": "Web istemcisinde sesli bildirimleri etkinleştir",
     "Enable desktop notifications": "Masaüstü bildirimlerini etkinleştir",
     "Enable email notifications": "E-posta bildirimlerini etkinleştir",
@@ -40,14 +38,12 @@
     "Error saving email notification preferences": "E-posta bildirim tercihlerini kaydetme hatası",
     "#example": "örnek",
     "Expand panel": "Genişletme paneli",
-    "Failed to": "Başaramadı",
     "Failed to add tag %(tagName)s to room": "%(tagName)s etiketi odaya eklenemedi",
     "Failed to change settings": "Ayarlar değiştirilemedi",
-    "Failed to forget room %(errCode)s": "Odayı unutma başarısız oldu %(errCode)s",
+    "Failed to forget room %(errCode)s": "Oda unutulması başarısız oldu %(errCode)s",
     "Failed to update keywords": "Anahtar kelimeler güncellenemedi",
     "Failed to get protocol list from Home Server": "Ana Sunucu'dan protokol listesi alınamadı",
     "Failed to get public room list": "Genel odalar listesi alınamadı",
-    "Failed to join the room": "Odaya girilemedi",
     "Failed to remove tag %(tagName)s from room": "Odadan %(tagName)s etiketi kaldırılamadı",
     "Failed to send report: ": "Rapor gönderilemedi: ",
     "Failed to set direct chat tag": "Direkt sohbet etiketi ayarlanamadı",
@@ -58,9 +54,7 @@
     "Filter room names": "Oda isimlerini filtrele",
     "Forget": "Unut",
     "Forward Message": "Mesajı İlet",
-    " from room": " Odadan",
     "Guests can join": "Misafirler katılabilirler",
-    "Guest users can't invite users. Please register to invite.": "Misafir kullanıcılar kullanıcıları davet edemezler . Davet etmek için lütfen kayıt olun.",
     "Hide panel": "Paneli gizle",
     "(HTTP status %(httpStatus)s)": "(HTTP durumu %(httpStatus)s)",
     "I understand the risks and wish to continue": "Riskleri anlıyorum ve devam etmek istiyorum",
@@ -90,15 +84,13 @@
     "Notify me for anything else": "Başka herhangi bir şey için bana bildirim yap",
     "Off": "Kapalı",
     "On": "Açık",
-    "Operation failed": "Operasyon başarısız",
+    "Operation failed": "Operasyon başarısız oldu",
     "Permalink": "Kalıcı Bağlantı(permalink)",
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Lütfen hatayı tanımlayın. Ne yaptınız ? Ne gerçekleşmesini beklediniz ? Ne gerçekleşti ?",
     "Please describe the bug and/or send logs.": "Lütfen hatayı tanımlayın ve/veya kayıtları gönderin.",
     "Please install <a href=\"https://www.google.com/chrome\">Chrome</a> or <a href=\"https://getfirefox.com\">Firefox</a> for the best experience.": "Lütfen <a href=\"https://www.google.com/chrome\"> Chrome </a> ya da <a href=\"https://getfirefox.com\"> Firefox </a> 'u en iyi deneyim için yükleyin.",
-    "Please Register": "Lütfen Kaydolun",
     "powered by Matrix": "Matrix tarafından desteklenmektedir",
     "Quote": "Alıntı",
-    "Redact": "Yazıya Dökme",
     "Reject": "Reddet",
     "Remove %(name)s from the directory?": "%(name)s'i dizinden kaldırılsın mı ?",
     "Remove": "Kaldır",
@@ -110,30 +102,25 @@
     "Riot does not know how to join a room on this network": "Riot bu ağdaki bir odaya nasıl gireceğini bilmiyor",
     "Riot is not supported on mobile web. Install the app?": "Riot mobil web'de desteklenmiyor . Uygulamayı yükle ?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot geçerli tarayıcınızda mevcut olmayan veya denemelik olan birçok gelişmiş tarayıcı özelliği kullanıyor.",
-    "Room directory": "Oda dizini",
     "Room not found": "Oda bulunamadı",
     "Search": "Ara",
     "Search…": "Arama…",
     "Search for a room": "Oda ara",
     "Send": "Gönder",
     "Send logs": "Kayıtları gönder",
-    "Settings": "Ayarlar",
     "Source URL": "Kaynak URL",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Üzgünüz , tarayıcınız Riot'u  <b> çalıştıramıyor </b>.",
-    "Start chat": "Sohbet başlat",
     "The Home Server may be too old to support third party networks": "Ana Sunucu 3. parti ağları desteklemek için çok eski olabilir",
     "There are advanced notifications which are not shown here": "Burada gösterilmeyen gelişmiş bildirimler var",
     "The server may be unavailable or overloaded": "Sunucu kullanılamıyor veya aşırı yüklenmiş olabilir",
     "This Room": "Bu Oda",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Bu odaya misafirler tarafından erişilemez . Kaydolursanız katılabilirsiniz.",
-    " to room": " odasına",
     "Unable to fetch notification target list": "Bildirim hedef listesi çekilemedi",
     "Unable to join network": "Ağa bağlanılamıyor",
     "Unable to look up room ID from server": "Sunucudan oda ID'si aranamadı",
     "Unavailable": "Kullanım dışı",
     "Unhide Preview": "Önizlemeyi Göster",
     "Unknown device": "Bilinmeyen aygıt",
-    "unknown error code": "Bilinmeyen hata kodu",
+    "unknown error code": "bilinmeyen hata kodu",
     "Unnamed room": "İsimsiz oda",
     "Update": "Güncelleştirme",
     "Uploaded on %(date)s by %(user)s": "%(user)s tarafında %(date)s e yüklendi",
@@ -148,7 +135,6 @@
     "You cannot delete this image. (%(code)s)": "Bu resmi silemezsiniz. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Bu mesajı silemezsiniz (%(code)s)",
     "You are not receiving desktop notifications": "Masaüstü bildirimleri almıyorsunuz",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Konuk olarak Riotluyorsunuz. Daha fazla odaya ve özelliğe erişmek için <a> Kayıt Ol </a> ya da <a> Oturum Aç </a> !",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Onları Riot dışında bir istemciden yapılandırmış olabilirsiniz . Onları Riot içersinide ayarlayamazsınız ama hala geçerlidirler",
     "Sunday": "Pazar",
     "Monday": "Pazartesi",
@@ -161,7 +147,6 @@
     "Yesterday": "Dün",
     "OK": "Tamam",
     "You need to be using HTTPS to place a screen-sharing call.": "Ekran paylaşımlı arama yapmak için HTTPS kullanıyor olmalısınız.",
-    "Welcome page": "Karşılama sayfası",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "Geçerli tarayıcınız ile birlikte , uygulamanın görünüş ve kullanım hissi tamamen hatalı olabilir ve bazı ya da tüm özellikler çalışmayabilir. Yine de denemek isterseniz devam edebilirsiniz ancak karşılaşabileceğiniz sorunlar karşısında kendi başınasınız !",
     "Welcome to Riot.im": "Riot.im'e Hoş Geldiniz",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Dağıtık , şifreli sohbet &amp; işbirliği ile Matrix tarafından desteklenmektedir",
@@ -191,10 +176,10 @@
     "Dev chat for the Dendrite dev team": "Dendrite Geliştirici Takımı için Geliştirici sohbeti",
     "Co-ordination for Riot/Web translators": "Riot/Web çevirmenleri için koordinasyon",
     "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix'te varolan ağlara (Slack , IRC , Gitter vb.) bağlı ya da bağımsız bir çok oda var . Dizini kontrol edin!",
-    "Failed to change password. Is your password correct?": "Şifre değiştirme başarısız oldu . Şifreniz doğru mu ?",
+    "Failed to change password. Is your password correct?": "Şifreniz değiştirilemedi . Şifreniz doğru mu ?",
     "You have successfully set a password!": "Başarıyla bir şifre ayarladınız!",
     "You can now return to your account after signing out, and sign in on other devices.": "Şimdi oturumunuzu iptal ettikten sonra başka cihazda oturum açarak hesabınıza dönebilirsiniz.",
-    "Continue": "Devam",
+    "Continue": "Devam Et",
     "Please set a password!": "Lütfen bir şifre ayarlayın !",
     "This will allow you to return to your account after signing out, and sign in on other devices.": "Bu oturumunuzu kapattıktan sonra hesabınıza dönmenizi ve diğer cihazlarda oturum açmanızı sağlar.",
     "You have successfully set a password and an email address!": "Başarıyla bir şifre ve e-posta adresi ayarladın !",
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index 59852cf1bc..b017389e0a 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -13,7 +13,6 @@
     "Collapse panel": "Згорнути панель",
     "Collecting app version information": "Збір інформації про версію застосунка",
     "Collecting logs": "Збір журналів",
-    "Create new room": "Створити нову кімнату",
     "Couldn't find a matching Matrix room": "Неможливо знайти відповідну кімнату",
     "Custom Server Options": "Нетипові параметри сервера",
     "customServer_text": "Ви можете скористатись нетиповими параметрами сервера щоб увійти в інші сервери Matrix, зазначивши посилання на окремий Домашній сервер<br/>Це дозволяє вам використовувати Riot із вже існуючою обліковкою Matrix на іншому Домашньому сервері.<br/><br/>Ви також можете зазначити нетиповий сервер ідентифікації, але ви не матимете змоги ані запрошувати користувачів за е-поштою, ані бути запрошеними за е-поштою самі.",
@@ -38,14 +37,12 @@
     "Error saving email notification preferences": "Помилка при збереженні параметрів сповіщень е-поштою",
     "#example": "#зразок",
     "Expand panel": "Розгорнути панель",
-    "Failed to": "Не вдалось",
     "Failed to add tag %(tagName)s to room": "Не вдалось додати до кімнати мітку %(tagName)s",
     "Failed to change settings": "Не вдалось змінити налаштування",
     "Failed to forget room %(errCode)s": "Не вдалось забути кімнату %(errCode)s",
     "Failed to update keywords": "Не вдалось оновити ключові слова",
     "Failed to get protocol list from Home Server": "Не вдалось отримати перелік протоколів з Домашнього серверу",
     "Failed to get public room list": "Не вдалось отримати перелік прилюдних кімнат",
-    "Failed to join the room": "Не вдалося приєднатись до кімнати",
     "Failed to remove tag %(tagName)s from room": "Не вдалося прибрати з кімнати мітку %(tagName)s",
     "Failed to send report: ": "Не вдалося надіслати звіт: ",
     "Failed to set direct chat tag": "Не вдалося встановити мітку прямого чату",
@@ -55,9 +52,7 @@
     "Filter room names": "Відфільтрувати назви кімнат",
     "Forget": "Забути",
     "Forward Message": "Переслати повідомлення",
-    " from room": " з кімнати",
     "Guests can join": "Гості можуть приєднуватися",
-    "Guest users can't invite users. Please register to invite.": "Гості не можуть запрошувати користувачів. Зареєструйтесь, будь ласка, для видачі запрошень.",
     "Hide panel": "Сховати панель",
     "(HTTP status %(httpStatus)s)": "(статус HTTP %(httpStatus)s)",
     "I understand the risks and wish to continue": "Я ознайомлений з ризиками і хочу продовжити",
@@ -87,10 +82,8 @@
     "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "Опишіть, будь ласка, ваду. Що ви зробили? На що ви очікували? Що трапилось натомість?",
     "Please describe the bug and/or send logs.": "Опишіть, будь ласка, ваду та/або надішліть журнали.",
     "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=\"https://www.google.com/chrome\">Chrome</a> або <a href=\"https://getfirefox.com\">Firefox</a>.",
-    "Please Register": "Зареєструйтеся, будь ласка",
     "powered by Matrix": "працює на Matrix",
     "Quote": "Цитувати",
-    "Redact": "Видалити",
     "Reject": "Відмовитись",
     "Remove %(name)s from the directory?": "Прибрати %(name)s з каталогу?",
     "Remove": "Прибрати",
@@ -100,27 +93,21 @@
     "Resend": "Перенадіслати",
     "Riot Desktop on %(platformName)s": "Riot Desktop на %(platformName)s",
     "Call invitation": "Запрошення до виклику",
-    "Drop here %(toAction)s": "Кидайте сюди %(toAction)s",
     "Riot does not know how to join a room on this network": "Riot не знає як приєднатись до кімнати у цій мережі",
     "Riot is not supported on mobile web. Install the app?": "Riot не працює через оглядач на мобільних пристроях. Встановити застосунок?",
     "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot використовує багато новітніх функцій, деякі з яких не доступні або є експериментальними у вашому оглядачі.",
-    "Room directory": "Каталог кімнат",
     "Room not found": "Кімнату не знайдено",
     "Search": "Пошук",
     "Search…": "Пошук…",
     "Search for a room": "Пошук кімнати",
     "Send": "Надіслати",
     "Send logs": "Надіслати журнали",
-    "Settings": "Налаштування",
     "Source URL": "Джерельне посилання",
     "Sorry, your browser is <b>not</b> able to run Riot.": "Вибачте, ваш оглядач <b>не</b> спроможний запустити Riot.",
-    "Start chat": "Почати розмову",
     "The Home Server may be too old to support third party networks": "Домашній сервер може бути застарим для підтримки сторонніх мереж",
     "There are advanced notifications which are not shown here": "Є додаткові сповіщення, що не показуються тут",
     "The server may be unavailable or overloaded": "Сервер може бути недосяжним або перевантаженим",
     "This Room": "Ця кімната",
-    "This room is inaccessible to guests. You may be able to join if you register.": "Ця кімната є недосяжною для гостей. Напевно ви матимете змогу приєднатись, якщо зареєструєтесь.",
-    " to room": " до кімнати",
     "Unable to fetch notification target list": "Неможливо отримати перелік цілей сповіщення",
     "Unable to join network": "Неможливо приєднатись до мережі",
     "Unable to look up room ID from server": "Неможливо знайти ID кімнати на сервері",
@@ -140,7 +127,6 @@
     "You cannot delete this image. (%(code)s)": "Ви не можете видалити це зображення. (%(code)s)",
     "You cannot delete this message. (%(code)s)": "Ви не можете видалити це повідомлення. (%(code)s)",
     "You are not receiving desktop notifications": "Ви не отримуєте сповіщення на стільниці",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "Ви Riot'уєте як гість. <a>Зареєструйтеся</a> або <a>увійдіть</a> щоб мати ширший доступ до кімнат та функцій!",
     "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "Можливо, ви налаштували їх не у Riot, а у іншому застосунку. Ви не можете регулювати їх у Riot, але вони все ще мають силу",
     "Sunday": "Неділя",
     "Monday": "Понеділок",
@@ -153,7 +139,6 @@
     "Yesterday": "Вчора",
     "OK": "Гаразд",
     "You need to be using HTTPS to place a screen-sharing call.": "Ви маєте використовувати HTTPS щоб зробити виклик із поширенням екрану.",
-    "Welcome page": "Ласкаво просимо",
     "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "У вашому оглядачі вигляд застосунку може бути повністю іншим, а деякі або навіть усі функції можуть не працювати. Якщо ви наполягаєте, то можете продовжити користування, але ви маєте впоратись з усіма можливими проблемами власноруч!",
     "Welcome to Riot.im": "Ласкаво просимо до Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Децентралізований, шифрований чат та засіб для співробітництва, що працює на [matrix]",
@@ -194,5 +179,31 @@
     "No rooms to show": "Кімнати відсутні",
     "Noisy": "Шумний",
     "Unavailable": "Нема в наявності",
-    "Unhide Preview": "Відкрити попередній перегляд"
+    "Unhide Preview": "Відкрити попередній перегляд",
+    "Failed to set Direct Message status of room": "Не вдалось встановити статус прямого спілкування в кімнаті",
+    "Messages containing my display name": "Повідомлення,  вміщає моє ім'я",
+    "Running Matrix services": "Запуск служби Matrix",
+    "Set Password": "Задати пароль",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "Сповіщення з наступних ключових слів дотримуються правил, що не можуть бути показані тут:",
+    "To return to your account in future you need to <u>set a password</u>": "Щоб мати змогу використовувати вашу обліковку у майбутньому, <u>зазначте пароль</u>",
+    "Warning": "Попередження",
+    "Checking for an update...": "Перевірка оновлень…",
+    "Error encountered (%(errorDetail)s).": "Трапилась помилка (%(errorDetail)s).",
+    "No update available.": "Оновлення відсутні.",
+    "Downloading update...": "Звантажується оновлення…",
+    "Couldn't load home page": "Не вдалось завантажити домівку",
+    "Back": "Назад",
+    "Bug report sent": "Звіт про помилки відправлений",
+    "Developer Tools": "Інструменти розробника",
+    "Failed to send custom event.": "Не вдалося відправити приватний захід.",
+    "Filter results": "Фільтр результатів",
+    "Send Custom Event": "Відправити приватний захід",
+    "Send Custom State Event": "Відправити статус приватного заходу",
+    "Explore Room State": "Перегляд статуса кімнати",
+    "You must specify an event type!": "Необхідно вказати тип захода!",
+    "Thank you!": "Дякую!",
+    "Event sent!": "Захід відправлено!",
+    "Event Type": "Тип західу",
+    "Event Content": "Зміст заходу",
+    "State Key": "Ключ стану"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index 646cfc68d8..0a1465b4cf 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -4,16 +4,16 @@
     "Notifications": "通知",
     "OK": "确定",
     "Operation failed": "操作失败",
-    "%(appName)s via %(browserName)s on %(osName)s": "应用%(appName)s通过%(osName)s上的%(browserName)s浏览器运行",
-    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a>和<a href=\"http://opera.com\">Opera</a>均可运行。",
+    "%(appName)s via %(browserName)s on %(osName)s": "应用 %(appName)s 通过 %(osName)s 上的 %(browserName)s 浏览器运行",
+    "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> 和 <a href=\"http://opera.com\">Opera</a> 均可运行。",
     "A new version of Riot is available.": "Riot 有更新可用。",
     "Add an email address above to configure email notifications": "请在上方输入电子邮件地址以接收邮件通知",
     "Advanced notification settings": "通知高级设置",
     "All messages": "全部消息",
     "All messages (loud)": "全部消息（高亮）",
-    "All Rooms": "全部房间",
+    "All Rooms": "全部聊天室",
     "All notifications are currently disabled for all targets.": "当前所有目标的通知均已禁用。",
-    "An error occurred whilst saving your email notification preferences.": "保存邮件通知偏好设定时出现错误。",
+    "An error occurred whilst saving your email notification preferences.": "保存邮件通知首选项设定时出现错误。",
     "Call invitation": "语音邀请",
     "Cancel": "取消",
     "Cancel Sending": "取消发送",
@@ -21,14 +21,187 @@
     "Changelog": "变更日志",
     "Collecting app version information": "正在收集应用版本信息",
     "Collecting logs": "正在收集日志",
-    "Create new room": "创建新房间",
-    "Couldn't find a matching Matrix room": "未找到符合的 Matrix 房间",
+    "Couldn't find a matching Matrix room": "未找到符合的 Matrix 聊天室",
     "Custom Server Options": "自定义服务器选项",
-    "customServer_text": "你可以通过指定自定义服务器选项中的其他 Home server URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他 Home server 上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
+    "customServer_text": "你可以通过指定自定义服务器选项中的其他主服务器的 URL 来登录其他 Matrix 服务器。<br/>该选项允许你在 Riot 上使用其他主服务器上的帐号。<br/><br/>你也可以自定义身份验证服务器，但你将不能通过邮件邀请其他用户，同样的，你也不能通过邮件被其他用户邀请。",
     "delete the alias.": "删除别名。",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除房间别名 %(alias)s 并将 %(name)s 从列表中删除吗？",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "确定要删除聊天室别名 %(alias)s 并将 %(name)s 从列表中删除吗？",
     "Describe your problem here.": "在这里描述你的问题。",
-    "Directory": "房间列表",
+    "Directory": "聊天室目录",
     "Dismiss": "设为已读",
-    "Download this file": "下载该文件"
+    "Download this file": "下载该文件",
+    "Collapse panel": "折叠面板",
+    "Direct Chat": "私聊",
+    "Enable audible notifications in web client": "在网页客户端启用音频通知",
+    "Enable desktop notifications": "启用桌面通知",
+    "Enable email notifications": "启用电子邮件通知",
+    "Enable notifications for this account": "为本账号启用通知",
+    "Enable them now": "现在启用",
+    "Enter keywords separated by a comma:": "输入以逗号间隔的关键字：",
+    "Error": "错误",
+    "Error saving email notification preferences": "保存电子邮件通知的首选项时出错",
+    "#example": "#例子",
+    "Expand panel": "展开面板",
+    "Failed to add tag %(tagName)s to room": "无法为聊天室新增标签 %(tagName)s",
+    "Failed to change settings": "变更设置失败",
+    "Failed to forget room %(errCode)s": "无法忘记聊天室 %(errCode)s",
+    "Failed to update keywords": "无法更新关键字",
+    "Failed to get protocol list from Home Server": "无法从主服务器取得协议列表",
+    "Failed to get public room list": "无法取得公开的聊天室列表",
+    "Failed to remove tag %(tagName)s from room": "移除聊天室标签 %(tagName)s 失败",
+    "Failed to send report: ": "无法发送报告： ",
+    "Failed to set direct chat tag": "无法设定私聊标签",
+    "Failed to set Direct Message status of room": "无法设置聊天室的私聊状态",
+    "Favourite": "收藏",
+    "Fetching third party location failed": "获取第三方位置失败",
+    "Files": "文件",
+    "Filter room names": "过滤聊天室名称",
+    "Forget": "忘记",
+    "Forward Message": "转发消息",
+    "Guests can join": "访客可以加入",
+    "Hide panel": "隐藏面板",
+    "(HTTP status %(httpStatus)s)": "(HTTP 状态 %(httpStatus)s)",
+    "I understand the risks and wish to continue": "我了解这些风险并愿意继续",
+    "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:": "为了诊断问题，来自客户端的活动记录会随着这个程序 bug 报告一并发出。如果你只想送出以上文字，请取消勾选：",
+    "Invite to this room": "邀请加入此聊天室",
+    "Keywords": "关键字",
+    "Leave": "离开",
+    "Login": "登录",
+    "Loading bug report module": "正在载入 bug 报告模块",
+    "Low Priority": "低优先级",
+    "Members": "成员",
+    "Mentions only": "只限提及",
+    "Messages containing my display name": "消息中含有我的显示名称",
+    "Messages containing <span>keywords</span>": "消息包含 <span>关键字</span>",
+    "Messages containing my user name": "消息中包含我的用户名",
+    "Messages in group chats": "群组聊天中的消息",
+    "Messages in one-to-one chats": "一对一聊天种的消息",
+    "Messages sent by bot": "由机器人发出的消息",
+    "more": "更多",
+    "No rooms to show": "无聊天室",
+    "Noisy": "吵闹",
+    "Notification targets": "通知目标",
+    "Notifications on the following keywords follow rules which can’t be displayed here:": "以下关键字依照规则将不会在此显示：",
+    "Notify for all other messages/rooms": "为所有其他消息/聊天室显示通知",
+    "Notify me for anything else": "所有消息都通知我",
+    "Off": "关闭",
+    "On": "打开",
+    "Permalink": "永久链接",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "请描述这个 bug，您做了什么动作？预期会发生的状况？以及实际发生的？",
+    "Please describe the bug and/or send logs.": "请描述这个 bug 和/或发送日志。",
+    "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=\"https://www.google.com/chrome\">Chrome</a> 或 <a href=\"https://getfirefox.com\">Firefox</a> 来得到最佳体验。",
+    "powered by Matrix": "由 Matrix 提供",
+    "Quote": "引述",
+    "Reject": "拒绝",
+    "Remove %(name)s from the directory?": "从目录中移除 %(name)s 吗？",
+    "Remove": "移除",
+    "remove %(name)s from the directory.": "从目录中移除 %(name)s。",
+    "Remove from Directory": "从目录中移除",
+    "Report a bug": "报告一个 bug",
+    "Resend": "重新发送",
+    "Riot Desktop on %(platformName)s": "Riot 桌面版在 %(platformName)s",
+    "Riot does not know how to join a room on this network": "Riot 不知道如何在此网络中加入聊天室",
+    "Riot is not supported on mobile web. Install the app?": "Riot 不支持浏览器网页，要安装 app 吗？",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Riot 使用了许多先进的浏览器功能，有些在你目前所用的浏览器上无法使用或仅为实验性的功能。",
+    "Room not found": "找不到聊天室",
+    "Search": "搜索",
+    "Search…": "搜索…",
+    "Search for a room": "搜索聊天室",
+    "Send": "发送",
+    "Send logs": "发送日志",
+    "Source URL": "源网址",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "抱歉，您的浏览器 <b>无法</b> 运行 Riot.",
+    "The Home Server may be too old to support third party networks": "主服务器可能太老旧无法支持第三方网络",
+    "There are advanced notifications which are not shown here": "更多的通知并没有在此显示出来",
+    "The server may be unavailable or overloaded": "服务器可能无法使用或超过负载",
+    "This Room": "此聊天室",
+    "Unable to fetch notification target list": "无法获取通知目标列表",
+    "Unable to join network": "无法加入网络",
+    "Unable to look up room ID from server": "无法在服务器上找到聊天室 ID",
+    "Unavailable": "无法获得",
+    "Unhide Preview": "取消隐藏预览",
+    "Unknown device": "未知设备",
+    "unknown error code": "未知错误代码",
+    "Unnamed room": "未命名的聊天室",
+    "Update": "更新",
+    "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上传",
+    "Uploading report": "上传报告",
+    "View Decrypted Source": "查看解密的来源",
+    "View Source": "查看源码",
+    "What's New": "新鲜事",
+    "What's new?": "有什么新闻？",
+    "Waiting for response from server": "正在等待来自服务器的回应",
+    "When I'm invited to a room": "当我被邀请进入聊天室",
+    "World readable": "公开可读",
+    "You cannot delete this image. (%(code)s)": "您不能删除这个图片。(%(code)s)",
+    "You cannot delete this message. (%(code)s)": "您不能删除此消息。(%(code)s)",
+    "You are not receiving desktop notifications": "您将不会收到桌面通知",
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "您也许不曾在其他 Riot 之外的客户端设置它们。在 Riot 下你无法调整他们但仍然可用",
+    "Sunday": "星期日",
+    "Monday": "星期一",
+    "Tuesday": "星期二",
+    "Wednesday": "星期三",
+    "Thursday": "星期四",
+    "Friday": "星期五",
+    "Saturday": "星期六",
+    "Today": "今天",
+    "Yesterday": "昨天",
+    "Warning": "警告",
+    "Checking for an update...": "正在检查更新…",
+    "Error encountered (%(errorDetail)s).": "遇到错误 (%(errorDetail)s)。",
+    "No update available.": "没有可用更新。",
+    "Downloading update...": "正在下载更新…",
+    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 来放置屏幕分享通话。",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "您目前的浏览器，应用程序的外观和感觉完全不正确，有些或全部功能可能无法使用。如果您仍想继续尝试，可以继续，但请自行负担其后果！",
+    "Welcome to Riot.im": "欢迎来到 Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化，加密聊天  &amp; 由 [matrix] 提供",
+    "Search the room directory": "搜索聊天室目录",
+    "Chat with Riot Bot": "与 Riot 机器人聊天",
+    "Get started with some tips from Riot Bot!": "使用从 Riot 机器人学来的小窍门开始！",
+    "General discussion about Matrix and Riot": "关于 Matrix 与 Riot 的一般讨论",
+    "Discussion of all things Matrix!": "讨论所有关于 Matrix 的事情！",
+    "Riot/Web &amp; Desktop chat": "Riot/Web &amp; 桌面聊天",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk 聊天",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk 聊天",
+    "Matrix technical discussions": "Matrix 技术讨论",
+    "Running Matrix services": "正在运行 Matrix 服务",
+    "Community-run support for Synapse": "运行 Synapse 的社区支持",
+    "Admin support for Dendrite": "Dendrite 的管理员支持",
+    "Announcements about Synapse releases": "Synapse 的发布公告",
+    "Support for those using and running matrix-appservice-irc": "使用与执行 matrix-appservice-irc 的支持",
+    "Building services on Matrix": "正在 Matrix 上建立服务",
+    "Support for those using the Matrix spec": "使用 Matrix 规范的支持",
+    "Design and implementation of E2E in Matrix": "在 Matrix 中 E2E 的设计与实现",
+    "Implementing VR services with Matrix": "使用 Matrix 实现虚拟现实服务",
+    "Implementing VoIP services with Matrix": "使用 Matrix 实现 VoIP 服务",
+    "Discussion of the Identity Service API": "识别服务 API 的讨论",
+    "Support for those using, running and writing other bridges": "那些使用、运行并撰写其他桥接应用的支持",
+    "Contributing code to Matrix and Riot": "贡献程序代码给 Matrix 与 Riot",
+    "Dev chat for the Riot/Web dev team": "Riot/Web 开发团队的开发聊天",
+    "Dev chat for the Dendrite dev team": "Dendrite 的开发团队的开发聊天",
+    "Co-ordination for Riot/Web translators": "Riot/Web 翻译者的协调区",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix 中已有许多聊天室，连接到已有的网络（Slack、IRC 与 Gitter 等）或独立的网络，请查看目录！",
+    "Failed to change password. Is your password correct?": "修改密码失败。确认原密码输入正确吗？",
+    "You have successfully set a password!": "您已成功设置密码！",
+    "You can now return to your account after signing out, and sign in on other devices.": "您可以在注销后回到您的账号，并在其他设备上登录。",
+    "Continue": "继续",
+    "Please set a password!": "请设置密码！",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "这让您可以在注销后回到您的账号，并在其他设备上登录。",
+    "You have successfully set a password and an email address!": "您已经成功设置了密码和电子邮件地址！",
+    "Remember, you can always set an email address in user settings if you change your mind.": "请记住，如果您改变想法，您永远可以在用户设置中设置电子邮件。",
+    "To return to your account in future you need to <u>set a password</u>": "要在未来回到您的账号，您需要 <u>设置密码</u>",
+    "Set Password": "设置密码",
+    "Couldn't load home page": "不能加载首页",
+    "Bug report sent": "发送DEBUG报告",
+    "Thank you!": "谢谢！",
+    "Developer Tools": "开发者工具",
+    "Failed to send custom event.": "发送自定义事件失败。",
+    "Filter results": "过滤结果",
+    "Send Custom Event": "发送自定义事件",
+    "Send Custom State Event": "发送自定义状态事件",
+    "You must specify an event type!": "你必须制定一个事件类型！",
+    "Event sent!": "事件已发出！",
+    "Event Type": "事件类型",
+    "Event Content": "事件内容",
+    "State Key": "状态密钥"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 5b22640d87..881adc7aa1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -1,48 +1,43 @@
 {
-    "Direct Chat": "私聊",
-    "Drop here %(toAction)s": "拖拽到這里 %(toAction)s",
+    "Direct Chat": "私人聊天",
     "Error": "錯誤",
     "Failed to forget room %(errCode)s": "無法忘記聊天室 %(errCode)s",
-    "Failed to join the room": "無法加入此聊天室",
-    "Favourite": "收藏",
-    "Search": "搜索",
-    "Settings": "設置",
+    "Favourite": "我的最愛",
+    "Search": "搜尋",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s 透過 %(browserName)s 在 %(osName)s",
     "<a href=\"http://apple.com/safari\">Safari</a> and <a href=\"http://opera.com\">Opera</a> work too.": "<a href=\"http://apple.com/safari\">Safari</a> 與 <a href=\"http://opera.com\">Opera</a> 也能使用。",
     "Advanced notification settings": "進階通知設定",
     "All messages": "所有訊息",
-    "All messages (loud)": "所有訊息 (loud)",
+    "All messages (loud)": "所有訊息（吵鬧）",
     "All Rooms": "所有的聊天室",
     "Call invitation": "通話邀請",
     "Cancel": "取消",
     "Cancel Sending": "取消傳送",
-    "Can't update user notification settings": "無法更新用戶的通知設定",
+    "Can't update user notification settings": "無法更新使用者的通知設定",
     "Changelog": "變更記錄",
     "Close": "關閉",
-    "Collapse panel": "閤上面版",
+    "Collapse panel": "摺疊面板",
     "Collecting logs": "收集記錄",
-    "Create new room": "開設新聊天室",
     "Couldn't find a matching Matrix room": "不能找到符合 Matrix 的聊天室",
-    "Custom Server Options": "自定伺服器選項",
-    "delete the alias.": "刪除別名",
-    "Describe your problem here.": "在此描述你的問題",
+    "Custom Server Options": "自訂伺服器選項",
+    "delete the alias.": "刪除別名。",
+    "Describe your problem here.": "在此描述你的問題。",
     "Directory": "目錄",
     "Dismiss": "無視",
     "Download this file": "下載這個檔案",
     "Enable desktop notifications": "啟用桌面通知",
-    "Enable email notifications": "啟用電郵通知",
+    "Enable email notifications": "啟用電子郵件通知",
     "Enable notifications for this account": "本帳號啟用通知",
     "Enable them now": "現在啟用它們",
-    "#example": "#例子",
-    "Expand panel": "擴充面版",
-    "Failed to": "失敗於",
+    "#example": "#範例",
+    "Expand panel": "展開面板",
     "Failed to change settings": "變更設定失敗",
     "Failed to update keywords": "無法更新關鍵字",
     "Members": "成員",
-    "Mentions only": "只有提到",
+    "Mentions only": "僅提及",
     "Messages containing my display name": "訊息中有包含我的顯示名稱",
     "Messages containing <span>keywords</span>": "訊息包含 <span>關鍵字</span>",
-    "Messages containing my user name": "訊息中有我的用戶名",
+    "Messages containing my user name": "訊息中有我的使用者名稱",
     "Messages in group chats": "在群組聊天中的訊息",
     "Messages in one-to-one chats": "在一對一聊天中的訊息",
     "Messages sent by bot": "由機器人送出的訊息",
@@ -54,38 +49,34 @@
     "Off": "關閉",
     "On": "開啟",
     "Operation failed": "操作失敗",
-    "powered by Matrix": "由Matrix架設",
+    "powered by Matrix": "由 Matrix 架設",
     "Quote": "引述",
     "Remove": "移除",
-    "Resend": "重新送出",
-    "Room directory": "聊天室目錄",
-    "Room not found": "未找到聊天室",
-    "Search…": "搜尋...",
+    "Resend": "重新傳送",
+    "Room not found": "找不到聊天室",
+    "Search…": "搜尋…",
     "Search for a room": "搜尋聊天室",
-    "Send": "送出",
-    "Send logs": "送出記錄",
+    "Send": "傳送",
+    "Send logs": "傳送記錄",
     "Source URL": "來源網址",
-    "Start chat": "開始聊天",
     "This Room": "這個聊天室",
-    "This room is inaccessible to guests. You may be able to join if you register.": "這個聊天室不對訪客開放，要加入須先註冊。",
-    " to room": "到聊天室",
     "Unable to join network": "無法加入網路",
     "Unable to look up room ID from server": "無法從伺服器找到聊天室 ID",
     "Unavailable": "無法取得",
-    "Unhide Preview": "不隱藏預覽",
-    "Unknown device": "不知名的設備",
+    "Unhide Preview": "取消隱藏預覽",
+    "Unknown device": "未知裝置",
     "unknown error code": "未知的錯誤代碼",
-    "Unnamed room": "無名的聊天室",
+    "Unnamed room": "無命名的聊天室",
     "Update": "更新",
-    "Uploaded on %(date)s by %(user)s": "由 %(user)s　在 %(date)s 更新",
+    "Uploaded on %(date)s by %(user)s": "由 %(user)s 在 %(date)s 上傳",
     "Uploading report": "上傳報告",
-    "View Decrypted Source": "檢示解密的來源",
-    "View Source": "檢示來源",
+    "View Decrypted Source": "檢視解密的來源",
+    "View Source": "檢視來源",
     "What's New": "新鮮事",
     "What's new?": "有什麼新聞？",
-    "Waiting for response from server": "等候來自伺服器的回應",
+    "Waiting for response from server": "正在等待來自伺服器的回應",
     "When I'm invited to a room": "當我被邀請加入聊天室",
-    "You cannot delete this message. (%(code)s)": "你不能刪除這個訊息 (%(code)s)",
+    "You cannot delete this message. (%(code)s)": "你不能刪除這個訊息。(%(code)s)",
     "Sunday": "星期日",
     "Monday": "星期一",
     "Tuesday": "星期二",
@@ -95,70 +86,127 @@
     "Saturday": "星期六",
     "Today": "今天",
     "Yesterday": "昨天",
-    "OK": "OK",
-    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用　HTTPS 來置放畫面分享的通話。",
-    "Welcome page": "歡迎頁",
-    "A new version of Riot is available.": "Riot 發佈了新版本",
-    "Add an email address above to configure email notifications": "在上面新增電子郵件以設定電郵通知",
-    "All notifications are currently disabled for all targets.": "目前所有的通知功能已取消",
-    "An error occurred whilst saving your email notification preferences.": "在儲存你的電郵通知偏好時發生錯誤",
+    "OK": "確定",
+    "You need to be using HTTPS to place a screen-sharing call.": "你需要使用 HTTPS 來放置螢幕分享的通話。",
+    "A new version of Riot is available.": "Riot 釋出了新版本。",
+    "Add an email address above to configure email notifications": "在上面新增電子郵件以設定電子郵件通知",
+    "All notifications are currently disabled for all targets.": "目前所有的通知功能已停用。",
+    "An error occurred whilst saving your email notification preferences.": "在儲存你的電子郵件通知偏好時發生錯誤。",
     "Collecting app version information": "收集應用程式版本資訊",
-    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "刪除聊天室別名 %(alias)s並從目錄移除 %(name)s",
-    "Enable audible notifications in web client": "在網頁客戶端設定聲音通知",
-    "Enter keywords separated by a comma:": "輸入關鍵字以逼號,區隔",
-    "Error saving email notification preferences": "儲存電郵通知偏好時出錯",
+    "Delete the room alias %(alias)s and remove %(name)s from the directory?": "刪除聊天室別名 %(alias)s 並從目錄移除 %(name)s？",
+    "Enable audible notifications in web client": "在網頁客戶端啟用音訊通知",
+    "Enter keywords separated by a comma:": "輸入以逗號隔開的關鍵字：",
+    "Error saving email notification preferences": "儲存電子郵件通知偏好設定時出錯",
     "Failed to add tag %(tagName)s to room": "無法為聊天室新增標籤 %(tagName)s",
-    "Failed to get protocol list from Home Server": "無法從主機伺服器取得協議清單",
+    "Failed to get protocol list from Home Server": "無法從主機伺服器取得協定清單",
     "Failed to get public room list": "無法取得公開的聊天室清單",
     "Failed to remove tag %(tagName)s from room": "移除聊天室的標籤 %(tagName)s 失敗",
-    "Failed to send report: ": "無法傳送報告:",
-    "Failed to set direct chat tag": "無法設定直接聊天標籤",
-    "Failed to set Direct Message status of room": "無法設定聊天室的私訊狀態",
+    "Failed to send report: ": "無法傳送報告： ",
+    "Failed to set direct chat tag": "無法設定私人聊天標籤",
+    "Failed to set Direct Message status of room": "無法設定聊天室的私人訊息狀態",
     "Fetching third party location failed": "抓取第三方位置失敗",
     "Files": "檔案",
     "Filter room names": "過濾聊天室名稱",
     "Forget": "忘記",
     "Forward Message": "轉寄訊息",
-    " from room": "來自聊天室",
     "Guests can join": "訪客可以加入",
-    "Guest users can't invite users. Please register to invite.": "訪客不能邀請用戶，請先註冊再行邀請。",
     "Hide panel": "隱藏面板",
     "I understand the risks and wish to continue": "我了解這些風險並願意繼續",
     "Invite to this room": "邀請加入這個聊天室",
     "Keywords": "關鍵字",
     "Leave": "離開",
-    "Loading bug report module": "載入程式臭蟲報告模組",
-    "Low Priority": "低度優先",
-    "Notify for all other messages/rooms": "通知所有其它的訊息/聊天室",
+    "Loading bug report module": "正在載入程式臭蟲報告模組",
+    "Low Priority": "低優先度",
+    "Notify for all other messages/rooms": "通知其他所有的訊息/聊天室",
     "Notify me for anything else": "所有消息都通知我",
-    "Permalink": "永久鏈接",
+    "Permalink": "永久連結",
     "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=\"https://www.google.com/chrome\">Chrome</a> 或 <a href=\"https://getfirefox.com\">Firefox</a> 來取得最佳體驗。",
-    "Please Register": "請註冊",
-    "Redact": "纂輯\t",
     "Reject": "拒絕",
     "Remove %(name)s from the directory?": "自目錄中移除 %(name)s？",
-    "remove %(name)s from the directory.": "自目錄中移除 %(name)s",
+    "remove %(name)s from the directory.": "自目錄中移除 %(name)s。",
     "Remove from Directory": "自目錄中移除",
     "Report a bug": "回報程式臭蟲",
-    "Riot Desktop on %(platformName)s": "Riot 在 %(platformName)s 桌面",
+    "Riot Desktop on %(platformName)s": "Riot 桌面版在 %(platformName)s",
     "Riot does not know how to join a room on this network": "Riot 不知道如何在此網路中加入聊天室",
-    "Sorry, your browser is <b>not</b> able to run Riot.": "可惜你的瀏覽器 <b>無法</b> 執行 Riot.",
+    "Sorry, your browser is <b>not</b> able to run Riot.": "可惜，您的瀏覽器 <b>無法</b> 執行 Riot.",
     "The Home Server may be too old to support third party networks": "主機伺服器可能太老舊無法支援第三方網路",
-    "The server may be unavailable or overloaded": "伺服器可能過載或無法連取",
+    "The server may be unavailable or overloaded": "伺服器可能無法使用或是超過負載",
     "Unable to fetch notification target list": "無法抓取通知的目標清單",
-    "customServer_text": "你可以使用自定伺服器選項來登入其它的 Matrix 伺服器，只要在在主機伺服器網址上指定其網址資料。<br/>這可讓你透過已有的 Matrix 帳號在不同的主機伺服器上使用  Riot。<br/><br/>你也可以設定自定的識別伺服器但你將無法透過電子郵件來邀請用戶或是以自己的電子郵件來接受別人的邀請。",
-    "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:": "為了診斷問題，來自客戶的活動記錄會隨著這個程式臭蟲報告一起送出。如果你只想送出以上文字，請取消勾選：",
-    "Notification targets": "通知標的",
+    "customServer_text": "你可以使用自訂伺服器選項來登入其它的 Matrix 伺服器，只要在在主機伺服器網址上指定其網址資料。<br/>這可讓你透過已有的 Matrix 帳號在不同的主機伺服器上使用  Riot。<br/><br/>你也可以設定自定的識別伺服器但你將無法透過電子郵件來邀請用戶或是以自己的電子郵件來接受別人的邀請。",
+    "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:": "為了診斷問題，來自客戶端的活動記錄會隨著這個程式臭蟲報告一起送出。如果你只想送出以上文字，請取消勾選：",
+    "Notification targets": "通知目標",
     "Notifications on the following keywords follow rules which can’t be displayed here:": "以下關鍵字依照規則其通知將不會顯示在此：",
-    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "請描述這個程式臭蟲，你作了什麼動作？你預期會發生什麼狀況？以及實際發生的狀況為何？",
+    "Please describe the bug. What did you do? What did you expect to happen? What actually happened?": "請描述這個程式臭蟲，您做了什麼動作？您預期會發生什麼狀況？以及實際發生的狀況為何？",
     "Please describe the bug and/or send logs.": "請描述這個程式臭蟲以及／或送出活動記錄。",
-    "Riot is not supported on mobile web. Install the app?": "Riot 不支援行動網頁，要下載應用程式嗎？",
-    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Roit 使用了許多先進的瀏覽器功能，有些在你目前所用的瀏覽器上無法使用或僅為試驗效能。",
-    "There are advanced notifications which are not shown here": "有些進階的通知並未在此顯現",
-    "World readable": "全世界可讀",
-    "You cannot delete this image. (%(code)s)": "你不能刪除這個圖片(%(code)s)",
+    "Riot is not supported on mobile web. Install the app?": "Riot 不支援行動版網頁，要安裝應用程式嗎？",
+    "Riot uses many advanced browser features, some of which are not available or experimental in your current browser.": "Roit 使用了許多先進的瀏覽器功能，有些在你目前所用的瀏覽器上無法使用或僅為實驗中的功能。",
+    "There are advanced notifications which are not shown here": "有些進階的通知並未在此顯示",
+    "World readable": "公開可讀",
+    "You cannot delete this image. (%(code)s)": "你不能刪除這個圖片。(%(code)s)",
     "You are not receiving desktop notifications": "你將不會收到桌面通知",
-    "You are Rioting as a guest. <a>Register</a> or <a>sign in</a> to access more rooms and features!": "你目前以訪客身份使用 Riot  <a>註冊</a> 或 <a>登錄</a> 來使用更多聊天室和功能！",
-    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "你也許不曾在其它Riot之外的客戶端設定它們，在 Riot底下你無法調它們但其仍然可用",
-    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "你目前的瀏覽器，其應用程式的外觀和感覺可能完全不正確，有些或全部功能可以無法使用。如果你仍想試，可以繼續但得自負後果。"
+    "You might have configured them in a client other than Riot. You cannot tune them in Riot but they still apply": "你也許不曾在其它 Riot 之外的客戶端設定它們。在 Riot 底下你無法調整它們但其仍然可用",
+    "With your current browser, the look and feel of the application may be completely incorrect, and some or all features may not function. If you want to try it anyway you can continue, but you are on your own in terms of any issues you may encounter!": "您目前的瀏覽器，其應用程式的外觀和感覺可能完全不正確，有些或全部功能可以無法使用。如果您仍想要繼續嘗試，可以繼續，但必須自行承擔後果！",
+    "(HTTP status %(httpStatus)s)": "(HTTP 狀態 %(httpStatus)s)",
+    "Login": "登入",
+    "Warning": "警告",
+    "Checking for an update...": "正在檢查更新...",
+    "Error encountered (%(errorDetail)s).": "遇到錯誤 (%(errorDetail)s)。",
+    "No update available.": "沒有可用的更新。",
+    "Downloading update...": "正在下䵧更新...",
+    "Welcome to Riot.im": "歡迎來到 Riot.im",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "去中心化、加密聊天 &amp; 由 [matrix] 提供協作",
+    "Search the room directory": "搜尋聊天室目錄",
+    "Chat with Riot Bot": "與 Riot 機器人聊天",
+    "Get started with some tips from Riot Bot!": "使用從 Riot 機器人來的一些訣竅開始！",
+    "General discussion about Matrix and Riot": "關於 Matrix 與 Riot 的一般討論",
+    "Discussion of all things Matrix!": "討論所有關於 Matrix 的事情！",
+    "Riot/Web &amp; Desktop chat": "Riot/網路 &amp; 桌面聊天",
+    "Riot/iOS &amp; matrix-ios-sdk chat": "Riot/iOS &amp; matrix-ios-sdk 聊天",
+    "Riot/Android &amp; matrix-android-sdk chat": "Riot/Android &amp; matrix-android-sdk 聊天",
+    "Matrix technical discussions": "Matrix 技術討論",
+    "Running Matrix services": "正在執行 Matrix 服務",
+    "Community-run support for Synapse": "Synapse 的社群支援",
+    "Admin support for Dendrite": "Dendrite 的管理員支援",
+    "Announcements about Synapse releases": "關於 Synapse 釋出的公告",
+    "Support for those using and running matrix-appservice-irc": "使用與執行 matrix-appservice-irc 的支援",
+    "Building services on Matrix": "正在 Matrix 上建立服務",
+    "Support for those using the Matrix spec": "那些使用 Matrix 規範的支援",
+    "Design and implementation of E2E in Matrix": "在 Matrix 中 E2E 的設計與實作",
+    "Implementing VR services with Matrix": "使用 Matrix 實作虛擬實境服務",
+    "Implementing VoIP services with Matrix": "使用 Matrix 實作 VoIP 服務",
+    "Discussion of the Identity Service API": "識別服務 API 的討論",
+    "Support for those using, running and writing other bridges": "那些使用、執行與撰寫其他橋接的支援",
+    "Contributing code to Matrix and Riot": "貢獻程式碼給 Matrix 與 Riot",
+    "Dev chat for the Riot/Web dev team": "Riot/Web 開發團隊的開發聊天",
+    "Dev chat for the Dendrite dev team": "Dendrite 開發團隊的開發聊天",
+    "Co-ordination for Riot/Web translators": "Riot/Web 翻譯者的協調區",
+    "Lots of rooms already exist in Matrix, linked to existing networks (Slack, IRC, Gitter etc) or independent. Check out the directory!": "Matrix 中已有許多聊天室，連結到已有的網路（Slack、IRC 與 Gitter 等等）或是獨立的網路。看看目錄！",
+    "Failed to change password. Is your password correct?": "變更密碼失敗。您的密碼正確嗎？",
+    "You have successfully set a password!": "您已經成功設定密碼！",
+    "You can now return to your account after signing out, and sign in on other devices.": "您可以在登出後回到您的帳號，並在其他裝置上登入。",
+    "Continue": "繼續",
+    "Please set a password!": "請設定密碼！",
+    "This will allow you to return to your account after signing out, and sign in on other devices.": "這讓您可以在登入後回到您帳號，並在其他裝置上登入。",
+    "You have successfully set a password and an email address!": "您已經成功設定密碼與電子郵件地址！",
+    "Remember, you can always set an email address in user settings if you change your mind.": "記住，如果您改變心意了，您永遠可以在使用者設定中設定電子郵件地址。",
+    "To return to your account in future you need to <u>set a password</u>": "要在未來回到您的帳號，您需要 <u>設定密碼</u>",
+    "Set Password": "設定密碼",
+    "Couldn't load home page": "無法載入首頁",
+    "Bug report sent": "已傳送臭蟲回報",
+    "Thank you!": "感謝您！",
+    "Back": "返回",
+    "Developer Tools": "開發者工具",
+    "Failed to send custom event.": "傳送自訂式件失敗。",
+    "Send Custom Event": "傳送自訂事件",
+    "Send Custom State Event": "傳送自訂狀態事件",
+    "Explore Room State": "探索聊天室狀態",
+    "Event sent!": "事件已傳送！",
+    "Event Type": "事件類型",
+    "Event Content": "事件內容",
+    "State Key": "狀態金鑰",
+    "Filter results": "過濾結果",
+    "You must specify an event type!": "您必須指定事件類型！",
+    "Show message in desktop notification": "在桌面通知中顯示訊息",
+    "Pin Message": "釘選訊息",
+    "Unpin Message": "取消釘選訊息"
 }
diff --git a/src/notifications/VectorPushRulesDefinitions.js b/src/notifications/VectorPushRulesDefinitions.js
index df6db6c354..6f72164265 100644
--- a/src/notifications/VectorPushRulesDefinitions.js
+++ b/src/notifications/VectorPushRulesDefinitions.js
@@ -16,6 +16,8 @@ limitations under the License.
 
 'use strict';
 
+import { _td } from 'matrix-react-sdk/lib/languageHandler';
+
 var StandardActions = require('./StandardActions');
 var PushRuleVectorState = require('./PushRuleVectorState');
 
@@ -65,7 +67,7 @@ module.exports = {
     // Messages containing user's display name
     ".m.rule.contains_display_name": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages containing my display name", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages containing my display name"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
@@ -76,7 +78,7 @@ module.exports = {
     // Messages containing user's username (localpart/MXID)
     ".m.rule.contains_user_name": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages containing my user name", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages containing my user name"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: { // The actions for each vector state, or null to disable the rule.
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_HIGHLIGHT_DEFAULT_SOUND,
@@ -87,7 +89,7 @@ module.exports = {
     // Messages just sent to the user in a 1:1 room
     ".m.rule.room_one_to_one": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Messages in one-to-one chats", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages in one-to-one chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -100,7 +102,7 @@ module.exports = {
     // By opposition, all other room messages are from group chat rooms.
     ".m.rule.message": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Messages in group chats", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages in group chats"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -111,7 +113,7 @@ module.exports = {
     // Invitation for the user
     ".m.rule.invite_for_me": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "When I'm invited to a room", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("When I'm invited to a room"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_DEFAULT_SOUND,
@@ -122,7 +124,7 @@ module.exports = {
     // Incoming call
     ".m.rule.call": new VectorPushRuleDefinition({
         kind: "underride",
-        description: "Call invitation", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Call invitation"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             on: StandardActions.ACTION_NOTIFY,
             loud: StandardActions.ACTION_NOTIFY_RING_SOUND,
@@ -133,7 +135,7 @@ module.exports = {
     // Notifications from bots
     ".m.rule.suppress_notices": new VectorPushRuleDefinition({
         kind: "override",
-        description: "Messages sent by bot", // passed through _t() translation in src/components/views/settings/Notifications.js
+        description: _td("Messages sent by bot"), // passed through _t() translation in src/components/views/settings/Notifications.js
         vectorStateToActions: {
             // .m.rule.suppress_notices is a "negative" rule, we have to invert its enabled value for vector UI
             on: StandardActions.ACTION_DISABLED,
diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index 5b1d1de6f1..a9b8092848 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -38,8 +38,8 @@ body {
     -webkit-font-smoothing: subpixel-antialiased;
 }
 
-div.error {
-    color: red;
+div.error, div.warning {
+    color: $warning-color;
 }
 
 h2 {
@@ -87,6 +87,11 @@ textarea {
     transition: opacity 0.2s ease-in-out;
 }
 
+.mx_fadable.mx_fadable_faded {
+    opacity: 0.3;
+    pointer-events: none;
+}
+
 /* XXX: critical hack to GeminiScrollbar to allow them to work in FF 42 and Chrome 48.
    Stop the scrollbar view from pushing out the container's overall sizing, which causes
    flexbox to adapt to the new size and cause the view to keep growing.
@@ -306,3 +311,24 @@ textarea {
 .changelog_text {
     font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
 }
+
+.mx_Beta {
+    color: red;
+    margin-right: 10px;
+    position: relative;
+    top: -3px;
+    background-color: white;
+    padding: 0 4px;
+    border-radius: 3px;
+    border: 1px solid darkred;
+    cursor: help;
+    transition-duration: 200ms;
+    font-size: smaller;
+    filter: opacity(0.5);
+}
+
+.mx_Beta:hover {
+    color: white;
+    border: 1px solid gray;
+    background-color: darkred;
+}
diff --git a/src/skins/vector/css/_components.scss b/src/skins/vector/css/_components.scss
index aef7f6db7b..82c2c18641 100644
--- a/src/skins/vector/css/_components.scss
+++ b/src/skins/vector/css/_components.scss
@@ -3,8 +3,10 @@
 @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/_GroupView.scss";
 @import "./matrix-react-sdk/structures/_LoginBox.scss";
 @import "./matrix-react-sdk/structures/_MatrixChat.scss";
+@import "./matrix-react-sdk/structures/_MyGroups.scss";
 @import "./matrix-react-sdk/structures/_NotificationPanel.scss";
 @import "./matrix-react-sdk/structures/_RoomStatusBar.scss";
 @import "./matrix-react-sdk/structures/_RoomView.scss";
@@ -17,7 +19,10 @@
 @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/_CreateGroupDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_QuestionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
 @import "./matrix-react-sdk/views/elements/_AccessibleButton.scss";
@@ -25,10 +30,13 @@
 @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/_EditableItemList.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/elements/_RoleButton.scss";
+@import "./matrix-react-sdk/views/groups/_GroupInviteTile.scss";
+@import "./matrix-react-sdk/views/groups/_GroupRoomList.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";
@@ -38,6 +46,7 @@
 @import "./matrix-react-sdk/views/messages/_RoomAvatarEvent.scss";
 @import "./matrix-react-sdk/views/messages/_TextualEvent.scss";
 @import "./matrix-react-sdk/views/messages/_UnknownBody.scss";
+@import "./matrix-react-sdk/views/rooms/_AppsDrawer.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";
@@ -53,13 +62,14 @@
 @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 "./matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss";
+@import "./matrix-react-sdk/views/rooms/_PinnedEventTile.scss";
 @import "./vector-web/_fonts.scss";
 @import "./vector-web/structures/_CompatibilityPage.scss";
 @import "./vector-web/structures/_HomePage.scss";
@@ -71,6 +81,7 @@
 @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/dialogs/_DevtoolsDialog.scss";
 @import "./vector-web/views/dialogs/_SetEmailDialog.scss";
 @import "./vector-web/views/dialogs/_SetPasswordDialog.scss";
 @import "./vector-web/views/directory/_NetworkDropdown.scss";
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
new file mode 100644
index 0000000000..1a92fc1008
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -0,0 +1,308 @@
+/*
+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_GroupView {
+    max-width: 960px;
+    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+
+.mx_GroupView_error {
+    margin: auto;
+}
+
+.mx_GroupView_header {
+    max-width: 960px;
+    min-height: 70px;
+    align-items: center;
+    display: flex;
+    padding-bottom: 10px;
+}
+
+.mx_GroupView_header_view {
+    border-bottom: 1px solid $primary-hairline-color;
+    padding-bottom: 0px;
+}
+
+.mx_GroupView_header_avatar, .mx_GroupView_header_info {
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.mx_GroupHeader_button {
+    margin-left: 12px;
+    cursor: pointer;
+}
+
+.mx_GroupHeader_button object {
+    // prevents clicks from being swallowed by svg in 'object' tag
+    pointer-events: none;
+}
+
+.mx_GroupView_editable {
+    border-bottom: 1px solid $strong-input-border-color ! important;
+    min-width: 150px;
+    cursor: text;
+}
+
+.mx_GroupView_editable:focus {
+    border-bottom: 1px solid $accent-color ! important;
+    outline: none;
+    box-shadow: none;
+}
+
+.mx_GroupView_header_name:hover div:not(.mx_GroupView_editable) {
+    color: $accent-color;
+    cursor: pointer;
+}
+
+.mx_GroupView_avatarPicker {
+    position: relative;
+}
+
+.mx_GroupView_avatarPicker_edit {
+    position: absolute;
+    top: 50px;
+    left: 15px;
+}
+
+.mx_GroupView_avatarPicker .mx_Spinner {
+    width: 48px;
+    height: 48px ! important;
+}
+
+.mx_GroupView_header_leftCol {
+    flex: 1;
+}
+
+.mx_GroupView_header_rightCol {
+    display: flex;
+    align-items: center;
+}
+
+.mx_GroupView_textButton {
+    display: inline-block;
+}
+
+.mx_GroupView_header_groupid {
+    font-weight: normal;
+    font-size: initial;
+    padding-left: 10px;
+}
+
+.mx_GroupView_header_name {
+    vertical-align: middle;
+    width: 100%;
+    height: 31px;
+    overflow: hidden;
+    color: $primary-fg-color;
+    font-weight: bold;
+    font-size: 22px;
+    padding-left: 19px;
+    padding-right: 16px;
+    /* why isn't text-overflow working? */
+    text-overflow: ellipsis;
+    border-bottom: 1px solid transparent;
+}
+
+.mx_GroupView_header_shortDesc {
+    vertical-align: bottom;
+    float: left;
+    max-height: 42px;
+    color: $settings-grey-fg-color;
+    font-weight: 300;
+    font-size: 13px;
+    padding-left: 19px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    border-bottom: 1px solid transparent;
+}
+
+.mx_GroupView_avatarPicker_label {
+    cursor: pointer;
+}
+
+.mx_GroupView_cancelButton {
+    padding-left: 8px;
+}
+
+.mx_GroupView_cancelButton img {
+    position: relative;
+    top: 5px;
+}
+
+.mx_GroupView_body  {
+    flex-grow: 1;
+}
+
+.mx_GroupView_rooms {
+    flex-grow: 1;
+    display: flex;
+    flex-direction: column;
+    min-height: 200px;
+    user-select: none;
+}
+
+.mx_GroupView h3 {
+    text-transform: uppercase;
+    color: $h3-color;
+    font-weight: 600;
+    font-size: 13px;
+    margin-bottom: 10px;
+}
+
+.mx_GroupView_rooms_header .mx_AccessibleButton {
+    padding-left: 14px;
+    margin-bottom: 14px;
+    height: 24px;
+}
+
+.mx_GroupView_group {
+    border-top: 1px solid $primary-hairline-color;
+}
+
+.mx_GroupView_group_disabled {
+    opacity: 0.3;
+    pointer-events: none;
+}
+
+.mx_GroupView_rooms_header_addRow_button {
+    display: inline-block;
+}
+
+.mx_GroupView_rooms_header_addRow_button object {
+    pointer-events: none;
+}
+
+.mx_GroupView_rooms_header_addRow_label {
+    display: inline-block;
+    vertical-align: top;
+    line-height: 24px;
+    padding-left: 28px;
+    color: $accent-color;
+}
+
+.mx_GroupView_rooms .mx_RoomDetailList {
+    flex-grow: 1;
+    border-top: 1px solid $primary-hairline-color;
+    padding-top: 10px;
+}
+
+.mx_GroupView .mx_RoomView_messageListWrapper {
+    justify-content: flex-start;
+}
+
+.mx_GroupView_membershipSection {
+    color: $greyed-fg-color;
+}
+
+.mx_GroupView_membershipSubSection {
+    justify-content: space-between;
+    display: flex;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+.mx_GroupView_membershipSection_description {
+    /* To match textButton */
+    line-height: 34px;
+}
+
+.mx_GroupView_membershipSection .mx_GroupView_textButton {
+    margin-right: 0px;
+    margin-top: 0px;
+    margin-left: 8px;
+}
+
+.mx_GroupView_memberSettings_toggle label {
+    cursor: pointer;
+    user-select: none;
+}
+
+.mx_GroupView_memberSettings input {
+    margin-right: 6px;
+}
+
+.mx_GroupView_featuredThings {
+    margin-top: 20px;
+}
+
+.mx_GroupView_featuredThings_header {
+    font-weight: bold;
+    font-size: 120%;
+    margin-bottom: 20px;
+}
+
+.mx_GroupView_featuredThings_category {
+    font-weight: bold;
+    font-size: 110%;
+    margin-top: 10px;
+}
+
+.mx_GroupView_featuredThings_container {
+    display: flex;
+}
+
+.mx_GroupView_featuredThings_addButton,
+.mx_GroupView_featuredThing {
+    display: table-cell;
+    text-align: center;
+
+    width: 100px;
+    margin: 0px 20px;
+}
+
+.mx_GroupView_featuredThing {
+    position: relative;
+}
+
+.mx_GroupView_featuredThing .mx_GroupView_featuredThing_deleteButton {
+    position: absolute;
+    top: -7px;
+    right: 11px;
+    opacity: 0.4;
+}
+
+.mx_GroupView_featuredThing .mx_BaseAvatar {
+    /* To prevent misalignment with mx_TintableSvg (in addButton) */
+    vertical-align: initial;
+}
+
+.mx_GroupView_featuredThings_addButton object {
+    pointer-events: none;
+}
+
+.mx_GroupView_featuredThing_name {
+    word-wrap: break-word;
+}
+
+.mx_GroupView_uploadInput {
+    display: none;
+}
+
+.mx_GroupView_body .gm-scroll-view > *{
+    margin: 0px 50px 11px 68px;
+}
+
+.mx_GroupView_groupDesc textarea {
+    width: 50%;
+    height: 150px;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
index 92d8833bc6..7f6199c451 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_LoginBox {
+    min-height: 24px;
+    height: unset !important;
+    padding-top: 13px !important;
+    padding-bottom: 14px !important;
+}
+
 .mx_LoginBox_loginButton_wrapper {
     text-align: center;
     width: 100%;
@@ -21,13 +28,13 @@ limitations under the License.
 
 .mx_LoginBox_loginButton,
 .mx_LoginBox_registerButton {
-    margin-top: -8px;
+    margin-top: 3px;
     height: 40px;
     border: 0px;
     border-radius: 40px;
     margin-left: 4px;
     margin-right: 4px;
-    width: 80px;
+    min-width: 80px;
 
     background-color: $accent-color;
     color: $primary-bg-color;
@@ -35,4 +42,6 @@ limitations under the License.
     cursor: pointer;
 
     font-size: 15px;
+    padding: 0 11px;
+    word-break: break-word;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
new file mode 100644
index 0000000000..ddcf46fb47
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
@@ -0,0 +1,123 @@
+/*
+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_MyGroups {
+    max-width: 960px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_MyGroups .mx_RoomHeader_simpleHeader {
+    margin-left: 0px;
+}
+
+.mx_MyGroups_header {
+    /* Keep mid-point of create button aligned with icon in page header */
+    margin-left: 2px;
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.mx_MyGroups_headerCard {
+    flex: 1 0 50%;
+    margin-bottom: 30px;
+    min-width: 400px;
+    display: flex;
+    align-items: center;
+}
+
+.mx_MyGroups_headerCard .mx_MyGroups_headerCard_button {
+    margin-right: 13px;
+    height: 50px;
+}
+
+.mx_MyGroups_headerCard_button object {
+    /* Otherwise the SVG object absorbs clicks and the button doesn't work */
+    pointer-events: none;
+}
+
+.mx_MyGroups_headerCard_header {
+    font-weight: bold;
+    margin-bottom: 10px;
+}
+
+.mx_MyGroups_headerCard_content {
+    padding-right: 15px;
+}
+
+/* Until the button is wired up */
+.mx_MyGroups_joinBox {
+    visibility: hidden;
+}
+
+.mx_MyGroups_content {
+    margin-left: 2px;
+}
+
+.mx_MyGroups_placeholder {
+    background-color: $group-my-groups-placeholder-bg;
+    color: $group-my-groups-placeholder-fg;
+    line-height: 400px;
+    border-radius: 10px;
+    text-align: center;
+}
+
+.mx_MyGroups_joinedGroups {
+    display: flex;
+    flex-direction: row;
+    flex-flow: wrap;
+    justify-content: space-around;
+}
+
+.mx_MyGroups_joinedGroups .mx_GroupTile {
+    min-width: 300px;
+    flex: 1 0 25%;
+    height: 75px;
+    margin-bottom: 15px;
+    margin-right: 10px;
+    display: flex;
+    align-items: flex-start;
+    cursor: pointer;
+}
+
+.mx_GroupTile_profile {
+    margin-left: 10px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.mx_GroupTile_profile h3.mx_GroupTile_name {
+    margin: 0px;
+    font-size: 15px;
+}
+
+.mx_GroupTile_profile .mx_GroupTile_groupId {
+    font-size: 13px;
+}
+
+.mx_GroupTile_profile .mx_GroupTile_desc {
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    font-size: 13px;
+    max-height: 36px;
+    overflow: hidden;
+}
+
+.mx_GroupTile_profile .mx_GroupTile_groupId {
+    opacity: 0.7;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss
index 1ae2a47c86..ca7431eac2 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss
@@ -140,11 +140,6 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_RoomStatusBar_tabCompleteBar {
-    padding-top: 10px;
-    color: $primary-fg-color;
-}
-
 .mx_RoomStatusBar_typingBar {
     height: 50px;
     line-height: 50px;
@@ -155,24 +150,14 @@ limitations under the License.
     display: block;
 }
 
-.mx_RoomStatusBar_tabCompleteWrapper {
-    display: flex;
-    height: 26px;
-}
+.mx_RoomStatusBar_isAlone {
+    height: 50px;
+    line-height: 50px;
 
-.mx_RoomStatusBar_tabCompleteWrapper .mx_TabCompleteBar {
-    flex: 1 1 auto;
-}
-
-.mx_RoomStatusBar_tabCompleteEol {
-    flex: 0 0 auto;
-    color: $accent-color;
-}
-
-.mx_RoomStatusBar_tabCompleteEol object {
-    vertical-align: middle;
-    margin-right: 8px;
-    margin-top: -2px;
+    color: $primary-fg-color;
+    opacity: 0.5;
+    overflow-y: hidden;
+    display: block;
 }
 
 .mx_MatrixChat_useCompactLayout {
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index ae7735de8a..dfd91885f8 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -76,17 +76,36 @@ limitations under the License.
     flex: 0 0 auto;
 }
 
-.mx_RoomView_topUnreadMessagesBar {
+.mx_RoomView_auxPanel_apps {
+    max-width: 1920px ! important;
+}
+
+
+.mx_RoomView_body {
+    order: 3;
+    flex: 1 1 0;
+    flex-direction: column;
+    display: flex;
+}
+
+.mx_RoomView_body .mx_RoomView_topUnreadMessagesBar {
+    order: 1;
+}
+
+.mx_RoomView_body .mx_RoomView_messagePanel {
+    order: 2;
+}
+
+.mx_RoomView_body .mx_RoomView_statusArea {
     order: 3;
 }
 
-.mx_RoomView_messagePanel {
+.mx_RoomView_body .mx_MessageComposer {
     order: 4;
+}
 
-    flex: 1 1 0;
-
+.mx_RoomView_messagePanel {
     width: 100%;
-
     overflow-y: auto;
 }
 
@@ -127,18 +146,6 @@ limitations under the License.
     clear: both;
 }
 
-.mx_RoomView_invitePrompt {
-    order: 2;
-
-    min-width: 0px;
-    max-width: 960px;
-    width: 100%;
-    margin: auto;
-
-    margin-top: 12px;
-    margin-bottom: 12px;
-}
-
 li.mx_RoomView_myReadMarker_container {
     height: 0px;
     margin: 0px;
@@ -156,8 +163,6 @@ hr.mx_RoomView_myReadMarker {
 }
 
 .mx_RoomView_statusArea {
-    order: 5;
-
     width: 100%;
     flex: 0 0 auto;
 
@@ -232,8 +237,6 @@ hr.mx_RoomView_myReadMarker {
 }
 
 .mx_RoomView .mx_MessageComposer {
-    order: 6;
-
     width: 100%;
     flex: 0 0 auto;
     margin-right: 2px;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
index 9809a81ab1..6607253886 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -80,6 +80,16 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_UserSettings_button.mx_UserSettings_buttonSmall {
+    height: 36px;
+    padding: 4px;
+    padding-left: 7px;
+    padding-right: 7px;
+    font-size: 12px;
+    margin-right: 5px;
+    line-height: 12px;
+}
+
 .mx_UserSettings_button.danger {
     background-color: $warning-color;
 }
@@ -102,6 +112,13 @@ limitations under the License.
     padding-right: 1em;
 }
 
+.mx_UserSettings_passwordWarning {
+    /* To move the "Sign out" button out of the way */
+    clear: both;
+    color: $warning-color;
+    margin-bottom: 5px;
+}
+
 .mx_UserSettings_importExportButtons {
     padding-top: 10px;
     padding-left: 40px;
@@ -235,6 +252,16 @@ input.mx_UserSettings_phoneNumberField {
     display: none;
 }
 
+.mx_UserSettings_avatarPicker_imgContainer {
+    display: inline-block;
+}
+
+.mx_UserSettings_avatarPicker_remove {
+    display: inline-block;
+    float: right;
+    margin-right: -15px;
+}
+
 .mx_UserSettings_advanced_spoiler,
 .mx_UserSettings_link {
     cursor: pointer;
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
index 805c817a28..86ab39be1b 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -67,6 +67,10 @@ limitations under the License.
     margin-bottom: 14px;
 }
 
+.mx_Login_field_disabled {
+    opacity: 0.3;
+}
+
 .mx_Login_fieldLabel {
     margin-top: -10px;
     margin-left: 8px;
@@ -87,6 +91,10 @@ limitations under the License.
     color: $accent-fg-color;
 }
 
+.mx_Login_submit:disabled {
+    opacity: 0.3;
+}
+
 .mx_Login_label {
     font-size: 13px;
     opacity: 0.8;
@@ -265,3 +273,16 @@ limitations under the License.
     margin: 3px;
     vertical-align: top;
 }
+
+.mx_Login_language {
+  margin-left: auto;
+  margin-right: auto;
+  min-width: 60%;
+}
+
+.mx_Login_language_div {
+  display: flex;
+  margin-top: 12px;
+  margin-bottom: 12px;
+}
+
diff --git a/src/skins/vector/css/matrix-react-sdk/views/avatars/_BaseAvatar.scss b/src/skins/vector/css/matrix-react-sdk/views/avatars/_BaseAvatar.scss
index 106f0cde71..320efda043 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/avatars/_BaseAvatar.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/avatars/_BaseAvatar.scss
@@ -20,6 +20,7 @@ limitations under the License.
 
 .mx_BaseAvatar_initial {
     position: absolute;
+    left: 0px;
     color: $avatar-initial-color;
     text-align: center;
     speak: none;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss
index 38bb4f01c3..a950ea8d12 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss
@@ -14,6 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_ChatInviteDialog {
+    /* XXX: padding-left is on mx_Dialog but padding-right has subsequently
+     * been added on other dialogs. Surely all our dialogs should have consistent
+     * right hand padding?
+     */
+    padding-right: 58px;
+}
+
 /* Using a textarea for this element, to circumvent autofill */
 .mx_ChatInviteDialog_input,
 .mx_ChatInviteDialog_input:focus
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss
new file mode 100644
index 0000000000..ebe89027a6
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss
@@ -0,0 +1,35 @@
+/*
+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_CreateGroupDialog_inputRow {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.mx_CreateGroupDialog_label {
+    text-align: left;
+    padding-bottom: 12px;
+}
+
+.mx_CreateGroupDialog_input {
+    font-size: 15px;
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $primary-fg-color;
+    background-color: $primary-bg-color;
+}
+
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss
new file mode 100644
index 0000000000..888f147d21
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss
@@ -0,0 +1,33 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+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_CreateRoomDialog_details_summary {
+    outline: none;
+}
+
+.mx_CreateRoomDialog_label {
+    text-align: left;
+    padding-bottom: 12px;
+}
+
+.mx_CreateRoomDialog_input {
+    font-size: 15px;
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $primary-fg-color;
+    background-color: $primary-bg-color;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss
new file mode 100644
index 0000000000..3d47f17592
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss
@@ -0,0 +1,18 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+.mx_QuestionDialog {
+    padding-right: 58px;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
index 637c5d124b..2ddbb36c2a 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss
@@ -18,6 +18,10 @@ limitations under the License.
     position: relative;
 }
 
+.mx_Dropdown_disabled {
+    opacity: 0.3;
+}
+
 .mx_Dropdown_input {
     position: relative;
     border-radius: 3px;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_EditableItemList.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_EditableItemList.scss
new file mode 100644
index 0000000000..9fbb39aa17
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_EditableItemList.scss
@@ -0,0 +1,62 @@
+/*
+Copyright 2017 New Vector Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_EditableItemList {
+    margin-top: 12px;
+    margin-bottom: 0px;
+}
+
+.mx_EditableItem {
+    display: flex;
+    margin-left: 56px;
+}
+
+.mx_EditableItem .mx_EditableItem_editable {
+    border: 0px;
+    border-bottom: 1px solid $strong-input-border-color;
+    padding: 0px;
+    min-width: 240px;
+    max-width: 400px;
+    margin-bottom: 16px;
+}
+
+.mx_EditableItem .mx_EditableItem_editable:focus {
+    border-bottom: 1px solid $accent-color;
+    outline: none;
+    box-shadow: none;
+}
+
+.mx_EditableItem .mx_EditableItem_editablePlaceholder {
+    color: $settings-grey-fg-color;
+}
+
+.mx_EditableItem .mx_EditableItem_addButton,
+.mx_EditableItem .mx_EditableItem_removeButton {
+    padding-left: 0.5em;
+    position: relative;
+    cursor: pointer;
+
+    visibility: hidden;
+}
+
+.mx_EditableItem:hover .mx_EditableItem_addButton,
+.mx_EditableItem:hover .mx_EditableItem_removeButton {
+    visibility: visible;
+}
+
+.mx_EditableItemList_label {
+    margin-bottom: 8px;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_MemberEventListSummary.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_MemberEventListSummary.scss
index 1025052beb..02ecb5d84a 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_MemberEventListSummary.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_MemberEventListSummary.scss
@@ -50,11 +50,22 @@ limitations under the License.
 }
 
 .mx_MatrixChat_useCompactLayout {
+    .mx_MemberEventListSummary {
+        font-size: 13px;
+        .mx_EventTile_line {
+            line-height: 20px;
+        }
+    }
+
     .mx_MemberEventListSummary_line {
         line-height: 22px;
     }
 
     .mx_MemberEventListSummary_toggle {
-        margin-top: 2px;
+        margin-top: 3px;
+    }
+
+    .mx_TextualEvent.mx_MemberEventListSummary_summary {
+        font-size: 13px;
     }
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
index 2dcd813692..0927cfbcbc 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
@@ -2,19 +2,47 @@
 // naming scheme; it's completely unclear where or how they're being used
 // --Matthew
 
-.mx_UserPill {
-    color: white;
-    background-color: $accent-color;
-    padding: 2px 8px;
+.mx_UserPill,
+.mx_RoomPill {
     border-radius: 16px;
+    display: inline-block;
+    height: 20px;
+    line-height: 20px;
+    padding-left: 5px;
 }
 
+.mx_EventTile_body .mx_UserPill,
+.mx_EventTile_body .mx_RoomPill {
+    cursor: pointer;
+}
+
+/* More specific to override `.markdown-body a` color */
+.mx_EventTile_content .markdown-body a.mx_UserPill,
+.mx_UserPill {
+    color: $primary-fg-color;
+    background-color: $other-user-pill-bg-color;
+    padding-right: 5px;
+}
+
+.mx_EventTile_highlight .mx_EventTile_content .markdown-body a.mx_UserPill_me {
+    color: $accent-fg-color;
+    background-color: $mention-user-pill-bg-color;
+    padding-right: 5px;
+}
+
+/* More specific to override `.markdown-body a` color */
+.mx_EventTile_content .markdown-body a.mx_RoomPill,
 .mx_RoomPill {
-    background-color: white;
-    color: $accent-color;
-    border: 1px solid $accent-color;
-    padding: 2px 8px;
-    border-radius: 16px;
+    color: $accent-fg-color;
+    background-color: $rte-room-pill-color;
+    padding-right: 5px;
+}
+
+.mx_UserPill .mx_BaseAvatar,
+.mx_RoomPill .mx_BaseAvatar {
+    position: relative;
+    left: -3px;
+    top: 2px;
 }
 
 .mx_Markdown_BOLD {
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
new file mode 100644
index 0000000000..6b4034b9aa
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
@@ -0,0 +1,74 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_GroupInviteTile {
+    position: relative;
+    cursor: pointer;
+    font-size: 13px;
+    display: block;
+    height: 34px;
+}
+
+.mx_GroupInviteTile_nameContainer {
+    display: inline-block;
+    width: 180px;
+    height: 24px;
+}
+
+.mx_GroupInviteTile_avatarContainer {
+    display: inline-block;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 16px;
+    padding-right: 6px;
+    width: 24px;
+    height: 24px;
+    vertical-align: middle;
+}
+
+.mx_GroupInviteTile_name {
+    display: inline-block;
+    position: relative;
+    width: 165px;
+    vertical-align: middle;
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-top: 2px;
+    padding-bottom: 3px;
+    color: $roomtile-name-color;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.mx_GroupInviteTile_badge {
+    display: inline-block;
+    min-width: 15px;
+    height: 15px;
+    position: absolute;
+    right: 8px; /*gutter */
+    top: 9px;
+    border-radius: 8px;
+    color: $accent-fg-color;
+    background-color: $group-alert-color;
+    font-weight: 600;
+    font-size: 10px;
+    text-align: center;
+    padding-top: 1px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
diff --git a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss
new file mode 100644
index 0000000000..91f0c34789
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss
@@ -0,0 +1,36 @@
+/*
+Copyright 2017 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_GroupRoomTile {
+    position: relative;
+    color: $primary-fg-color;
+    cursor: pointer;
+}
+
+.mx_GroupRoomTile_delete {
+    opacity: 0.4;
+    position: absolute;
+    top: 6px;
+    right: 10px;
+    cursor: pointer;
+
+    display: none;
+}
+
+.mx_GroupRoomTile:hover > .mx_GroupRoomTile_delete {
+    display: initial;
+}
+
diff --git a/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss b/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss
index e614aca7d8..cf722e5ae8 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_MEmoteBody {
+    white-space: pre-wrap;
+}
+
 .mx_MEmoteBody_sender {
     cursor: pointer;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
new file mode 100644
index 0000000000..14b8cb4572
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -0,0 +1,237 @@
+/*
+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.
+*/
+
+.mx_AppsDrawer {
+    margin-bottom: 3px;
+}
+
+.mx_AppsContainer {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+}
+
+.mx_AddWidget_button {
+    order: 2;
+    cursor: pointer;
+    padding-right: 12px;
+    padding: 0;
+    margin: 5px auto 5px auto;
+    color: $accent-color;
+    font-size: 12px;
+}
+
+.mx_AddWidget_button_full_width {
+    max-width: 960px;
+}
+
+.mx_SetAppURLDialog_input {
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $primary-hairline-color;
+    background-color: $primary-bg-color;
+    font-size: 15px;
+}
+
+.mx_AppTile {
+    max-width: 960px;
+    width: 50%;
+    margin: 0 5px 2px 0;
+    border: 1px solid $primary-hairline-color;
+    border-radius: 2px;
+    // height: 350px;
+    // display: inline-block;
+}
+
+.mx_AppTileFullWidth {
+    max-width: 960px;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    border: 1px solid $primary-hairline-color;
+    border-radius: 2px;
+    // height: 350px;
+    // display: inline-block;
+}
+
+.mx_AppTileMenuBar {
+    // height: 15px;
+    margin: 0;
+    padding: 2px 10px;
+    // background-color: $e2e-verified-color;
+    // border-bottom: 1px solid $primary-hairline-color;
+    font-size: 10px;
+}
+
+.mx_AppTileMenuBarWidgets {
+    float: right;
+}
+.mx_AppTileMenuBarWidget {
+    // pointer-events: none;
+    cursor: pointer;
+    width: 10px;
+    height: 10px;
+    padding: 1px;
+    transition-duration: 500ms;
+    border: 1px solid transparent;
+}
+
+.mx_AppTileMenuBarWidgetDelete {
+    filter: none;
+}
+
+.mx_AppTileMenuBarWidget:hover {
+    border: 1px solid $primary-hairline-color;
+    border-radius: 2px;
+}
+
+.mx_AppTileBody{
+    height: 350px;
+    width: 100%;
+    overflow: hidden;
+}
+
+.mx_AppTileBody iframe {
+    width: 100%;
+    height: 350px;
+    overflow: hidden;
+    border: none;
+    padding: 0;
+    margin: 0;
+    display: block;
+}
+
+.mx_CloseAppWidget {
+}
+
+.mx_AppTileMenuBarWidgetPadding {
+    margin-right: 5px;
+}
+
+.mx_AppIconTile {
+    background-color: $lightbox-bg-color;
+    border: 1px solid rgba(0, 0, 0, 0);
+    width: 200px;
+    box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
+    transition: 0.3s;
+    border-radius: 3px;
+    margin: 5px;
+    display: inline-block;
+}
+
+.mx_AppIconTile.mx_AppIconTile_active {
+    color: $accent-color;
+    border-color: $accent-color;
+}
+
+.mx_AppIconTile:hover {
+    border: 1px solid $accent-color;
+    box-shadow: 0 0 10px 5px rgba(200,200,200,0.5);
+}
+
+.mx_AppIconTile_content {
+    padding: 2px 16px;
+    height: 60px;
+    overflow: hidden;
+}
+
+.mx_AppIconTile_content h4 {
+    margin-top: 5px;
+    margin-bottom: 2px;
+}
+
+.mx_AppIconTile_content p {
+    margin-top: 0;
+    margin-bottom: 5px;
+    font-size: smaller;
+}
+
+.mx_AppIconTile_image {
+    padding: 10px;
+    width: 75%;
+    max-width:100px;
+    max-height:100px;
+    width: auto;
+    height: auto;
+}
+
+.mx_AppIconTile_imageContainer {
+    text-align: center;
+    width: 100%;
+    background-color: white;
+    border-radius: 3px 3px 0 0;
+    height: 155px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+form.mx_Custom_Widget_Form div {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
+.mx_AppPermissionWarning {
+    text-align: center;
+    padding: 30px 0;
+    background-color: $primary-bg-color;
+}
+
+.mx_AppPermissionWarningImage {
+    margin: 10px 0;
+}
+
+.mx_AppPermissionWarningImage img {
+    width: 100px;
+}
+
+.mx_AppPermissionWarningText {
+    max-width: 400px;
+    margin: 10px auto 10px auto;
+    color: $primary-fg-color;
+}
+
+.mx_AppPermissionWarningTextLabel {
+    font-weight: bold;
+    display: block;
+}
+
+.mx_AppPermissionWarningTextURL {
+    color: $accent-color;
+}
+
+.mx_AppPermissionButton {
+    padding: 5px;
+    border-radius: 5px;
+    color: $warning-color;
+    background-color: $primary-bg-color;
+}
+
+.mx_AppPermissionButton:hover {
+    background-color: $primary-fg-color;
+    cursor: pointer;
+}
+
+.mx_AppLoading {
+    min-height: 305px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    font-weight: bold;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
index 062dd0bade..6bf3f3b60a 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_Autocomplete.scss
@@ -38,6 +38,7 @@
 .mx_Autocomplete_Completion_pill {
     border-radius: 17px;
     height: 34px;
+    padding: 0px 5px;
     display: flex;
     user-select: none;
     cursor: pointer;
@@ -45,10 +46,22 @@
     color: $primary-fg-color;
 }
 
-.mx_Autocomplete_Completion_pill * {
+.mx_Autocomplete_Completion_pill > * {
     margin: 0 3px;
 }
 
+.mx_Autocomplete_Completion_container_truncate {
+    .mx_Autocomplete_Completion_title,
+    .mx_Autocomplete_Completion_subtitle,
+    .mx_Autocomplete_Completion_description {
+        /* Ellipsis for long names/subtitles/descriptions*/
+        max-width: 150px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
 /* container for pill-style completions */
 .mx_Autocomplete_Completion_container_pill {
     margin: 12px;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
index 3f360e79a0..712e4bae74 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
@@ -28,7 +28,8 @@ limitations under the License.
     width: 26px;
 }
 
-.mx_EntityTile_avatar {
+.mx_EntityTile_avatar,
+.mx_GroupRoomTile_avatar {
     display: table-cell;
     padding-left: 3px;
     padding-right: 12px;
@@ -48,12 +49,15 @@ limitations under the License.
     right: 6px;
 }
 
-.mx_EntityTile_name {
+.mx_EntityTile_name,
+.mx_GroupRoomTile_name {
     display: table-cell;
     vertical-align: middle;
     overflow: hidden;
     font-size: 14px;
     text-overflow: ellipsis;
+    white-space: nowrap;
+    max-width: 135px;
 }
 
 .mx_EntityTile_details {
@@ -64,8 +68,6 @@ limitations under the License.
 
 .mx_EntityTile_name_hover {
     font-size: 13px;
-    overflow: hidden;
-    text-overflow: ellipsis;
 }
 
 .mx_EntityTile_chevron {
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
index 7d8e4ba2b7..bb0ca9594b 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -45,7 +45,6 @@ limitations under the License.
 
 .mx_EventTile .mx_SenderProfile {
     color: $primary-fg-color;
-    opacity: 0.5;
     font-size: 14px;
     display: block; /* anti-zalgo, with overflow hidden */
     overflow-y: hidden;
@@ -57,6 +56,22 @@ limitations under the License.
     line-height: 22px;
 }
 
+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_name,
+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_aux {
+    opacity: 0.5;
+}
+
+.mx_EventTile .mx_SenderProfile .mx_Flair {
+    opacity: 0.7;
+    margin-left: 5px;
+}
+
+.mx_EventTile .mx_SenderProfile .mx_Flair img {
+    vertical-align: -2px;
+    margin-right: 2px;
+    border-radius: 8px;
+}
+
 .mx_EventTile .mx_MessageTimestamp {
     display: block;
     visibility: hidden;
@@ -128,6 +143,12 @@ limitations under the License.
     color: $event-sending-color;
 }
 
+.mx_EventTile_sending .mx_UserPill,
+.mx_EventTile_sending .mx_RoomPill,
+.mx_EventTile_sending .mx_emojione {
+    opacity: 0.5;
+}
+
 .mx_EventTile_notSent {
     color: $event-notsent-color;
 }
@@ -316,7 +337,7 @@ limitations under the License.
     font-family: inherit ! important;
     white-space: normal ! important;
     line-height: inherit ! important;
-    color: inherit;
+    color: inherit; // inherit the colour from the dark or light theme by default (but not for code blocks)
     font-size: 14px;
 }
 
@@ -330,8 +351,11 @@ limitations under the License.
 }
 
 .mx_EventTile_content .markdown-body code {
+    // deliberate constants as we're behind an invert filter
     background-color: #f8f8f8;
+    color: #333;
 }
+
 .mx_EventTile_copyButton {
     position: absolute;
     display: inline-block;
@@ -343,14 +367,17 @@ limitations under the License.
     height: 19px;
     background-image: url($copy-button-url);
 }
+
 .mx_EventTile_body pre {
     position: relative;
     border: 1px solid transparent;
 }
+
 .mx_EventTile:hover .mx_EventTile_body pre
 {
-    border: 1px solid $primary-hairline-color;
+    border: 1px solid #e5e5e5; // deliberate constant as we're behind an invert filter
 }
+
 .mx_EventTile_body pre:hover .mx_EventTile_copyButton
 {
     visibility: visible;
@@ -364,6 +391,7 @@ limitations under the License.
 .mx_EventTile_content .markdown-body h6
 {
     font-family: inherit ! important;
+    color: inherit;
 }
 
 
@@ -390,7 +418,15 @@ limitations under the License.
     }
 
     .mx_EventTile.mx_EventTile_info {
+        // same as the padding for non-compact .mx_EventTile.mx_EventTile_info
         padding-top: 0px;
+        font-size: 13px;
+        .mx_EventTile_line {
+            line-height: 20px;
+        }
+        .mx_EventTile_avatar {
+            top: 4px;
+        }
     }
 
     .mx_EventTile .mx_SenderProfile {
@@ -398,6 +434,7 @@ limitations under the License.
     }
 
     .mx_EventTile.mx_EventTile_emote {
+        // add a bit more space for emotes so that avatars don't collide
         padding-top: 8px;
         .mx_EventTile_avatar {
             top: 2px;
@@ -425,10 +462,6 @@ limitations under the License.
         top: 2px;
     }
 
-    .mx_EventTile.mx_EventTile_info .mx_EventTile_avatar {
-        top: 5px;
-    }
-
     .mx_EventTile_e2eIcon {
         top: 7px;
     }
@@ -442,12 +475,21 @@ limitations under the License.
     }
 
     .mx_EventTile_continuation .mx_EventTile_readAvatars,
-    .mx_EventTile_info .mx_EventTile_readAvatars,
     .mx_EventTile_emote .mx_EventTile_readAvatars {
         top: 5px;
     }
 
+    .mx_EventTile_info .mx_EventTile_readAvatars {
+        top: 4px;
+    }
+
     .mx_RoomView_MessageList h2 {
         margin-top: 6px;
     }
+
+    .mx_EventTile_content .markdown-body {
+      p, ul, ol, dl, blockquote, pre, table {
+        margin-bottom: 4px; // 1/4 of the non-compact margin-bottom
+      }
+    }
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss
index f1584d4e00..2a5be3250d 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss
@@ -18,6 +18,12 @@ limitations under the License.
     padding: 10px 0px;
 }
 
+.mx_MemberDeviceInfo.mx_DeviceVerifyButtons {
+    padding: 6px 0;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+}
 
 .mx_MemberDeviceInfo_textButton {
     color: $accent-fg-color;
@@ -26,12 +32,11 @@ limitations under the License.
     text-align: center;
     padding-left: 1em;
     padding-right: 1em;
-    width: 95px;
     border: 0px;
     font-size: 14px;
-
     cursor: pointer;
-    display: inline;
+    margin: 2px;
+    flex: 1;
 }
 
 .mx_MemberDeviceInfo_deviceId {
@@ -44,11 +49,6 @@ limitations under the License.
     border-bottom: 1px solid rgba(0,0,0,0.1);
 }
 
-.mx_MemberDeviceInfo_blacklist,
-.mx_MemberDeviceInfo_unblacklist {
-    float: right;
-}
-
 /* "Unblacklist" is too long for a regular button: make it wider and
    reduce the padding. */
 .mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
index 45e5c15728..dd41483b6c 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MemberList {
+.mx_MemberList,
+.mx_GroupMemberList,
+.mx_GroupRoomList {
     height: 100%;
 
     margin-top: 12px;
@@ -44,7 +46,9 @@ limitations under the License.
     flex: 1 1 0px;
 }
 
-.mx_MemberList_query {
+.mx_MemberList_query,
+.mx_GroupMemberList_query,
+.mx_GroupRoomList_query {
     font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
     border-radius: 3px;
     border: 1px solid $input-border-color;
@@ -57,13 +61,17 @@ limitations under the License.
     width: 189px;
 }
 
-.mx_MemberList_query::-moz-placeholder {
+.mx_MemberList_query::-moz-placeholder,
+.mx_GroupMemberList_query::-moz-placeholder,
+.mx_GroupRoomList_query::-moz-placeholder {
     color: $primary-fg-color;
     opacity: 0.5;
     font-size: 14px;
 }
 
-.mx_MemberList_query::-webkit-input-placeholder {
+.mx_MemberList_query::-webkit-input-placeholder,
+.mx_GroupMemberList_query::-webkit-input-placeholder,
+.mx_GroupRoomList_query::-webkit-input-placeholder {
     color: $primary-fg-color;
     opacity: 0.5;
     font-size: 14px;
@@ -84,6 +92,7 @@ limitations under the License.
 }
 */
 
+.mx_GroupMemberList_invited h2,
 .mx_MemberList_invited h2 {
     text-transform: uppercase;
     color: $h3-color;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
index 85c0e2c762..14e758535e 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
@@ -78,6 +78,16 @@ limitations under the License.
     margin-right: 6px;
 }
 
+@keyframes visualbell
+{
+    from { background-color: #faa }
+    to { background-color: $primary-bg-color }
+}
+
+.mx_MessageComposer_input_error {
+    animation: 0.2s visualbell;
+}
+
 .mx_MessageComposer_input_empty .public-DraftEditorPlaceholder-root {
     display: none;
 }
@@ -85,7 +95,17 @@ limitations under the License.
 .mx_MessageComposer_input .DraftEditor-root {
     width: 100%;
     flex: 1;
+    word-break: break-word;
+}
+
+.mx_MessageComposer_input .DraftEditor-root .DraftEditor-editorContainer {
+    /* Ensure mx_UserPill and mx_RoomPill (see _RichText) are not obscured from the top */
+    padding-top: 2px;
+}
+
+.mx_MessageComposer_input .public-DraftEditor-content {
     max-height: 120px;
+    min-height: 21px;
     overflow: auto;
 }
 
@@ -96,6 +116,12 @@ limitations under the License.
     border-left: 4px solid $blockquote-bar-color;
 }
 
+.mx_MessageComposer_input pre.public-DraftStyleDefault-pre pre {
+    background-color: $rte-code-bg-color;
+    border-radius: 3px;
+    padding: 10px;
+}
+
 .mx_MessageComposer_input textarea {
     display: block;
     width: 100%;
@@ -128,7 +154,8 @@ limitations under the License.
 .mx_MessageComposer_upload,
 .mx_MessageComposer_hangup,
 .mx_MessageComposer_voicecall,
-.mx_MessageComposer_videocall {
+.mx_MessageComposer_videocall,
+.mx_MessageComposer_apps {
     /*display: table-cell;*/
     /*vertical-align: middle;*/
     /*padding-left: 10px;*/
@@ -140,7 +167,8 @@ limitations under the License.
 .mx_MessageComposer_upload object,
 .mx_MessageComposer_hangup object,
 .mx_MessageComposer_voicecall object,
-.mx_MessageComposer_videocall object {
+.mx_MessageComposer_videocall object,
+.mx_MessageComposer_apps object {
     pointer-events: none;
 }
 
@@ -181,11 +209,6 @@ limitations under the License.
     cursor: pointer;
 }
 
-.mx_MessageComposer_format_button_disabled {
-    cursor: not-allowed;
-    opacity: 0.5;
-}
-
 .mx_MessageComposer_formatbar_cancel {
     margin-right: 22px;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventTile.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventTile.scss
new file mode 100644
index 0000000000..ca790ef8f0
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventTile.scss
@@ -0,0 +1,67 @@
+/*
+Copyright 2017 Travis Ralston
+
+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_PinnedEventTile {
+    min-height: 40px;
+    margin-bottom: 5px;
+    width: 100%;
+    border-radius: 5px; // for the hover
+}
+
+.mx_PinnedEventTile:hover {
+    background-color: $event-selected-color;
+}
+
+.mx_PinnedEventTile .mx_PinnedEventTile_sender {
+    color: #868686;
+    font-size: 0.8em;
+    vertical-align: top;
+    display: block;
+    padding-bottom: 3px;
+}
+
+.mx_PinnedEventTile .mx_EventTile_content {
+    margin-left: 50px;
+    position: relative;
+    top: 0;
+    left: 0;
+}
+
+.mx_PinnedEventTile .mx_BaseAvatar {
+    float: left;
+    margin-right: 10px;
+}
+
+.mx_PinnedEventTile:hover .mx_PinnedEventTile_actions {
+    display: block;
+}
+
+.mx_PinnedEventTile_actions {
+    float: right;
+    margin-right: 10px;
+    display: none;
+}
+
+.mx_PinnedEventTile_unpinButton {
+    display: inline-block;
+    cursor: pointer;
+    margin-left: 10px;
+}
+
+.mx_PinnedEventTile_gotoButton {
+    display: inline-block;
+    font-size: 0.8em;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss
new file mode 100644
index 0000000000..663d5bdf6e
--- /dev/null
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_PinnedEventsPanel.scss
@@ -0,0 +1,37 @@
+/*
+Copyright 2017 Travis Ralston
+
+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_PinnedEventsPanel {
+    border-top: 1px solid $primary-hairline-color;
+}
+
+.mx_PinnedEventsPanel_body {
+    max-height: 300px;
+    overflow-y: auto;
+    padding-bottom: 15px;
+}
+
+.mx_PinnedEventsPanel_header {
+    margin: 0;
+    padding-top: 8px;
+    padding-bottom: 15px;
+}
+
+.mx_PinnedEventsPanel_cancel {
+    margin: 12px;
+    float: right;
+    display: inline-block;
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
index bb80832deb..fd4bdca095 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -60,6 +60,10 @@ limitations under the License.
     padding-right: 12px;
 }
 
+.mx_RoomHeader_textButton_danger {
+    background-color: $warning-color;
+}
+
 .mx_RoomHeader_cancelButton {
     order: 2;
     cursor: pointer;
@@ -138,10 +142,17 @@ limitations under the License.
 .mx_RoomHeader_name,
 .mx_RoomHeader_avatar,
 .mx_RoomHeader_avatarPicker,
-.mx_RoomHeader_avatarPicker_edit {
+.mx_RoomHeader_avatarPicker_edit,
+.mx_RoomHeader_avatarPicker_remove {
     cursor: pointer;
 }
 
+.mx_RoomHeader_avatarPicker_remove {
+    position: absolute;
+    top: -11px;
+    right: -9px;
+}
+
 .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
     color: $accent-color;
 }
@@ -187,8 +198,12 @@ limitations under the License.
     object-fit: cover;
 }
 
+.mx_RoomHeader_avatarPicker {
+    margin-top: 23px;
+    position: relative;
+}
+
 .mx_RoomHeader_avatarPicker_edit {
-    position: absolute;
     margin-left: 16px;
     margin-top: 4px;
 }
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
index 517ff94c1b..9e269ac2b5 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -21,9 +21,7 @@ limitations under the License.
 }
 
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_unbanButton,
-.mx_RoomSettings_integrationsButton,
-.mx_RoomSettings_integrationsButton_error {
+.mx_RoomSettings_unbanButton {
     position: relative;
     height: 36px;
     background-color: $accent-color;
@@ -36,25 +34,37 @@ limitations under the License.
     padding-left: 12px;
     padding-right: 12px;
 }
+.mx_RoomSettings_integrationsButton_error {
+    position: relative;
+    cursor: not-allowed;
+}
+.mx_RoomSettings_integrationsButton_error img {
+    position: absolute;
+    right: -5px;
+    top: -5px;
+}
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_integrationsButton,
 .mx_RoomSettings_integrationsButton_error {
     float: right;
 }
-.mx_RoomSettings_integrationsButton_error {
-    pointer: not-allowed;
+.mx_RoomSettings_integrationsButton_error .mx_RoomSettings_integrationsButton_errorPopup {
+    display: none;
+}
+.mx_RoomSettings_integrationsButton_error:hover .mx_RoomSettings_integrationsButton_errorPopup {
+    display: inline;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
     position: absolute;
     top: 110%;
-    left: -26%;
-    width: 150%;
+    left: -125%;
+    width: 348%;
     padding: 2%;
     font-size: 10pt;
     line-height: 1.5em;
     border-radius: 5px;
     background-color: $accent-color;
     color: $accent-fg-color;
+    text-align: center;
 }
 .mx_RoomSettings_unbanButton {
     display: inline;
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_TabCompleteBar.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_TabCompleteBar.scss
deleted file mode 100644
index 5dcbd21a47..0000000000
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_TabCompleteBar.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-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.
-*/
-
-.mx_TabCompleteBar {
-    overflow: hidden;
-}
-
-.mx_TabCompleteBar_item {
-    display: inline-block;
-    margin-right: 15px;
-    margin-bottom: 2px;
-    cursor: pointer;
-}
-
-.mx_TabCompleteBar_command {
-    margin-right: 8px;
-    background-color: $accent-color;
-    padding-left: 8px;
-    padding-right: 8px;
-    padding-top: 2px;
-    padding-bottom: 2px;
-    margin-bottom: 6px;
-    border-radius: 30px;
-    position: relative;
-    top: 1px;
-}
-
-.mx_TabCompleteBar_command .mx_TabCompleteBar_text {
-    opacity: 1.0;
-    vertical-align: initial;
-    color: $accent-fg-color;
-}
-
-.mx_TabCompleteBar_item img {
-    margin-right: 8px;
-    vertical-align: middle;
-}
-
-.mx_TabCompleteBar_text {
-    color: $primary-fg-color;
-    vertical-align: middle;
-    opacity: 0.5;
-}
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index fc24af93e2..f1117a7a09 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -19,6 +19,13 @@ $focus-brightness: 125%;
 
 // red warning colour
 $warning-color: #ff0064;
+$mention-user-pill-bg-color: #ff0064;
+$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
+
+// groups
+$group-alert-color: #774f7e;
+$group-my-groups-placeholder-bg: #f7f7f7;
+$group-my-groups-placeholder-fg: #888;
 
 $preview-bar-bg-color: #f7f7f7;
 
@@ -78,6 +85,7 @@ $voip-accept-color: #80f480;
 
 $rte-bg-color: #e9e9e9;
 $rte-code-bg-color: rgba(0, 0, 0, 0.04);
+$rte-room-pill-color: #aaa;
 
 // ********************
 
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index fe2e7591cf..034bd748ef 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -20,6 +20,11 @@ $focus-brightness: 200%;
 // red warning colour
 $warning-color: #ff0064;
 
+// groups
+$group-my-groups-placeholder-bg: #454545;
+
+$other-user-pill-bg-color: rgba(255, 255, 255, 0.1);
+
 $preview-bar-bg-color: #333;
 
 // left-panel style muted accent color
@@ -129,6 +134,9 @@ $progressbar-color: #000;
 }
 
 // markdown overrides:
+.mx_EventTile_content .markdown-body pre:hover {
+    border-color: #808080 !important; // inverted due to rules below
+}
 .mx_EventTile_content .markdown-body {
     pre, code {
         filter: invert(1);
diff --git a/src/skins/vector/css/vector-web/structures/_RightPanel.scss b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
index 056e9bd338..85057410ce 100644
--- a/src/skins/vector/css/vector-web/structures/_RightPanel.scss
+++ b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
@@ -78,6 +78,7 @@ limitations under the License.
 
 .mx_RightPanel .mx_MemberList,
 .mx_RightPanel .mx_MemberInfo,
+.mx_RightPanel .mx_GroupRoomList,
 .mx_RightPanel_blank {
     order: 2;
     flex: 1 1 0;
@@ -93,30 +94,26 @@ limitations under the License.
 }
 
 .mx_RightPanel_footer .mx_RightPanel_invite {
-    line-height: 35px;
     font-size: 14px;
 	color: $primary-fg-color;
     padding-top: 13px;
     padding-left: 5px;
     cursor: pointer;
+    display: flex;
+    align-items: center;
 }
 
 .collapsed .mx_RightPanel_footer .mx_RightPanel_invite {
     display: none;
 }
 
-.mx_RightPanel_invite .mx_RightPanel_icon {
-    display: inline-block;
-}
-
 .mx_RightPanel_invite .mx_RightPanel_icon object {
     pointer-events: none;
 }
 
 .mx_RightPanel_invite .mx_RightPanel_message {
-    display: inline-block;
-    vertical-align: top;
-    padding-left: 10px
+    padding-left: 10px;
+    line-height: 18px;
 }
 
 .mx_MatrixChat_useCompactLayout {
diff --git a/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
new file mode 100644
index 0000000000..975ee8c1a0
--- /dev/null
+++ b/src/skins/vector/css/vector-web/views/dialogs/_DevtoolsDialog.scss
@@ -0,0 +1,19 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+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_DevTools_RoomStateExplorer_button, .mx_DevTools_RoomStateExplorer_query {
+    margin-bottom: 10px;
+}
diff --git a/src/skins/vector/img/cancel-red.svg b/src/skins/vector/img/cancel-red.svg
new file mode 100644
index 0000000000..a72a970b62
--- /dev/null
+++ b/src/skins/vector/img/cancel-red.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <title>Slice 1</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <path d="M9.74464309,-3.02908503 L8.14106175,-3.02908503 L8.14106175,8.19448443 L-3.03028759,8.19448443 L-3.03028759,9.7978515 L8.14106175,9.7978515 L8.14106175,20.9685098 L9.74464309,20.9685098 L9.74464309,9.7978515 L20.9697124,9.7978515 L20.9697124,8.19448443 L9.74464309,8.19448443 L9.74464309,-3.02908503" id="Fill-108" opacity="0.9" fill="#ff0064" sketch:type="MSShapeGroup" transform="translate(8.969712, 8.969712) rotate(-315.000000) translate(-8.969712, -8.969712) "></path>
+    </g>
+</svg>
diff --git a/src/skins/vector/img/edit.svg b/src/skins/vector/img/edit.svg
new file mode 100644
index 0000000000..a0be3454e1
--- /dev/null
+++ b/src/skins/vector/img/edit.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<g>
+	
+		<rect x="178.846" y="92.087" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 224.3476 631.1498)" width="128.085" height="354.049"/>
+	<path d="M471.723,88.393l-48.115-48.114c-11.723-11.724-31.558-10.896-44.304,1.85l-45.202,45.203l90.569,90.568l45.202-45.202
+		C482.616,119.952,483.445,100.116,471.723,88.393z"/>
+	<polygon points="64.021,363.252 32,480 148.737,447.979 	"/>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icon-delete-pink.svg b/src/skins/vector/img/icon-delete-pink.svg
new file mode 100644
index 0000000000..9d9907d81b
--- /dev/null
+++ b/src/skins/vector/img/icon-delete-pink.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<g>
+	<path fill="#FF0064" d="M85.633,454.889c0,31.168,25.553,56.661,56.79,56.661h227.156c31.234,0,56.787-25.493,56.787-56.661
+		V128.225H85.633V454.889z M468.958,43.042H362.479L326.828,0.45H185.173l-35.652,42.591H43.042v42.592h425.916V43.042z"/>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-apps-active.svg b/src/skins/vector/img/icons-apps-active.svg
new file mode 100644
index 0000000000..ea222d0511
--- /dev/null
+++ b/src/skins/vector/img/icons-apps-active.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="35px"
+	 height="35px" viewBox="0 0 35 35" enable-background="new 0 0 35 35" xml:space="preserve">
+<g id="Layer_1">
+	<path id="Oval-109-Copy" fill="#76CFA6" enable-background="new    " d="M17.5,35C27.165,35,35,27.165,35,17.5S27.165,0,17.5,0
+		S0,7.835,0,17.5S7.835,35,17.5,35z"/>
+	<g id="Icon">
+		<g>
+			<path fill="none" stroke="#FFFFFF" d="M7.5,12.5h5v-5h-5V12.5z M15,27.5h5v-5h-5V27.5z M7.5,27.5h5v-5h-5V27.5z M7.5,20h5v-5h-5
+				V20z M15,20h5v-5h-5V20z M22.5,7.5v5h5v-5H22.5z M15,12.5h5v-5h-5V12.5z M22.5,20h5v-5h-5V20z M22.5,27.5h5v-5h-5V27.5z"/>
+		</g>
+	</g>
+</g>
+<g id="Layer_2">
+	<g id="Icon_1_" opacity="0.15">
+		<g>
+			<path fill="none" stroke="#76CFA6" d="M7.5,12.5h5v-5h-5V12.5z M15,27.5h5v-5h-5V27.5z M7.5,27.5h5v-5h-5V27.5z M7.5,20h5v-5h-5
+				V20z M15,20h5v-5h-5V20z M22.5,7.5v5h5v-5H22.5z M15,12.5h5v-5h-5V12.5z M22.5,20h5v-5h-5V20z M22.5,27.5h5v-5h-5V27.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-apps.svg b/src/skins/vector/img/icons-apps.svg
new file mode 100644
index 0000000000..affd8e6408
--- /dev/null
+++ b/src/skins/vector/img/icons-apps.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="35px" height="35px" viewBox="0 0 35 35" enable-background="new 0 0 35 35" xml:space="preserve">
+<path id="Oval-109-Copy" opacity="0.15" fill="#76CFA6" enable-background="new    " d="M17.5,35C27.165,35,35,27.165,35,17.5
+	S27.165,0,17.5,0S0,7.835,0,17.5S7.835,35,17.5,35z"/>
+<g id="Icon">
+	<g>
+		<path fill="none" stroke="#76CFA6" d="M7.5,12.5h5v-5h-5V12.5z M15,27.5h5v-5h-5V27.5z M7.5,27.5h5v-5h-5V27.5z M7.5,20h5v-5h-5
+			V20z M15,20h5v-5h-5V20z M22.5,7.5v5h5v-5H22.5z M15,12.5h5v-5h-5V12.5z M22.5,20h5v-5h-5V20z M22.5,27.5h5v-5h-5V27.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-groups.svg b/src/skins/vector/img/icons-groups.svg
new file mode 100644
index 0000000000..8f89ba83c4
--- /dev/null
+++ b/src/skins/vector/img/icons-groups.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
+<style type="text/css">
+	.st4{fill:none;stroke-miterlimit:10;}
+</style>
+<g id="icons_people" transform="translate(50.000000, 725.000000)">
+	<path id="Oval-1-Copy-7" fill="#76CFA6" d="M-37.5-700c6.9,0,12.5-5.6,12.5-12.5S-30.6-725-37.5-725S-50-719.4-50-712.5
+		S-44.4-700-37.5-700z"/>
+	<g id="g4240_1_" transform="translate(6.945774,9.0366549)">
+		<path id="path4242_1_" class="st4" stroke="#FFFFFF" d="M-38.8-714.1c0-3.2,0-5.7-5.7-5.7s-5.7,2.5-5.7,5.7C-46.2-714.1-43.8-714.1-38.8-714.1z"/>
+		<circle id="circle4244_1_" class="st4" stroke="#FFFFFF" cx="-44.5" cy="-724.7" r="3.2"/>
+	</g>
+	<g>
+		<path fill="#FFFFFF" d="M-45.8-708.7c0-2.5,0.3-4,4.5-4c0.3,0,0.6,0,0.8,0c-0.3-0.3-0.6-0.6-0.8-1c0,0,0,0-0.1,0
+			c-5.5,0-5.5,2.7-5.5,5.5v0.5h2.7c0.1-0.3,0.1-0.7,0.2-1H-45.8z"/>
+		<path fill="#FFFFFF" d="M-43.6-717.4c0-1.3,1-2.3,2.3-2.3c0.6,0,1.1,0.2,1.5,0.5c0.3-0.2,0.6-0.3,1-0.5c-0.6-0.7-1.5-1.1-2.4-1.1
+			c-1.8,0-3.3,1.5-3.3,3.3c0,1.8,1.4,3.2,3.2,3.3c-0.1-0.3-0.2-0.7-0.3-1C-42.8-715.3-43.6-716.2-43.6-717.4z"/>
+		<path fill="#FFFFFF" d="M-27.8-708.2c0-2.8,0-5.5-5.5-5.5c-0.2,0-0.3,0-0.5,0c-0.2,0.4-0.5,0.7-0.8,1c0.4,0,0.8-0.1,1.3-0.1
+			c4.2,0,4.5,1.5,4.5,4h-2.4c0.1,0.3,0.2,0.7,0.2,1h3.1V-708.2z"/>
+		<path fill="#FFFFFF" d="M-33.3-719.7c1.3,0,2.3,1,2.3,2.3c0,1.3-1,2.3-2.3,2.3c0,0,0,0,0,0c0,0.3-0.1,0.7-0.3,1c0.1,0,0.2,0,0.3,0
+			c1.8,0,3.3-1.5,3.3-3.3c0-1.8-1.5-3.3-3.3-3.3c-1,0-1.9,0.5-2.5,1.2c0.3,0.1,0.6,0.3,0.9,0.5C-34.6-719.4-34-719.7-33.3-719.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-hide-apps.svg b/src/skins/vector/img/icons-hide-apps.svg
new file mode 100644
index 0000000000..b622e97f71
--- /dev/null
+++ b/src/skins/vector/img/icons-hide-apps.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
+<style type="text/css">
+	.st1{opacity:0.85;}
+	.st2{fill:none;stroke:#FFFFFF;stroke-width:1;stroke-linecap:round;stroke-miterlimit:10;}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:none;stroke:#FFFFFF;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<g id="Layer_1_1_">
+	<path id="Oval-109-Copy" fill="#76CFA6" d="M17.5,35C27.2,35,35,27.2,35,17.5S27.2,0,17.5,0S0,7.8,0,17.5S7.8,35,17.5,35z"/>
+</g>
+<g id="frame" class="st1">
+	<g id="Layer_3">
+		<g>
+			<g>
+				<line class="st2" x1="17.5" y1="21" x2="17.5" y2="26"/>
+				<g>
+					<polygon class="st3" points="15.5,21.8 17.5,18.3 19.5,21.8 					"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<rect x="6.7" y="6.7" class="st4" width="21.6" height="21.6"/>
+	<line class="st4" x1="6.7" y1="16.7" x2="28.2" y2="16.7"/>
+	<path class="st3" d="M13.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3H9.9c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H13
+		C13.2,13.5,13.3,13.4,13.3,13.3z"/>
+	<path class="st3" d="M19.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H19
+		C19.2,13.5,19.3,13.4,19.3,13.3z"/>
+	<path class="st3" d="M25.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H25
+		C25.2,13.5,25.3,13.4,25.3,13.3z"/>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-pin.svg b/src/skins/vector/img/icons-pin.svg
new file mode 100644
index 0000000000..a6fbf13baa
--- /dev/null
+++ b/src/skins/vector/img/icons-pin.svg
@@ -0,0 +1,7 @@
+<svg width="16px" height="16px" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <g transform="scale(0.03125)">
+  <path id="svg_2" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" d="m315.802,402.338c12.73,-33.537 13.503,-69.629 3.623,-102.697l93.245,-103.107l7.831,7.831c10.411,10.409 27.283,10.409 37.691,0c10.41,-10.408 10.41,-27.281 0.001,-37.69l-112.869,-112.867c-10.407,-10.409 -27.279,-10.41 -37.689,-0.001c-10.408,10.41 -10.409,27.283 0.001,37.693l7.833,7.833l-103.107,93.243c-33.069,-9.878 -69.163,-9.107 -102.697,3.626c-4.7,1.785 -8.001,5.646 -9.059,10.604c-1.175,5.473 0.627,11.402 4.697,15.472l184.42,184.421c4.069,4.07 10,5.871 15.472,4.695c4.959,-1.055 8.82,-4.357 10.607,-9.056z"/>
+  <polyline id="svg_3" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" points="    180.951,297.927 46,466 215.319,332.295   "/>
+  <!--<line id="svg_4" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" y2="219.549" y1="138.166" x2="255.531" x1="336.915"/>-->
+ </g>
+</svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/icons-room-add.svg b/src/skins/vector/img/icons-room-add.svg
new file mode 100644
index 0000000000..fc0ab750b6
--- /dev/null
+++ b/src/skins/vector/img/icons-room-add.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg4196" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 25 25"
+	 style="enable-background:new 0 0 25 25;" xml:space="preserve">
+<style type="text/css">
+	.st1{opacity:0.7;}
+	.st2{fill:none;stroke-linecap:round;}
+</style>
+<g id="icons_people" transform="translate(50.000000, 725.000000)">
+	<path id="Oval-1-Copy-7" fill="#76CFA6" d="M-37.5-700c6.9,0,12.5-5.6,12.5-12.5S-30.6-725-37.5-725S-50-719.4-50-712.5
+		S-44.4-700-37.5-700z"/>
+	<g id="text3879" transform="matrix(1.0243293,0,0,0.97624855,-24.996028,0.15844144)">
+		<g id="Group-3" transform="translate(14.4375,3.9375)" class="st1">
+			<path id="Line" class="st2" stroke="#ffffff" d="M-23.2-733.8h4.6"/>
+			<path id="path3142" class="st2" stroke="#ffffff" d="M-20.9-736.2v4.8"/>
+		</g>
+		<path id="path3002" fill="#ffffff" d="M-11.4-731.3l-0.5,2.6h2.2v1h-2.4l-0.7,3.3h-1.1l0.7-3.3
+			h-2.3l-0.6,3.3h-1.1l0.6-3.3h-2v-1h2.2l0.5-2.6H-18v-1h2.3l0.6-3.4h1.1l-0.6,3.4h2.4l0.7-3.4h1l-0.7,3.4h2v1H-11.4 M-15.3-728.7
+			h2.3l0.5-2.6h-2.3L-15.3-728.7"/>
+	</g>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-room.svg b/src/skins/vector/img/icons-room.svg
new file mode 100644
index 0000000000..d2abb21301
--- /dev/null
+++ b/src/skins/vector/img/icons-room.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 25 25" style="enable-background:new 0 0 25 25;" xml:space="preserve">
+<g id="icons_people">
+	<path id="Oval-1-Copy-7" fill="#76CFA6" d="M12.5,25C19.4,25,25,19.4,25,12.5S19.4,0,12.5,0S0,5.6,0,12.5S5.6,25,12.5,25z"/>
+	<g id="text3879" transform="scale(1.0243293,0.97624855)">
+		<path id="path3002" fill="#ffffff" d="M15.3,11.1l-0.6,3.3h2.8v1.3h-3l-0.8,4.2h-1.3l0.8-4.2h-3l-0.8,4.2H8.1l0.8-4.2H6.3v-1.3h2.8
+			l0.7-3.3H7.1V9.9H10l0.8-4.3h1.4l-0.8,4.3h3l0.8-4.3h1.3l-0.8,4.3h2.6v1.2H15.3 M10.4,14.5h3l0.6-3.3h-3L10.4,14.5"/>
+	</g>
+</g>
+</svg>
diff --git a/src/skins/vector/img/icons-show-apps.svg b/src/skins/vector/img/icons-show-apps.svg
new file mode 100644
index 0000000000..3438157301
--- /dev/null
+++ b/src/skins/vector/img/icons-show-apps.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 35 35" style="enable-background:new 0 0 35 35;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.15;}
+	.st2{fill:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:10;}
+	.st3{fill:none;stroke-linejoin:round;stroke-miterlimit:10;}
+</style>
+<g id="Layer_1_1_" class="st0">
+	<path id="Oval-109-Copy" fill="#76CFA6" d="M17.5,35C27.2,35,35,27.2,35,17.5S27.2,0,17.5,0S0,7.8,0,17.5S7.8,35,17.5,35z"/>
+</g>
+<g id="frame">
+	<g id="Layer_3">
+		<g>
+			<g>
+				<line class="st2" stroke="#76CFA6" x1="17.5" y1="23.9" x2="17.5" y2="18.9"/>
+				<g>
+					<polygon fill="#76CFA6" points="19.5,23.1 17.5,26.6 15.5,23.1 					"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<rect x="6.7" y="6.7" class="st3" stroke="#76CFA6" width="21.6" height="21.6"/>
+	<line class="st3" stroke="#76CFA6" x1="6.7" y1="16.7" x2="28.2" y2="16.7"/>
+	<path fill="#76CFA6" d="M13.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3H9.9c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H13
+		C13.2,13.5,13.3,13.4,13.3,13.3z"/>
+	<path fill="#76CFA6" d="M19.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H19
+		C19.2,13.5,19.3,13.4,19.3,13.3z"/>
+	<path fill="#76CFA6" d="M25.3,13.3v-3.1c0-0.1-0.1-0.3-0.3-0.3h-3.1c-0.1,0-0.3,0.1-0.3,0.3v3.1c0,0.1,0.1,0.3,0.3,0.3H25
+		C25.2,13.5,25.3,13.4,25.3,13.3z"/>
+</g>
+</svg>
diff --git a/src/skins/vector/img/logos/riot-im-logo-1.svg b/src/skins/vector/img/logos/riot-im-logo-1.svg
new file mode 100644
index 0000000000..a806c3bfda
--- /dev/null
+++ b/src/skins/vector/img/logos/riot-im-logo-1.svg
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 163.60767 144.2"
+   xml:space="preserve"
+   sodipodi:docname="riot-im-logo-1.svg"
+   width="163.60767"
+   height="144.2"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata3918"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs3916" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="2071"
+     id="namedview3914"
+     showgrid="false"
+     inkscape:zoom="0.98333333"
+     inkscape:cx="81.80767"
+     inkscape:cy="72.1"
+     inkscape:window-x="1912"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style3856">
+	.st0{fill:#7DC8A2;}
+	.st1{fill:#AFDBC5;}
+	.st2{fill:#764D80;}
+	.st3{fill:#764D80;stroke:#764D80;stroke-miterlimit:10;}
+</style><g
+     id="Layer_3"
+     transform="translate(-38.19233,-47.9)"><g
+       id="g3910"><g
+         id="g3886"><g
+           id="g3884"><path
+             class="st0"
+             d="M 100.6,48.1 H 59.7 c -0.1,0 -0.2,0 -0.3,0 -11.4,0 -20.6,9.2 -20.6,20.6 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.3,0 51.4,-23.1 51.4,-51.4 0,-28.3 -23.1,-51.4 -51.4,-51.4 z"
+             id="path3858"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="M 59.5,186.9 C 51,186.9 44.1,180 44.1,171.5 V 68.6 c 0,-8.5 6.9,-15.4 15.3,-15.4 0.1,0 0.2,0 0.3,0 h 40.9 c 25.5,0 46.3,20.8 46.3,46.3 0,25.5 -20.8,46.3 -46.3,46.3 H 74.9 v 25.7 c 0,8.4 -6.9,15.4 -15.4,15.4 z"
+             id="path3860"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 59.5,181.7 c -5.7,0 -10.3,-4.6 -10.3,-10.3 V 68.6 c 0,-5.6 4.5,-10.2 10.1,-10.3 0.1,0 0.2,0 0.3,0 h 41 c 22.7,0 41.1,18.5 41.1,41.1 0,22.6 -18.5,41.1 -41.1,41.1 H 69.8 v 30.8 c 0,5.8 -4.6,10.4 -10.3,10.4 z"
+             id="path3862"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 59.5,176.6 c -2.9,0 -5.2,-2.3 -5.2,-5.2 V 68.6 c 0,-2.8 2.2,-5.1 5,-5.2 h 0.2 41.1 c 19.9,0 36,16.2 36,36 0,19.8 -16.1,36 -36,36 H 64.7 v 36 c 0,2.9 -2.3,5.2 -5.2,5.2 z"
+             id="path3864"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 59.5,130.3 h 41.1 c 17,0 30.9,-13.8 30.9,-30.9 0,-17.1 -13.8,-30.9 -30.9,-30.9 H 59.5 Z"
+             id="path3866"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="M 64.7,125.2 V 73.7 h 36 c 14.2,0 25.7,11.5 25.7,25.7 0,14.2 -11.5,25.7 -25.7,25.7 z"
+             id="path3868"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="M 69.8,120.1 V 78.9 h 30.8 c 11.4,0 20.6,9.2 20.6,20.6 0,11.4 -9.2,20.6 -20.6,20.6 z"
+             id="path3870"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="M 74.9,115 V 84 h 25.7 c 8.5,0 15.5,6.9 15.5,15.5 0,8.6 -6.9,15.5 -15.5,15.5 z"
+             id="path3872"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="M 80,109.8 V 89.1 h 20.6 c 5.7,0 10.4,4.6 10.4,10.4 0,5.8 -4.6,10.4 -10.4,10.4 z"
+             id="path3874"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="M 85.2,104.7 V 94.2 h 15.4 c 2.9,0 5.2,2.3 5.2,5.2 0,2.9 -2.3,5.2 -5.2,5.2 z"
+             id="path3876"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><g
+             id="g3882"><circle
+               transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7245,46.1263)"
+               class="st2"
+               cx="58.799999"
+               cy="68.599998"
+               id="ellipse3878"
+               r="20.6"
+               style="fill:#764d80" /><path
+               class="st2"
+               d="m 147.6,159.6 c 6.5,9.3 4.3,22.1 -5,28.6 -9.3,6.5 -22.1,4.3 -28.6,-5 l -30.8,-44 c -6.5,-9.3 -4.3,-22.1 5,-28.6 9.3,-6.5 22.1,-4.3 28.6,5 z"
+               id="path3880"
+               inkscape:connector-curvature="0"
+               style="fill:#764d80" /></g></g></g><g
+         id="g3908"><g
+           id="g3896"><path
+             class="st2"
+             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path3888"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
+             id="path3890"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path3892"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path3894"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /></g><g
+           id="g3902"><path
+             class="st2"
+             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
+             id="path3898"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
+             id="path3900"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /></g><g
+           id="g3906"><path
+             class="st3"
+             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path3904"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/logos/riot-im-logo-2.svg b/src/skins/vector/img/logos/riot-im-logo-2.svg
new file mode 100644
index 0000000000..f9cc92f13b
--- /dev/null
+++ b/src/skins/vector/img/logos/riot-im-logo-2.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 163.7 144.10001"
+   xml:space="preserve"
+   sodipodi:docname="riot-im-logo-2.svg"
+   width="163.7"
+   height="144.10001"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata64"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs62" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview60"
+     showgrid="false"
+     inkscape:zoom="0.98333333"
+     inkscape:cx="81.9"
+     inkscape:cy="72"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#F69E98;}
+	.st1{fill:#764D80;}
+</style><g
+     id="Layer_3"
+     transform="translate(-38.1,-47.9)"><g
+       id="g26"><g
+         id="g24"><g
+           id="g12"><path
+             class="st0"
+             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path4"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /><path
+             class="st0"
+             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
+             id="path6"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /><path
+             class="st0"
+             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path8"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /><path
+             class="st0"
+             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path10"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /></g><g
+           id="g18"><path
+             class="st0"
+             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
+             id="path14"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /><path
+             class="st0"
+             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
+             id="path16"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /></g><g
+           id="g22"><path
+             class="st0"
+             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path20"
+             inkscape:connector-curvature="0"
+             style="fill:#f69e98" /></g></g></g></g><g
+     id="g57"
+     transform="translate(-38.1,-47.9)"><path
+       class="st1"
+       d="M 99.9,48 H 58.7 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.5 c 28.4,0 51.4,-23 51.4,-51.4 C 151.2,71 128.2,48 99.9,48 Z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#764d80" /><path
+       class="st0"
+       d="m 58.7,187.6 c -8.9,0 -16.2,-7.2 -16.2,-16.2 V 68.6 c 0,-8.9 7.1,-16.1 16,-16.2 h 41.3 c 26,0 47,21 47,47 0,26 -21,47 -47,47 H 74.9 v 25 c 0,9 -7.2,16.2 -16.2,16.2 z M 58.6,53.9 c -8,0.1 -14.5,6.6 -14.5,14.7 v 102.8 c 0,8.1 6.6,14.7 14.7,14.7 8.1,0 14.7,-6.6 14.7,-14.7 v -26.5 h 26.4 c 25.1,0 45.5,-20.4 45.5,-45.5 0,-25.1 -20.4,-45.5 -45.5,-45.5 0,0 -41.3,0 -41.3,0 z"
+       id="path31"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="m 58.7,182.4 c -6.1,0 -11,-4.9 -11,-11 V 68.6 c 0,-6 4.8,-10.8 10.8,-11 h 41.3 c 23.1,0 41.9,18.7 41.9,41.9 0,23.2 -18.7,41.8 -41.9,41.8 h -30 v 30.1 c 0,6.1 -4.9,11 -11.1,11 0.1,0 0.1,0 0,0 z M 58.5,59 c -5.2,0.1 -9.3,4.4 -9.3,9.6 v 102.8 c -0.2,5.3 4,9.7 9.2,9.8 5.2,0.1 9.7,-4 9.8,-9.2 0,-0.2 0,-0.4 0,-0.6 v -31.6 h 31.6 c 22.3,0 40.3,-18.1 40.3,-40.4 0,-22.3 -18.1,-40.3 -40.3,-40.3 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="m 58.7,177.3 c -3.2,0 -5.9,-2.6 -5.9,-5.9 V 68.6 c 0,-3.1 2.5,-5.7 5.6,-5.9 h 41.4 c 20.3,0 36.7,16.4 36.7,36.7 0,20.3 -16.4,36.7 -36.7,36.7 H 64.6 v 35.2 c 0,3.3 -2.6,6 -5.9,6 z M 58.5,64.2 c -2.3,0.2 -4.1,2.1 -4.1,4.4 v 102.8 c 0,2.4 2,4.4 4.4,4.4 2.4,0 4.4,-2 4.4,-4.4 v -36.8 h 36.7 c 19.4,0 35.2,-15.8 35.2,-35.2 0,-19.4 -15.8,-35.2 -35.2,-35.2 z"
+       id="path35"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,131 H 58 V 67.9 h 41.9 c 17.4,0 31.6,14.1 31.6,31.6 0,17.5 -14.2,31.5 -31.6,31.5 z M 59.5,129.5 H 99.9 C 116.5,129.5 130,116 130,99.4 130,82.8 116.5,69.3 99.9,69.3 H 59.5 Z"
+       id="path37"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,125.9 H 63.2 V 73 h 36.7 c 14.6,0.3 26.2,12.3 25.9,26.9 -0.3,14.3 -11.8,25.7 -25.9,26 z M 64.6,124.4 H 99.8 C 113.6,124.1 124.5,112.7 124.2,99 123.9,85.6 113.2,74.8 99.8,74.6 H 64.6 Z"
+       id="path39"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,120.7 H 68.3 V 78.2 h 31.6 c 11.8,0.3 21.1,10 20.8,21.7 -0.3,11.4 -9.5,20.6 -20.8,20.8 z M 69.8,119.2 H 99.9 C 110.8,119 119.5,109.9 119.2,99 119,88.4 110.4,79.9 99.9,79.7 H 69.8 Z"
+       id="path41"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,115.6 H 73.4 V 83.3 h 26.4 c 8.9,0 16.1,7.2 16.1,16.1 0,8.9 -7.1,16.2 -16,16.2 z m -25,-1.6 h 24.9 c 8.1,0 14.6,-6.6 14.6,-14.6 0,-8 -6.6,-14.6 -14.6,-14.6 v 0 H 74.9 Z"
+       id="path43"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,110.4 H 78.6 v -22 h 21.3 c 6.1,0 11,4.9 11,11 0,6.1 -5,11 -11,11 z m -19.8,-1.5 h 19.8 c 5.2,0 9.5,-4.3 9.5,-9.5 0,-5.2 -4.3,-9.5 -9.5,-9.5 H 80.1 Z"
+       id="path45"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="M 99.9,105.3 H 83.7 V 93.6 h 16.1 c 3.2,0 5.9,2.6 5.9,5.9 0,3.3 -2.6,5.8 -5.8,5.8 0,0 0,0 0,0 z m -14.7,-1.5 h 14.7 c 2.4,0 4.4,-2 4.4,-4.4 0,-2.4 -2,-4.4 -4.4,-4.4 H 85.2 Z"
+       id="path47"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="m 99.4,100.2 h -9.3 c -0.4,0 -0.8,-0.3 -0.8,-0.8 0,-0.5 0.3,-0.8 0.8,-0.8 h 9.3 c 0.4,0 0.8,0.3 0.8,0.8 0,0.5 -0.4,0.8 -0.8,0.8 z"
+       id="path49"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="m 58.7,172.2 c -0.4,0 -0.8,-0.3 -0.8,-0.8 v -36 c 0,-0.4 0.3,-0.8 0.8,-0.8 0.4,0 0.8,0.3 0.8,0.8 v 36 c 0,0.4 -0.3,0.8 -0.8,0.8 z"
+       id="path51"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><circle
+       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7215,46.1209)"
+       class="st0"
+       cx="58.799999"
+       cy="68.599998"
+       id="ellipse53"
+       r="20.6"
+       style="fill:#f69e98" /><path
+       class="st0"
+       d="m 147.5,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 L 83,139.1 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
+       id="path55"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /></g></svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/logos/riot-im-logo-3.svg b/src/skins/vector/img/logos/riot-im-logo-3.svg
new file mode 100644
index 0000000000..7f81dacd72
--- /dev/null
+++ b/src/skins/vector/img/logos/riot-im-logo-3.svg
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 163.89999 144.3"
+   xml:space="preserve"
+   sodipodi:docname="riot-im-logo-3.svg"
+   width="163.89999"
+   height="144.3"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata68"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs66" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview64"
+     showgrid="false"
+     inkscape:zoom="0.98333333"
+     inkscape:cx="82.1"
+     inkscape:cy="72.2"
+     inkscape:window-x="1034"
+     inkscape:window-y="234"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#FAC79E;}
+	.st1{fill:#E45E5D;}
+	.st2{fill:#F8A05F;}
+</style><g
+     id="Layer_3"
+     transform="translate(-37.9,-47.9)"><g
+       id="g26"><g
+         id="g24"><g
+           id="g12"><path
+             class="st0"
+             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path4"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /><path
+             class="st0"
+             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
+             id="path6"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /><path
+             class="st0"
+             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path8"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /><path
+             class="st0"
+             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path10"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /></g><g
+           id="g18"><path
+             class="st0"
+             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
+             id="path14"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /><path
+             class="st0"
+             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
+             id="path16"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /></g><g
+           id="g22"><path
+             class="st0"
+             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path20"
+             inkscape:connector-curvature="0"
+             style="fill:#fac79e" /></g></g></g></g><g
+     id="g61"
+     transform="translate(-37.9,-47.9)"><path
+       class="st1"
+       d="M 99.6,48.2 H 58.5 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 V 151 h 20.6 c 28.4,0 51.4,-23 51.4,-51.4 0,-28.4 -23.1,-51.4 -51.5,-51.4 z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#e45e5d" /><polygon
+       class="st2"
+       points="37.9,96.3 37.9,104.3 85,48.2 78.3,48.2 "
+       id="polygon31"
+       style="fill:#f8a05f" /><polygon
+       class="st2"
+       points="37.9,112.3 37.9,120.2 98.4,48.2 91.7,48.2 "
+       id="polygon33"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 110.8,49.5 c -1.9,-0.4 -3.9,-0.8 -5.9,-1 L 38,128.3 v 8 z"
+       id="path35"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><polygon
+       class="st2"
+       points="37.9,80.3 37.9,88.3 71.6,48.2 64.8,48.2 "
+       id="polygon37"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 121.2,53 c -1.6,-0.8 -3.3,-1.4 -5,-2 l -78.3,93.2 v 8 z"
+       id="path39"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 79.1,151 h 0.2 L 144,73.8 c -0.9,-1.5 -1.9,-3 -2.9,-4.5 L 43.5,185.6 c 1.2,1.3 2.5,2.4 4,3.3 l 31.6,-37.7 z"
+       id="path41"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="M 150.2,90.4 99.4,151 h 0.2 c 2.3,0 4.6,-0.2 6.9,-0.5 l 44.5,-53 c -0.2,-2.4 -0.4,-4.7 -0.8,-7.1 z"
+       id="path43"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 78.7,175.7 -12.6,15 c 6.4,-2.6 11.2,-8.2 12.6,-15 z"
+       id="path45"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 147.9,117.1 c 1.3,-3.6 2.2,-7.4 2.7,-11.2 l -35.9,42.8 c 3.7,-1.1 7.3,-2.7 10.6,-4.6 z"
+       id="path47"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 130.2,58.3 c -1.4,-1 -2.8,-2 -4.3,-2.9 l -88,104.8 v 8 z"
+       id="path49"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 137.8,65.2 c -1.2,-1.3 -2.4,-2.5 -3.6,-3.7 L 38.4,175.7 c 0.4,1.9 1.1,3.8 2,5.6 z"
+       id="path51"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 79.1,167.2 v -8 l -26.8,32 c 1.9,0.6 3.9,1 5.9,1 z"
+       id="path53"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><path
+       class="st2"
+       d="m 148.7,84.2 c -0.6,-1.9 -1.3,-3.7 -2.1,-5.5 L 85.9,151 h 6.7 z"
+       id="path55"
+       inkscape:connector-curvature="0"
+       style="fill:#f8a05f" /><circle
+       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.8644,46.014)"
+       class="st0"
+       cx="58.5"
+       cy="68.800003"
+       id="ellipse57"
+       r="20.6"
+       style="fill:#fac79e" /><path
+       class="st0"
+       d="m 147.3,159.8 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
+       id="path59"
+       inkscape:connector-curvature="0"
+       style="fill:#fac79e" /></g></svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/logos/riot-im-logo-4.svg b/src/skins/vector/img/logos/riot-im-logo-4.svg
new file mode 100644
index 0000000000..307868e604
--- /dev/null
+++ b/src/skins/vector/img/logos/riot-im-logo-4.svg
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 163.89999 144.10001"
+   xml:space="preserve"
+   sodipodi:docname="riot-im-logo-4.svg"
+   width="163.89999"
+   height="144.10001"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata70"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs68" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview66"
+     showgrid="false"
+     inkscape:zoom="0.98333333"
+     inkscape:cx="82.1"
+     inkscape:cy="72"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#C7BDCD;}
+	.st1{fill:#E45E5D;}
+	.st2{fill:#F69E98;}
+</style><g
+     id="Layer_3"
+     transform="translate(-37.9,-47.9)"><g
+       id="g26"><g
+         id="g24"><g
+           id="g12"><path
+             class="st0"
+             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path4"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /><path
+             class="st0"
+             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
+             id="path6"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /><path
+             class="st0"
+             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path8"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /><path
+             class="st0"
+             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path10"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /></g><g
+           id="g18"><path
+             class="st0"
+             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
+             id="path14"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /><path
+             class="st0"
+             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
+             id="path16"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /></g><g
+           id="g22"><path
+             class="st0"
+             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path20"
+             inkscape:connector-curvature="0"
+             style="fill:#c7bdcd" /></g></g></g></g><g
+     id="g63"
+     transform="translate(-37.9,-47.9)"><path
+       class="st1"
+       d="M 99.6,48 H 58.5 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 V 150.8 H 99.6 C 128,150.8 151,127.8 151,99.4 151,71 128,48 99.6,48 Z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#e45e5d" /><path
+       class="st2"
+       d="m 40.7,181.7 c 1.1,1.9 2.6,3.7 4.2,5.1 H 72 c 1.7,-1.5 3.1,-3.2 4.2,-5.1 z"
+       id="path31"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,140.6 v 5.1 h 84 c 3,-1.4 5.8,-3.2 8.4,-5.1 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><rect
+       x="37.900002"
+       y="150.8"
+       class="st2"
+       width="41.099998"
+       height="5.0999999"
+       id="rect35"
+       style="fill:#f69e98" /><rect
+       x="37.900002"
+       y="161.10001"
+       class="st2"
+       width="41.099998"
+       height="5.0999999"
+       id="rect37"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 38.6,63.4 h 97.6 c -1.8,-1.9 -3.8,-3.6 -5.9,-5.1 H 40.7 c -0.9,1.6 -1.6,3.3 -2.1,5.1 z"
+       id="path39"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,171.4 v 0 c 0,1.7 0.2,3.4 0.7,5.1 h 39.8 c 0.4,-1.7 0.7,-3.4 0.7,-5.1 0,0 -41.2,0 -41.2,0 z"
+       id="path41"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,104.6 h 112.8 c 0.2,-1.7 0.3,-3.4 0.3,-5.1 H 37.9 Z"
+       id="path43"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,130.3 v 5.1 h 98.3 c 1.6,-1.6 3.1,-3.3 4.4,-5.1 z"
+       id="path45"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,68.6 v 5.1 H 144 c -1,-1.8 -2.2,-3.5 -3.4,-5.1 z"
+       id="path47"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 58.7,48 h -0.2 c -5,0 -9.8,1.8 -13.6,5.1 h 77 C 114.9,49.7 107.3,48 99.6,48 Z"
+       id="path49"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="M 37.9,78.9 V 84 h 110.7 c -0.6,-1.7 -1.2,-3.5 -1.9,-5.1 z"
+       id="path51"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,120 v 5.1 H 144 c 1,-1.7 1.8,-3.4 2.6,-5.1 z"
+       id="path53"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,109.7 v 5.1 h 110.7 c 0.5,-1.7 1,-3.4 1.3,-5.1 z"
+       id="path55"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><path
+       class="st2"
+       d="m 37.9,89.3 v 5.1 h 112.8 c -0.2,-1.7 -0.4,-3.4 -0.8,-5.1 z"
+       id="path57"
+       inkscape:connector-curvature="0"
+       style="fill:#f69e98" /><circle
+       transform="matrix(0.8192,-0.5736,0.5736,0.8192,-28.7665,45.9782)"
+       class="st0"
+       cx="58.5"
+       cy="68.599998"
+       id="ellipse59"
+       r="20.6"
+       style="fill:#c7bdcd" /><path
+       class="st0"
+       d="m 147.3,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
+       id="path61"
+       inkscape:connector-curvature="0"
+       style="fill:#c7bdcd" /></g></svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/logos/riot-im-logo-5.svg b/src/skins/vector/img/logos/riot-im-logo-5.svg
new file mode 100644
index 0000000000..2653d7c9c8
--- /dev/null
+++ b/src/skins/vector/img/logos/riot-im-logo-5.svg
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 164.01289 144.2"
+   xml:space="preserve"
+   sodipodi:docname="riot-im-logo-5.svg"
+   width="164.01289"
+   height="144.2"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata42"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs40" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview38"
+     showgrid="false"
+     inkscape:zoom="0.98333333"
+     inkscape:cx="82.212895"
+     inkscape:cy="72.1"
+     inkscape:window-x="1100"
+     inkscape:window-y="295"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#AFDBC5;}
+	.st1{fill:#764D80;}
+</style><g
+     id="Layer_3"
+     transform="translate(-37.787105,-47.9)"><g
+       id="g26"><g
+         id="g24"><g
+           id="g12"><path
+             class="st0"
+             d="M 183.6,80.7 H 200 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path4"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 183.6,51.3 h 4.9 v 5 0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 0 c 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 z"
+             id="path6"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 200,123.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path8"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 191.8,94.5 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path10"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /></g><g
+           id="g18"><path
+             class="st0"
+             d="m 201.1,157 c -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.4,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.4 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.3,0 0.7,-0.1 1.1,-0.4 0.3,-0.3 0.4,-0.6 0.4,-1.1 0,-0.4 -0.1,-0.8 -0.4,-1.1 z"
+             id="path14"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 201.5,175.3 v -0.2 c 0,-0.4 -0.1,-0.8 -0.4,-1.1 -0.3,-0.3 -0.6,-0.4 -1.1,-0.4 h -16.5 c -0.3,0 -0.7,0 -1.1,0.3 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 h 12.1 l -7.3,4.9 c -0.4,0.4 -0.6,0.8 -0.6,1.3 0,0.5 0.3,1 0.7,1.3 l 7.3,5 h -12.1 c -0.3,0 -0.7,0.1 -1.1,0.4 -0.3,0.3 -0.4,0.6 -0.4,1.1 0,0.5 0.1,0.7 0.4,1.1 0.3,0.4 0.6,0.4 1.1,0.4 H 200 c 0.4,0 0.7,-0.1 1.1,-0.4 0.4,-0.3 0.4,-0.6 0.4,-1.1 v -0.2 c 0,-0.5 -0.1,-1.1 -0.7,-1.4 l -9.2,-6.1 9.2,-6.1 c 0.4,-0.3 0.7,-0.8 0.7,-1.4 z"
+             id="path16"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /></g><g
+           id="g22"><path
+             class="st0"
+             d="m 190.7,146.1 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path20"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /></g></g></g></g><g
+     id="g35"
+     transform="translate(-37.787105,-47.9)"><path
+       class="st1"
+       d="M 99.5,48.1 H 58.4 c -11.4,0 -20.6,9.2 -20.6,20.6 0,0 0,0 0,0 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.4,0 51.4,-23 51.4,-51.4 0,-28.4 -23.2,-51.4 -51.5,-51.4 z"
+       id="path29"
+       inkscape:connector-curvature="0"
+       style="fill:#764d80" /><circle
+       transform="matrix(0.8211,-0.5708,0.5708,0.8211,-28.7968,45.5905)"
+       class="st0"
+       cx="58.299999"
+       cy="68.699997"
+       id="ellipse31"
+       r="20.5"
+       style="fill:#afdbc5" /><path
+       class="st0"
+       d="m 147.2,159.6 c 6.5,9.3 4.3,22.1 -5.1,28.6 -9.4,6.5 -22.1,4.3 -28.6,-5.1 l -30.8,-44 c -6.5,-9.3 -4.2,-22.1 5.1,-28.6 9.3,-6.5 22.1,-4.2 28.6,5.1 z"
+       id="path33"
+       inkscape:connector-curvature="0"
+       style="fill:#afdbc5" /></g></svg>
\ No newline at end of file
diff --git a/src/skins/vector/img/logos/riot.im logo.svg b/src/skins/vector/img/logos/riot.im logo.svg
new file mode 100644
index 0000000000..5ebd96e84b
--- /dev/null
+++ b/src/skins/vector/img/logos/riot.im logo.svg	
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 163.57917 144.19999"
+   xml:space="preserve"
+   id="svg75"
+   sodipodi:docname="riot.im logo.svg"
+   width="163.57916"
+   height="144.2"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata81"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs79" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview77"
+     showgrid="false"
+     inkscape:zoom="0.28031832"
+     inkscape:cx="73.079153"
+     inkscape:cy="50.349988"
+     inkscape:window-x="1067"
+     inkscape:window-y="442"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg75" /><style
+     type="text/css"
+     id="style2">
+	.st0{fill:#7DC8A2;}
+	.st1{fill:#AFDBC5;}
+	.st2{fill:#764D80;}
+	.st3{fill:#764D80;stroke:#764D80;stroke-miterlimit:10;}
+</style><g
+     id="Grid"
+     transform="translate(-522.22083,-327.1)"><g
+       id="g4" /><g
+       id="g6" /><g
+       id="g8" /><g
+       id="g10" /><g
+       id="g12" /></g><g
+     id="Design"
+     transform="translate(-522.22083,-327.1)"><g
+       id="g17"><g
+         id="g15" /></g></g><g
+     id="Layer_3"
+     transform="translate(-522.22083,-327.1)"><g
+       id="g72"><g
+         id="g48"><g
+           id="g46"><path
+             class="st0"
+             d="m 584.6,327.3 h -40.9 c -0.1,0 -0.2,0 -0.3,0 -11.4,0 -20.6,9.2 -20.6,20.6 v 102.8 c 0,11.4 9.2,20.6 20.6,20.6 11.4,0 20.6,-9.2 20.6,-20.6 v -20.6 h 20.6 c 28.3,0 51.4,-23.1 51.4,-51.4 0,-28.3 -23.1,-51.4 -51.4,-51.4 z"
+             id="path20"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 543.5,466.1 c -8.5,0 -15.4,-6.9 -15.4,-15.4 V 347.8 c 0,-8.5 6.9,-15.4 15.3,-15.4 0.1,0 0.2,0 0.3,0 h 40.9 c 25.5,0 46.3,20.8 46.3,46.3 0,25.5 -20.8,46.3 -46.3,46.3 h -25.7 v 25.7 c 0,8.4 -6.9,15.4 -15.4,15.4 z"
+             id="path22"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 543.5,460.9 c -5.7,0 -10.3,-4.6 -10.3,-10.3 V 347.8 c 0,-5.6 4.5,-10.2 10.1,-10.3 0.1,0 0.2,0 0.3,0 h 41 c 22.7,0 41.1,18.5 41.1,41.1 0,22.6 -18.5,41.1 -41.1,41.1 h -30.8 v 30.8 c 0,5.8 -4.6,10.4 -10.3,10.4 z"
+             id="path24"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 543.5,455.8 c -2.9,0 -5.2,-2.3 -5.2,-5.2 V 347.8 c 0,-2.8 2.2,-5.1 5,-5.2 h 0.2 41.1 c 19.9,0 36,16.2 36,36 0,19.8 -16.1,36 -36,36 h -35.9 v 36 c 0,2.9 -2.3,5.2 -5.2,5.2 z"
+             id="path26"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 543.5,409.5 h 41.1 c 17,0 30.9,-13.8 30.9,-30.9 0,-17.1 -13.8,-30.9 -30.9,-30.9 h -41.1 z"
+             id="path28"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 548.7,404.4 v -51.5 h 36 c 14.2,0 25.7,11.5 25.7,25.7 0,14.2 -11.5,25.7 -25.7,25.7 h -36 z"
+             id="path30"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 553.8,399.3 v -41.2 h 30.8 c 11.4,0 20.6,9.2 20.6,20.6 0,11.4 -9.2,20.6 -20.6,20.6 z"
+             id="path32"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 558.9,394.2 v -31 h 25.7 c 8.5,0 15.5,6.9 15.5,15.5 0,8.6 -6.9,15.5 -15.5,15.5 z"
+             id="path34"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><path
+             class="st0"
+             d="m 564,389 v -20.7 h 20.6 c 5.7,0 10.4,4.6 10.4,10.4 0,5.8 -4.6,10.4 -10.4,10.4 H 564 Z"
+             id="path36"
+             inkscape:connector-curvature="0"
+             style="fill:#7dc8a2" /><path
+             class="st1"
+             d="m 569.2,383.9 v -10.5 h 15.4 c 2.9,0 5.2,2.3 5.2,5.2 0,2.9 -2.3,5.2 -5.2,5.2 h -15.4 z"
+             id="path38"
+             inkscape:connector-curvature="0"
+             style="fill:#afdbc5" /><g
+             id="g44"><circle
+               transform="matrix(0.8192,-0.5736,0.5736,0.8192,-101.3379,374.2691)"
+               class="st2"
+               cx="542.79999"
+               cy="347.79999"
+               id="ellipse40"
+               r="20.6"
+               style="fill:#764d80" /><path
+               class="st2"
+               d="m 631.6,438.8 c 6.5,9.3 4.3,22.1 -5,28.6 -9.3,6.5 -22.1,4.3 -28.6,-5 l -30.8,-44 c -6.5,-9.3 -4.3,-22.1 5,-28.6 9.3,-6.5 22.1,-4.3 28.6,5 z"
+               id="path42"
+               inkscape:connector-curvature="0"
+               style="fill:#764d80" /></g></g></g><g
+         id="g70"><g
+           id="g58"><path
+             class="st2"
+             d="M 667.6,359.9 H 684 c 0.9,0 1.6,-0.7 1.6,-1.6 0,-0.9 -0.7,-1.6 -1.6,-1.6 h -16.4 c -0.9,0 -1.6,0.7 -1.6,1.6 0,0.9 0.7,1.6 1.6,1.6 z"
+             id="path50"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 667.6,330.5 h 4.9 v 5 c 0,0 0,0 0,0 l -5.8,4 c -0.7,0.5 -0.9,1.5 -0.4,2.3 0.5,0.7 1.5,0.9 2.3,0.4 l 4.6,-3.2 c 1.1,2.2 3.3,3.6 5.9,3.6 3.6,0 6.6,-3 6.6,-6.6 v -7.2 c 0,0 0,0 0,0 0,-0.6 -0.3,-1.1 -0.7,-1.4 -0.3,-0.2 -0.6,-0.3 -0.9,-0.3 v 0 h -9.8 -6.5 c -0.9,0 -1.6,0.7 -1.6,1.6 -0.2,1.1 0.5,1.8 1.4,1.8 z m 14.7,5.6 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 v -5.6 h 6.5 v 5.6 z"
+             id="path52"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 684,402.9 c -0.9,0 -1.6,0.7 -1.6,1.6 v 4.9 h -14.7 c -0.9,0 -1.6,0.7 -1.6,1.6 v 0 c 0,0.9 0.7,1.6 1.6,1.6 h 14.7 v 5 c 0,0.9 0.7,1.6 1.6,1.6 0.9,0 1.6,-0.7 1.6,-1.6 v -6.6 0 -6.5 c 0,-0.9 -0.7,-1.6 -1.6,-1.6 z"
+             id="path54"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /><path
+             class="st2"
+             d="m 675.8,373.7 c -5.5,0 -10,4.5 -10,10 0,5.5 4.5,10 10,10 5.5,0 10,-4.5 10,-10 0,-5.5 -4.5,-10 -10,-10 z m 0,16.7 c -3.7,0 -6.7,-3 -6.7,-6.7 0,-3.7 3,-6.7 6.7,-6.7 3.7,0 6.7,3 6.7,6.7 0,3.7 -3,6.7 -6.7,6.7 z"
+             id="path56"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80" /></g><g
+           id="g64"><path
+             class="st3"
+             d="M 667.5,436.3 H 684 c 0.3,0 0.5,0.1 0.7,0.3 0.2,0.2 0.3,0.4 0.3,0.7 0,0.3 -0.1,0.5 -0.3,0.7 -0.2,0.2 -0.5,0.3 -0.7,0.3 h -16.5 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.4,-0.3 0.7,-0.3 z"
+             id="path60"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /><path
+             class="st3"
+             d="M 667.5,453.3 H 684 c 0.3,0 0.5,0.1 0.7,0.3 0.2,0.2 0.3,0.4 0.3,0.7 v 0.2 c 0,0.4 -0.2,0.7 -0.5,1 l -9.8,6.5 9.8,6.5 c 0.4,0.2 0.5,0.5 0.5,1 v 0.2 c 0,0.3 -0.1,0.5 -0.3,0.7 -0.2,0.2 -0.4,0.3 -0.7,0.3 h -16.5 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.5,-0.3 0.7,-0.3 h 13.7 l -8.6,-5.9 c -0.3,-0.2 -0.5,-0.5 -0.5,-0.9 0,-0.3 0.2,-0.6 0.5,-0.9 l 8.6,-5.8 h -13.7 c -0.3,0 -0.5,-0.1 -0.7,-0.3 -0.2,-0.2 -0.3,-0.4 -0.3,-0.7 0,-0.3 0.1,-0.5 0.3,-0.7 0.2,-0.2 0.4,-0.2 0.7,-0.2 z"
+             id="path62"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g><g
+           id="g68"><path
+             class="st3"
+             d="m 674.7,425.3 c 0.3,0 0.6,0.1 0.9,0.4 0.2,0.2 0.4,0.5 0.4,0.9 0,0.3 -0.1,0.6 -0.4,0.9 -0.2,0.2 -0.5,0.4 -0.9,0.4 h -0.5 c -0.3,0 -0.6,-0.1 -0.9,-0.4 -0.2,-0.2 -0.4,-0.5 -0.4,-0.9 0,-0.4 0.1,-0.7 0.4,-0.9 0.2,-0.2 0.5,-0.4 0.9,-0.4 z"
+             id="path66"
+             inkscape:connector-curvature="0"
+             style="fill:#764d80;stroke:#764d80;stroke-miterlimit:10" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/vector/index.js b/src/vector/index.js
index 9f16205164..a08397ce5a 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -45,6 +45,12 @@ rageshake.init().then(() => {
     console.error("Failed to initialise rageshake: " + err);
 });
 
+window.addEventListener('beforeunload', (e) => {
+    console.log('riot-web closing');
+    // try to flush the logs to indexeddb
+    rageshake.flush();
+});
+
 
  // add React and ReactPerf to the global namespace, to make them easier to
  // access via the console
@@ -59,11 +65,12 @@ var sdk = require("matrix-react-sdk");
 const PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
 sdk.loadSkin(require('../component-index'));
 var VectorConferenceHandler = require('../VectorConferenceHandler');
-var UpdateChecker = require("./updater");
-var q = require('q');
+import Promise from 'bluebird';
 var request = require('browser-request');
 import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+// Also import _t directly so we can call it just `_t` as this is what gen-i18n.js expects
+import { _t } from 'matrix-react-sdk/lib/languageHandler';
 
 import url from 'url';
 
@@ -182,11 +189,11 @@ var makeRegistrationUrl = function(params) {
 
 window.addEventListener('hashchange', onHashChange);
 
-function getConfig() {
-    let deferred = q.defer();
+function getConfig(configJsonFilename) {
+    let deferred = Promise.defer();
 
     request(
-        { method: "GET", url: "config.json" },
+        { method: "GET", url: configJsonFilename },
         (err, response, body) => {
             if (err || response.status < 200 || response.status >= 300) {
                 // Lack of a config isn't an error, we should
@@ -216,18 +223,16 @@ function getConfig() {
     return deferred.promise;
 }
 
-function onLoadCompleted() {
+function onTokenLoginCompleted() {
     // if we did a token login, we're now left with the token, hs and is
     // url as query params in the url; a little nasty but let's redirect to
     // clear them.
-    if (window.location.search) {
-        var parsedUrl = url.parse(window.location.href);
-        parsedUrl.search = "";
-        var formatted = url.format(parsedUrl);
-        console.log("Redirecting to " + formatted + " to drop loginToken " +
-                    "from queryparams");
-        window.location.href = formatted;
-    }
+    var parsedUrl = url.parse(window.location.href);
+    parsedUrl.search = "";
+    var formatted = url.format(parsedUrl);
+    console.log("Redirecting to " + formatted + " to drop loginToken " +
+                "from queryparams");
+    window.location.href = formatted;
 }
 
 async function loadApp() {
@@ -245,23 +250,33 @@ async function loadApp() {
 
     if (!preventRedirect) {
         if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) {
-            if (confirm(languageHandler._t("Riot is not supported on mobile web. Install the app?"))) {
+            if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
                 window.location = "https://itunes.apple.com/us/app/vector.im/id1083446067";
                 return;
             }
         }
         else if (/Android/.test(navigator.userAgent)) {
-            if (confirm(languageHandler._t("Riot is not supported on mobile web. Install the app?"))) {
+            if (confirm(_t("Riot is not supported on mobile web. Install the app?"))) {
                 window.location = "https://play.google.com/store/apps/details?id=im.vector.alpha";
                 return;
             }
         }
     }
 
+    // Load the config file. First try to load up a domain-specific config of the
+    // form "config.$domain.json" and if that fails, fall back to config.json.
     let configJson;
     let configError;
     try {
-        configJson = await getConfig();
+        try {
+            configJson = await getConfig(`config.${document.domain}.json`);
+            // 404s succeed with an empty json config, so check that there are keys
+            if (Object.keys(configJson).length === 0) {
+                throw new Error(); // throw to enter the catch
+            }
+        } catch (e) {
+            configJson = await getConfig("config.json");
+        }
     } catch (e) {
         configError = e;
     }
@@ -277,7 +292,9 @@ async function loadApp() {
             Unable to load config file: please refresh the page to try again.
         </div>, document.getElementById('matrixchat'));
     } else if (validBrowser) {
-        UpdateChecker.start();
+        const platform = PlatformPeg.get();
+        platform.startUpdater();
+
         const MatrixChat = sdk.getComponent('structures.MatrixChat');
         window.matrixChat = ReactDOM.render(
             <MatrixChat
@@ -288,9 +305,9 @@ async function loadApp() {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragparts.params}
                 enableGuest={true}
-                onLoadCompleted={onLoadCompleted}
+                onTokenLoginCompleted={onTokenLoginCompleted}
                 initialScreenAfterLogin={getScreenFromLocation(window.location)}
-                defaultDeviceDisplayName={PlatformPeg.get().getDefaultDeviceDisplayName()}
+                defaultDeviceDisplayName={platform.getDefaultDeviceDisplayName()}
             />,
             document.getElementById('matrixchat')
         );
diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index fa0f999cb8..0f76bf09f2 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -17,14 +17,21 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import VectorBasePlatform from './VectorBasePlatform';
+import VectorBasePlatform, {updateCheckStatusEnum} from './VectorBasePlatform';
 import dis from 'matrix-react-sdk/lib/dispatcher';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import q from 'q';
-import electron, {remote, ipcRenderer} from 'electron';
+import Promise from 'bluebird';
+import {remote, ipcRenderer, desktopCapturer} from 'electron';
+import rageshake from '../rageshake';
 
 remote.autoUpdater.on('update-downloaded', onUpdateDownloaded);
 
+// try to flush the rageshake logs to indexeddb before quit.
+ipcRenderer.on('before-quit', function () {
+    console.log('riot-desktop closing');
+    rageshake.flush();
+});
+
 function onUpdateDownloaded(ev: Event, releaseNotes: string, ver: string, date: Date, updateURL: string) {
     dis.dispatch({
         action: 'new_version',
@@ -62,10 +69,42 @@ function _onAction(payload: Object) {
     }
 }
 
+function getUpdateCheckStatus(status) {
+    if (status === true) {
+        return { status: updateCheckStatusEnum.DOWNLOADING };
+    } else if (status === false) {
+        return { status: updateCheckStatusEnum.NOTAVAILABLE };
+    } else {
+        return {
+            status: updateCheckStatusEnum.ERROR,
+            detail: status,
+        };
+    }
+}
+
 export default class ElectronPlatform extends VectorBasePlatform {
     constructor() {
         super();
         dis.register(_onAction);
+        this.updatable = Boolean(remote.autoUpdater.getFeedURL());
+
+        /*
+            IPC Call `check_updates` returns:
+            true if there is an update available
+            false if there is not
+            or the error if one is encountered
+         */
+        ipcRenderer.on('check_updates', (event, status) => {
+            if (!this.showUpdateCheck) return;
+            dis.dispatch({
+                action: 'check_updates',
+                value: getUpdateCheckStatus(status),
+            });
+            this.showUpdateCheck = false;
+        });
+
+        this.startUpdateCheck = this.startUpdateCheck.bind(this);
+        this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
 
     getHumanReadableName(): string {
@@ -134,20 +173,21 @@ export default class ElectronPlatform extends VectorBasePlatform {
     }
 
     getAppVersion(): Promise<string> {
-        return q(remote.app.getVersion());
+        return Promise.resolve(remote.app.getVersion());
     }
 
-    pollForUpdate() {
-        // In electron we control the update process ourselves, since
-        // it needs to run in the main process, so we just run the timer
-        // loop in the main electron process instead.
+    startUpdateCheck() {
+        if (this.showUpdateCheck) return;
+        super.startUpdateCheck();
+
+        ipcRenderer.send('check_updates');
     }
 
     installUpdate() {
         // IPC to the main process to install the update, since quitAndInstall
         // doesn't fire the before-quit event so the main process needs to know
         // it should exit.
-        electron.ipcRenderer.send('install_update');
+        ipcRenderer.send('install_update');
     }
 
     getDefaultDeviceDisplayName(): string {
@@ -161,10 +201,49 @@ export default class ElectronPlatform extends VectorBasePlatform {
     isElectron(): boolean { return true; }
 
     requestNotificationPermission(): Promise<string> {
-        return q('granted');
+        return Promise.resolve('granted');
     }
 
     reload() {
         remote.getCurrentWebContents().reload();
     }
+
+    /* BEGIN copied and slightly-modified code
+     * setupScreenSharingForIframe function from:
+     * https://github.com/jitsi/jitsi-meet-electron-utils
+     * Copied directly here to avoid the need for a native electron module for
+     * 'just a bit of JavaScript'
+     * NOTE: Apache v2.0 licensed
+     */
+    setupScreenSharingForIframe(iframe: Object) {
+        iframe.contentWindow.JitsiMeetElectron = {
+            /**
+             * Get sources available for screensharing. The callback is invoked
+             * with an array of DesktopCapturerSources.
+             *
+             * @param {Function} callback - The success callback.
+             * @param {Function} errorCallback - The callback for errors.
+             * @param {Object} options - Configuration for getting sources.
+             * @param {Array} options.types - Specify the desktop source types
+             * to get, with valid sources being "window" and "screen".
+             * @param {Object} options.thumbnailSize - Specify how big the
+             * preview images for the sources should be. The valid keys are
+             * height and width, e.g. { height: number, width: number}. By
+             * default electron will return images with height and width of
+             * 150px.
+             */
+            obtainDesktopStreams(callback, errorCallback, options = {}) {
+                desktopCapturer.getSources(options,
+                    (error, sources) => {
+                        if (error) {
+                            errorCallback(error);
+                            return;
+                        }
+
+                        callback(sources);
+                    });
+            },
+        };
+    }
+    /* END of copied and slightly-modified code */
 }
diff --git a/src/vector/platform/VectorBasePlatform.js b/src/vector/platform/VectorBasePlatform.js
index 76707d1d58..c3df04f5b7 100644
--- a/src/vector/platform/VectorBasePlatform.js
+++ b/src/vector/platform/VectorBasePlatform.js
@@ -19,9 +19,18 @@ limitations under the License.
 
 import BasePlatform from 'matrix-react-sdk/lib/BasePlatform';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
+import dis from 'matrix-react-sdk/lib/dispatcher';
 
 import Favico from 'favico.js';
 
+export const updateCheckStatusEnum = {
+    CHECKING: 'CHECKING',
+    ERROR: 'ERROR',
+    NOTAVAILABLE: 'NOTAVAILABLE',
+    DOWNLOADING: 'DOWNLOADING',
+    READY: 'READY',
+};
+
 /**
  * Vector-specific extensions to the BasePlatform template
  */
@@ -34,7 +43,12 @@ export default class VectorBasePlatform extends BasePlatform {
         // and we set the state each time, even if the value hasn't changed,
         // so we'd need to fix that if enabling the animation.
         this.favicon = new Favico({animation: 'none'});
+        this.showUpdateCheck = false;
         this._updateFavicon();
+        this.updatable = true;
+
+        this.startUpdateCheck = this.startUpdateCheck.bind(this);
+        this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
 
     getHumanReadableName(): string {
@@ -75,12 +89,32 @@ export default class VectorBasePlatform extends BasePlatform {
     }
 
     /**
-     * Check for the availability of an update to the version of the
-     * app that's currently running.
-     * If an update is available, this function should dispatch the
-     * 'new_version' action.
+     * Begin update polling, if applicable
      */
-    pollForUpdate() {
+    startUpdater() {
+    }
+
+    /**
+     * Whether we can call checkForUpdate on this platform build
+     */
+    canSelfUpdate(): boolean {
+        return this.updatable;
+    }
+
+    startUpdateCheck() {
+        this.showUpdateCheck = true;
+        dis.dispatch({
+            action: 'check_updates',
+            value: { status: updateCheckStatusEnum.CHECKING },
+        });
+    }
+
+    stopUpdateCheck() {
+        this.showUpdateCheck = false;
+        dis.dispatch({
+            action: 'check_updates',
+            value: false,
+        })
     }
 
     /**
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index b9e941e63c..b88ee93f1d 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -17,19 +17,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import VectorBasePlatform from './VectorBasePlatform';
+import VectorBasePlatform, {updateCheckStatusEnum} from './VectorBasePlatform';
 import request from 'browser-request';
 import dis from 'matrix-react-sdk/lib/dispatcher.js';
 import { _t } from 'matrix-react-sdk/lib/languageHandler';
-import q from 'q';
+import Promise from 'bluebird';
 
 import url from 'url';
 import UAParser from 'ua-parser-js';
 
+var POKE_RATE_MS = 10 * 60 * 1000; // 10 min
+
 export default class WebPlatform extends VectorBasePlatform {
     constructor() {
         super();
         this.runningVersion = null;
+
+        this.startUpdateCheck = this.startUpdateCheck.bind(this);
+        this.stopUpdateCheck = this.stopUpdateCheck.bind(this);
     }
 
     getHumanReadableName(): string {
@@ -63,7 +68,7 @@ export default class WebPlatform extends VectorBasePlatform {
         // annoyingly, the latest spec says this returns a
         // promise, but this is only supported in Chrome 46
         // and Firefox 47, so adapt the callback API.
-        const defer = q.defer();
+        const defer = Promise.defer();
         global.Notification.requestPermission((result) => {
             defer.resolve(result);
         });
@@ -98,7 +103,7 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     _getVersion(): Promise<string> {
-        const deferred = q.defer();
+        const deferred = Promise.defer();
 
         // We add a cachebuster to the request to make sure that we know about
         // the most recent version on the origin server. That might not
@@ -127,13 +132,18 @@ export default class WebPlatform extends VectorBasePlatform {
 
     getAppVersion(): Promise<string> {
         if (this.runningVersion !== null) {
-            return q(this.runningVersion);
+            return Promise.resolve(this.runningVersion);
         }
         return this._getVersion();
     }
 
+    startUpdater() {
+        this.pollForUpdate();
+        setInterval(this.pollForUpdate.bind(this), POKE_RATE_MS);
+    }
+
     pollForUpdate() {
-        this._getVersion().done((ver) => {
+        return this._getVersion().then((ver) => {
             if (this.runningVersion === null) {
                 this.runningVersion = ver;
             } else if (this.runningVersion !== ver) {
@@ -142,9 +152,29 @@ export default class WebPlatform extends VectorBasePlatform {
                     currentVersion: this.runningVersion,
                     newVersion: ver,
                 });
+                // Return to skip a MatrixChat state update
+                return;
             }
+            return { status: updateCheckStatusEnum.NOTAVAILABLE };
         }, (err) => {
             console.error("Failed to poll for update", err);
+            return {
+                status: updateCheckStatusEnum.ERROR,
+                detail: err.message || err.status ? err.status.toString() : 'Unknown Error',
+            };
+        });
+    }
+
+    startUpdateCheck() {
+        if (this.showUpdateCheck) return;
+        super.startUpdateCheck();
+        this.pollForUpdate().then((updateState) => {
+            if (!this.showUpdateCheck) return;
+            if (!updateState) return;
+            dis.dispatch({
+                action: 'check_updates',
+                value: updateState,
+            });
         });
     }
 
diff --git a/src/vector/rageshake.js b/src/vector/rageshake.js
index 0138d62445..d097741471 100644
--- a/src/vector/rageshake.js
+++ b/src/vector/rageshake.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import q from "q";
+import Promise from 'bluebird';
 
 // This module contains all the code needed to log the console, persist it to
 // disk and submit bug reports. Rationale is as follows:
@@ -116,7 +116,7 @@ class IndexedDBLogStore {
      */
     connect() {
         let req = this.indexedDB.open("logs");
-        return q.Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
             req.onsuccess = (event) => {
                 this.db = event.target.result;
                 // Periodically flush logs to local storage / indexeddb
@@ -193,7 +193,7 @@ class IndexedDBLogStore {
         }
         // there is no flush promise or there was but it has finished, so do
         // a brand new one, destroying the chain which may have been built up.
-        this.flushPromise = q.Promise((resolve, reject) => {
+        this.flushPromise = new Promise((resolve, reject) => {
             if (!this.db) {
                 // not connected yet or user rejected access for us to r/w to
                 // the db.
@@ -277,7 +277,7 @@ class IndexedDBLogStore {
         }
 
         function deleteLogs(id) {
-            return q.Promise((resolve, reject) => {
+            return new Promise((resolve, reject) => {
                 const txn = db.transaction(
                     ["logs", "logslastmod"], "readwrite"
                 );
@@ -375,7 +375,7 @@ class IndexedDBLogStore {
  */
 function selectQuery(store, keyRange, resultMapper) {
     const query = store.openCursor(keyRange);
-    return q.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
         let results = [];
         query.onerror = (event) => {
             reject(new Error("Query failed: " + event.target.errorCode));
@@ -410,8 +410,16 @@ module.exports = {
         }
         logger = new ConsoleLogger();
         logger.monkeyPatch(window.console);
-        if (window.indexedDB) {
-            store = new IndexedDBLogStore(window.indexedDB, logger);
+
+        // just *accessing* indexedDB throws an exception in firefox with
+        // indexeddb disabled.
+        let indexedDB;
+        try {
+            indexedDB = window.indexedDB;
+        } catch(e) {}
+
+        if (indexedDB) {
+            store = new IndexedDBLogStore(indexedDB, logger);
             initPromise = store.connect();
             return initPromise;
         }
@@ -419,6 +427,13 @@ module.exports = {
         return initPromise;
     },
 
+    flush: function() {
+        if (!store) {
+            return;
+        }
+        store.flush();
+    },
+
     /**
      * Clean up old logs.
      * @return Promise Resolves if cleaned logs.
diff --git a/src/vector/submit-rageshake.js b/src/vector/submit-rageshake.js
index c6c551c61f..b66ec9abe6 100644
--- a/src/vector/submit-rageshake.js
+++ b/src/vector/submit-rageshake.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import pako from 'pako';
-import q from "q";
+import Promise from 'bluebird';
 
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
@@ -100,7 +100,7 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
 }
 
 function _submitReport(endpoint, body, progressCallback) {
-    const deferred = q.defer();
+    const deferred = Promise.defer();
 
     const req = new XMLHttpRequest();
     req.open("POST", endpoint);
diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index d967012567..29da3413b3 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -33,10 +33,10 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var ReactTestUtils = require('react-addons-test-utils');
 var expect = require('expect');
-var q = require('q');
+import Promise from 'bluebird';
 
 var test_utils = require('../test-utils');
-var MockHttpBackend = require('../mock-request');
+var MockHttpBackend = require('matrix-mock-request');
 
 var HS_URL='http://localhost';
 var IS_URL='http://localhost';
@@ -100,29 +100,19 @@ describe('joining a room', function () {
             // wait for /sync to happen. This may take some time, as the client
             // has to initialise indexeddb.
             console.log("waiting for /sync");
-            let syncDone = false;
             httpBackend.when('GET', '/sync')
-                .check((r) => {syncDone = true;})
                 .respond(200, {});
-            function awaitSync(attempts) {
-                if (syncDone) {
-                    return q();
-                }
-                if (!attempts) {
-                    throw new Error("Gave up waiting for /sync")
-                }
-                return httpBackend.flush().then(() => awaitSync(attempts-1));
-            }
 
-            return awaitSync(10).then(() => {
+            return httpBackend.flushAllExpected({
+                timeout: 1000,
+            }).then(() => {
                 // wait for the directory requests
                 httpBackend.when('POST', '/publicRooms').respond(200, {chunk: []});
                 httpBackend.when('GET', '/thirdparty/protocols').respond(200, {});
-                return q.all([
-                    httpBackend.flush('/thirdparty/protocols'),
-                    httpBackend.flush('/publicRooms'),
-                ]);
+                return httpBackend.flushAllExpected();
             }).then(() => {
+                console.log(`${Date.now()} App made requests for directory view; switching to a room.`);
+
                 var roomDir = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomDirectory);
 
@@ -139,19 +129,17 @@ describe('joining a room', function () {
                 httpBackend.when('GET', '/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync")
                     .respond(401, {errcode: 'M_GUEST_ACCESS_FORBIDDEN'});
 
-                return q.all([
-                    httpBackend.flush('/directory/room/'+encodeURIComponent(ROOM_ALIAS), 1, 200),
-                    httpBackend.flush('/rooms/'+encodeURIComponent(ROOM_ID)+"/initialSync", 1, 200),
-                ]);
+                return httpBackend.flushAllExpected();
             }).then(() => {
-                httpBackend.verifyNoOutstandingExpectation();
+                console.log(`${Date.now()} App made room preview request`);
 
-                return q.delay(1);
-            }).then(() => {
-                // we should now have a roomview, with a preview bar
+                // we should now have a roomview
                 roomView = ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, RoomView);
 
+                // the preview bar may take a tick to be displayed
+                return Promise.delay(1);
+            }).then(() => {
                 const previewBar = ReactTestUtils.findRenderedComponentWithType(
                     roomView, RoomPreviewBar);
 
@@ -164,14 +152,14 @@ describe('joining a room', function () {
                     .respond(200, {room_id: ROOM_ID});
             }).then(() => {
                 // wait for the join request to be made
-                return q.delay(1);
+                return Promise.delay(1);
             }).then(() => {
                 // and again, because the state update has to go to the store and
                 // then one dispatch within the store, then to the view
                 // XXX: This is *super flaky*: a better way would be to declare
                 // that we expect a certain state transition to happen, then wait
                 // for that transition to occur.
-                return q.delay(1);
+                return Promise.delay(1);
             }).then(() => {
                 // the roomview should now be loading
                 expect(roomView.state.room).toBe(null);
@@ -186,10 +174,11 @@ describe('joining a room', function () {
             }).then(() => {
                 httpBackend.verifyNoOutstandingExpectation();
 
-                return q.delay(1);
+                return Promise.delay(1);
             }).then(() => {
-                // We've joined, expect this to false
-                expect(roomView.state.joining).toBe(false);
+                // NB. we don't expect the 'joining' flag to reset at any point:
+                // it will stay set and we observe whether we have Room object for
+                // the room and whether our member event shows we're joined.
 
                 // now send the room down the /sync pipe
                 httpBackend.when('GET', '/sync').
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a323a26269..2161987688 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -22,16 +22,19 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactTestUtils from 'react-addons-test-utils';
 import expect from 'expect';
-import q from 'q';
+import Promise from 'bluebird';
+import MatrixReactTestUtils from 'matrix-react-test-utils';
 
 import jssdk from 'matrix-js-sdk';
 
 import sdk from 'matrix-react-sdk';
 import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
 import * as languageHandler from 'matrix-react-sdk/lib/languageHandler';
+import {VIEWS} from 'matrix-react-sdk/lib/components/structures/MatrixChat';
+import dis from 'matrix-react-sdk/lib/dispatcher';
 
 import * as test_utils from '../test-utils';
-import MockHttpBackend from '../mock-request';
+import MockHttpBackend from 'matrix-mock-request';
 import {parseQs, parseQsFromFragment} from '../../src/vector/url_utils';
 
 var DEFAULT_HS_URL='http://my_server';
@@ -47,8 +50,8 @@ describe('loading:', function () {
     // the mounted MatrixChat
     let matrixChat;
 
-    // a promise which resolves when the MatrixChat calls onLoadCompleted
-    let loadCompletePromise;
+    // a promise which resolves when the MatrixChat calls onTokenLoginCompleted
+    let tokenLoginCompletePromise;
 
     beforeEach(function() {
         test_utils.beforeEach(this);
@@ -68,7 +71,8 @@ describe('loading:', function () {
         });
     });
 
-    afterEach(async function() {
+    afterEach(async function () {
+        console.log(`${Date.now()}: loading: afterEach`);
         if (parentDiv) {
             ReactDOM.unmountComponentAtNode(parentDiv);
             parentDiv.remove();
@@ -78,9 +82,15 @@ describe('loading:', function () {
         // unmounting should have cleared the MatrixClientPeg
         expect(MatrixClientPeg.get()).toBe(null);
 
+        // chrome seems to take *ages* to delete the indexeddbs.
+        this.timeout(10000);
+
         // clear the indexeddbs so we can start from a clean slate next time.
-        await test_utils.deleteIndexedDB('matrix-js-sdk:crypto');
-        await test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync');
+        await Promise.all([
+            test_utils.deleteIndexedDB('matrix-js-sdk:crypto'),
+            test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
+        ]);
+        console.log(`${Date.now()}: loading: afterEach complete`);
     });
 
     /* simulate the load process done by index.js
@@ -99,8 +109,8 @@ describe('loading:', function () {
             toString: function() { return this.search + this.hash; },
         };
 
-        let loadCompleteDefer = q.defer();
-        loadCompletePromise = loadCompleteDefer.promise;
+        let tokenLoginCompleteDefer = Promise.defer();
+        tokenLoginCompletePromise = tokenLoginCompleteDefer.promise;
 
         function onNewScreen(screen) {
             console.log(Date.now() + " newscreen "+screen);
@@ -135,7 +145,7 @@ describe('loading:', function () {
                 realQueryParams={params}
                 startingFragmentQueryParams={fragParts.params}
                 enableGuest={true}
-                onLoadCompleted={loadCompleteDefer.resolve}
+                onTokenLoginCompleted={() => tokenLoginCompleteDefer.resolve()}
                 initialScreenAfterLogin={getScreenFromLocation(windowLocation)}
                 makeRegistrationUrl={() => {throw new Error('Not implemented');}}
             />, parentDiv
@@ -153,8 +163,8 @@ describe('loading:', function () {
             .check((r) => {syncRequest = r;})
             .respond(200, response);
 
-        console.log("waiting for /sync");
         for (let attempts = 10; attempts > 0; attempts--) {
+            console.log(Date.now() + " waiting for /sync");
             if (syncRequest) {
                 return syncRequest;
             }
@@ -167,7 +177,7 @@ describe('loading:', function () {
         it('gives a login panel by default', function (done) {
             loadApp();
 
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
                 assertAtLoadingSpinner(matrixChat);
@@ -179,12 +189,9 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return awaitLoginComponent(matrixChat);
             }).then(() => {
-                // we expect a single <Login> component following session load
-                ReactTestUtils.findRenderedComponentWithType(
-                    matrixChat, sdk.getComponent('structures.login.Login'));
-                expect(windowLocation.hash).toEqual("");
+                expect(windowLocation.hash).toEqual("#/login");
             }).done(done, done);
         });
 
@@ -193,7 +200,7 @@ describe('loading:', function () {
                 uriFragment: "#/room/!room:id",
             });
 
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
                 assertAtLoadingSpinner(matrixChat);
@@ -205,7 +212,7 @@ describe('loading:', function () {
                 return httpBackend.flush();
             }).then(() => {
                 // Wait for another trip around the event loop for the UI to update
-                return q.delay(1);
+                return Promise.delay(10);
             }).then(() => {
                 return completeLogin(matrixChat);
             }).then(() => {
@@ -228,7 +235,7 @@ describe('loading:', function () {
                 uriFragment: "#/login",
             });
 
-            return q.delay(100).then(() => {
+            return awaitLoginComponent(matrixChat).then(() => {
                 // we expect a single <Login> component
                 ReactTestUtils.findRenderedComponentWithType(
                     matrixChat, sdk.getComponent('structures.login.Login'));
@@ -335,7 +342,7 @@ describe('loading:', function () {
                 },
             });
 
-            return q.delay(1).then(() => {
+            return Promise.delay(1).then(() => {
                 // we expect a loading spinner while we log into the RTS
                 assertAtLoadingSpinner(matrixChat);
 
@@ -360,6 +367,9 @@ describe('loading:', function () {
                 loadApp({
                     uriFragment: "#/login",
                 });
+
+                // give the UI a chance to display
+                return awaitLoginComponent(matrixChat);
             });
 
             it('shows a login view', function() {
@@ -396,7 +406,7 @@ describe('loading:', function () {
         it('shows a home page by default', function (done) {
             loadApp();
 
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
                 assertAtLoadingSpinner(matrixChat);
@@ -429,7 +439,7 @@ describe('loading:', function () {
 
             loadApp();
 
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
                 assertAtLoadingSpinner(matrixChat);
@@ -464,7 +474,7 @@ describe('loading:', function () {
             loadApp({
                 uriFragment: "#/room/!room:id"
             });
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // at this point, we're trying to do a guest registration;
                 // we expect a spinner
                 assertAtLoadingSpinner(matrixChat);
@@ -489,6 +499,76 @@ describe('loading:', function () {
                 expect(windowLocation.hash).toEqual("#/room/!room:id");
             }).done(done, done);
         });
+
+        describe('Login as user', function() {
+            beforeEach(function() {
+                // first we have to load the homepage
+                loadApp();
+
+                httpBackend.when('POST', '/register').check(function(req) {
+                    expect(req.queryParams.kind).toEqual('guest');
+                }).respond(200, {
+                    user_id: "@guest:localhost",
+                    access_token: "secret_token",
+                });
+
+                return httpBackend.flush().then(() => {
+                    return awaitSyncingSpinner(matrixChat);
+                }).then(() => {
+                    // we got a sync spinner - let the sync complete
+                    return expectAndAwaitSync();
+                }).then(() => {
+                    // once the sync completes, we should have a home page
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, sdk.getComponent('structures.HomePage'));
+
+                    // we simulate a click on the 'login' button by firing off
+                    // the relevant dispatch.
+                    //
+                    // XXX: is it an anti-pattern to access the react-sdk's
+                    // dispatcher in this way? Is it better to find the login
+                    // button and simulate a click? (we might have to arrange
+                    // for it to be shown - it's not always, due to the
+                    // collapsing left panel
+
+                    dis.dispatch({ action: 'start_login' });
+
+                    return awaitLoginComponent(matrixChat);
+                });
+            });
+
+            it('should give us a login page', function() {
+                expect(windowLocation.hash).toEqual("#/login");
+
+                // we expect a single <Login> component
+                ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login')
+                );
+            });
+
+            it('should allow us to return to the app', function() {
+                const login = ReactTestUtils.findRenderedComponentWithType(
+                    matrixChat, sdk.getComponent('structures.login.Login')
+                );
+
+                const linkText = 'Return to app';
+
+                const returnToApp = ReactTestUtils.scryRenderedDOMComponentsWithTag(
+                    login, 'a').find((e) => e.innerText === linkText);
+
+                if (!returnToApp) {
+                    throw new Error(`Couldn't find '${linkText}' link`);
+                }
+
+                ReactTestUtils.Simulate.click(returnToApp);
+
+                return Promise.delay(1).then(() => {
+                    // we should be straight back into the home page
+                    ReactTestUtils.findRenderedComponentWithType(
+                        matrixChat, sdk.getComponent('structures.HomePage'));
+                });
+            });
+        });
     });
 
     describe('Token login:', function() {
@@ -497,7 +577,7 @@ describe('loading:', function () {
                 queryString: "?loginToken=secretToken&homeserver=https%3A%2F%2Fhomeserver&identityServer=https%3A%2F%2Fidserver",
             });
 
-            q.delay(1).then(() => {
+            Promise.delay(1).then(() => {
                 // we expect a spinner while we're logging in
                 assertAtLoadingSpinner(matrixChat);
 
@@ -513,12 +593,12 @@ describe('loading:', function () {
 
                 return httpBackend.flush();
             }).then(() => {
-                // at this point, MatrixChat should fire onLoadCompleted, which
+                // at this point, MatrixChat should fire onTokenLoginCompleted, which
                 // makes index.js reload the app. We're not going to attempt to
                 // simulate the reload - just check that things are left in the
                 // right state for the reloaded app.
 
-                return loadCompletePromise;
+                return tokenLoginCompletePromise;
             }).then(() => {
                 // check that the localstorage has been set up in such a way that
                 // the reloaded app can pick up where we leave off.
@@ -530,7 +610,6 @@ describe('loading:', function () {
         });
     });
 
-
     // check that we have a Login component, send a 'user:pass' login,
     // and await the HTTP requests.
     function completeLogin(matrixChat) {
@@ -539,7 +618,6 @@ describe('loading:', function () {
             matrixChat, sdk.getComponent('structures.login.Login'));
 
         httpBackend.when('POST', '/login').check(function(req) {
-            console.log(req);
             expect(req.data.type).toEqual('m.login.password');
             expect(req.data.identifier.type).toEqual('m.id.user');
             expect(req.data.identifier.user).toEqual('user');
@@ -553,7 +631,7 @@ describe('loading:', function () {
 
         return httpBackend.flush().then(() => {
             // Wait for another trip around the event loop for the UI to update
-            return q.delay(1);
+            return Promise.delay(1);
         }).then(() => {
             // we expect a spinner
             ReactTestUtils.findRenderedComponentWithType(
@@ -589,7 +667,8 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading || matrixChat.state.loggingIn) {
+    if (matrixChat.state.view === VIEWS.LOADING ||
+            matrixChat.state.view === VIEWS.LOGGING_IN) {
         console.log(Date.now() + " Awaiting sync spinner: still loading.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not loaded after " +
@@ -597,7 +676,7 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
         }
         // loading can take quite a long time, because we delete the
         // indexedDB store.
-        return q.delay(5).then(() => {
+        return Promise.delay(5).then(() => {
             return awaitSyncingSpinner(matrixChat, retryLimit, retryCount + 1);
         });
     }
@@ -606,7 +685,7 @@ function awaitSyncingSpinner(matrixChat, retryLimit, retryCount) {
 
     // state looks good, check the rendered output
     assertAtSyncingSpinner(matrixChat);
-    return q();
+    return Promise.resolve();
 }
 
 function assertAtSyncingSpinner(matrixChat) {
@@ -628,14 +707,13 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
         retryCount = 0;
     }
 
-    if (matrixChat.state.loading ||
-        !(matrixChat.state.loggedIn && matrixChat.state.ready)) {
+    if (matrixChat.state.view !== VIEWS.LOGGED_IN || !matrixChat.state.ready) {
         console.log(Date.now() + " Awaiting room view: not ready yet.");
         if (retryCount >= retryLimit) {
             throw new Error("MatrixChat still not ready after " +
                             retryCount + " tries");
         }
-        return q.delay(0).then(() => {
+        return Promise.delay(0).then(() => {
             return awaitRoomView(matrixChat, retryLimit, retryCount + 1);
         });
     }
@@ -645,5 +723,11 @@ function awaitRoomView(matrixChat, retryLimit, retryCount) {
     // state looks good, check the rendered output
     ReactTestUtils.findRenderedComponentWithType(
         matrixChat, sdk.getComponent('structures.RoomView'));
-    return q();
+    return Promise.resolve();
+}
+
+function awaitLoginComponent(matrixChat, attempts) {
+    return MatrixReactTestUtils.waitForRenderedComponentWithType(
+        matrixChat, sdk.getComponent('structures.login.Login'), attempts,
+    );
 }
diff --git a/test/mock-request.js b/test/mock-request.js
deleted file mode 100644
index 64ac6c06d5..0000000000
--- a/test/mock-request.js
+++ /dev/null
@@ -1,336 +0,0 @@
-"use strict";
-const q = require("q");
-import expect from 'expect';
-
-/**
- * Construct a mock HTTP backend, heavily inspired by Angular.js.
- * @constructor
- */
-function HttpBackend() {
-    this.requests = [];
-    this.expectedRequests = [];
-    const self = this;
-    // the request function dependency that the SDK needs.
-    this.requestFn = function(opts, callback) {
-        const req = new Request(opts, callback);
-        console.log(`${Date.now()} HTTP backend received request: ${req}`);
-        self.requests.push(req);
-
-        const abort = function() {
-            const idx = self.requests.indexOf(req);
-            if (idx >= 0) {
-                console.log("Aborting HTTP request: %s %s", opts.method,
-                            opts.uri);
-                self.requests.splice(idx, 1);
-                req.callback("aborted");
-            }
-        };
-
-        return {
-            abort: abort,
-        };
-    };
-
-    // very simplistic mapping from the whatwg fetch interface onto the request
-    // interface, so we can use the same mock backend for both.
-    this.fetchFn = function(input, init) {
-        init = init || {};
-        const requestOpts = {
-            uri: input,
-            method: init.method || 'GET',
-            body: init.body,
-        };
-
-        return new Promise((resolve, reject) => {
-            function callback(err, response, body) {
-                if (err) {
-                    reject(err);
-                }
-                resolve({
-                    ok: response.statusCode >= 200 && response.statusCode < 300,
-                    json: () => body,
-                });
-            };
-
-            const req = new Request(requestOpts, callback);
-            console.log(`HTTP backend received request: ${req}`);
-            self.requests.push(req);
-        });
-    };
-}
-HttpBackend.prototype = {
-    /**
-     * Respond to all of the requests (flush the queue).
-     * @param {string} path The path to flush (optional) default: all.
-     * @param {integer} numToFlush The number of things to flush (optional), default: all.
-     * @param {integer=} waitTime  The time (in ms) to wait for a request to happen.
-     *    default: 100
-     *
-     * @return {Promise} resolves when there is nothing left to flush, with the
-     *    number of requests flushed
-     */
-    flush: function(path, numToFlush, waitTime) {
-        const defer = q.defer();
-        const self = this;
-        let flushed = 0;
-        if (waitTime === undefined) {
-            waitTime = 100;
-        }
-
-        function log(msg) {
-            console.log(`${Date.now()} flush[${path || ''}]: ${msg}`);
-        }
-
-        log("HTTP backend flushing... (path=" + path
-            + " numToFlush=" + numToFlush
-            + " waitTime=" + waitTime
-            + ")",
-        );
-        const endTime =  waitTime + Date.now();
-
-        const tryFlush = function() {
-            // if there's more real requests and more expected requests, flush 'em.
-            log(`  trying to flush => reqs=[${self.requests}] ` +
-                `expected=[${self.expectedRequests}]`,
-            );
-            if (self._takeFromQueue(path)) {
-                // try again on the next tick.
-                flushed += 1;
-                if (numToFlush && flushed === numToFlush) {
-                    log(`Flushed assigned amount: ${numToFlush}`);
-                    defer.resolve(flushed);
-                } else {
-                    log(`  flushed. Trying for more.`);
-                    setTimeout(tryFlush, 0);
-                }
-            } else if (flushed === 0 && Date.now() < endTime) {
-                // we may not have made the request yet, wait a generous amount of
-                // time before giving up.
-                log(`  nothing to flush yet; waiting for requests.`);
-                setTimeout(tryFlush, 5);
-            } else {
-                if (flushed === 0) {
-                    log("nothing to flush; giving up");
-                } else {
-                    log(`no more flushes after flushing ${flushed} requests`);
-                }
-                defer.resolve(flushed);
-            }
-        };
-
-        setTimeout(tryFlush, 0);
-
-        return defer.promise;
-    },
-
-    /**
-     * Attempts to resolve requests/expected requests.
-     * @param {string} path The path to flush (optional) default: all.
-     * @return {boolean} true if something was resolved.
-     */
-    _takeFromQueue: function(path) {
-        let req = null;
-        let i;
-        let j;
-        let matchingReq = null;
-        let expectedReq = null;
-        let testResponse = null;
-        for (i = 0; i < this.requests.length; i++) {
-            req = this.requests[i];
-            for (j = 0; j < this.expectedRequests.length; j++) {
-                expectedReq = this.expectedRequests[j];
-                if (path && path !== expectedReq.path) {
-                    continue;
-                }
-                if (expectedReq.method === req.method &&
-                        req.path.indexOf(expectedReq.path) !== -1) {
-                    if (!expectedReq.data || (JSON.stringify(expectedReq.data) ===
-                            JSON.stringify(req.data))) {
-                        matchingReq = expectedReq;
-                        this.expectedRequests.splice(j, 1);
-                        break;
-                    }
-                }
-            }
-
-            if (matchingReq) {
-                // remove from request queue
-                this.requests.splice(i, 1);
-                i--;
-
-                for (j = 0; j < matchingReq.checks.length; j++) {
-                    matchingReq.checks[j](req);
-                }
-                testResponse = matchingReq.response;
-                console.log(`${Date.now()}    responding to ${matchingReq.path}`);
-                let body = testResponse.body;
-                if (Object.prototype.toString.call(body) == "[object Function]") {
-                    body = body(req.path, req.data);
-                }
-                req.callback(
-                    testResponse.err, testResponse.response, body,
-                );
-                matchingReq = null;
-            }
-        }
-        if (testResponse) {  // flushed something
-            return true;
-        }
-        return false;
-    },
-
-    /**
-     * Makes sure that the SDK hasn't sent any more requests to the backend.
-     */
-    verifyNoOutstandingRequests: function() {
-        const firstOutstandingReq = this.requests[0] || {};
-        expect(this.requests.length).toEqual(0,
-            "Expected no more HTTP requests but received request to " +
-            firstOutstandingReq.path,
-        );
-    },
-
-    /**
-     * Makes sure that the test doesn't have any unresolved requests.
-     */
-    verifyNoOutstandingExpectation: function() {
-        const firstOutstandingExpectation = this.expectedRequests[0] || {};
-        expect(this.expectedRequests.length).toEqual(0,
-            "Expected to see HTTP request for " + firstOutstandingExpectation.path,
-        );
-    },
-
-    /**
-     * Create an expected request.
-     * @param {string} method The HTTP method
-     * @param {string} path The path (which can be partial)
-     * @param {Object} data The expected data.
-     * @return {Request} An expected request.
-     */
-    when: function(method, path, data) {
-        const pendingReq = new ExpectedRequest(method, path, data);
-        this.expectedRequests.push(pendingReq);
-        return pendingReq;
-    },
-};
-
-/**
- * Represents the expectation of a request.
- *
- * <p>Includes the conditions to be matched against, the checks to be made,
- * and the response to be returned.
- *
- * @constructor
- * @param {string} method
- * @param {string} path
- * @param {object?} data
- */
-function ExpectedRequest(method, path, data) {
-    this.method = method;
-    this.path = path;
-    this.data = data;
-    this.response = null;
-    this.checks = [];
-}
-
-ExpectedRequest.prototype = {
-    toString: function() {
-        return this.method + " " + this.path
-    },
-
-    /**
-     * Execute a check when this request has been satisfied.
-     * @param {Function} fn The function to execute.
-     * @return {Request} for chaining calls.
-     */
-    check: function(fn) {
-        this.checks.push(fn);
-        return this;
-    },
-
-    /**
-     * Respond with the given data when this request is satisfied.
-     * @param {Number} code The HTTP status code.
-     * @param {Object|Function} data The HTTP JSON body. If this is a function,
-     * it will be invoked when the JSON body is required (which should be returned).
-     */
-    respond: function(code, data) {
-        this.response = {
-            response: {
-                statusCode: code,
-                headers: {},
-            },
-            body: data,
-            err: null,
-        };
-    },
-
-    /**
-     * Fail with an Error when this request is satisfied.
-     * @param {Number} code The HTTP status code.
-     * @param {Error} err The error to throw (e.g. Network Error)
-     */
-    fail: function(code, err) {
-        this.response = {
-            response: {
-                statusCode: code,
-                headers: {},
-            },
-            body: null,
-            err: err,
-        };
-    },
-};
-
-/**
- * Represents a request made by the app.
- *
- * @constructor
- * @param {object} opts opts passed to request()
- * @param {function} callback
- */
-function Request(opts, callback) {
-    this.opts = opts;
-    this.callback = callback;
-
-    Object.defineProperty(this, 'method', {
-        get: function() {
-            return opts.method;
-        },
-    });
-
-    Object.defineProperty(this, 'path', {
-        get: function() {
-            return opts.uri;
-        },
-    });
-
-    Object.defineProperty(this, 'data', {
-        get: function() {
-            return opts.body;
-        },
-    });
-
-    Object.defineProperty(this, 'queryParams', {
-        get: function() {
-            return opts.qs;
-        },
-    });
-
-    Object.defineProperty(this, 'headers', {
-        get: function() {
-            return opts.headers || {};
-        },
-    });
-}
-
-Request.prototype = {
-    toString: function() {
-        return this.method + " " + this.path;
-    },
-};
-
-/**
- * The HttpBackend class.
- */
-module.exports = HttpBackend;
diff --git a/test/test-utils.js b/test/test-utils.js
index a1c1cd0ad5..a5b22febfe 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var q = require('q');
+import Promise from 'bluebird';
 
 /**
  * Perform common actions before each test case, e.g. printing the test case
@@ -28,28 +28,33 @@ export function browserSupportsWebRTC() {
 }
 
 export function deleteIndexedDB(dbName) {
-    return new q.Promise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
         if (!window.indexedDB) {
             resolve();
             return;
         }
 
-        console.log(`Removing indexeddb instance: ${dbName}`);
+        const startTime = Date.now();
+        console.log(`${startTime}: Removing indexeddb instance: ${dbName}`);
         const req = window.indexedDB.deleteDatabase(dbName);
 
         req.onblocked = () => {
-            console.log(`can't yet delete indexeddb because it is open elsewhere`);
+            console.log(`${Date.now()}: can't yet delete indexeddb ${dbName} because it is open elsewhere`);
         };
 
         req.onerror = (ev) => {
             reject(new Error(
-                "unable to delete indexeddb: " + ev.target.error,
+                `${Date.now()}: unable to delete indexeddb ${dbName}: ${ev.target.error}`,
             ));
         };
 
         req.onsuccess = () => {
-            console.log(`Removed indexeddb instance: ${dbName}`);
+            const now = Date.now();
+            console.log(`${now}: Removed indexeddb instance: ${dbName} in ${now-startTime} ms`);
             resolve();
         };
+    }).catch((e) => {
+        console.error(`${Date.now()}: Error removing indexeddb instance ${dbName}: ${e}`);
+        throw e;
     });
 }