diff --git a/.gitignore b/.gitignore
index c7f99f6925..bc6255165b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@ electron/pub
 /src/component-index.js
 /.tmp
 /webpack-stats.json
+.vscode
+.vscode/
diff --git a/package.json b/package.json
index 85ac45633f..d36f38ff83 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,8 @@
     "shell-escape": "^0.2.0",
     "simple-proxy-agent": "^1.1.0",
     "stylelint": "^13.9.0",
+    "stylelint-config-standard": "^20.0.0",
+    "stylelint-scss": "^3.18.0",
     "terser-webpack-plugin": "^2.3.8",
     "typescript": "^4.1.3",
     "webpack": "^4.46.0",
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index e81c990124..e6a15d3cdf 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -33,5 +33,6 @@
     "Powered by Matrix": "Běží na Matrixu",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s pro desktopový počítač (%(platformName)s)",
     "Missing indexeddb worker script!": "Nenačetl se skript spravující indexdb!",
-    "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních"
+    "Use %(brand)s on mobile": "Používání %(brand)s v mobilních zařízeních",
+    "Switch to space by number": "Přepnout na prostor podle čísla"
 }
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 0f9dfa5d20..51d8054251 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -33,5 +33,6 @@
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s verwendet erweiterte Browserfunktionen, die von deinem Browser nicht unterstützt werden.",
     "Your browser can't run %(brand)s": "Dein Browser kann %(brand)s nicht ausführen",
     "Powered by Matrix": "Betrieben mit Matrix",
-    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy"
+    "Use %(brand)s on mobile": "Verwende %(brand)s am Handy",
+    "Switch to space by number": "Zum n-ten Space wechseln"
 }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 358e2f951b..f5e220b36a 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,5 +1,4 @@
 {
-    "Missing indexeddb worker script!": "Missing indexeddb worker script!",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
     "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
     "Your Element is misconfigured": "Your Element is misconfigured",
diff --git a/src/i18n/strings/es.json b/src/i18n/strings/es.json
index ff1f8b51a3..8bbfe59aef 100644
--- a/src/i18n/strings/es.json
+++ b/src/i18n/strings/es.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "Tu navegador no es compatible con %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funciones avanzadas que su navegador actual no soporta.",
     "Powered by Matrix": "Funciona con Matrix",
-    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil"
+    "Use %(brand)s on mobile": "Usar %(brand)s en modo móvil",
+    "Switch to space by number": "Cambiar a espacio por número"
 }
diff --git a/src/i18n/strings/et.json b/src/i18n/strings/et.json
index acaaf562b5..4a9eb8450a 100644
--- a/src/i18n/strings/et.json
+++ b/src/i18n/strings/et.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "%(brand)s ei toimi sinu brauseris",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s kasutab mitmeid uusi brauseri-põhiseid tehnoloogiaid, mis ei ole veel sinu veebibrauseris toetatud.",
     "Powered by Matrix": "Põhineb Matrix'il",
-    "Use %(brand)s on mobile": "Kasuta %(brand)s rakendust nutiseadmes"
+    "Use %(brand)s on mobile": "Kasuta %(brand)s rakendust nutiseadmes",
+    "Switch to space by number": "Vaata kogukonnakeskust tema numbri alusel"
 }
diff --git a/src/i18n/strings/gl.json b/src/i18n/strings/gl.json
index 17b229a351..c9b18d3cf2 100644
--- a/src/i18n/strings/gl.json
+++ b/src/i18n/strings/gl.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "O teu navegador non pode executar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s utiliza características avanzadas do navegador que non están dispoñibles no teu navegador.",
     "Powered by Matrix": "Funciona grazas a Matrix",
-    "Use %(brand)s on mobile": "Utiliza %(brand)s no móbil"
+    "Use %(brand)s on mobile": "Utiliza %(brand)s no móbil",
+    "Switch to space by number": "Cambiar a espazo polo número"
 }
diff --git a/src/i18n/strings/he.json b/src/i18n/strings/he.json
index 59fbea2839..29aaf5f218 100644
--- a/src/i18n/strings/he.json
+++ b/src/i18n/strings/he.json
@@ -4,9 +4,9 @@
     "Unknown device": "מכשיר לא ידוע",
     "You need to be using HTTPS to place a screen-sharing call.": "עליך להשתמש ב HTTPS בכדי לבצע שיחת ווידאו משותפת.",
     "Welcome to Element": "ברוכים הבאים ל Element",
-    "Decentralised, encrypted chat & collaboration powered by [matrix]": "צ'ט מוצפן & ושת\"פ נעשה ע\"י ה [matrix]",
+    "Decentralised, encrypted chat & collaboration powered by [matrix]": "צא'ט וכלי שיתוף פעולה מבוזר ומוצפן &  מופעל ע\"י [matrix]",
     "Invalid JSON": "JSON לא חוקי",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהבאים, default_server_config, default_server_name, או default_hs_url.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "תצורה שגויה: ניתן לציין רק אחד מהערכים הבאים, default_server_config, default_server_name, או default_hs_url.",
     "Invalid configuration: no default server specified.": "תצורה שגויה: לא צוין שרת ברירת מחדל.",
     "Open user settings": "פתח הגדרות משתמש",
     "Go to your browser to complete Sign In": "עבור לדפדפן להמשך ההתחברות",
@@ -17,7 +17,7 @@
     "Open": "פתח",
     "Download Completed": "ההורדה הושלמה",
     "Unexpected error preparing the app. See console for details.": "שגיאה לא צפויה במהלך הכנת האפליקציה. ראו קונסול לפרטים נוספים.",
-    "Unable to load config file: please refresh the page to try again.": "לא יכול לקרוא את קובץ ההגדרות: אנא אתחלו את הדף לנסות שנית.",
+    "Unable to load config file: please refresh the page to try again.": "לא יכול לטעון את קובץ ההגדרות: יש לרענן את הדף כדי לנסות שנית.",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "האלמנט מכיל הגדרת JSON שגויה, אנא תקנו את הבעיה ואתחלו את הדף.",
     "Your Element is misconfigured": "האלמנט מוגדר באופן שגוי",
     "Go to element.io": "חזור לאתר הראשי: element.io",
@@ -31,6 +31,7 @@
     "Powered by Matrix": "מופעל על ידי מטריקס",
     "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s שולחן עבודה %(platformName)s",
-    "The message from the parser is: %(message)s": "ההודעה מהניתוח היא: %(message)s",
-    "Missing indexeddb worker script!": "סקריפט indexeddb worker חסר!"
+    "The message from the parser is: %(message)s": "ההודעה מהמנתח היא: %(message)s",
+    "Missing indexeddb worker script!": "סקריפט indexeddb worker חסר!",
+    "Switch to space by number": "עבור אל 'Space' על פי מספרו"
 }
diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json
index 7f90879549..a0785675c9 100644
--- a/src/i18n/strings/hu.json
+++ b/src/i18n/strings/hu.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "A böngészője nem tudja futtatni ezt: %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s speciális böngészőfunkciókat használ, amelyeket a jelenlegi böngészője nem támogat.",
     "Powered by Matrix": "A gépházban: Matrix",
-    "Use %(brand)s on mobile": "Mobilon használd ezt: %(brand)s"
+    "Use %(brand)s on mobile": "Mobilon használd ezt: %(brand)s",
+    "Switch to space by number": "Tér váltás számmal"
 }
diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json
index c14e74c63c..4601f249f2 100644
--- a/src/i18n/strings/it.json
+++ b/src/i18n/strings/it.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "Il tuo browser non può eseguire %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funzionalità avanzate del browser che non sono supportate dal tuo browser attuale.",
     "Powered by Matrix": "Offerto da Matrix",
-    "Use %(brand)s on mobile": "Usa %(brand)s su mobile"
+    "Use %(brand)s on mobile": "Usa %(brand)s su mobile",
+    "Switch to space by number": "Passa allo spazio per numero"
 }
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index 7229505387..47322348e0 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -6,7 +6,7 @@
     "Welcome to Element": "Welkom bij Element",
     "Decentralised, encrypted chat & collaboration powered by [matrix]": "Gedecentraliseerd en versleuteld chatten & samenwerken dankzij [matrix]",
     "Sign In": "Inloggen",
-    "Create Account": "Registeren",
+    "Create Account": "Registreren",
     "Explore rooms": "Gesprekken ontdekken",
     "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.",
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet starten",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
     "Powered by Matrix": "Mogelijk gemaakt door Matrix",
-    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel"
+    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
+    "Switch to space by number": "Wissel naar space per nummer"
 }
diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json
index 0892b7bf34..67dee8c093 100644
--- a/src/i18n/strings/pt_BR.json
+++ b/src/i18n/strings/pt_BR.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "Seu browser não consegue rodar %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s usa funcionalidade de browser avançada que não é suportada por seu browser atual.",
     "Powered by Matrix": "Powered by Matrix",
-    "Use %(brand)s on mobile": "Usar %(brand)s em celular"
+    "Use %(brand)s on mobile": "Usar %(brand)s em celular",
+    "Switch to space by number": "Trocar para espaço por número"
 }
diff --git a/src/i18n/strings/si.json b/src/i18n/strings/si.json
index 4ed8b51092..e1062ecafc 100644
--- a/src/i18n/strings/si.json
+++ b/src/i18n/strings/si.json
@@ -4,5 +4,15 @@
     "Welcome to Element": "ඉලමන්ට් වෙත සාදරයෙන් පිළිගනිමු",
     "Open": "විවෘත කරන්න",
     "Powered by Matrix": "මැට්‍රික්ස් මඟින් බලගන්වා ඇත",
-    "Sign In": "පිවිසෙන්න"
+    "Sign In": "පිවිසෙන්න",
+    "Dismiss": "ඉවතලන්න",
+    "Explore rooms": "කාමර බලන්න",
+    "Create Account": "ගිණුමක් සාදන්න",
+    "Failed to start": "ඇරඹීමට අපොහොසත් විය",
+    "Go to element.io": "element.io වෙත යන්න",
+    "Your browser can't run %(brand)s": "ඔබගේ අතිරික්සුවට %(brand)s ධාවනය කළ නොහැකිය",
+    "Unsupported browser": "සහය නොදක්වන අතිරික්සුව කි",
+    "Go to your browser to complete Sign In": "පිවිසීම සම්පූර්ණ කිරීමට ඔබගේ අතිරික්සුව වෙත යන්න",
+    "Download Completed": "බාගැනීම සම්පූර්ණයි",
+    "Open user settings": "පරිශීලක සැකසුම් විවෘත කරන්න"
 }
diff --git a/src/i18n/strings/sq.json b/src/i18n/strings/sq.json
index de1b035090..6926859b99 100644
--- a/src/i18n/strings/sq.json
+++ b/src/i18n/strings/sq.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "Shfletuesi juaj s’mund të xhirojë %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s përdor veçori të thelluara të shfletuesit, të cilat shfletuesi juaj i tanishëm s’i mbulon.",
     "Powered by Matrix": "Bazuar në Matrix",
-    "Use %(brand)s on mobile": "Përdor %(brand)s në celular"
+    "Use %(brand)s on mobile": "Përdor %(brand)s në celular",
+    "Switch to space by number": "Kalo te hapësira me numrin"
 }
diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json
index 3bb712a9f0..6c137bee40 100644
--- a/src/i18n/strings/sv.json
+++ b/src/i18n/strings/sv.json
@@ -33,5 +33,6 @@
     "Powered by Matrix": "Drivs av Matrix",
     "Your browser can't run %(brand)s": "Din webbläsare kan inte köra %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s använder avancerade webbläsarfunktioner som inte stöds av din aktuella webbläsare.",
-    "Use %(brand)s on mobile": "Använd %(brand)s på mobilen"
+    "Use %(brand)s on mobile": "Använd %(brand)s på mobilen",
+    "Switch to space by number": "Byt till utrymme med nummer"
 }
diff --git a/src/i18n/strings/tr.json b/src/i18n/strings/tr.json
index 4ab11605f5..d45526ec89 100644
--- a/src/i18n/strings/tr.json
+++ b/src/i18n/strings/tr.json
@@ -33,5 +33,6 @@
     "%(brand)s Desktop (%(platformName)s)": "%(brand)s Masaüstü (%(platformName)s)",
     "Open": "Aç",
     "Missing indexeddb worker script!": "Indexeddb worker kodu eksik!",
-    "Use %(brand)s on mobile": "Mobilde %(brand)s kullan"
+    "Use %(brand)s on mobile": "Mobilde %(brand)s kullan",
+    "Switch to space by number": "Sayı ile belirtilen alana geç"
 }
diff --git a/src/i18n/strings/uk.json b/src/i18n/strings/uk.json
index a1456a6b07..f11da7c7ab 100644
--- a/src/i18n/strings/uk.json
+++ b/src/i18n/strings/uk.json
@@ -33,5 +33,6 @@
     "Powered by Matrix": "Працює на Matrix",
     "Your browser can't run %(brand)s": "Ваш переглядач неспроможний запустити %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s використовує передові властивості, які ваш браузер не підтримує.",
-    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному"
+    "Use %(brand)s on mobile": "Користуйтеся %(brand)s на мобільному",
+    "Switch to space by number": "Перейдіть до простору за номером"
 }
diff --git a/src/i18n/strings/zh_Hans.json b/src/i18n/strings/zh_Hans.json
index d509109611..c11a6e1a31 100644
--- a/src/i18n/strings/zh_Hans.json
+++ b/src/i18n/strings/zh_Hans.json
@@ -33,5 +33,6 @@
     "Your browser can't run %(brand)s": "浏览器无法运行 %(brand)s",
     "%(brand)s uses advanced browser features which aren't supported by your current browser.": "当前浏览器不支持 %(brand)s 所需的高级浏览器特性。",
     "Powered by Matrix": "由 Matrix 驱动",
-    "Use %(brand)s on mobile": "在移动设备上使用 %(brand)s"
+    "Use %(brand)s on mobile": "在移动设备上使用 %(brand)s",
+    "Switch to space by number": "按数字切换空间"
 }
diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json
index 3cd8118204..57cf32a1c1 100644
--- a/src/i18n/strings/zh_Hant.json
+++ b/src/i18n/strings/zh_Hant.json
@@ -30,8 +30,9 @@
     "Open": "開啟",
     "Your Element is misconfigured": "Element 配置錯誤",
     "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Element 的配置中包含無效JSON，請更正錯誤並重新加載網頁。",
-    "Your browser can't run %(brand)s": "當前瀏覽器無法運行%(brand)s",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "當前瀏覽器不支持%(brand)s使用的高級特性。",
+    "Your browser can't run %(brand)s": "您的瀏覽器無法執行 %(brand)s",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s 使用了您目前的瀏覽器不支援的進階瀏覽器功能。",
     "Powered by Matrix": "由 Matrix 提供",
-    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s"
+    "Use %(brand)s on mobile": "在行動裝置上使用 %(brand)s",
+    "Switch to space by number": "依數字切換至空間"
 }
diff --git a/src/vector/indexeddb-worker.ts b/src/vector/indexeddb-worker.ts
new file mode 100644
index 0000000000..e196cdfb35
--- /dev/null
+++ b/src/vector/indexeddb-worker.ts
@@ -0,0 +1,21 @@
+/*
+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.
+*/
+
+import { IndexedDBStoreWorker } from 'matrix-js-sdk/src/indexeddb-worker';
+
+const remoteWorker = new IndexedDBStoreWorker(postMessage as InstanceType<typeof Worker>["postMessage"]);
+
+global.onmessage = remoteWorker.onMessage;
diff --git a/yarn.lock b/yarn.lock
index 328996ea5e..f9ff5ae6c6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10834,6 +10834,29 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
+stylelint-config-recommended@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657"
+  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+
+stylelint-config-standard@^20.0.0:
+  version "20.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d"
+  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
+  dependencies:
+    stylelint-config-recommended "^3.0.0"
+
+stylelint-scss@^3.18.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.19.0.tgz#528006d5a4c5a0f1f4d709b02fd3f626ed66d742"
+  integrity sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==
+  dependencies:
+    lodash "^4.17.15"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
 stylelint@^13.9.0:
   version "13.9.0"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.9.0.tgz#93921ee6e11d4556b9f31131f485dc813b68e32a"