diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..2c068fff33
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @matrix-org/element-web
diff --git a/.node-version b/.node-version
new file mode 100644
index 0000000000..8351c19397
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+14
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 30fcf46790..5720c0f23e 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -60,7 +60,6 @@ import Modal from './Modal';
 import { _t } from './languageHandler';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
-import WidgetEchoStore from './stores/WidgetEchoStore';
 import SettingsStore from './settings/SettingsStore';
 import { Jitsi } from "./widgets/Jitsi";
 import { WidgetType } from "./widgets/WidgetType";
@@ -86,6 +85,7 @@ import { randomUppercaseString, randomLowercaseString } from "matrix-js-sdk/src/
 import EventEmitter from 'events';
 import SdkConfig from './SdkConfig';
 import { ensureDMExists, findDMForUser } from './createRoom';
+import { WidgetLayoutStore, Container } from './stores/widgets/WidgetLayoutStore';
 import { getIncomingCallToastKey } from './toasts/IncomingCallToast';
 import ToastStore from './stores/ToastStore';
 import IncomingCallToast from "./toasts/IncomingCallToast";
@@ -1011,14 +1011,10 @@ export default class CallHandler extends EventEmitter {
 
         // prevent double clicking the call button
         const room = MatrixClientPeg.get().getRoom(roomId);
-        const currentJitsiWidgets = WidgetUtils.getRoomWidgetsOfType(room, WidgetType.JITSI);
-        const hasJitsi = currentJitsiWidgets.length > 0
-            || WidgetEchoStore.roomHasPendingWidgetsOfType(roomId, currentJitsiWidgets, WidgetType.JITSI);
-        if (hasJitsi) {
-            Modal.createTrackedDialog('Call already in progress', '', ErrorDialog, {
-                title: _t('Call in Progress'),
-                description: _t('A call is currently being placed!'),
-            });
+        const jitsiWidget = WidgetStore.instance.getApps(roomId).find((app) => WidgetType.JITSI.matches(app.type));
+        if (jitsiWidget) {
+            // If there already is a Jitsi widget pin it
+            WidgetLayoutStore.instance.moveToContainer(room, jitsiWidget, Container.Top);
             return;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6612a20c28..88798bc0da 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -64,8 +64,6 @@
     "Unable to transfer call": "Unable to transfer call",
     "Transfer Failed": "Transfer Failed",
     "Failed to transfer call": "Failed to transfer call",
-    "Call in Progress": "Call in Progress",
-    "A call is currently being placed!": "A call is currently being placed!",
     "Permission Required": "Permission Required",
     "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
     "End conference": "End conference",
diff --git a/src/theme.js b/src/theme.js
index 2caf48b65a..cd14d2d9db 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -171,15 +171,10 @@ export async function setTheme(theme) {
     // look for the stylesheet elements.
     // styleElements is a map from style name to HTMLLinkElement.
     const styleElements = Object.create(null);
-    let a;
-    for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
-        const href = a.getAttribute("href");
-        // shouldn't we be using the 'title' tag rather than the href?
-        const match = href && href.match(/^bundles\/.*\/theme-(.*)\.css$/);
-        if (match) {
-            styleElements[match[1]] = a;
-        }
-    }
+    const themes = Array.from(document.querySelectorAll('[data-mx-theme]'));
+    themes.forEach(theme => {
+        styleElements[theme.attributes['data-mx-theme'].value.toLowerCase()] = theme;
+    });
 
     if (!(stylesheetName in styleElements)) {
         throw new Error("Unknown theme " + stylesheetName);