diff --git a/static/golive.html.tmpl b/static/golive.html.tmpl
deleted file mode 100644
index c773fe52f..000000000
--- a/static/golive.html.tmpl
+++ /dev/null
@@ -1,487 +0,0 @@
-<!DOCTYPE html>
-<html
-  lang="en"
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:v="urn:schemas-microsoft-com:vml"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
->
-  <head>
-    <meta charset="utf-8" />
-    <!-- utf-8 works for most cases -->
-    <meta name="viewport" content="width=device-width" />
-    <!-- Forcing initial-scale shouldn't be necessary -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <!-- Use the latest (edge) version of IE rendering engine -->
-    <meta name="x-apple-disable-message-reformatting" />
-    <!-- Disable auto-scale in iOS 10 Mail entirely -->
-    <title></title>
-    <!-- The title tag shows in email notifications, like Android 4.4. -->
-
-    <link
-      href="https://fonts.googleapis.com/css?family=Lato:300,400,700"
-      rel="stylesheet"
-    />
-
-    <!-- CSS Reset : BEGIN -->
-    <style>
-      /* What it does: Remove spaces around the email design added by some email clients. */
-      /* Beware: It can remove the padding / margin and add a background color to the compose a reply window. */
-      html,
-      body {
-        margin: 0 auto !important;
-        padding: 0 !important;
-        height: 100% !important;
-        width: 100% !important;
-        background: #f1f1f1;
-      }
-
-      /* What it does: Stops email clients resizing small text. */
-      * {
-        -ms-text-size-adjust: 100%;
-        -webkit-text-size-adjust: 100%;
-      }
-
-      /* What it does: Centers email on Android 4.4 */
-      div[style*='margin: 16px 0'] {
-        margin: 0 !important;
-      }
-
-      /* What it does: Stops Outlook from adding extra spacing to tables. */
-      table,
-      td {
-        mso-table-lspace: 0pt !important;
-        mso-table-rspace: 0pt !important;
-      }
-
-      /* What it does: Fixes webkit padding issue. */
-      table {
-        border-spacing: 0 !important;
-        border-collapse: collapse !important;
-        table-layout: fixed !important;
-        margin: 0 auto !important;
-      }
-
-      /* What it does: Uses a better rendering method when resizing images in IE. */
-      img {
-        -ms-interpolation-mode: bicubic;
-      }
-
-      /* What it does: Prevents Windows 10 Mail from underlining links despite inline CSS. Styles for underlined links should be inline. */
-      a {
-        text-decoration: none;
-      }
-
-      /* What it does: A work-around for email clients meddling in triggered links. */
-      *[x-apple-data-detectors],  /* iOS */
-.unstyle-auto-detected-links *,
-.aBn {
-        border-bottom: 0 !important;
-        cursor: default !important;
-        color: inherit !important;
-        text-decoration: none !important;
-        font-size: inherit !important;
-        font-family: inherit !important;
-        font-weight: inherit !important;
-        line-height: inherit !important;
-      }
-
-      /* What it does: Prevents Gmail from displaying a download button on large, non-linked images. */
-      .a6S {
-        display: none !important;
-        opacity: 0.01 !important;
-      }
-
-      /* What it does: Prevents Gmail from changing the text color in conversation threads. */
-      .im {
-        color: inherit !important;
-      }
-
-      /* If the above doesn't work, add a .g-img class to any image in question. */
-      img.g-img + div {
-        display: none !important;
-      }
-
-      /* What it does: Removes right gutter in Gmail iOS app: https://github.com/TedGoas/Cerberus/issues/89  */
-      /* Create one of these media queries for each additional viewport size you'd like to fix */
-
-      /* iPhone 4, 4S, 5, 5S, 5C, and 5SE */
-      @media only screen and (min-device-width: 320px) and (max-device-width: 374px) {
-        u ~ div .email-container {
-          min-width: 320px !important;
-        }
-      }
-      /* iPhone 6, 6S, 7, 8, and X */
-      @media only screen and (min-device-width: 375px) and (max-device-width: 413px) {
-        u ~ div .email-container {
-          min-width: 375px !important;
-        }
-      }
-      /* iPhone 6+, 7+, and 8+ */
-      @media only screen and (min-device-width: 414px) {
-        u ~ div .email-container {
-          min-width: 414px !important;
-        }
-      }
-    </style>
-
-    <!-- CSS Reset : END -->
-
-    <!-- Progressive Enhancements : BEGIN -->
-    <style>
-      .primary {
-        background: #6655b3;
-      }
-      .bg_white {
-        background: #ffffff;
-      }
-      .bg_light {
-        background: #fafafa;
-      }
-      .bg_black {
-        background: #000000;
-      }
-      .bg_dark {
-        background: rgba(0, 0, 0, 0.8);
-      }
-      .email-section {
-        padding: 2.5em;
-      }
-
-      /*BUTTON*/
-      .btn {
-        padding: 10px 15px;
-        display: inline-block;
-        font-size: 1.4em;
-      }
-      .btn.btn-primary {
-        border-radius: 5px;
-        background: #6655b3;
-        color: #ffffff;
-      }
-      .btn.btn-white {
-        border-radius: 5px;
-        background: #ffffff;
-        color: #000000;
-      }
-      .btn.btn-white-outline {
-        border-radius: 5px;
-        background: transparent;
-        border: 1px solid #fff;
-        color: #fff;
-      }
-      .btn.btn-black-outline {
-        border-radius: 0px;
-        background: transparent;
-        border: 2px solid #000;
-        color: #000;
-        font-weight: 700;
-      }
-
-      h1,
-      h2,
-      h3,
-      h4,
-      h5,
-      h6 {
-        font-family: 'Lato', sans-serif;
-        color: #000000;
-        margin-top: 0;
-        font-weight: 400;
-      }
-
-      body {
-        font-family: 'Lato', sans-serif;
-        font-weight: 400;
-        font-size: 15px;
-        line-height: 1.8;
-        color: rgba(0, 0, 0, 0.4);
-      }
-
-      a {
-        color: #6655b3;
-      }
-
-      table {
-      }
-      /*LOGO*/
-
-      .logo h1 {
-        margin: 0;
-      }
-      .logo h1 a {
-        color: #6655b3;
-        font-size: 24px;
-        font-weight: 700;
-        font-family: 'Lato', sans-serif;
-      }
-
-      /*HERO*/
-      .hero {
-        position: relative;
-        z-index: 0;
-      }
-
-      .hero .text {
-        color: rgba(0, 0, 0, 0.3);
-      }
-      .hero .text h2 {
-        color: #000;
-        font-size: 40px;
-        margin-bottom: 0;
-        font-weight: 400;
-        line-height: 1.4;
-      }
-      .hero .text h3 {
-        font-size: 24px;
-        font-weight: 300;
-      }
-      .hero .text h2 span {
-        font-weight: 600;
-        color: #6655b3;
-      }
-
-      /*HEADING SECTION*/
-      .heading-section {
-      }
-      .heading-section h2 {
-        color: #000000;
-        font-size: 28px;
-        margin-top: 0;
-        line-height: 1.4;
-        font-weight: 400;
-      }
-      .heading-section .subheading {
-        margin-bottom: 20px !important;
-        display: inline-block;
-        font-size: 13px;
-        text-transform: uppercase;
-        letter-spacing: 2px;
-        color: rgba(0, 0, 0, 0.4);
-        position: relative;
-      }
-      .heading-section .subheading::after {
-        position: absolute;
-        left: 0;
-        right: 0;
-        bottom: -10px;
-        content: '';
-        width: 100%;
-        height: 2px;
-        background: #6655b3;
-        margin: 0 auto;
-      }
-
-      .heading-section-white {
-        color: rgba(255, 255, 255, 0.8);
-      }
-      .heading-section-white h2 {
-        line-height: 1;
-        padding-bottom: 0;
-      }
-      .heading-section-white h2 {
-        color: #ffffff;
-      }
-      .heading-section-white .subheading {
-        margin-bottom: 0;
-        display: inline-block;
-        font-size: 13px;
-        text-transform: uppercase;
-        letter-spacing: 2px;
-        color: rgba(255, 255, 255, 0.4);
-      }
-
-      ul.social {
-        padding: 0;
-      }
-      ul.social li {
-        display: inline-block;
-        margin-right: 10px;
-      }
-
-      /*FOOTER*/
-
-      .footer {
-        border-top: 1px solid rgba(0, 0, 0, 0.05);
-        color: rgba(0, 0, 0, 0.5);
-      }
-      .footer .heading {
-        color: #000;
-        font-size: 20px;
-      }
-      .footer ul {
-        margin: 0;
-        padding: 0;
-      }
-      .footer ul li {
-        list-style: none;
-        margin-bottom: 10px;
-      }
-      .footer ul li a {
-        color: rgba(0, 0, 0, 1);
-      }
-
-      #owncast-promo {
-        font-size: 10px;
-      }
-
-      @media screen and (max-width: 500px) {
-      }
-    </style>
-  </head>
-
-  <body
-    width="100%"
-    style="
-      margin: 0;
-      padding: 0 !important;
-      mso-line-height-rule: exactly;
-      background-color: #f1f1f1;
-    "
-  >
-    <center style="width: 100%; background-color: #f1f1f1">
-      <div
-        style="
-          display: none;
-          font-size: 1px;
-          max-height: 0px;
-          max-width: 0px;
-          opacity: 0;
-          overflow: hidden;
-          mso-hide: all;
-          font-family: sans-serif;
-        "
-      >
-        &zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;&zwnj;&nbsp;
-      </div>
-      <div style="max-width: 600px; margin: 0 auto" class="email-container">
-        <!-- BEGIN BODY -->
-        <table
-          align="center"
-          role="presentation"
-          cellspacing="0"
-          cellpadding="0"
-          border="0"
-          width="100%"
-          style="margin: auto"
-        >
-          <tr>
-            <td
-              valign="top"
-              class="bg_white"
-              style="padding: 1em 2.5em 0 2.5em"
-            >
-              <table
-                role="presentation"
-                border="0"
-                cellpadding="0"
-                cellspacing="0"
-                width="100%"
-              >
-                <tr>
-                  <td class="logo" style="text-align: center">
-                    <h1><a href="{{.ServerURL}}">{{.ServerName}}</a></h1>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <!-- end tr -->
-          <tr>
-            <td
-              valign="middle"
-              class="hero bg_white"
-              style="padding: 3em 0 2em 0"
-            >
-              <a href="{{.ServerURL}}">
-                <img
-                  src="{{.Logo}}"
-                  alt=""
-                  style="
-                    width: 100px;
-                    max-width: 600px;
-                    height: auto;
-                    margin: auto;
-                    display: block;
-                  "
-                />
-              </a>
-            </td>
-          </tr>
-          <!-- end tr -->
-          <tr>
-            <td
-              valign="middle"
-              class="hero bg_white"
-              style="padding: 2em 0 4em 0"
-            >
-              <table>
-                <tr>
-                  <td>
-                    <div
-                      class="text"
-                      style="padding: 0 2.5em; text-align: center"
-                    >
-                      <a href="{{.ServerURL}}">
-                        <img
-                          src="{{.Thumbnail}}"
-                          alt=""
-                          style="
-                            width: 300px;
-                            max-width: 600px;
-                            height: auto;
-                            margin: auto;
-                            display: block;
-                          "
-                        />
-                      </a>
-                      <h2><a href="{{.ServerURL}}">{{.ServerName}}</h2></a>
-                      <h3>{{.StreamDescription}}</h3>
-                      <p>
-                        <a href="{{.ServerURL}}" class="btn btn-primary"
-                          >Watch now!</a
-                        >
-                      </p>
-                    </div>
-                  </td>
-                </tr>
-              </table>
-            </td>
-          </tr>
-          <!-- end tr -->
-          <!-- 1 Column Text + Button : END -->
-        </table>
-        <table
-          align="center"
-          role="presentation"
-          cellspacing="0"
-          cellpadding="0"
-          border="0"
-          width="100%"
-          style="margin: auto"
-        >
-          <!-- end: tr -->
-          <tr>
-            <td class="bg_light" style="text-align: center">
-              <p>
-                No longer want to receive emails from {{.ServerName}}? You should
-                <a href="[[UNSUB_LINK_EN]]" style="color: rgba(0, 0, 0, 0.8)"
-                  >unsubscribe here</a
-                >.
-              </p>
-              <p id="owncast-promo">
-                This stream is powered by
-                <a href="https://owncast.online"
-                  ><img
-                    src="https://owncast.online/images/logo.svg"
-                    width="10px"
-                  />&nbsp;Owncast</a
-                >
-                and you can run your own, too.
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </center>
-  </body>
-</html>
diff --git a/web/components/stores/eventhandlers/connected-client-info-handler.ts b/web/components/stores/eventhandlers/connected-client-info-handler.ts
index 36ac64060..fe6454ec3 100644
--- a/web/components/stores/eventhandlers/connected-client-info-handler.ts
+++ b/web/components/stores/eventhandlers/connected-client-info-handler.ts
@@ -10,5 +10,5 @@ export default function handleConnectedClientInfoMessage(
   const { id, displayName, scopes } = user;
   setChatDisplayName(displayName);
   setChatUserId(id);
-  setIsChatModerator(scopes.includes('moderator'));
+  setIsChatModerator(scopes?.includes('moderator'));
 }
diff --git a/web/next.config.js b/web/next.config.js
index 40a920da6..845894579 100644
--- a/web/next.config.js
+++ b/web/next.config.js
@@ -33,10 +33,6 @@ module.exports = withLess({
         source: '/thumbnail.jpg',
         destination: 'http://localhost:8080/thumbnail.jpg', // Proxy to Backend to work around CORS.
       },
-      {
-        source: '/favicon.ico',
-        destination: 'http://localhost:8080/favicon.ico', // Proxy to Backend to work around CORS.
-      },
     ];
   },
 });
diff --git a/webroot/favicon.ico b/web/public/favicon.ico
similarity index 100%
rename from webroot/favicon.ico
rename to web/public/favicon.ico
diff --git a/webroot/img/favicon/android-icon-144x144.png b/web/public/img/favicon/android-icon-144x144.png
similarity index 100%
rename from webroot/img/favicon/android-icon-144x144.png
rename to web/public/img/favicon/android-icon-144x144.png
diff --git a/webroot/img/favicon/android-icon-192x192.png b/web/public/img/favicon/android-icon-192x192.png
similarity index 100%
rename from webroot/img/favicon/android-icon-192x192.png
rename to web/public/img/favicon/android-icon-192x192.png
diff --git a/webroot/img/favicon/android-icon-36x36.png b/web/public/img/favicon/android-icon-36x36.png
similarity index 100%
rename from webroot/img/favicon/android-icon-36x36.png
rename to web/public/img/favicon/android-icon-36x36.png
diff --git a/webroot/img/favicon/android-icon-48x48.png b/web/public/img/favicon/android-icon-48x48.png
similarity index 100%
rename from webroot/img/favicon/android-icon-48x48.png
rename to web/public/img/favicon/android-icon-48x48.png
diff --git a/webroot/img/favicon/android-icon-72x72.png b/web/public/img/favicon/android-icon-72x72.png
similarity index 100%
rename from webroot/img/favicon/android-icon-72x72.png
rename to web/public/img/favicon/android-icon-72x72.png
diff --git a/webroot/img/favicon/android-icon-96x96.png b/web/public/img/favicon/android-icon-96x96.png
similarity index 100%
rename from webroot/img/favicon/android-icon-96x96.png
rename to web/public/img/favicon/android-icon-96x96.png
diff --git a/webroot/img/favicon/apple-icon-114x114.png b/web/public/img/favicon/apple-icon-114x114.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-114x114.png
rename to web/public/img/favicon/apple-icon-114x114.png
diff --git a/webroot/img/favicon/apple-icon-120x120.png b/web/public/img/favicon/apple-icon-120x120.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-120x120.png
rename to web/public/img/favicon/apple-icon-120x120.png
diff --git a/webroot/img/favicon/apple-icon-144x144.png b/web/public/img/favicon/apple-icon-144x144.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-144x144.png
rename to web/public/img/favicon/apple-icon-144x144.png
diff --git a/webroot/img/favicon/apple-icon-152x152.png b/web/public/img/favicon/apple-icon-152x152.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-152x152.png
rename to web/public/img/favicon/apple-icon-152x152.png
diff --git a/webroot/img/favicon/apple-icon-180x180.png b/web/public/img/favicon/apple-icon-180x180.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-180x180.png
rename to web/public/img/favicon/apple-icon-180x180.png
diff --git a/webroot/img/favicon/apple-icon-57x57.png b/web/public/img/favicon/apple-icon-57x57.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-57x57.png
rename to web/public/img/favicon/apple-icon-57x57.png
diff --git a/webroot/img/favicon/apple-icon-60x60.png b/web/public/img/favicon/apple-icon-60x60.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-60x60.png
rename to web/public/img/favicon/apple-icon-60x60.png
diff --git a/webroot/img/favicon/apple-icon-72x72.png b/web/public/img/favicon/apple-icon-72x72.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-72x72.png
rename to web/public/img/favicon/apple-icon-72x72.png
diff --git a/webroot/img/favicon/apple-icon-76x76.png b/web/public/img/favicon/apple-icon-76x76.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-76x76.png
rename to web/public/img/favicon/apple-icon-76x76.png
diff --git a/webroot/img/favicon/apple-icon-precomposed.png b/web/public/img/favicon/apple-icon-precomposed.png
similarity index 100%
rename from webroot/img/favicon/apple-icon-precomposed.png
rename to web/public/img/favicon/apple-icon-precomposed.png
diff --git a/webroot/img/favicon/apple-icon.png b/web/public/img/favicon/apple-icon.png
similarity index 100%
rename from webroot/img/favicon/apple-icon.png
rename to web/public/img/favicon/apple-icon.png
diff --git a/webroot/img/favicon/browserconfig.xml b/web/public/img/favicon/browserconfig.xml
similarity index 100%
rename from webroot/img/favicon/browserconfig.xml
rename to web/public/img/favicon/browserconfig.xml
diff --git a/webroot/img/favicon/favicon-16x16.png b/web/public/img/favicon/favicon-16x16.png
similarity index 100%
rename from webroot/img/favicon/favicon-16x16.png
rename to web/public/img/favicon/favicon-16x16.png
diff --git a/webroot/img/favicon/favicon-32x32.png b/web/public/img/favicon/favicon-32x32.png
similarity index 100%
rename from webroot/img/favicon/favicon-32x32.png
rename to web/public/img/favicon/favicon-32x32.png
diff --git a/webroot/img/favicon/favicon-96x96.png b/web/public/img/favicon/favicon-96x96.png
similarity index 100%
rename from webroot/img/favicon/favicon-96x96.png
rename to web/public/img/favicon/favicon-96x96.png
diff --git a/webroot/img/favicon/ms-icon-144x144.png b/web/public/img/favicon/ms-icon-144x144.png
similarity index 100%
rename from webroot/img/favicon/ms-icon-144x144.png
rename to web/public/img/favicon/ms-icon-144x144.png
diff --git a/webroot/img/favicon/ms-icon-150x150.png b/web/public/img/favicon/ms-icon-150x150.png
similarity index 100%
rename from webroot/img/favicon/ms-icon-150x150.png
rename to web/public/img/favicon/ms-icon-150x150.png
diff --git a/webroot/img/favicon/ms-icon-310x310.png b/web/public/img/favicon/ms-icon-310x310.png
similarity index 100%
rename from webroot/img/favicon/ms-icon-310x310.png
rename to web/public/img/favicon/ms-icon-310x310.png
diff --git a/webroot/img/favicon/ms-icon-70x70.png b/web/public/img/favicon/ms-icon-70x70.png
similarity index 100%
rename from webroot/img/favicon/ms-icon-70x70.png
rename to web/public/img/favicon/ms-icon-70x70.png
diff --git a/webroot/manifest.json b/web/public/manifest.json
similarity index 100%
rename from webroot/manifest.json
rename to web/public/manifest.json
