From 5bdbda90b5458e25f8b2d8d6f394bc542c610517 Mon Sep 17 00:00:00 2001
From: TheElixZammuto <theelixzammuto@gmail.com>
Date: Thu, 28 Dec 2023 01:25:49 +0100
Subject: [PATCH] Web UI migration to Vite and Vue3 and improvements to the UX
 (#1673)

Co-authored-by: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
---
 .github/workflows/CI.yml                      |   11 +-
 cmake/dependencies/common.cmake               |    1 +
 cmake/packaging/common.cmake                  |   11 +-
 cmake/packaging/linux.cmake                   |    6 +-
 cmake/packaging/macos.cmake                   |    2 -
 cmake/packaging/unix.cmake                    |    3 -
 cmake/packaging/windows.cmake                 |    3 -
 cmake/targets/common.cmake                    |    6 +
 docker/debian-bookworm.dockerfile             |    3 -
 docker/debian-bullseye.dockerfile             |   21 +-
 docker/fedora-38.dockerfile                   |    5 +-
 docker/fedora-39.dockerfile                   |    5 +-
 docker/ubuntu-20.04.dockerfile                |   21 +-
 docker/ubuntu-22.04.dockerfile                |   22 +-
 docs/source/building/linux.rst                |    7 -
 docs/source/building/macos.rst                |    7 -
 docs/source/building/windows.rst              |   13 +-
 docs/source/conf.py                           |    2 +-
 docs/source/contributing/contributing.rst     |   20 +
 package.json                                  |   10 +-
 packaging/linux/Arch/PKGBUILD                 |    4 -
 .../linux/flatpak/dev.lizardbyte.sunshine.yml |    3 -
 packaging/macos/Portfile                      |    4 -
 scripts/icons/convert_and_pack.sh             |    6 +-
 src/confighttp.cpp                            |   32 +-
 src_assets/common/assets/web/Navbar.vue       |   60 +
 src_assets/common/assets/web/ResourceCard.vue |   36 +
 src_assets/common/assets/web/apps.html        |  820 ++++----
 src_assets/common/assets/web/clients.html     |    3 -
 src_assets/common/assets/web/config.html      | 1870 +++++++----------
 .../common/assets/web/header-no-nav.html      |   14 -
 src_assets/common/assets/web/header.html      |   83 -
 src_assets/common/assets/web/index.html       |  167 +-
 src_assets/common/assets/web/password.html    |  164 +-
 src_assets/common/assets/web/pin.html         |   56 +-
 .../{ => public}/images/logo-sunshine-16.png  |  Bin
 .../{ => public}/images/logo-sunshine-45.png  |  Bin
 .../images/sunshine-locked-16.png             |  Bin
 .../images/sunshine-locked-45.png             |  Bin
 .../{ => public}/images/sunshine-locked.ico   |  Bin
 .../{ => public}/images/sunshine-locked.png   |  Bin
 .../{ => public}/images/sunshine-locked.svg   |    0
 .../images/sunshine-pausing-16.png            |  Bin
 .../images/sunshine-pausing-45.png            |  Bin
 .../{ => public}/images/sunshine-pausing.ico  |  Bin
 .../{ => public}/images/sunshine-pausing.png  |  Bin
 .../{ => public}/images/sunshine-pausing.svg  |    0
 .../images/sunshine-playing-16.png            |  Bin
 .../images/sunshine-playing-45.png            |  Bin
 .../{ => public}/images/sunshine-playing.ico  |  Bin
 .../{ => public}/images/sunshine-playing.png  |  Bin
 .../{ => public}/images/sunshine-playing.svg  |    0
 .../web/{ => public}/images/sunshine.ico      |  Bin
 .../common/assets/web/template_header.html    |    9 +
 .../common/assets/web/troubleshooting.html    |  355 ++--
 src_assets/common/assets/web/welcome.html     |  127 +-
 vite.config.js                                |   53 +
 57 files changed, 1868 insertions(+), 2177 deletions(-)
 create mode 100644 src_assets/common/assets/web/Navbar.vue
 create mode 100644 src_assets/common/assets/web/ResourceCard.vue
 delete mode 100644 src_assets/common/assets/web/clients.html
 delete mode 100644 src_assets/common/assets/web/header-no-nav.html
 delete mode 100644 src_assets/common/assets/web/header.html
 rename src_assets/common/assets/web/{ => public}/images/logo-sunshine-16.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/logo-sunshine-45.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-locked-16.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-locked-45.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-locked.ico (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-locked.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-locked.svg (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-pausing-16.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-pausing-45.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-pausing.ico (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-pausing.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-pausing.svg (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-playing-16.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-playing-45.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-playing.ico (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-playing.png (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine-playing.svg (100%)
 rename src_assets/common/assets/web/{ => public}/images/sunshine.ico (100%)
 create mode 100644 src_assets/common/assets/web/template_header.html
 create mode 100644 vite.config.js

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8eadad41..38907881 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -398,8 +398,6 @@ jobs:
           mkdir -p build
           mkdir -p artifacts
 
-          npm install
-
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=/usr \
@@ -527,8 +525,6 @@ jobs:
           BUILD_VERSION: ${{ needs.check_changelog.outputs.next_version_bare }}
           COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
         run: |
-          npm install
-
           mkdir build
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release \
@@ -719,8 +715,9 @@ jobs:
             mingw-w64-x86_64-boost
             mingw-w64-x86_64-cmake
             mingw-w64-x86_64-curl
-            mingw-w64-x86_64-onevpl
+            mingw-w64-x86_64-nodejs
             mingw-w64-x86_64-nsis
+            mingw-w64-x86_64-onevpl
             mingw-w64-x86_64-openssl
             mingw-w64-x86_64-opus
             mingw-w64-x86_64-toolchain
@@ -728,10 +725,6 @@ jobs:
             wget
             yasm
 
-      - name: Install npm packages
-        run: |
-          npm install
-
       - name: Build Windows
         shell: msys2 {0}
         env:
diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
index 9bc7c56c..34ea09f7 100644
--- a/cmake/dependencies/common.cmake
+++ b/cmake/dependencies/common.cmake
@@ -84,3 +84,4 @@ elseif(UNIX)
         include(${CMAKE_MODULE_PATH}/dependencies/linux.cmake)
     endif()
 endif()
+
diff --git a/cmake/packaging/common.cmake b/cmake/packaging/common.cmake
index 0b41524f..ad3f9bc0 100644
--- a/cmake/packaging/common.cmake
+++ b/cmake/packaging/common.cmake
@@ -12,9 +12,14 @@ set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/sunshine.png)
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}")
 set(CPACK_STRIP_FILES YES)
 
-# install npm modules
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/node_modules"
-        DESTINATION "${SUNSHINE_ASSETS_DIR}/web")
+#install common assets
+install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/"
+        DESTINATION "${SUNSHINE_ASSETS_DIR}"
+        PATTERN "web" EXCLUDE)
+
+# install built vite assets
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/assets/web"
+        DESTINATION "${SUNSHINE_ASSETS_DIR}")
 
 # platform specific packaging
 if(WIN32)
diff --git a/cmake/packaging/linux.cmake b/cmake/packaging/linux.cmake
index 842277b9..8106345f 100644
--- a/cmake/packaging/linux.cmake
+++ b/cmake/packaging/linux.cmake
@@ -70,11 +70,11 @@ if(${SUNSHINE_TRAY} STREQUAL 1)
     install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status"
             RENAME "sunshine-tray.svg")
-    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-playing.svg"
+    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-playing.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
-    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-pausing.svg"
+    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-pausing.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
-    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/images/sunshine-locked.svg"
+    install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-locked.svg"
             DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/status")
 
     set(CPACK_DEBIAN_PACKAGE_DEPENDS "\
diff --git a/cmake/packaging/macos.cmake b/cmake/packaging/macos.cmake
index 2b173393..f7c3a518 100644
--- a/cmake/packaging/macos.cmake
+++ b/cmake/packaging/macos.cmake
@@ -10,8 +10,6 @@ if(SUNSHINE_PACKAGE_MACOS)  # todo
     set(MAC_PREFIX "${CMAKE_PROJECT_NAME}.app/Contents")
     set(INSTALL_RUNTIME_DIR "${MAC_PREFIX}/MacOS")
 
-    install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/"
-            DESTINATION "${SUNSHINE_ASSETS_DIR}")
     install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/macos/assets/"
             DESTINATION "${SUNSHINE_ASSETS_DIR}")
 
diff --git a/cmake/packaging/unix.cmake b/cmake/packaging/unix.cmake
index 660811f3..bacbfc91 100644
--- a/cmake/packaging/unix.cmake
+++ b/cmake/packaging/unix.cmake
@@ -13,6 +13,3 @@ if(NOT CMAKE_INSTALL_PREFIX)
 endif()
 
 install(TARGETS sunshine RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-
-install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/"
-        DESTINATION "${SUNSHINE_ASSETS_DIR}")
diff --git a/cmake/packaging/windows.cmake b/cmake/packaging/windows.cmake
index 3231d761..dc2add19 100644
--- a/cmake/packaging/windows.cmake
+++ b/cmake/packaging/windows.cmake
@@ -36,9 +36,6 @@ install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/misc/gamepad/"
         COMPONENT gamepad)
 
 # Sunshine assets
-install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/"
-        DESTINATION "${SUNSHINE_ASSETS_DIR}"
-        COMPONENT assets)
 install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/assets/"
         DESTINATION "${SUNSHINE_ASSETS_DIR}"
         COMPONENT assets)
diff --git a/cmake/targets/common.cmake b/cmake/targets/common.cmake
index 72f89bf5..7c446e46 100644
--- a/cmake/targets/common.cmake
+++ b/cmake/targets/common.cmake
@@ -33,3 +33,9 @@ foreach(flag IN LISTS SUNSHINE_COMPILE_OPTIONS)
 endforeach()
 
 target_compile_options(sunshine PRIVATE $<$<COMPILE_LANGUAGE:CXX>:${SUNSHINE_COMPILE_OPTIONS}>;$<$<COMPILE_LANGUAGE:CUDA>:${SUNSHINE_COMPILE_OPTIONS_CUDA};-std=c++17>)  # cmake-lint: disable=C0301
+
+#WebUI build
+add_custom_target(web-ui ALL
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        COMMENT "Installing NPM Dependencies and Building the Web UI"
+        COMMAND bash -c \"npm install && SUNSHINE_SOURCE_ASSETS_DIR=${SUNSHINE_SOURCE_ASSETS_DIR} SUNSHINE_ASSETS_DIR=${CMAKE_BINARY_DIR} npm run build\") # cmake-lint: disable=C0301
diff --git a/docker/debian-bookworm.dockerfile b/docker/debian-bookworm.dockerfile
index 1172d35a..c9d4fccd 100644
--- a/docker/debian-bookworm.dockerfile
+++ b/docker/debian-bookworm.dockerfile
@@ -95,9 +95,6 @@ _INSTALL_CUDA
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
diff --git a/docker/debian-bullseye.dockerfile b/docker/debian-bullseye.dockerfile
index 6d7ebdd3..3e602105 100644
--- a/docker/debian-bullseye.dockerfile
+++ b/docker/debian-bullseye.dockerfile
@@ -31,6 +31,7 @@ set -e
 apt-get update -y
 apt-get install -y --no-install-recommends \
   build-essential \
+  ca-certificates \
   cmake=3.18.* \
   git \
   libavdevice-dev \
@@ -58,8 +59,6 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
-  nodejs \
-  npm \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
   apt-get install -y --no-install-recommends \
@@ -69,6 +68,17 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
+#Install Node
+# hadolint ignore=SC1091
+RUN <<_INSTALL_NODE
+#!/bin/bash
+set -e
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+source "$HOME/.nvm/nvm.sh"
+nvm install 20.9.0
+nvm use 20.9.0
+_INSTALL_NODE
+
 # install cuda
 WORKDIR /build/cuda
 # versions: https://developer.nvidia.com/cuda-toolkit-archive
@@ -95,16 +105,17 @@ _INSTALL_CUDA
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
 # cmake and cpack
+# hadolint ignore=SC1091
 RUN <<_MAKE
 #!/bin/bash
 set -e
+#Set Node version
+source "$HOME/.nvm/nvm.sh"
+nvm use 20.9.0
 cmake \
   -DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \
   -DCMAKE_BUILD_TYPE=Release \
diff --git a/docker/fedora-38.dockerfile b/docker/fedora-38.dockerfile
index 2245ba9b..9f836fb8 100644
--- a/docker/fedora-38.dockerfile
+++ b/docker/fedora-38.dockerfile
@@ -52,7 +52,7 @@ dnf -y install \
   libXrandr-devel \
   libXtst-devel \
   mesa-libGL-devel \
-  nodejs-npm \
+  nodejs \
   numactl-devel \
   openssl-devel \
   opus-devel \
@@ -94,9 +94,6 @@ _DEPS
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
diff --git a/docker/fedora-39.dockerfile b/docker/fedora-39.dockerfile
index 6c6db891..26b10f4b 100644
--- a/docker/fedora-39.dockerfile
+++ b/docker/fedora-39.dockerfile
@@ -52,7 +52,7 @@ dnf -y install \
   libXrandr-devel \
   libXtst-devel \
   mesa-libGL-devel \
-  nodejs-npm \
+  nodejs \
   numactl-devel \
   openssl-devel \
   opus-devel \
@@ -94,9 +94,6 @@ _DEPS
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
diff --git a/docker/ubuntu-20.04.dockerfile b/docker/ubuntu-20.04.dockerfile
index 5634d48e..bad8285d 100644
--- a/docker/ubuntu-20.04.dockerfile
+++ b/docker/ubuntu-20.04.dockerfile
@@ -31,6 +31,7 @@ set -e
 apt-get update -y
 apt-get install -y --no-install-recommends \
   build-essential \
+  ca-certificates \
   gcc-10=10.5.* \
   g++-10=10.5.* \
   git \
@@ -59,8 +60,6 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
-  nodejs \
-  npm \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
   apt-get install -y --no-install-recommends \
@@ -70,6 +69,17 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
+#Install Node
+# hadolint ignore=SC1091
+RUN <<_INSTALL_NODE
+#!/bin/bash
+set -e
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+source "$HOME/.nvm/nvm.sh"
+nvm install 20.9.0
+nvm use 20.9.0
+_INSTALL_NODE
+
 # Update gcc alias
 # https://stackoverflow.com/a/70653945/11214013
 RUN <<_GCC_ALIAS
@@ -131,16 +141,17 @@ _INSTALL_CUDA
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
 # cmake and cpack
+# hadolint ignore=SC1091
 RUN <<_MAKE
 #!/bin/bash
 set -e
+#Set Node version
+source "$HOME/.nvm/nvm.sh"
+nvm use 20.9.0
 cmake \
   -DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \
   -DCMAKE_BUILD_TYPE=Release \
diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile
index c9c6b70d..2f37a691 100644
--- a/docker/ubuntu-22.04.dockerfile
+++ b/docker/ubuntu-22.04.dockerfile
@@ -32,6 +32,7 @@ apt-get update -y
 apt-get install -y --no-install-recommends \
   build-essential \
   cmake=3.22.* \
+  ca-certificates \
   git \
   libayatana-appindicator3-dev \
   libavdevice-dev \
@@ -58,8 +59,6 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
-  nodejs \
-  npm \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then
   apt-get install -y --no-install-recommends \
@@ -69,6 +68,17 @@ apt-get clean
 rm -rf /var/lib/apt/lists/*
 _DEPS
 
+#Install Node
+# hadolint ignore=SC1091
+RUN <<_INSTALL_NODE
+#!/bin/bash
+set -e
+wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash
+source "$HOME/.nvm/nvm.sh"
+nvm install 20.9.0
+nvm use 20.9.0
+_INSTALL_NODE
+
 # install cuda
 WORKDIR /build/cuda
 # versions: https://developer.nvidia.com/cuda-toolkit-archive
@@ -95,16 +105,18 @@ _INSTALL_CUDA
 WORKDIR /build/sunshine/
 COPY --link .. .
 
-# setup npm dependencies
-RUN npm install
-
 # setup build directory
 WORKDIR /build/sunshine/build
 
 # cmake and cpack
+# hadolint ignore=SC1091
 RUN <<_MAKE
 #!/bin/bash
 set -e
+#Set Node version
+source "$HOME/.nvm/nvm.sh"
+nvm use 20.9.0
+#Actually build
 cmake \
   -DCMAKE_CUDA_COMPILER:PATH=/build/cuda/bin/nvcc \
   -DCMAKE_BUILD_TYPE=Release \
diff --git a/docs/source/building/linux.rst b/docs/source/building/linux.rst
index 0ac90079..eab0aaab 100644
--- a/docs/source/building/linux.rst
+++ b/docs/source/building/linux.rst
@@ -192,13 +192,6 @@ If the version of CUDA available from your distro is not adequate, manually inst
    ./cuda.run --silent --toolkit --toolkitpath=/usr --no-opengl-libs --no-man-page --no-drm
    rm ./cuda.run
 
-npm dependencies
-----------------
-Install npm dependencies.
-   .. code-block:: bash
-
-      npm install
-
 Build
 -----
 .. Attention:: Ensure you are in the build directory created during the clone step earlier before continuing.
diff --git a/docs/source/building/macos.rst b/docs/source/building/macos.rst
index 2d39ec17..6bfa2c70 100644
--- a/docs/source/building/macos.rst
+++ b/docs/source/building/macos.rst
@@ -24,13 +24,6 @@ Install Requirements
       cd /usr/local/include
       ln -s ../opt/openssl/include/openssl .
 
-npm dependencies
-----------------
-Install npm dependencies.
-   .. code-block:: bash
-
-      npm install
-
 Build
 -----
 .. Attention:: Ensure you are in the build directory created during the clone step earlier before continuing.
diff --git a/docs/source/building/windows.rst b/docs/source/building/windows.rst
index 623bd16a..a8164d3c 100644
--- a/docs/source/building/windows.rst
+++ b/docs/source/building/windows.rst
@@ -16,17 +16,8 @@ Install dependencies:
 
       pacman -S base-devel cmake diffutils gcc git make mingw-w64-x86_64-binutils \
       mingw-w64-x86_64-boost mingw-w64-x86_64-cmake mingw-w64-x86_64-curl \
-      mingw-w64-x86_64-onevpl mingw-w64-x86_64-openssl mingw-w64-x86_64-opus \
-      mingw-w64-x86_64-toolchain
-
-npm dependencies
-----------------
-Install nodejs and npm. Downloads available `here <https://nodejs.org/en/download/>`__.
-
-Install npm dependencies.
-   .. code-block:: bash
-
-      npm install
+      mingw-w64-x86_64-nodejs mingw-w64-x86_64-onevpl mingw-w64-x86_64-openssl \ 
+      mingw-w64-x86_64-opus mingw-w64-x86_64-toolchain
 
 Build
 -----
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 3c9e338b..c2b66a56 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -69,7 +69,7 @@ source_suffix = ['.rst', '.md']
 # -- Options for HTML output -------------------------------------------------
 
 # images
-html_favicon = os.path.join(root_dir, 'src_assets', 'common', 'assets', 'web', 'images', 'sunshine.ico')
+html_favicon = os.path.join(root_dir, 'src_assets', 'common', 'assets', 'web', 'public', 'images', 'sunshine.ico')
 html_logo = os.path.join(root_dir, 'sunshine.png')
 
 # Add any paths that contain custom static files (such as style sheets) here,
diff --git a/docs/source/contributing/contributing.rst b/docs/source/contributing/contributing.rst
index a50300d2..ab85e13d 100644
--- a/docs/source/contributing/contributing.rst
+++ b/docs/source/contributing/contributing.rst
@@ -3,3 +3,23 @@ Contributing
 
 Read our contribution guide in our organization level
 `docs <https://lizardbyte.readthedocs.io/en/latest/developers/contributing.html>`__.
+
+Web UI
+------
+The Web UI uses `Vite <https://vitejs.dev/>`__ as its build system, to handle the integration of the NPM libraries.
+
+The HTML pages used by the Web UI are found in ``src_assets/common/assets/web``.
+
+`EJS <https://www.npmjs.com/package/vite-plugin-ejs>`__ is used as a templating system for the pages (check ``template_header.html`` and ``template_header_main.html``).
+
+The Style System is provided by `Bootstrap <https://getbootstrap.com/>`__.
+
+The JS framework used by the more interactive pages is `Vue <https://vuejs.org/>`__.
+
+Building
+^^^^^^^^
+Sunshine already builds the UI as part of its build process, but you can make faster changes by starting vite manually.
+
+.. code-block:: bash
+
+   npm run dev
\ No newline at end of file
diff --git a/package.json b/package.json
index f5152b6a..8ed5b32d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,15 @@
 {
+  "scripts": {
+    "build": "vite build --debug",
+    "dev": "vite build --watch"
+  },
   "dependencies": {
     "@fortawesome/fontawesome-free": "6.4.2",
+    "@popperjs/core": "2.11.8",
+    "@vitejs/plugin-vue": "4.3.4",
     "bootstrap": "5.3.2",
-    "vue": "2.6.12"
+    "vite": "4.4.9",
+    "vite-plugin-ejs": "1.6.4",
+    "vue": "3.2.25"
   }
 }
diff --git a/packaging/linux/Arch/PKGBUILD b/packaging/linux/Arch/PKGBUILD
index cfd76065..68cbecb8 100644
--- a/packaging/linux/Arch/PKGBUILD
+++ b/packaging/linux/Arch/PKGBUILD
@@ -70,10 +70,6 @@ prepare() {
 }
 
 build() {
-    pushd "$pkgname"
-    npm install
-    popd
-
     export BRANCH="@GITHUB_BRANCH@"
     export BUILD_VERSION="@GITHUB_BUILD_VERSION@"
     export COMMIT="@GITHUB_COMMIT@"
diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index be1ae8ad..d4f0c164 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -312,9 +312,6 @@ modules:
       env:
         npm_config_nodedir: /usr/lib/sdk/node18
         NPM_CONFIG_LOGLEVEL: info
-    build-commands:
-      # Install npm dependencies
-      - cd ${FLATPAK_BUILDER_BUILDDIR} && npm install
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/app
diff --git a/packaging/macos/Portfile b/packaging/macos/Portfile
index c22c1cb9..73a775a1 100644
--- a/packaging/macos/Portfile
+++ b/packaging/macos/Portfile
@@ -55,10 +55,6 @@ platform darwin {
     }
 }
 
-pre-build {
-    system -W ${worksrcpath} "npm install"
-}
-
 notes-append "Run @PROJECT_NAME@ by executing 'sunshine <path to user config>', e.g. 'sunshine ~/sunshine.conf' "
 notes-append "The config file will be created if it doesn't exist."
 notes-append "It is recommended to set a location for the apps file in the config."
diff --git a/scripts/icons/convert_and_pack.sh b/scripts/icons/convert_and_pack.sh
index dd1183b9..950effc9 100644
--- a/scripts/icons/convert_and_pack.sh
+++ b/scripts/icons/convert_and_pack.sh
@@ -37,9 +37,9 @@ icon_sizes=${!icon_sizes_keys[@]}
 echo "using icon sizes:"
 echo ${icon_sizes[@]}
 
-src_vectors=("../../src_assets/common/assets/web/images/sunshine-locked.svg"
-             "../../src_assets/common/assets/web/images/sunshine-pausing.svg"
-             "../../src_assets/common/assets/web/images/sunshine-playing.svg"
+src_vectors=("../../src_assets/common/assets/web/public/images/sunshine-locked.svg"
+             "../../src_assets/common/assets/web/public/images/sunshine-pausing.svg"
+             "../../src_assets/common/assets/web/public/images/sunshine-playing.svg"
              "../../sunshine.svg")
 
 echo "using sources vectors:"
diff --git a/src/confighttp.cpp b/src/confighttp.cpp
index 0de9cfb9..50bd87d3 100644
--- a/src/confighttp.cpp
+++ b/src/confighttp.cpp
@@ -161,11 +161,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "index.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -174,11 +173,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "pin.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -187,12 +185,11 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "apps.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
     headers.emplace("Access-Control-Allow-Origin", "https://images.igdb.com/");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -201,11 +198,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "clients.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -214,11 +210,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "config.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -227,11 +222,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "password.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -241,11 +235,10 @@ namespace confighttp {
       send_redirect(response, request, "/");
       return;
     }
-    std::string header = read_file(WEB_DIR "header-no-nav.html");
     std::string content = read_file(WEB_DIR "welcome.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -254,11 +247,10 @@ namespace confighttp {
 
     print_req(request);
 
-    std::string header = read_file(WEB_DIR "header.html");
     std::string content = read_file(WEB_DIR "troubleshooting.html");
     SimpleWeb::CaseInsensitiveMultimap headers;
     headers.emplace("Content-Type", "text/html; charset=utf-8");
-    response->write(header + content, headers);
+    response->write(content, headers);
   }
 
   void
@@ -295,14 +287,14 @@ namespace confighttp {
   getNodeModules(resp_https_t response, req_https_t request) {
     print_req(request);
     fs::path webDirPath(WEB_DIR);
-    fs::path nodeModulesPath(webDirPath / "node_modules");
+    fs::path nodeModulesPath(webDirPath / "assets");
 
     // .relative_path is needed to shed any leading slash that might exist in the request path
     auto filePath = fs::weakly_canonical(webDirPath / fs::path(request->path).relative_path());
 
-    // Don't do anything if file does not exist or is outside the node_modules directory
+    // Don't do anything if file does not exist or is outside the assets directory
     if (!isChildPath(filePath, nodeModulesPath)) {
-      BOOST_LOG(warning) << "Someone requested a path " << filePath << " that is outside the node_modules folder";
+      BOOST_LOG(warning) << "Someone requested a path " << filePath << " that is outside the assets folder";
       response->write(SimpleWeb::StatusCode::client_error_bad_request, "Bad Request");
     }
     else if (!fs::exists(filePath)) {
@@ -757,7 +749,7 @@ namespace confighttp {
     server.resource["^/api/covers/upload$"]["POST"] = uploadCover;
     server.resource["^/images/sunshine.ico$"]["GET"] = getFaviconImage;
     server.resource["^/images/logo-sunshine-45.png$"]["GET"] = getSunshineLogoImage;
-    server.resource["^/node_modules\\/.+$"]["GET"] = getNodeModules;
+    server.resource["^/assets\\/.+$"]["GET"] = getNodeModules;
     server.config.reuse_address = true;
     server.config.address = net::af_to_any_address_string(address_family);
     server.config.port = port_https;
diff --git a/src_assets/common/assets/web/Navbar.vue b/src_assets/common/assets/web/Navbar.vue
new file mode 100644
index 00000000..948fb4d7
--- /dev/null
+++ b/src_assets/common/assets/web/Navbar.vue
@@ -0,0 +1,60 @@
+<template>
+    <nav class="navbar navbar-expand-lg navbar-light" style="background-color: #ffc400">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="/" title="Sunshine">
+                <img src="/images/logo-sunshine-45.png" height="45" alt="Sunshine">
+            </a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+                aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+                    <li class="nav-item">
+                        <a class="nav-link" href="/"><i class="fas fa-fw fa-home"></i> Home</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/pin"><i class="fas fa-fw fa-unlock"></i> PIN</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/apps"><i class="fas fa-fw fa-stream"></i> Applications</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/config"><i class="fas fa-fw fa-cog"></i> Configuration</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/password"><i class="fas fa-fw fa-user-shield"></i> Change Password</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/troubleshooting"><i class="fas fa-fw fa-info"></i> Troubleshooting</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+</template>
+
+<script>
+export default {
+    created() {
+        console.log("Header mounted!")
+    },
+    mounted() {
+        let el = document.querySelector("a[href='" + document.location.pathname + "']");
+        if (el) el.classList.add("active")
+        let discordWidget = document.createElement('script')
+        discordWidget.setAttribute('src', 'https://app.lizardbyte.dev/js/discord.js')
+        document.head.appendChild(discordWidget)
+    }
+}
+</script>
+
+<style>
+.nav-link.active {
+    font-weight: 500;
+}
+
+.form-control::placeholder {
+    opacity: 0.5;
+}
+</style>
diff --git a/src_assets/common/assets/web/ResourceCard.vue b/src_assets/common/assets/web/ResourceCard.vue
new file mode 100644
index 00000000..8bdfb5f9
--- /dev/null
+++ b/src_assets/common/assets/web/ResourceCard.vue
@@ -0,0 +1,36 @@
+<template>
+    <div class="card p-2">
+        <div class="card-body">
+            <h2>Resources</h2>
+            <br />
+            <p>
+                Resources for Sunshine!
+            </p>
+            <div class="card-group p-4 align-items-center">
+                <a class="btn btn-success m-1" href="https://app.lizardbyte.dev" target="_blank">LizardByte Website</a>
+                <a class="btn btn-primary m-1" href="https://app.lizardbyte.dev/discord" target="_blank">
+                    <i class="fab fa-fw fa-discord"></i> Discord</a>
+                <a class="btn btn-secondary m-1" href="https://github.com/LizardByte/Sunshine/discussions" target="_blank">
+                    <i class="fab fa-fw fa-github"></i> Github Discussions</a>
+            </div>
+        </div>
+    </div>
+    <!--Legal-->
+    <div class="card p-2 mt-4">
+        <div class="card-body">
+            <h2>Legal</h2>
+            <br />
+            <p>
+                By continuing to use this software you agree to the terms and conditions in the following documents.
+            </p>
+            <div class="card-group p-4 align-items-center">
+                <a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/LICENSE"
+                    target="_blank">
+                    <i class="fas fa-fw fa-file-alt"></i> License</a>
+                <a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/NOTICE"
+                    target="_blank">
+                    <i class="fas fa-fw fa-exclamation"></i> Third Party Notice</a>
+            </div>
+        </div>
+    </div>
+</template>
diff --git a/src_assets/common/assets/web/apps.html b/src_assets/common/assets/web/apps.html
index bd09051d..c9131440 100644
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -1,370 +1,383 @@
-<div id="app" class="container">
-  <div class="my-4">
-    <h1>Applications</h1>
-    <div>Applications are refreshed only when Client is restarted</div>
-  </div>
-  <div class="card p-4">
-    <table class="table">
-      <thead>
-        <tr>
-          <th scope="col">Name</th>
-          <th scope="col">Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr v-for="(app,i) in apps" :key="i">
-          <td>{{app.name}}</td>
-          <td>
-            <button class="btn btn-primary" @click="editApp(i)">
-              <i class="fas fa-edit"></i> Edit
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+      <%- header %>
+      <style>
+        .precmd-head {
+          width: 200px;
+        }
+
+        .monospace {
+          font-family: monospace;
+        }
+
+        .cover-finder {}
+
+        .cover-finder .cover-results {
+          max-height: 400px;
+          overflow-x: hidden;
+          overflow-y: auto;
+        }
+
+        .cover-finder .cover-results.busy * {
+          cursor: wait !important;
+          pointer-events: none;
+        }
+
+        .cover-container {
+          padding-top: 133.33%;
+          position: relative;
+        }
+
+        .cover-container.result {
+          cursor: pointer;
+        }
+
+        .spinner-border {
+          position: absolute;
+          left: 0;
+          top: 0;
+          right: 0;
+          bottom: 0;
+          margin: auto;
+        }
+
+        .cover-container img {
+          display: block;
+          position: absolute;
+          top: 0;
+          width: 100%;
+          height: 100%;
+          object-fit: cover;
+        }
+
+        .config-page {
+          padding: 1em;
+          border: 1px solid #dee2e6;
+          border-top: none;
+        }
+
+        td {
+          padding: 0 0.5em;
+        }
+
+        .env-table td {
+          padding: 0.25em;
+          border-bottom: rgba(0, 0, 0, 0.25) 1px solid;
+          vertical-align: top;
+        }
+      </style>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div class="container">
+    <div class="my-4">
+      <h1>Applications</h1>
+      <div>Applications are refreshed only when Client is restarted</div>
+    </div>
+    <div class="card p-4">
+      <table class="table">
+        <thead>
+          <tr>
+            <th scope="col">Name</th>
+            <th scope="col">Actions</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(app,i) in apps" :key="i">
+            <td>{{app.name}}</td>
+            <td>
+              <button class="btn btn-primary mx-1" @click="editApp(i)">
+                <i class="fas fa-edit"></i> Edit
+              </button>
+              <button class="btn btn-danger mx-1" @click="showDeleteForm(i)">
+                <i class="fas fa-trash"></i> Delete
+              </button>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="edit-form card mt-2" v-if="showEditForm">
+      <div class="p-4">
+        <!--name-->
+        <div class="mb-3">
+          <label for="appName" class="form-label">Application Name</label>
+          <input type="text" class="form-control" id="appName" aria-describedby="appNameHelp" v-model="editForm.name" />
+          <div id="appNameHelp" class="form-text">
+            Application Name, as shown on Moonlight
+          </div>
+        </div>
+        <!--output-->
+        <div class="mb-3">
+          <label for="appOutput" class="form-label">Output</label>
+          <input type="text" class="form-control monospace" id="appOutput" aria-describedby="appOutputHelp"
+            v-model="editForm.output" />
+          <div id="appOutputHelp" class="form-text">
+            The file where the output of the command is stored, if it is not
+            specified, the output is ignored
+          </div>
+        </div>
+        <!--prep-cmd-->
+        <div class="mb-3">
+          <label for="excludeGlobalPrep" class="form-label">Global Prep Commands</label>
+          <select id="excludeGlobalPrep" class="form-select" v-model="editForm['exclude-global-prep-cmd']">
+            <option v-for="val in [false, true]" :value="val">
+              {{ !val ? 'Enabled' : 'Disabled' }}
+            </option>
+          </select>
+          <div class="form-text">
+            Enable/Disable the execution of Global Prep Commands for this
+            application.
+          </div>
+        </div>
+        <div class="mb-3">
+          <label for="appName" class="form-label">Command Preparations</label>
+          <div class="form-text">
+            A list of commands to be run before/after this application.<br />
+            If any of the prep-commands fail, starting the application is aborted.
+          </div>
+          <div class="d-flex justify-content-start mb-3 mt-3" v-if="editForm['prep-cmd'].length === 0">
+            <button class="btn btn-success" @click="addPrepCmd">
+              <i class="fas fa-plus mr-1"></i> Add Commands
             </button>
-            <button class="btn btn-danger" @click="showDeleteForm(i)">
-              <i class="fas fa-trash"></i> Delete
+          </div>
+          <table class="table" v-if="editForm['prep-cmd'].length > 0">
+            <thead>
+              <tr>
+                <th scope="col"><i class="fas fa-play"></i> Do Command</th>
+                <th scope="col"><i class="fas fa-undo"></i> Undo Command</th>
+                <th scope="col" v-if="platform === 'windows'">
+                  <i class="fas fa-shield-alt"></i> Run as Admin
+                </th>
+                <th scope="col"></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(c, i) in editForm['prep-cmd']">
+                <td>
+                  <input type="text" class="form-control monospace" v-model="c.do" />
+                </td>
+                <td>
+                  <input type="text" class="form-control monospace" v-model="c.undo" />
+                </td>
+                <td v-if="platform === 'windows'">
+                  <div class="form-check">
+                    <input type="checkbox" class="form-check-input" :id="'prep-cmd-admin-' + i" v-model="c.elevated"
+                      true-value="true" false-value="false" />
+                    <label :for="'prep-cmd-admin-' + i" class="form-check-label">Elevated</label>
+                  </div>
+                </td>
+                <td>
+                  <button class="btn btn-danger" @click="editForm['prep-cmd'].splice(i,1)">
+                    <i class="fas fa-trash"></i>
+                  </button>
+                  <button class="btn btn-success" @click="addPrepCmd">
+                    <i class="fas fa-plus"></i>
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <!--detached-->
+        <div class="mb-3">
+          <label for="appName" class="form-label">Detached Commands</label>
+          <div v-for="(c,i) in editForm.detached" class="d-flex justify-content-between my-2">
+            <input type="text" v-model="editForm.detached[i]" class="form-control monospace">
+            <button class="btn btn-danger mx-2" @click="editForm.detached.splice(i,1)">
+              &times;
             </button>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-  <div class="edit-form card mt-2" v-if="showEditForm">
-    <div class="p-4">
-      <!--name-->
-      <div class="mb-3">
-        <label for="appName" class="form-label">Application Name</label>
-        <input
-          type="text"
-          class="form-control"
-          id="appName"
-          aria-describedby="appNameHelp"
-          v-model="editForm.name"
-        />
-        <div id="appNameHelp" class="form-text">
-          Application Name, as shown on Moonlight
+          </div>
+          <div class="d-flex justify-content-between">
+            <button class="btn btn-success" @click="editForm.detached.push('');">
+              <i class="fas fa-plus mr-1"></i> Add Detached Command
+            </button>
+          </div>
+          <div class="form-text">
+            A list of commands to be run and forgotten about
+          </div>
         </div>
-      </div>
-      <!--output-->
-      <div class="mb-3">
-        <label for="appOutput" class="form-label">Output</label>
-        <input
-          type="text"
-          class="form-control monospace"
-          id="appOutput"
-          aria-describedby="appOutputHelp"
-          v-model="editForm.output"
-        />
-        <div id="appOutputHelp" class="form-text">
-          The file where the output of the command is stored, if it is not
-          specified, the output is ignored
+        <!--command-->
+        <div class="mb-3">
+          <label for="appCmd" class="form-label">Command</label>
+          <input type="text" class="form-control monospace" id="appCmd" aria-describedby="appCmdHelp"
+            v-model="editForm.cmd" />
+          <div id="appCmdHelp" class="form-text">
+            The main application, if it is not specified, a process is started
+            that sleeps indefinitely
+          </div>
         </div>
-      </div>
-      <!--prep-cmd-->
-      <div class="mb-3">
-        <label for="excludeGlobalPrep" class="form-label"
-          >Global Prep Commands</label
-        >
-        <select
-          id="excludeGlobalPrep"
-          class="form-select"
-          v-model="editForm['exclude-global-prep-cmd']"
-        >
-          <option v-for="val in [false, true]" :value="val">
-            {{ !val ? 'Enabled' : 'Disabled' }}
-          </option>
-        </select>
-        <div class="form-text">
-          Enable/Disable the execution of Global Prep Commands for this
-          application.
+        <!--working dir-->
+        <div class="mb-3">
+          <label for="appWorkingDir" class="form-label">Working Directory</label>
+          <input type="text" class="form-control monospace" id="appWorkingDir" aria-describedby="appWorkingDirHelp"
+            v-model="editForm['working-dir']" />
+          <div id="appWorkingDirHelp" class="form-text">
+            The working directory that should be passed to the process. For
+            example, some applications use the working directory to search for
+            configuration files. If not set, Sunshine will default to the parent
+            directory of the command
+          </div>
         </div>
-      </div>
-      <div class="mb-3">
-        <label for="appName" class="form-label">Command Preparations</label>
-        <div class="form-text">
-          A list of commands to be run before/after this application.<br />
-          If any of the prep-commands fail, starting the application is aborted.
+        <!-- elevation -->
+        <div class="mb-3 form-check" v-if="platform === 'windows'">
+          <label for="appElevation" class="form-check-label">Run as administrator</label>
+          <input type="checkbox" class="form-check-input" id="appElevation" v-model="editForm.elevated"
+            true-value="true" false-value="false" />
+          <div class="form-text">
+            This can be necessary for some applications that require administrator
+            permissions to run properly.
+          </div>
         </div>
-        <div
-          class="d-flex justify-content-start mb-3 mt-3"
-          v-if="editForm['prep-cmd'].length === 0"
-        >
-          <button class="btn btn-success" @click="addPrepCmd">
-            <i class="fas fa-plus mr-1"></i> Add Commands
-          </button>
+        <!-- auto-detach -->
+        <div class="mb-3 form-check">
+          <label for="autoDetach" class="form-check-label">Continue streaming if the application exits quickly</label>
+          <input type="checkbox" class="form-check-input" id="autoDetach" v-model="editForm['auto-detach']"
+            true-value="true" false-value="false" />
+          <div class="form-text">
+            This will attempt to automatically detect launcher-type apps that close
+            quickly after launching another program or instance of themselves. When
+            a launcher-type app is detected, it is treated as a detached app.
+          </div>
         </div>
-        <table class="table" v-if="editForm['prep-cmd'].length > 0">
-          <thead>
-            <tr>
-              <th scope="col"><i class="fas fa-play"></i> Do Command</th>
-              <th scope="col"><i class="fas fa-undo"></i> Undo Command</th>
-              <th scope="col" v-if="platform === 'windows'">
-                <i class="fas fa-shield-alt"></i> Run as Admin
-              </th>
-              <th scope="col"></th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="(c, i) in editForm['prep-cmd']">
-              <td>
-                <input
-                  type="text"
-                  class="form-control monospace"
-                  v-model="c.do"
-                />
-              </td>
-              <td>
-                <input
-                  type="text"
-                  class="form-control monospace"
-                  v-model="c.undo"
-                />
-              </td>
-              <td v-if="platform === 'windows'">
-                <div class="form-check">
-                  <input
-                    type="checkbox"
-                    class="form-check-input"
-                    :id="'prep-cmd-admin-' + i"
-                    v-model="c.elevated"
-                    true-value="true"
-                    false-value="false"
-                  />
-                  <label :for="'prep-cmd-admin-' + i" class="form-check-label"
-                    >Elevated</label
-                  >
-                </div>
-              </td>
-              <td>
-                <button
-                  class="btn btn-danger"
-                  @click="$delete(editForm['prep-cmd'], i)"
-                >
-                  <i class="fas fa-trash"></i>
-                </button>
-                <button class="btn btn-success" @click="addPrepCmd">
-                  <i class="fas fa-plus"></i>
-                </button>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <!--detatched-->
-      <div class="mb-3">
-        <label for="appName" class="form-label">Detached Commands</label>
-        <div
-          v-for="(c,i) in editForm.detached"
-          class="d-flex justify-content-between my-2"
-        >
-          <pre>{{c}}</pre>
-          <button
-            class="btn btn-danger mx-2"
-            @click="editForm.detached.splice(i,1)"
-          >
-            &times;
-          </button>
-        </div>
-        <div class="d-flex justify-content-between">
-          <input
-            type="text"
-            class="form-control monospace"
-            v-model="detachedCmd"
-          />
-          <button
-            class="btn btn-success mx-2"
-            @click="editForm.detached.push(detachedCmd);detachedCmd = '';"
-          >
-            +
-          </button>
-        </div>
-        <div class="form-text">
-          A list of commands to be run and forgotten about
-        </div>
-      </div>
-      <!--command-->
-      <div class="mb-3">
-        <label for="appCmd" class="form-label">Command</label>
-        <input
-          type="text"
-          class="form-control monospace"
-          id="appCmd"
-          aria-describedby="appCmdHelp"
-          v-model="editForm.cmd"
-        />
-        <div id="appCmdHelp" class="form-text">
-          The main application, if it is not specified, a process is started
-          that sleeps indefinitely
-        </div>
-      </div>
-      <!--working dir-->
-      <div class="mb-3">
-        <label for="appWorkingDir" class="form-label">Working Directory</label>
-        <input
-          type="text"
-          class="form-control monospace"
-          id="appWorkingDir"
-          aria-describedby="appWorkingDirHelp"
-          v-model="editForm['working-dir']"
-        />
-        <div id="appWorkingDirHelp" class="form-text">
-          The working directory that should be passed to the process. For
-          example, some applications use the working directory to search for
-          configuration files. If not set, Sunshine will default to the parent
-          directory of the command
-        </div>
-      </div>
-      <!-- elevation -->
-      <div class="mb-3 form-check" v-if="platform === 'windows'">
-        <label for="appElevation" class="form-check-label"
-          >Run as administrator</label
-        >
-        <input
-          type="checkbox"
-          class="form-check-input"
-          id="appElevation"
-          v-model="editForm.elevated"
-          true-value="true"
-          false-value="false"
-        />
-        <div class="form-text">
-          This can be necessary for some applications that require administrator
-          permissions to run properly.
-        </div>
-      </div>
-      <!-- auto-detach -->
-      <div class="mb-3 form-check">
-        <label for="autoDetach" class="form-check-label"
-          >Continue streaming if the application exits quickly</label
-        >
-        <input
-          type="checkbox"
-          class="form-check-input"
-          id="autoDetach"
-          v-model="editForm['auto-detach']"
-          true-value="true"
-          false-value="false"
-        />
-        <div class="form-text">
-          This will attempt to automatically detect launcher-type apps that close
-          quickly after launching another program or instance of themselves. When
-          a launcher-type app is detected, it is treated as a detached app.
-        </div>
-      </div>
-      <!-- Image path -->
-      <div class="mb-3">
-        <label for="appImagePath" class="form-label">Image</label>
-        <div class="input-group dropup">
-          <input
-            type="text"
-            class="form-control monospace"
-            id="appImagePath"
-            aria-describedby="appImagePathHelp"
-            v-model="editForm['image-path']"
-          />
-          <button
-            class="btn btn-secondary dropdown-toggle"
-            type="button"
-            id="findCoverToggle"
-            data-bs-toggle="dropdown"
-            data-bs-auto-close="outside"
-            aria-expanded="false"
-            v-dropdown-show="showCoverFinder"
-            ref="coverFinderDropdown"
-          >
-            Find Cover
-          </button>
-          <div
-            class="dropdown-menu dropdown-menu-end w-50 cover-finder overflow-hidden"
-            aria-labelledby="findCoverToggle"
-          >
-            <div class="modal-header">
-              <h4 class="modal-title">Covers Found</h4>
-              <button
-                type="button"
-                class="btn-close"
-                aria-label="Close"
-                @click="closeCoverFinder"
-              ></button>
-            </div>
-            <div
-              class="modal-body cover-results px-3 pt-3"
-              :class="{ busy: coverFinderBusy }"
-            >
-              <div class="row">
-                <div
-                  v-if="coverSearching"
-                  class="col-12 col-sm-6 col-lg-4 mb-3"
-                >
-                  <div class="cover-container">
-                    <div class="spinner-border" role="status">
-                      <span class="visually-hidden">Loading...</span>
+        <div class="mb-3">
+          <label for="appImagePath" class="form-label">Image</label>
+          <div class="input-group dropup">
+            <input type="text" class="form-control monospace" id="appImagePath" aria-describedby="appImagePathHelp"
+              v-model="editForm['image-path']" />
+            <button class="btn btn-secondary dropdown-toggle" type="button" id="findCoverToggle"
+              aria-expanded="false" @click="showCoverFinder" ref="coverFinderDropdown">
+              Find Cover
+            </button>
+            <div class="dropdown-menu dropdown-menu-end w-50 cover-finder overflow-hidden"
+              aria-labelledby="findCoverToggle">
+              <div class="modal-header px-2">
+                <h4 class="modal-title">Covers Found</h4>
+                <button type="button" class="btn-close mr-2" aria-label="Close" @click="closeCoverFinder"></button>
+              </div>
+              <div class="modal-body cover-results px-3 pt-3" :class="{ busy: coverFinderBusy }">
+                <div class="row">
+                  <div v-if="coverSearching" class="col-12 col-sm-6 col-lg-4 mb-3">
+                    <div class="cover-container">
+                      <div class="spinner-border" role="status">
+                        <span class="visually-hidden">Loading...</span>
+                      </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  v-for="(cover,i) in coverCandidates"
-                  :key="'i'"
-                  class="col-12 col-sm-6 col-lg-4 mb-3"
-                  @click="useCover(cover)"
-                >
-                  <div class="cover-container result">
-                    <img class="rounded" :src="cover.url" />
+                  <div v-for="(cover,i) in coverCandidates" :key="'i'" class="col-12 col-sm-6 col-lg-4 mb-3"
+                    @click="useCover(cover)">
+                    <div class="cover-container result">
+                      <img class="rounded" :src="cover.url" />
+                    </div>
+                    <label class="d-block text-nowrap text-center text-truncate">
+                      {{cover.name}}
+                    </label>
                   </div>
-                  <label class="d-block text-nowrap text-center text-truncate">
-                    {{cover.name}}
-                  </label>
                 </div>
               </div>
             </div>
           </div>
+          <div id="appImagePathHelp" class="form-text">
+            Application icon/picture/image path that will be sent to client. Image
+            must be a PNG file. If not set, Sunshine will send default box image.
+          </div>
         </div>
-        <div id="appImagePathHelp" class="form-text">
-          Application icon/picture/image path that will be sent to client. Image
-          must be a PNG file. If not set, Sunshine will send default box image.
+        <div class="env-hint alert alert-info">
+          <div class="form-text">
+            <h4>About Environment Variables</h4>
+            All commands get these environment variables by default:
+          </div>
+          <table class="env-table">
+            <tr>
+              <td><b>Var Name</b></td>
+              <td><b></b></td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_APP_ID</td>
+              <td>App ID</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_APP_NAME</td>
+              <td>App Name</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_WIDTH</td>
+              <td>The Width requested by the client</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_HEIGHT</td>
+              <td>The Height requested by the client</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_FPS</td>
+              <td>The FPS requested by the client</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_HDR</td>
+              <td>(true/false) if HDR is enabled by the client</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_GCMAP</td>
+              <td>(int) the requested gamepad mask, in a bitset/bitfield format</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_HOST_AUDIO</td>
+              <td>(true/false) if the client has requested host audio</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_ENABLE_SOPS</td>
+              <td>(true/false) if the client has requested the option to optimize the game for optimal
+                streaming</td>
+            </tr>
+            <tr>
+              <td style="font-family: monospace">SUNSHINE_CLIENT_AUDIO_CONFIGURATION</td>
+              <td>The Audio Configuration requested by the client (2.0/5.1/7.1)</td>
+            </tr>
+          </table>
+          <div class="form-text" v-if="platform === 'windows'"><b>Example - QRes for Resolution
+              Automation:</b>
+            <pre>cmd /C &lt;qres path&gt;\QRes.exe /X:%SUNSHINE_CLIENT_WIDTH% /Y:%SUNSHINE_CLIENT_HEIGHT%</pre>
+          </div>
+          <div class="form-text" v-else-if="platform === 'linux'"><b>Example - Xrandr for Resolution
+              Automation:</b>
+            <pre>sh -c "xrandr --output HDMI-1 --mode \"${SUNSHINE_CLIENT_WIDTH}x${SUNSHINE_CLIENT_HEIGHT}\" --rate 60"</pre>
+          </div>
+          <div class="form-text" v-else-if="platform === 'macos'"><b>Example - displayplacer for
+              Resolution
+              Automation:</b>
+            <pre>sh -c "displayplacer "id:<screenId> res:${SUNSHINE_CLIENT_WIDTH}x${SUNSHINE_CLIENT_HEIGHT} hz:60 scaling:on origin:(0,0) degree:0""</pre>
+          </div>
+          <div class="form-text"><a
+              href="https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/guides/app_examples.html"
+              target="_blank">See More</a></div>
+        </div>
+        <!--buttons-->
+        <div class="d-flex">
+          <button @click="showEditForm = false" class="btn btn-secondary m-2">
+            Cancel
+          </button>
+          <button class="btn btn-primary m-2" @click="save">Save</button>
         </div>
-      </div>
-      <div class="env-hint">
-        <div class="form-text"><b>About Environment Variables: </b> All commands get these environment variables by default: </div>
-        <table>
-          <tr><td><b>Var Name</b></td><td><b></b></td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_APP_ID</td><td>App ID</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_APP_NAME</td><td>App Name</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_WIDTH</td><td>The Width requested by the client</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_HEIGHT</td><td>The Height requested by the client</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_FPS</td><td>The FPS requested by the client</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_HDR</td><td>(true/false) if HDR is enabled by the client</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_GCMAP</td><td>(int) the requested gamepad mask, in a bitset/bitfield format</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_HOST_AUDIO</td><td>(true/false) if the client has requested host audio</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_ENABLE_SOPS</td><td>(true/false) if the client has requested the option to optimize the game for optimal streaming</td></tr>
-          <tr><td style="font-family: monospace">SUNSHINE_CLIENT_AUDIO_CONFIGURATION</td><td>The Audio Configuration requested by the client (2.0/5.1/7.1)</td></tr>
-        </table>
-        <div class="form-text" v-if="platform === 'windows'"><b>Example - QRes for Resolution Automation:</b> <pre>cmd /C &lt;qres path&gt;\QRes.exe /X:%SUNSHINE_CLIENT_WIDTH% /Y:%SUNSHINE_CLIENT_HEIGHT%</pre></div>
-        <div class="form-text" v-else-if="platform === 'linux'"><b>Example - Xrandr for Resolution Automation:</b> <pre>sh -c "xrandr --output HDMI-1 --mode \"${SUNSHINE_CLIENT_WIDTH}x${SUNSHINE_CLIENT_HEIGHT}\" --rate 60"</pre></div>
-        <div class="form-text" v-else-if="platform === 'macos'"><b>Example - displayplacer for Resolution Automation:</b> <pre>sh -c "displayplacer "id:<screenId> res:${SUNSHINE_CLIENT_WIDTH}x${SUNSHINE_CLIENT_HEIGHT} hz:60 scaling:on origin:(0,0) degree:0""</pre></div>
-        <div class="form-text"><a href="https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/guides/app_examples.html" target="_blank">See More</a></div>
-      </div>
-      <!--buttons-->
-      <div class="d-flex">
-        <button @click="showEditForm = false" class="btn btn-secondary m-2">
-          Cancel
-        </button>
-        <button class="btn btn-primary m-2" @click="save">Save</button>
       </div>
     </div>
+    <div class="mt-2" v-else>
+      <button class="btn btn-primary" @click="newApp">
+        <i class="fas fa-plus"></i> Add New
+      </button>
+    </div>
   </div>
-  <div class="mt-2" v-else>
-    <button class="btn btn-primary" @click="newApp">
-      <i class="fas fa-plus"></i> Add New
-    </button>
-  </div>
-</div>
-<script>
-  Vue.directive('dropdown-show', {
-    bind: function (el, binding) {
-      el.addEventListener('show.bs.dropdown', binding.value);
-    }
-  });
-
-  new Vue({
-    el: "#app",
+</body>
+<script type="module">
+  import { createApp } from 'vue';
+  import Navbar from './Navbar.vue'
+  import {Dropdown} from 'bootstrap'
+  const app = createApp({
+    components: {
+      Navbar
+    },
     data() {
       return {
         apps: [],
@@ -384,7 +397,7 @@
           console.log(r);
           this.apps = r.apps;
         });
-      
+
       fetch("/api/config")
         .then(r => r.json())
         .then(r => this.platform = r.platform);
@@ -408,18 +421,18 @@
       },
       editApp(id) {
         this.editForm = JSON.parse(JSON.stringify(this.apps[id]));
-        this.$set(this.editForm, "index", id);
+        this.editForm.index = id;
         if (this.editForm["prep-cmd"] === undefined)
-          this.$set(this.editForm, "prep-cmd", []);
+          this.editForm["prep-cmd"] = [];
         if (this.editForm["detached"] === undefined)
-          this.$set(this.editForm, "detached", []);
+          this.editForm["detached"] = [];
         if (this.editForm["exclude-global-prep-cmd"] === undefined)
-          this.$set(this.editForm, "exclude-global-prep-cmd", false);
-        if(this.editForm["elevated"] === undefined && this.platform === 'windows'){
-          this.$set(this.editForm, "elevated", false);
+          this.editForm["exclude-global-prep-cmd"] = [];
+        if (this.editForm["elevated"] === undefined && this.platform === 'windows') {
+          this.editForm["elevated"] = [];
         }
-        if(this.editForm["auto-detach"] === undefined){
-          this.$set(this.editForm, "auto-detach", true);
+        if (this.editForm["auto-detach"] === undefined) {
+          this.editForm["auto-detach"] = true;
         }
         this.showEditForm = true;
       },
@@ -439,8 +452,8 @@
           undo: ""
         };
 
-        if(this.platform === 'windows'){
-          template = {...template, elevated: false};
+        if (this.platform === 'windows') {
+          template = { ...template, elevated: false };
         }
 
         this.editForm["prep-cmd"].push(template);
@@ -448,7 +461,19 @@
       showCoverFinder($event) {
         this.coverCandidates = [];
         this.coverSearching = true;
-
+        const ref = this.$refs.coverFinderDropdown;
+        if (!ref) {
+          console.error("Ref not found!");
+          return;
+        }
+        this.coverFinderDropdown = Dropdown.getInstance(ref);
+        if (!this.coverFinderDropdown) {
+          this.coverFinderDropdown = new Dropdown(ref);
+          if (!this.coverFinderDropdown) {
+            return;
+          }
+        }
+        this.coverFinderDropdown.show();
         function getSearchBucket(name) {
           let bucket = name.substring(0, Math.min(name.length, 2)).toLowerCase().replaceAll(/[^a-z\d]/g, '');
           if (!bucket) {
@@ -503,7 +528,7 @@
         if (!ref) {
           return;
         }
-        const dropdown = this.coverFinderDropdown = bootstrap.Dropdown.getInstance(ref);
+        const dropdown = this.coverFinderDropdown = Dropdown.getInstance(ref);
         if (!dropdown) {
           return;
         }
@@ -520,7 +545,7 @@
         }).then(r => {
           if (!r.ok) throw new Error("Failed to download covers");
           return r.json();
-        }).then(body => this.$set(this.editForm, "image-path", body.path))
+        }).then(body => this.editForm["image-path"] = body.path)
           .then(() => this.closeCoverFinder())
           .finally(() => this.coverFinderBusy = false);
       },
@@ -535,66 +560,13 @@
       },
     },
   });
+
+  app.directive('dropdown-show', {
+    mounted: function (el, binding) {
+      el.addEventListener('show.bs.dropdown', binding.value);
+    }
+  });
+
+  app.mount("#app")
+
 </script>
-
-<style>
-  .precmd-head {
-    width: 200px;
-  }
-
-  .monospace {
-    font-family: monospace;
-  }
-
-  .cover-finder {
-  }
-
-  .cover-finder .cover-results {
-    max-height: 400px;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  .cover-finder .cover-results.busy * {
-    cursor: wait !important;
-    pointer-events: none;
-  }
-
-  .cover-container {
-    padding-top: 133.33%;
-    position: relative;
-  }
-
-  .cover-container.result {
-    cursor: pointer;
-  }
-
-  .spinner-border {
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-  }
-
-  .cover-container img {
-    display: block;
-    position: absolute;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-  }
-
-  .config-page {
-    padding: 1em;
-    border: 1px solid #dee2e6;
-    border-top: none;
-  }
-
-  td {
-    padding: 0 0.5em;
-  }
-
-</style>
diff --git a/src_assets/common/assets/web/clients.html b/src_assets/common/assets/web/clients.html
deleted file mode 100644
index 5eaf56a4..00000000
--- a/src_assets/common/assets/web/clients.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="content" class="container">
-  <h1>Clients</h1>
-</div>
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 927ef945..7d3b01ca 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -1,630 +1,462 @@
-<div id="app" class="container">
-  <h1 class="my-4">Configuration</h1>
-  <div class="form" v-if="config">
-    <!--Header-->
-    <ul class="nav nav-tabs">
-      <li class="nav-item" v-for="tab in tabs" :key="tab.id">
-        <a
-          class="nav-link"
-          :class="{'active': tab.id === currentTab}"
-          href="#"
-          @click="currentTab = tab.id"
-          >{{tab.name}}</a
-        >
-      </li>
-    </ul>
-    <!--General Tab-->
-    <div v-if="currentTab === 'general'" class="config-page">
-      <!--Sunshine Name-->
-      <div class="mb-3">
-        <label for="sunshine_name" class="form-label">Sunshine Name</label>
-        <input
-          type="text"
-          class="form-control"
-          id="sunshine_name"
-          placeholder="Sunshine"
-          v-model="config.sunshine_name"
-        />
-        <div class="form-text">
-          The name displayed by Moonlight. If not specified, the PC's hostname is used
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <%- header %>
+    <style>
+      .config-page {
+        padding: 1em;
+        border: 1px solid #dee2e6;
+        border-top: none;
+      }
+
+      .buttons {
+        padding: 1em 0;
+      }
+
+      .ms-item {
+        background-color: #ccc;
+        font-size: 12px;
+        font-weight: bold;
+      }
+    </style>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div class="container">
+    <h1 class="my-4">Configuration</h1>
+    <div class="form" v-if="config">
+      <!--Header-->
+      <ul class="nav nav-tabs">
+        <li class="nav-item" v-for="tab in tabs" :key="tab.id">
+          <a class="nav-link" :class="{'active': tab.id === currentTab}" href="#"
+            @click="currentTab = tab.id">{{tab.name}}</a>
+        </li>
+      </ul>
+      <!--General Tab-->
+      <div v-if="currentTab === 'general'" class="config-page">
+        <!--Sunshine Name-->
+        <div class="mb-3">
+          <label for="sunshine_name" class="form-label">Sunshine Name</label>
+          <input type="text" class="form-control" id="sunshine_name" placeholder="Sunshine"
+            v-model="config.sunshine_name" />
+          <div class="form-text">
+            The name displayed by Moonlight. If not specified, the PC's hostname is used
+          </div>
         </div>
-      </div>
-      <!--Log Level-->
-      <div class="mb-3">
-        <label for="min_log_level" class="form-label">Log Level</label>
-        <select
-          id="min_log_level"
-          class="form-select"
-          v-model="config.min_log_level"
-        >
-          <option value="0">Verbose</option>
-          <option value="1">Debug</option>
-          <option value="2">Info</option>
-          <option value="3">Warning</option>
-          <option value="4">Error</option>
-          <option value="5">Fatal</option>
-          <option value="6">None</option>
-        </select>
-        <div class="form-text">
-          The minimum log level printed to standard out
+        <!--Log Level-->
+        <div class="mb-3">
+          <label for="min_log_level" class="form-label">Log Level</label>
+          <select id="min_log_level" class="form-select" v-model="config.min_log_level">
+            <option value="0">Verbose</option>
+            <option value="1">Debug</option>
+            <option value="2">Info</option>
+            <option value="3">Warning</option>
+            <option value="4">Error</option>
+            <option value="5">Fatal</option>
+            <option value="6">None</option>
+          </select>
+          <div class="form-text">
+            The minimum log level printed to standard out
+          </div>
         </div>
-      </div>
-      <!--Log Path-->
-      <div class="mb-3">
-        <label for="log_path" class="form-label">Logfile Path</label>
-        <input
-          type="text"
-          class="form-control"
-          id="log_path"
-          placeholder="sunshine.log"
-          v-model="config.log_path"
-        />
-        <div class="form-text">
-          The file where the current logs of Sunshine are stored.
+        <!--Log Path-->
+        <div class="mb-3">
+          <label for="log_path" class="form-label">Logfile Path</label>
+          <input type="text" class="form-control" id="log_path" placeholder="sunshine.log" v-model="config.log_path" />
+          <div class="form-text">
+            The file where the current logs of Sunshine are stored.
+          </div>
         </div>
-      </div>
-      <!--Origin Web UI Allowed-->
-      <div class="mb-3">
-        <label for="origin_web_ui_allowed" class="form-label"
-          >Origin Web UI Allowed</label
-        >
-        <select
-          id="origin_web_ui_allowed"
-          class="form-select"
-          v-model="config.origin_web_ui_allowed"
-          @change="forceUpdate"
-        >
-          <option value="pc">Only localhost may access Web UI</option>
-          <option value="lan">Only those in LAN may access Web UI</option>
-          <option value="wan">Anyone may access Web UI</option>
-        </select>
-        <div class="form-text">
-          The origin of the remote endpoint address that is not denied access to Web UI
+        <!--Origin Web UI Allowed-->
+        <div class="mb-3">
+          <label for="origin_web_ui_allowed" class="form-label">Origin Web UI Allowed</label>
+          <select id="origin_web_ui_allowed" class="form-select" v-model="config.origin_web_ui_allowed">
+            <option value="pc">Only localhost may access Web UI</option>
+            <option value="lan">Only those in LAN may access Web UI</option>
+            <option value="wan">Anyone may access Web UI</option>
+          </select>
+          <div class="form-text">
+            The origin of the remote endpoint address that is not denied access to Web UI
+          </div>
         </div>
-        <!-- add warning about exposing web ui to the internet -->
-        <div class="alert alert-danger" v-if="config.origin_web_ui_allowed === 'wan'">
-          <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Exposing the Web UI to the internet is a security risk! Proceed at your own risk!
+        <!--UPnP-->
+        <div class="mb-3">
+          <label for="upnp" class="form-label">UPnP</label>
+          <select id="upnp" class="form-select" v-model="config.upnp">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">Automatically configure port forwarding</div>
         </div>
-      </div>
-      <!--UPnP-->
-      <div class="mb-3">
-        <label for="upnp" class="form-label">UPnP</label>
-        <select id="upnp" class="form-select" v-model="config.upnp">
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">Automatically configure port forwarding</div>
-      </div>
-      <!--Gamepads-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="gamepad" class="form-label">Gamepads</label>
-        <select id="gamepad" class="form-select" v-model="config.gamepad">
-          <option value="auto">Automatic</option>
-          <option value="ds4">DS4 (PS4)</option>
-          <option value="x360">X360 (Xbox 360)</option>
-        </select>
-        <div class="form-text">Choose which type of gamepad to emulate on the host</div>
-      </div>
-      <div class="accordion" v-if="config.gamepad === 'ds4'">
-        <div class="accordion-item">
-          <h2 class="accordion-header">
-            <button class="accordion-button" type="button" data-bs-toggle="collapse"
-              data-bs-target="#panelsStayOpen-collapseOne">
-              Manual DS4 options
-            </button>
-          </h2>
-          <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
-            aria-labelledby="panelsStayOpen-headingOne">
-            <div class="accordion-body">
-              <div>
-                <label for="ds4_back_as_touchpad_click" class="form-label">Map Back/Select to Touchpad Click</label>
-                <select id="ds4_back_as_touchpad_click" class="form-select" v-model="config.ds4_back_as_touchpad_click">
-                  <option value="disabled">Disabled</option>
-                  <option value="enabled">Enabled (default)</option>
-                </select>
-                <div class="form-text">When forcing DS4 emulation, map Back/Select to Touchpad Click</div>
+        <!--Gamepads-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="gamepad" class="form-label">Gamepads</label>
+          <select id="gamepad" class="form-select" v-model="config.gamepad">
+            <option value="auto">Automatic</option>
+            <option value="ds4">DS4 (PS4)</option>
+            <option value="x360">X360 (Xbox 360)</option>
+          </select>
+          <div class="form-text">Choose which type of gamepad to emulate on the host</div>
+        </div>
+        <div class="accordion" v-if="config.gamepad === 'ds4'">
+          <div class="accordion-item">
+            <h2 class="accordion-header">
+              <button class="accordion-button" type="button" data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseOne">
+                Manual DS4 options
+              </button>
+            </h2>
+            <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
+              aria-labelledby="panelsStayOpen-headingOne">
+              <div class="accordion-body">
+                <div>
+                  <label for="ds4_back_as_touchpad_click" class="form-label">Map Back/Select to Touchpad Click</label>
+                  <select id="ds4_back_as_touchpad_click" class="form-select"
+                    v-model="config.ds4_back_as_touchpad_click">
+                    <option value="disabled">Disabled</option>
+                    <option value="enabled">Enabled (default)</option>
+                  </select>
+                  <div class="form-text">When forcing DS4 emulation, map Back/Select to Touchpad Click</div>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      <!--Ping Timeout-->
-      <div class="mb-3">
-        <label for="ping_timeout" class="form-label">Ping Timeout</label>
-        <input
-          type="text"
-          class="form-control"
-          id="ping_timeout"
-          placeholder="10000"
-          v-model="config.ping_timeout"
-        />
-        <div class="form-text">
-          How long to wait in milliseconds for data from moonlight before shutting down the stream
-        </div>
-      </div>
-      <!--Advertised FPS and Resolutions-->
-      <div class="mb-3">
-        <label for="ping_timeout" class="form-label"
-          >Advertised Resolutions and FPS</label
-        >
-        <div class="resolutions-container">
-          <label>Resolutions</label>
-          <div class="resolutions d-flex flex-wrap">
-            <div
-              class="p-2 ms-item m-2 d-flex justify-content-between"
-              v-for="(r,i) in resolutions"
-              :key="r"
-            >
-              <span class="px-2">{{r}}</span>
-              <span style="cursor: pointer" @click="resolutions.splice(i,1)"
-                >&times;</span
-              >
-            </div>
-            <form
-              @submit.prevent="resolutions.push(resIn);resIn = '';"
-              class="d-flex align-items-center"
-            >
-              <input
-                type="text"
-                v-model="resIn"
-                required
-                pattern="[0-9]+x[0-9]+"
-                style="
-                  border-top-right-radius: 0;
-                  border-bottom-right-radius: 0;
-                "
-                class="form-control"
-              />
-              <button
-                style="border-top-left-radius: 0; border-bottom-left-radius: 0"
-                class="btn btn-success"
-              >
-                +
-              </button>
-            </form>
+        <!--Ping Timeout-->
+        <div class="mb-3">
+          <label for="ping_timeout" class="form-label">Ping Timeout</label>
+          <input type="text" class="form-control" id="ping_timeout" placeholder="10000" v-model="config.ping_timeout" />
+          <div class="form-text">
+            How long to wait in milliseconds for data from moonlight before shutting down the stream
           </div>
         </div>
-        <div class="fps-container">
-          <label>FPS</label>
-          <div class="fps d-flex flex-wrap">
-            <div
-              class="p-2 ms-item m-2 d-flex justify-content-between"
-              v-for="(f,i) in fps"
-              :key="f"
-            >
-              <span class="px-2">{{f}}</span>
-              <span style="cursor: pointer" @click="fps.splice(i,1)"
-                >&times;</span
-              >
+        <!--Advertised FPS and Resolutions-->
+        <div class="mb-3">
+          <label for="ping_timeout" class="form-label">Advertised Resolutions and FPS</label>
+          <div class="resolutions-container">
+            <label>Resolutions</label>
+            <div class="resolutions d-flex flex-wrap">
+              <div class="p-2 ms-item m-2 d-flex justify-content-between" v-for="(r,i) in resolutions" :key="r">
+                <span class="px-2">{{r}}</span>
+                <span style="cursor: pointer" @click="resolutions.splice(i,1)">&times;</span>
+              </div>
+              <form @submit.prevent="resolutions.push(resIn);resIn = '';" class="d-flex align-items-center">
+                <input type="text" v-model="resIn" required pattern="[0-9]+x[0-9]+" style="
+                  border-top-right-radius: 0;
+                  border-bottom-right-radius: 0;
+                " class="form-control" />
+                <button style="border-top-left-radius: 0; border-bottom-left-radius: 0" class="btn btn-success">
+                  +
+                </button>
+              </form>
             </div>
-            <form
-              @submit.prevent="fps.push(fpsIn);fpsIn = '';"
-              class="d-flex align-items-center"
-            >
-              <input
-                type="text"
-                v-model="fpsIn"
-                required
-                pattern="[0-9]+"
-                style="
+          </div>
+          <div class="fps-container">
+            <label>FPS</label>
+            <div class="fps d-flex flex-wrap">
+              <div class="p-2 ms-item m-2 d-flex justify-content-between" v-for="(f,i) in fps" :key="f">
+                <span class="px-2">{{f}}</span>
+                <span style="cursor: pointer" @click="fps.splice(i,1)">&times;</span>
+              </div>
+              <form @submit.prevent="fps.push(fpsIn);fpsIn = '';" class="d-flex align-items-center">
+                <input type="text" v-model="fpsIn" required pattern="[0-9]+" style="
                   width: 6ch;
                   border-top-right-radius: 0;
                   border-bottom-right-radius: 0;
-                "
-                class="form-control"
-              />
-              <button
-                style="border-top-left-radius: 0; border-bottom-left-radius: 0"
-                class="btn btn-success"
-              >
-                +
-              </button>
-            </form>
+                " class="form-control" />
+                <button style="border-top-left-radius: 0; border-bottom-left-radius: 0" class="btn btn-success">
+                  +
+                </button>
+              </form>
+            </div>
+          </div>
+          <div class="form-text">
+            The display modes advertised by Sunshine<br />
+            Some versions of Moonlight, such as Moonlight-nx (Switch), rely on this list to ensure that the requested
+            resolutions and fps are supported.<br>
+            This setting does <b>not</b> change how the screen stream is sent to Moonlight
           </div>
         </div>
-        <div class="form-text">
-          The display modes advertised by Sunshine<br />
-          Some versions of Moonlight, such as Moonlight-nx (Switch), rely on this list to ensure that the requested
-          resolutions and fps are supported.<br>
-          This setting does <b>not</b> change how the screen stream is sent to Moonlight
+        <!-- Mapping Key AltRight to Key Windows -->
+        <div class="mb-3">
+          <label for="mapkey" class="form-label">Map Right Alt key to Windows key</label>
+          <select id="mapkey" class="form-select" v-model="config.key_rightalt_to_key_win">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            It may be possible that you cannot send the Windows Key from Moonlight directly.<br />
+            In those cases it may be useful to make Sunshine think the Right Alt key is the Windows key
+          </div>
+        </div>
+        <!-- Global Prep Commands -->
+        <div class="mb-3 d-flex flex-column">
+          <label class="form-label">Command Preparations</label>
+          <div class="form-text">
+            Configure a list of commands to be executed before or after running any application.
+            If any of the specified preparation commands fail, the application launch process will be aborted.
+          </div>
+          <table class="table" v-if="global_prep_cmd.length > 0">
+            <thead>
+              <tr>
+                <th scope="col"><i class="fas fa-play"></i> Do Command</th>
+                <th scope="col"><i class="fas fa-undo"></i> Undo Command</th>
+                <th scope="col" v-if="platform === 'windows'">
+                  <i class="fas fa-shield-alt"></i> Run as Admin
+                </th>
+                <th scope="col"></th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(c, i) in global_prep_cmd">
+                <td>
+                  <input type="text" class="form-control monospace" v-model="c.do" />
+                </td>
+                <td>
+                  <input type="text" class="form-control monospace" v-model="c.undo" />
+                </td>
+                <td v-if="platform === 'windows'">
+                  <div class="form-check">
+                    <input type="checkbox" class="form-check-input" :id="'prep-cmd-admin-' + i" v-model="c.elevated"
+                      true-value="true" false-value="false" />
+                    <label :for="'prep-cmd-admin-' + i" class="form-check-label">Elevated</label>
+                  </div>
+                </td>
+                <td>
+                  <button class="btn btn-danger" @click="global_prep_cmd.splice(i,1)">
+                    <i class="fas fa-trash"></i>
+                  </button>
+                  <button class="btn btn-success" @click="add_global_prep_cmd">
+                    <i class="fas fa-plus"></i>
+                  </button>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <button class="mt-2 btn btn-success" style="margin: 0 auto" @click="add_global_prep_cmd">
+            &plus; Add
+          </button>
         </div>
       </div>
-      <!-- Mapping Key AltRight to Key Windows -->
-      <div class="mb-3">
-        <label for="mapkey" class="form-label"
-          >Map Right Alt key to Windows key</label
-        >
-        <select
-          id="mapkey"
-          class="form-select"
-          v-model="config.key_rightalt_to_key_win"
-        >
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          It may be possible that you cannot send the Windows Key from Moonlight directly.<br />
-          In those cases it may be useful to make Sunshine think the Right Alt key is the Windows key
+      <!--Files Tab-->
+      <div v-if="currentTab === 'files'" class="config-page">
+        <!--Private Key-->
+        <div class="mb-3">
+          <label for="pkey" class="form-label">Private Key</label>
+          <input type="text" class="form-control" id="pkey" placeholder="/dir/pkey.pem" v-model="config.pkey" />
+          <div class="form-text">The private key used for the web UI and Moonlight client pairing. For best
+            compatibility, this should be an RSA-2048 private key.</div>
         </div>
-      </div>
-      <!-- Global Prep Commands -->
-      <div class="mb-3 d-flex flex-column">
-        <label class="form-label">Command Preparations</label>
-        <div class="form-text">
-          Configure a list of commands to be executed before or after running any application. 
-          If any of the specified preparation commands fail, the application launch process will be aborted.
+        <!--Certificate-->
+        <div class="mb-3">
+          <label for="cert" class="form-label">Certificate</label>
+          <input type="text" class="form-control" id="cert" placeholder="/dir/cert.pem" v-model="config.cert" />
+          <div class="form-text">
+            The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have
+            an RSA-2048 public key.
+          </div>
         </div>
-        <table class="table" v-if="global_prep_cmd.length > 0">
-          <thead>
-            <tr>
-              <th scope="col"><i class="fas fa-play"></i> Do Command</th>
-              <th scope="col"><i class="fas fa-undo"></i> Undo Command</th>
-              <th scope="col" v-if="platform === 'windows'">
-                <i class="fas fa-shield-alt"></i> Run as Admin
-              </th>
-              <th scope="col"></th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr v-for="(c, i) in global_prep_cmd">
-              <td>
-                <input type="text" class="form-control monospace" v-model="c.do" />
-              </td>
-              <td>
-                <input type="text" class="form-control monospace" v-model="c.undo" />
-              </td>
-              <td v-if="platform === 'windows'">
-                <div class="form-check">
-                  <input
-                    type="checkbox"
-                    class="form-check-input"
-                    :id="'prep-cmd-admin-' + i"
-                    v-model="c.elevated"
-                    true-value="true"
-                    false-value="false"
-                  />
-                  <label :for="'prep-cmd-admin-' + i" class="form-check-label"
-                    >Elevated</label
-                  >
-                </div>
-              </td>
-              <td>
-                <button class="btn btn-danger" @click="$delete(global_prep_cmd, i)">
-                  <i class="fas fa-trash"></i>
-                </button>
-                <button class="btn btn-success" @click="add_global_prep_cmd">
-                  <i class="fas fa-plus"></i>
-                </button>
-              </td>
-            </tr>
-          </tbody>
-        </table>              
-        <button class="mt-2 btn btn-success" style="margin: 0 auto" @click="add_global_prep_cmd">
-          &plus; Add
-        </button>
-      </div>
-    </div>
-    <!--Files Tab-->
-    <div v-if="currentTab === 'files'" class="config-page">
-      <!--Private Key-->
-      <div class="mb-3">
-        <label for="pkey" class="form-label">Private Key</label>
-        <input
-          type="text"
-          class="form-control"
-          id="pkey"
-          placeholder="/dir/pkey.pem"
-          v-model="config.pkey"
-        />
-        <div class="form-text">
-          The private key used for the web UI and Moonlight client pairing. For best compatibility, this should be an RSA-2048 private key.
-        </div>
-      </div>
-      <!--Certificate-->
-      <div class="mb-3">
-        <label for="cert" class="form-label">Certificate</label>
-        <input
-          type="text"
-          class="form-control"
-          id="cert"
-          placeholder="/dir/cert.pem"
-          v-model="config.cert"
-        />
-        <div class="form-text">
-          The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have an RSA-2048 public key.
-        </div>
-      </div>
 
-      <!--State File-->
-      <div class="mb-3">
-        <label for="file_state" class="form-label">State File</label>
-        <input
-          type="text"
-          class="form-control"
-          id="file_state"
-          placeholder="sunshine_state.json"
-          v-model="config.file_state"
-        />
-        <div class="form-text">
-          The file where current state of Sunshine is stored
+        <!--State File-->
+        <div class="mb-3">
+          <label for="file_state" class="form-label">State File</label>
+          <input type="text" class="form-control" id="file_state" placeholder="sunshine_state.json"
+            v-model="config.file_state" />
+          <div class="form-text">
+            The file where current state of Sunshine is stored
+          </div>
+        </div>
+        <!--Apps File-->
+        <div class="mb-3">
+          <label for="file_apps" class="form-label">Apps File</label>
+          <input type="text" class="form-control" id="file_apps" placeholder="apps.json" v-model="config.file_apps" />
+          <div class="form-text">
+            The file where current apps of Sunshine are stored
+          </div>
         </div>
       </div>
-      <!--Apps File-->
-      <div class="mb-3">
-        <label for="file_apps" class="form-label">Apps File</label>
-        <input
-          type="text"
-          class="form-control"
-          id="file_apps"
-          placeholder="apps.json"
-          v-model="config.file_apps"
-        />
-        <div class="form-text">
-          The file where current apps of Sunshine are stored
+      <div v-if="currentTab === 'input'" class="config-page">
+        <!--Home/Guide Button Emulation Timeout-->
+        <div class="mb-3">
+          <label for="back_button_timeout" class="form-label">Home/Guide Button Emulation Timeout</label>
+          <input type="text" class="form-control" id="back_button_timeout" placeholder="-1"
+            v-model="config.back_button_timeout" />
+          <div class="form-text">
+            If the Back/Select button is held down for the specified number of milliseconds, a Home/Guide button press
+            is
+            emulated.<br />
+            If set to a value &lt; 0 (default), holding the Back/Select button will not emulate the Home/Guide
+            button.<br />
+          </div>
+        </div>
+        <!--Enable Mouse Input-->
+        <div class="mb-3">
+          <label for="mouse" class="form-label">Enable Mouse Input</label>
+          <select id="mouse" class="form-select" v-model="config.mouse">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            Allows guests to control the host system with the mouse
+          </div>
+        </div>
+        <!--Enable Keyboard Input-->
+        <div class="mb-3">
+          <label for="keyboard" class="form-label">Enable Keyboard Input</label>
+          <select id="keyboard" class="form-select" v-model="config.keyboard">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            Allows guests to control the host system with the keyboard
+          </div>
+        </div>
+        <!--Enable Gamepad Input-->
+        <div class="mb-3">
+          <label for="gamepad" class="form-label">Enable Gamepad Input</label>
+          <select id="gamepad" class="form-select" v-model="config.controller">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            Allows guests to control the host system with a gamepad / controller
+          </div>
+        </div>
+        <!-- Key Repeat Delay-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="key_repeat_delay" class="form-label">Key Repeat Delay</label>
+          <input type="text" class="form-control" id="key_repeat_delay" placeholder="500"
+            v-model="config.key_repeat_delay" />
+          <div class="form-text">
+            Control how fast keys will repeat themselves<br />
+            The initial delay in milliseconds before repeating keys
+          </div>
+        </div>
+        <!-- Key Repeat Frequency-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="key_repeat_frequency" class="form-label">Key Repeat Frequency</label>
+          <input type="text" class="form-control" id="key_repeat_frequency" placeholder="24.9"
+            v-model="config.key_repeat_frequency" />
+          <div class="form-text">
+            How often keys repeat every second<br />
+            This configurable option supports decimals
+          </div>
+        </div>
+        <!-- Always send scancodes -->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="always_send_scancodes" class="form-label">Always Send Scancodes</label>
+          <select id="always_send_scancodes" class="form-select" v-model="config.always_send_scancodes">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            Sending scancodes enhances compatibility with games and apps
+            but may result in incorrect keyboard input from certain clients
+            that aren't using a US English keyboard layout.<br />
+            Enable if keyboard input is not working at all in certain applications.<br />
+            Disable if keys on the client are generating the wrong input on the host.
+          </div>
         </div>
       </div>
-    </div>
-    <div v-if="currentTab === 'input'" class="config-page">
-      <!--Home/Guide Button Emulation Timeout-->
-      <div class="mb-3">
-        <label for="back_button_timeout" class="form-label"
-          >Home/Guide Button Emulation Timeout</label
-        >
-        <input
-          type="text"
-          class="form-control"
-          id="back_button_timeout"
-          placeholder="-1"
-          v-model="config.back_button_timeout"
-        />
-        <div class="form-text">
-          If the Back/Select button is held down for the specified number of milliseconds, a Home/Guide button press is emulated.<br />
-          If set to a value &lt; 0 (default), holding the Back/Select button will not emulate the Home/Guide button.<br />
+      <!--Files Tab-->
+      <div v-if="currentTab === 'av'" class="config-page">
+        <!--Audio Sink-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="audio_sink" class="form-label">Audio Sink</label>
+          <input type="text" class="form-control" id="audio_sink" placeholder="Speakers (High Definition Audio Device)"
+            v-model="config.audio_sink" />
+          <div class="form-text">
+            Manually specify a specific audio device to capture. If unset, the device is chosen automatically.<br />
+            <b>We strongly recommend leaving this field blank to use automatic device selection!</b><br />
+            If you have multiple audio devices with identical names, you can get the Device ID using the following
+            command:<br />
+            <pre>tools\audio-info.exe</pre>
+          </div>
         </div>
-      </div>
-      <!--Enable Mouse Input-->
-      <div class="mb-3">
-        <label for="mouse" class="form-label"
-          >Enable Mouse Input</label
-        >
-        <select
-          id="mouse"
-          class="form-select"
-          v-model="config.mouse"
-        >
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          Allows guests to control the host system with the mouse
+        <div class="mb-3" v-if="platform === 'linux'">
+          <label for="audio_sink" class="form-label">Audio Sink</label>
+          <input type="text" class="form-control" id="audio_sink"
+            placeholder="alsa_output.pci-0000_09_00.3.analog-stereo" v-model="config.audio_sink" />
+          <div class="form-text">
+            The name of the audio sink used for Audio Loopback<br />
+            If you do not specify this variable, pulseaudio will select the default monitor device.<br />
+            <br />
+            You can find the name of the audio sink using either command:<br />
+            <pre>pacmd list-sinks | grep "name:"</pre>
+            <pre>pactl info | grep Source</pre>
+            <br />
+          </div>
         </div>
-      </div>
-      <!--Enable Keyboard Input-->
-      <div class="mb-3">
-        <label for="keyboard" class="form-label"
-          >Enable Keyboard Input</label
-        >
-        <select
-          id="keyboard"
-          class="form-select"
-          v-model="config.keyboard"
-        >
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          Allows guests to control the host system with the keyboard
+        <div class="mb-3" v-if="platform === 'macos'">
+          <label for="audio_sink" class="form-label">Audio Sink</label>
+          <input type="text" class="form-control" id="audio_sink" placeholder="BlackHole 2ch"
+            v-model="config.audio_sink" />
+          <div class="form-text">
+            The name of the audio sink used for Audio Loopback<br />
+            Sunshine can only access microphones on macOS due to system limitations.<br />
+            To stream system audio using <a href="https://github.com/mattingalls/Soundflower" target="_blank">
+              Soundflower
+            </a> or <a href="https://github.com/ExistentialAudio/BlackHole" target="_blank">
+              BlackHole
+            </a>.
+          </div>
         </div>
-      </div>
-      <!--Enable Gamepad Input-->
-      <div class="mb-3">
-        <label for="gamepad" class="form-label"
-          >Enable Gamepad Input</label
-        >
-        <select
-          id="gamepad"
-          class="form-select"
-          v-model="config.controller"
-        >
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          Allows guests to control the host system with a gamepad / controller
+        <!--Virtual Sink-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="virtual_sink" class="form-label">Virtual Sink</label>
+          <input type="text" class="form-control" id="virtual_sink" placeholder="Steam Streaming Speakers"
+            v-model="config.virtual_sink" />
+          <div class="form-text">
+            Manually specify a virtual audio device to use. If unset, the device is chosen automatically.<br />
+            <b>We strongly recommend leaving this field blank to use automatic device selection!</b><br />
+          </div>
         </div>
-      </div>
-      <!-- Key Repeat Delay-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="key_repeat_delay" class="form-label"
-          >Key Repeat Delay</label
-        >
-        <input
-          type="text"
-          class="form-control"
-          id="key_repeat_delay"
-          placeholder="500"
-          v-model="config.key_repeat_delay"
-        />
-        <div class="form-text">
-          Control how fast keys will repeat themselves<br />
-          The initial delay in milliseconds before repeating keys
+        <!--Install Steam Audio Drivers-->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="install_steam_audio_drivers" class="form-label">Install Steam Audio Drivers</label>
+          <select id="install_steam_audio_drivers" class="form-select" v-model="config.install_steam_audio_drivers">
+            <option value="disabled">Disabled</option>
+            <option value="enabled">Enabled</option>
+          </select>
+          <div class="form-text">
+            If Steam is installed, this will automatically install the Steam Streaming Speakers driver to support
+            5.1/7.1 surround sound and muting host audio.
+          </div>
         </div>
-      </div>
-      <!-- Key Repeat Frequency-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="key_repeat_frequency" class="form-label"
-          >Key Repeat Frequency</label
-        >
-        <input
-          type="text"
-          class="form-control"
-          id="key_repeat_frequency"
-          placeholder="24.9"
-          v-model="config.key_repeat_frequency"
-        />
-        <div class="form-text">
-          How often keys repeat every second<br />
-          This configurable option supports decimals
+        <!--Adapter Name -->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="adapter_name" class="form-label">Adapter Name</label>
+          <input type="text" class="form-control" id="adapter_name" placeholder="Radeon RX 580 Series"
+            v-model="config.adapter_name" />
+          <div class="form-text" v-if="platform === 'windows'">
+            Manually specify a GPU to use for capture. If unset, the GPU is chosen automatically.<br />
+            <b>We strongly recommend leaving this field blank to use automatic GPU selection!</b><br />
+            Note: This GPU must have a display connected and powered on.<br />
+            The appropriate values can be found using the following command:<br />
+            <pre>tools\dxgi-info.exe</pre>
+          </div>
         </div>
-      </div>
-      <!-- Always send scancodes -->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="always_send_scancodes" class="form-label"
-          >Always Send Scancodes</label
-        >
-        <select
-          id="always_send_scancodes"
-          class="form-select"
-          v-model="config.always_send_scancodes"
-        >
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          Sending scancodes enhances compatibility with games and apps
-          but may result in incorrect keyboard input from certain clients
-          that aren't using a US English keyboard layout.<br />
-          Enable if keyboard input is not working at all in certain applications.<br />
-          Disable if keys on the client are generating the wrong input on the host.
+        <!--Output Name -->
+        <div class="mb-3" v-if="platform === 'windows'">
+          <label for="output_name" class="form-label">Output Name</label>
+          <input type="text" class="form-control" id="output_name" placeholder="\\.\DISPLAY1"
+            v-model="config.output_name" />
+          <div class="form-text">
+            Manually specify a display to use for capture. If unset, the primary display is captured.<br />
+            Note: If you specified a GPU above, this display must be connected to that GPU.<br />
+            The appropriate values can be found using the following command:<br />
+            tools\dxgi-info.exe<br />
+          </div>
         </div>
-      </div>
-    </div>
-    <!--Files Tab-->
-    <div v-if="currentTab === 'av'" class="config-page">
-      <!--Audio Sink-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="audio_sink" class="form-label">Audio Sink</label>
-        <input
-          type="text"
-          class="form-control"
-          id="audio_sink"
-          placeholder="Speakers (High Definition Audio Device)"
-          v-model="config.audio_sink"
-        />
-        <div class="form-text">
-          Manually specify a specific audio device to capture. If unset, the device is chosen automatically.<br />
-          <b>We strongly recommend leaving this field blank to use automatic device selection!</b><br />
-          If you have multiple audio devices with identical names, you can get the Device ID using the following command:<br />
-          <pre>tools\audio-info.exe</pre>
-        </div>
-      </div>
-      <div class="mb-3" v-if="platform === 'linux'">
-        <label for="audio_sink" class="form-label">Audio Sink</label>
-        <input
-          type="text"
-          class="form-control"
-          id="audio_sink"
-          placeholder="alsa_output.pci-0000_09_00.3.analog-stereo"
-          v-model="config.audio_sink"
-        />
-        <div class="form-text">
-          The name of the audio sink used for Audio Loopback<br />
-          If you do not specify this variable, pulseaudio will select the default monitor device.<br />
-          <br />
-          You can find the name of the audio sink using either command:<br />
-          <pre>pacmd list-sinks | grep "name:"</pre>
-          <pre>pactl info | grep Source</pre>
-          <br />
-        </div>
-      </div>
-      <div class="mb-3" v-if="platform === 'macos'">
-        <label for="audio_sink" class="form-label">Audio Sink</label>
-        <input
-          type="text"
-          class="form-control"
-          id="audio_sink"
-          placeholder="BlackHole 2ch"
-          v-model="config.audio_sink"
-        />
-        <div class="form-text">
-          The name of the audio sink used for Audio Loopback<br />
-          Sunshine can only access microphones on macOS due to system limitations.<br />
-          To stream system audio using <a
-            href="https://github.com/mattingalls/Soundflower"
-            target="_blank">
-            Soundflower
-          </a> or <a
-            href="https://github.com/ExistentialAudio/BlackHole"
-            target="_blank">
-            BlackHole
-          </a>.
-        </div>
-      </div>
-      <!--Virtual Sink-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="virtual_sink" class="form-label">Virtual Sink</label>
-        <input
-          type="text"
-          class="form-control"
-          id="virtual_sink"
-          placeholder="Steam Streaming Speakers"
-          v-model="config.virtual_sink"
-        />
-        <div class="form-text">
-          Manually specify a virtual audio device to use. If unset, the device is chosen automatically.<br />
-          <b>We strongly recommend leaving this field blank to use automatic device selection!</b><br />
-        </div>
-      </div>
-      <!--Install Steam Audio Drivers-->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="install_steam_audio_drivers" class="form-label">Install Steam Audio Drivers</label>
-        <select id="install_steam_audio_drivers" class="form-select" v-model="config.install_steam_audio_drivers">
-          <option value="disabled">Disabled</option>
-          <option value="enabled">Enabled</option>
-        </select>
-        <div class="form-text">
-          If Steam is installed, this will automatically install the Steam Streaming Speakers driver to support
-          5.1/7.1 surround sound and muting host audio.
-        </div>
-      </div>
-      <!--Adapter Name -->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="adapter_name" class="form-label">Adapter Name</label>
-        <input
-          type="text"
-          class="form-control"
-          id="adapter_name"
-          placeholder="Radeon RX 580 Series"
-          v-model="config.adapter_name"
-        />
-        <div class="form-text" v-if="platform === 'windows'">
-          Manually specify a GPU to use for capture. If unset, the GPU is chosen automatically.<br />
-          <b>We strongly recommend leaving this field blank to use automatic GPU selection!</b><br />
-          Note: This GPU must have a display connected and powered on.<br />
-          The appropriate values can be found using the following command:<br />
-          <pre>tools\dxgi-info.exe</pre>
-        </div>
-      </div>
-      <!--Output Name -->
-      <div class="mb-3" v-if="platform === 'windows'">
-        <label for="output_name" class="form-label">Output Name</label>
-        <input
-          type="text"
-          class="form-control"
-          id="output_name"
-          placeholder="\\.\DISPLAY1"
-          v-model="config.output_name"
-        />
-        <div class="form-text">
-          Manually specify a display to use for capture. If unset, the primary display is captured.<br />
-          Note: If you specified a GPU above, this display must be connected to that GPU.<br />
-          The appropriate values can be found using the following command:<br />
-          tools\dxgi-info.exe<br />
-        </div>
-      </div>
-      <div class="mb-3" v-if="platform === 'linux'">
-        <label for="output_name" class="form-label">Monitor number</label>
-        <input
-          type="text"
-          class="form-control"
-          id="output_name"
-          placeholder="0"
-          v-model="config.output_name"
-        />
-        <div class="form-text">
-          During Sunshine startup, you should see the list of detected monitors, e.g.:<br />
-          <br />
-          <pre style="white-space: pre-line;">
+        <div class="mb-3" v-if="platform === 'linux'">
+          <label for="output_name" class="form-label">Monitor number</label>
+          <input type="text" class="form-control" id="output_name" placeholder="0" v-model="config.output_name" />
+          <div class="form-text">
+            During Sunshine startup, you should see the list of detected monitors, e.g.:<br />
+            <br />
+            <pre style="white-space: pre-line;">
             Info: Detecting connected monitors
             Info: Detected monitor 0: DVI-D-0, connected: false
             Info: Detected monitor 1: HDMI-0, connected: true
@@ -632,522 +464,348 @@
             Info: Detected monitor 3: DP-1, connected: false
             Info: Detected monitor 4: DVI-D-1, connected: false
           </pre>
-          You need to use the value before the colon in the output, e.g. <b>1</b>.
+            You need to use the value before the colon in the output, e.g. <b>1</b>.
+          </div>
         </div>
       </div>
-    </div>
-    <div v-if="currentTab === 'advanced'" class="config-page">
-      <!--Address family-->
-      <div class="mb-3">
-        <label for="address_family" class="form-label">Address Family</label>
-        <select
-          id="address_family"
-          class="form-select"
-          v-model="config.address_family"
-        >
-          <option value="ipv4">IPv4 only</option>
-          <option value="both">IPv4+IPv6</option>
-        </select>
-        <div class="form-text">Set the address family used by Sunshine</div>
+      <div v-if="currentTab === 'advanced'" class="config-page">
+        <!--Address family-->
+        <div class="mb-3">
+          <label for="address_family" class="form-label">Address Family</label>
+          <select id="address_family" class="form-select" v-model="config.address_family">
+            <option value="ipv4">IPv4 only</option>
+            <option value="both">IPv4+IPv6</option>
+          </select>
+          <div class="form-text">Set the address family used by Sunshine</div>
+        </div>
+        <!--Port family-->
+        <div class="mb-3">
+          <label for="port" class="form-label">Port</label>
+          <input type="number" min="1029" max="65514" class="form-control" id="port" placeholder="47989"
+            v-model="config.port" />
+          <div class="form-text">Set the family of ports used by Sunshine</div>
+          <!-- Add warning if any port is less than 1024 -->
+          <div class="alert alert-danger" v-if="(+effectivePort - 5) < 1024">
+            <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Sunshine cannot use ports below 1024!
+          </div>
+          <!-- Add warning if any port is above 65535 -->
+          <div class="alert alert-danger" v-if="(+effectivePort + 21) > 65535">
+            <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Ports above 65535 are not available!
+          </div>
+          <!-- Create a port table for the various ports needed by Sunshine -->
+          <table class="table">
+            <thead>
+              <tr>
+                <th scope="col">Protocol</th>
+                <th scope="col">Port</th>
+                <th scope="col">Note</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <!-- HTTPS -->
+                <td>TCP</td>
+                <td>{{+effectivePort - 5}}</td>
+                <td></td>
+              </tr>
+              <tr>
+                <!-- HTTP -->
+                <td>TCP</td>
+                <td>{{+effectivePort}}</td>
+                <td>
+                  <div class="alert alert-primary" role="alert" v-if="+effectivePort !== 47989">
+                    <i class="fa-solid fa-xl fa-circle-info"></i> Use this port to connect with Moonlight.
+                  </div>
+                </td>
+              </tr>
+              <tr>
+                <!-- Web UI -->
+                <td>TCP</td>
+                <td>{{+effectivePort + 1}}</td>
+                <td>Web UI</td>
+              </tr>
+              <tr>
+                <!-- RTSP -->
+                <td>TCP</td>
+                <td>{{+effectivePort + 21}}</td>
+                <td></td>
+              </tr>
+              <tr>
+                <!-- Video, Control, Audio -->
+                <td>UDP</td>
+                <td>{{+effectivePort + 9}} - {{+effectivePort + 11}}</td>
+                <td></td>
+              </tr>
+              <!--            <tr>-->
+              <!--              &lt;!&ndash; Mic &ndash;&gt;-->
+              <!--              <td>UDP</td>-->
+              <!--              <td>{{+effectivePort + 13}}</td>-->
+              <!--              <td></td>-->
+              <!--            </tr>-->
+            </tbody>
+          </table>
+          <!-- add warning about exposing web ui to the internet -->
+          <div class="alert alert-warning" v-if="config.origin_web_ui_allowed === 'wan'">
+            <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Exposing the Web UI to the internet is a security
+            risk!
+            Proceed at your own risk!
+          </div>
+        </div>
+        <!-- Quantization Parameter -->
+        <div class="mb-3">
+          <label for="qp" class="form-label">Quantization Parameter</label>
+          <input type="number" class="form-control" id="qp" placeholder="28" v-model="config.qp" />
+          <div class="form-text">
+            Quantization Parameter<br />
+            Some devices may not support Constant Bit Rate.<br />
+            For those devices, QP is used instead.<br />
+            Higher value means more compression, but less quality<br />
+          </div>
+        </div>
       </div>
-      <!--Port family-->
-      <div class="mb-3">
-        <label for="port" class="form-label">Port</label>
-        <input
-          type="number"
-          min="1029"
-          max="65514"
-          class="form-control"
-          id="port"
-          placeholder="47989"
-          v-model="config.port"
-        />
-        <div class="form-text">Set the family of ports used by Sunshine</div>
-        <!-- Add warning if any port is less than 1024 -->
-        <div class="alert alert-danger" v-if="(+effectivePort - 5) < 1024">
-          <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Sunshine cannot use ports below 1024!
+      <!--Software Settings-->
+      <div v-if="currentTab === 'sw'" class="config-page">
+        <div class="mb-3">
+          <label for="sw_preset" class="form-label">SW Presets</label>
+          <select id="sw_preset" class="form-select" v-model="config.sw_preset">
+            <option value="ultrafast">ultrafast</option>
+            <option value="superfast">superfast (default)</option>
+            <option value="veryfast">veryfast</option>
+            <option value="faster">faster</option>
+            <option value="fast">fast</option>
+            <option value="medium">medium</option>
+            <option value="slow">slow</option>
+            <option value="slower">slower</option>
+            <option value="veryslow">veryslow</option>
+          </select>
+          <div class="form-text">
+            Optimize the trade-off between encoding speed (encoded frames per second) and compression efficiency
+            (quality
+            per bit in the bitstream). Defaults to superfast.
+          </div>
         </div>
-        <!-- Add warning if any port is above 65535 -->
-        <div class="alert alert-danger" v-if="(+effectivePort + 21) > 65535">
-          <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Ports above 65535 are not available!
+        <div class="mb-3">
+          <label for="sw_tune" class="form-label">SW Tune</label>
+          <select id="sw_tune" class="form-select" v-model="config.sw_tune">
+            <option value="film">film -- use for high quality movie content; lowers deblocking</option>
+            <option value="animation">animation -- good for cartoons; uses higher deblocking and more reference frames
+            </option>
+            <option value="grain">grain -- preserves the grain structure in old, grainy film material</option>
+            <option value="stillimage">stillimage -- good for slideshow-like content</option>
+            <option value="fastdecode">fastdecode -- allows faster decoding by disabling certain filters</option>
+            <option value="zerolatency">zerolatency -- good for fast encoding and low-latency streaming (default)
+            </option>
+          </select>
+          <div class="form-text">
+            Tuning options, which are applied after the preset. Defaults to zerolatency.
+          </div>
         </div>
-        <!-- Create a port table for the various ports needed by Sunshine -->
-        <table class="table">
-          <thead>
-            <tr>
-              <th scope="col">Protocol</th>
-              <th scope="col">Port</th>
-              <th scope="col">Note</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <!-- HTTPS -->
-              <td>TCP</td>
-              <td>{{+effectivePort - 5}}</td>
-              <td></td>
-            </tr>
-            <tr>
-              <!-- HTTP -->
-              <td>TCP</td>
-              <td>{{+effectivePort}}</td>
-              <td>
-                <div class="alert alert-primary" role="alert" v-if="+effectivePort !== 47989">
-                  <i class="fa-solid fa-xl fa-circle-info"></i> Use this port to connect with Moonlight.
+      </div>
+      <!--Nvidia Encoder Settings-->
+      <div v-if="currentTab === 'nv'" class="config-page">
+        <!--NVENC SETTINGS-->
+        <div class="mb-3">
+          <label for="nvenc_preset" class="form-label">Performance preset</label>
+          <select id="nvenc_preset" class="form-select" v-model="config.nvenc_preset">
+            <option value="1">P1 (fastest, default)</option>
+            <option value="2">P2</option>
+            <option value="3">P3</option>
+            <option value="4">P4</option>
+            <option value="5">P5</option>
+            <option value="6">P6</option>
+            <option value="7">P7 (slowest)</option>
+          </select>
+          <div class="form-text">Higher numbers improve compression (quality at given bitrate) at the cost of
+            <strong>increased encoding latency</strong>.<br>
+            Recommended to change only when limited by network or decoder, otherwise similar effect can be
+            accomplished
+            by
+            increasing bitrate.
+          </div>
+        </div>
+        <div class="mb-3">
+          <label for="nvenc_twopass" class="form-label">Two-pass mode</label>
+          <select id="nvenc_twopass" class="form-select" v-model="config.nvenc_twopass">
+            <option value="disabled">Disabled (fastest, not recommended)</option>
+            <option value="quarter_res">Quarter resolution (faster, default)</option>
+            <option value="full_res">Full resolution (slower)</option>
+          </select>
+          <div class="form-text">Adds preliminary encoding pass.<br>
+            This allows to detect more motion vectors, better distribute bitrate across the frame and more strictly
+            adhere
+            to
+            bitrate limits.<br>
+            Disabling it is not recommended since this can lead to occasional bitrate overshoot and subsequent packet
+            loss.
+          </div>
+        </div>
+        <div class="accordion">
+          <div class="accordion-item">
+            <h2 class="accordion-header">
+              <button class="accordion-button" type="button" data-bs-toggle="collapse"
+                data-bs-target="#panelsStayOpen-collapseOne">
+                Miscellaneous options
+              </button>
+            </h2>
+            <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
+              aria-labelledby="panelsStayOpen-headingOne">
+              <div class="accordion-body">
+                <div class="mb-3" v-if="platform === 'windows'">
+                  <label for="nvenc_realtime_hags" class="form-label">Use realtime priority in hardware accelerated
+                    gpu
+                    scheduling</label>
+                  <select id="nvenc_realtime_hags" class="form-select" v-model="config.nvenc_realtime_hags">
+                    <option value="disabled">Disabled</option>
+                    <option value="enabled">Enabled (default)</option>
+                  </select>
+                  <div class="form-text">Currently NVIDIA drivers may freeze in encoder when
+                    <a href="https://devblogs.microsoft.com/directx/hardware-accelerated-gpu-scheduling/">HAGS</a>
+                    is enabled, realtime priority is used and VRAM utilization is close to maximum.<br>
+                    Disabling this option lowers the priority to high, sidestepping the freeze at the cost of reduced
+                    capture
+                    performance when the GPU is heavily loaded.
+                  </div>
                 </div>
-              </td>
-            </tr>
-            <tr>
-              <!-- Web UI -->
-              <td>TCP</td>
-              <td>{{+effectivePort + 1}}</td>
-              <td>Web UI</td>
-            </tr>
-            <tr>
-              <!-- RTSP -->
-              <td>TCP</td>
-              <td>{{+effectivePort + 21}}</td>
-              <td></td>
-            </tr>
-            <tr>
-              <!-- Video, Control, Audio -->
-              <td>UDP</td>
-              <td>{{+effectivePort + 9}} - {{+effectivePort + 11}}</td>
-              <td></td>
-            </tr>
-<!--            <tr>-->
-<!--              &lt;!&ndash; Mic &ndash;&gt;-->
-<!--              <td>UDP</td>-->
-<!--              <td>{{+effectivePort + 13}}</td>-->
-<!--              <td></td>-->
-<!--            </tr>-->
-          </tbody>
-        </table>
-        <!-- add warning about exposing web ui to the internet -->
-        <div class="alert alert-warning" v-if="config.origin_web_ui_allowed === 'wan'">
-          <i class="fa-solid fa-xl fa-triangle-exclamation"></i> Exposing the Web UI to the internet is a security risk!
-          Proceed at your own risk!
-        </div>
-      </div>
-      <!-- Quantization Parameter -->
-      <div class="mb-3">
-        <label for="qp" class="form-label">Quantization Parameter</label>
-        <input
-          type="number"
-          class="form-control"
-          id="qp"
-          placeholder="28"
-          v-model="config.qp"
-        />
-        <div class="form-text">
-          Quantization Parameter<br />
-          Some devices may not support Constant Bit Rate.<br />
-          For those devices, QP is used instead.<br />
-          Higher value means more compression, but less quality<br />
-        </div>
-      </div>
-      <!-- Min Threads -->
-      <div class="mb-3">
-        <label for="min_threads" class="form-label"
-          >Minimum Software Encoding Thread Count</label
-        >
-        <input
-          type="number"
-          min="1"
-          class="form-control"
-          id="min_threads"
-          placeholder="1"
-          v-model="config.min_threads"
-        />
-        <div class="form-text">
-          Increasing the value slightly reduces encoding efficiency, but the tradeoff is usually<br />
-          worth it to gain the use of more CPU cores for encoding. The ideal value is the lowest<br />
-          value that can reliably encode at your desired streaming settings on your hardware.
-        </div>
-      </div>
-      <!--HEVC Support -->
-      <div class="mb-3">
-        <label for="hevc_mode" class="form-label">HEVC Support</label>
-        <select id="hevc_mode" class="form-select" v-model="config.hevc_mode">
-          <option value="0">
-            Sunshine will advertise support for HEVC based on encoder capabilities (recommended)
-          </option>
-          <option value="1">
-            Sunshine will not advertise support for HEVC
-          </option>
-          <option value="2">
-            Sunshine will advertise support for HEVC Main profile
-          </option>
-          <option value="3">
-            Sunshine will advertise support for HEVC Main and Main10 (HDR) profiles
-          </option>
-        </select>
-        <div class="form-text">
-          Allows the client to request HEVC Main or HEVC Main10 video streams.<br />
-          HEVC is more CPU-intensive to encode, so enabling this may reduce performance when using software encoding.
-        </div>
-      </div>
-      <!--AV1 Support -->
-      <div class="mb-3">
-        <label for="av1_mode" class="form-label">AV1 Support</label>
-        <select id="av1_mode" class="form-select" v-model="config.av1_mode">
-          <option value="0">
-            Sunshine will advertise support for AV1 based on encoder capabilities (recommended)
-          </option>
-          <option value="1">
-            Sunshine will not advertise support for AV1
-          </option>
-          <option value="2">
-            Sunshine will advertise support for AV1 Main 8-bit profile
-          </option>
-          <option value="3">
-            Sunshine will advertise support for AV1 Main 8-bit and 10-bit (HDR) profiles
-          </option>
-        </select>
-        <div class="form-text">
-          Allows the client to request AV1 Main 8-bit or 10-bit video streams.<br />
-          AV1 is more CPU-intensive to encode, so enabling this may reduce performance when using software encoding.
-        </div>
-      </div>
-      <!--Capture-->
-      <div class="mb-3" v-if="platform === 'linux'">
-        <label for="capture" class="form-label">Force a Specific Capture Method</label>
-        <select id="capture" class="form-select" v-model="config.capture">
-          <option value="">Autodetect</option>
-          <option value="nvfbc">NvFBC</option>
-          <option value="wlr">wlroots</option>
-          <option value="kms">KMS</option>
-          <option value="x11">X11</option>
-        </select>
-        <div class="form-text">
-          Force a specific capture method, otherwise Sunshine will use the first one that works. NvFBC requires patched nvidia drivers.
-        </div>
-      </div>
-      <!--Encoder-->
-      <div class="mb-3">
-        <label for="encoder" class="form-label">Force a Specific Encoder</label>
-        <select id="encoder" class="form-select" v-model="config.encoder">
-          <option value="">Autodetect</option>
-          <option value="nvenc" v-if="platform === 'windows' || platform === 'linux'">NVIDIA NVENC</option>
-          <option value="quicksync" v-if="platform === 'windows'">Intel QuickSync</option>
-          <option value="amdvce" v-if="platform === 'windows'">AMD AMF/VCE</option>
-          <option value="vaapi" v-if="platform === 'linux'">VA-API</option>
-          <option value="videotoolbox" v-if="platform === 'macos'">VideoToolbox</option>
-          <option value="software">Software</option>
-        </select>
-        <div class="form-text">
-          Force a specific encoder, otherwise Sunshine will use the first encoder that is available<br />
-          Note: If you specify a hardware encoder on Windows, it must match the GPU where the display is connected.
-        </div>
-      </div>
-      <!--FEC Percentage-->
-      <div class="mb-3">
-        <label for="fec_percentage" class="form-label">FEC Percentage</label>
-        <input
-          type="text"
-          class="form-control"
-          id="fec_percentage"
-          placeholder="20"
-          v-model="config.fec_percentage"
-        />
-        <div class="form-text">
-          Percentage of error correcting packets per data packet in each video frame.<br />
-          Higher values can correct for more network packet loss, but at the cost of increasing bandwidth usage.<br />
-          The default value of 20 is what GeForce Experience uses.
-        </div>
-      </div>
-      <!--Channels-->
-      <div class="mb-3">
-        <label for="channels" class="form-label">Channels</label>
-        <input
-          type="text"
-          class="form-control"
-          id="channels"
-          placeholder="1"
-          v-model="config.channels"
-        />
-        <div class="form-text">
-          When multicasting, it could be useful to have different configurations for each connected Client. For example:
-          <ul>
-            <li>
-              Clients connected through WAN and LAN have different bitrate constraints.
-            </li>
-            <li>
-              Decoders may require different settings for color
-            </li>
-          </ul>
-          Unlike simply broadcasting to multiple Client, this will generate distinct video streams.<br />
-          Note, CPU usage increases for each distinct video stream generated
-        </div>
-      </div>
-      <!--Credentials File-->
-      <div class="mb-3">
-        <label for="credentials_file" class="form-label"
-          >Web Manager Credentials File</label
-        >
-        <input
-          type="text"
-          class="form-control"
-          id="credentials_file"
-          placeholder="sunshine_state.json"
-          v-model="config.credentials_file"
-        />
-        <div class="form-text">
-          Store Username/Password separately from Sunshine's state file.
-        </div>
-      </div>
-      <!--External IP-->
-      <div class="mb-3">
-        <label for="external_ip" class="form-label">External IP</label>
-        <input
-          type="text"
-          class="form-control"
-          id="external_ip"
-          placeholder="123.456.789.12"
-          v-model="config.external_ip"
-        />
-        <div class="form-text">
-          If no external IP address is given, Sunshine will automatically detect external IP
-        </div>
-      </div>
-    </div>
-    <!--Software Settings-->
-    <div v-if="currentTab === 'sw'" class="config-page">
-      <div class="mb-3">
-        <label for="sw_preset" class="form-label">SW Presets</label>
-        <select id="sw_preset" class="form-select" v-model="config.sw_preset">
-          <option value="ultrafast">ultrafast</option>
-          <option value="superfast">superfast (default)</option>
-          <option value="veryfast">veryfast</option>
-          <option value="faster">faster</option>
-          <option value="fast">fast</option>
-          <option value="medium">medium</option>
-          <option value="slow">slow</option>
-          <option value="slower">slower</option>
-          <option value="veryslow">veryslow</option>
-        </select>
-        <div class="form-text">
-          Optimize the trade-off between encoding speed (encoded frames per second) and compression efficiency (quality per bit in the bitstream). Defaults to superfast.
-        </div>
-      </div>
-      <div class="mb-3">
-        <label for="sw_tune" class="form-label">SW Tune</label>
-        <select id="sw_tune" class="form-select" v-model="config.sw_tune">
-          <option value="film">film -- use for high quality movie content; lowers deblocking</option>
-          <option value="animation">animation -- good for cartoons; uses higher deblocking and more reference frames</option>
-          <option value="grain">grain -- preserves the grain structure in old, grainy film material</option>
-          <option value="stillimage">stillimage -- good for slideshow-like content</option>
-          <option value="fastdecode">fastdecode -- allows faster decoding by disabling certain filters</option>
-          <option value="zerolatency">zerolatency -- good for fast encoding and low-latency streaming (default)</option>
-        </select>
-        <div class="form-text">
-          Tuning options, which are applied after the preset. Defaults to zerolatency.
-        </div>
-      </div>
-    </div>
-    <!--Nvidia Encoder Settings-->
-    <div v-if="currentTab === 'nv'" class="config-page">
-      <!--NVENC SETTINGS-->
-      <div class="mb-3">
-        <label for="nvenc_preset" class="form-label">Performance preset</label>
-        <select id="nvenc_preset" class="form-select" v-model="config.nvenc_preset">
-          <option value="1">P1 (fastest, default)</option>
-          <option value="2">P2</option>
-          <option value="3">P3</option>
-          <option value="4">P4</option>
-          <option value="5">P5</option>
-          <option value="6">P6</option>
-          <option value="7">P7 (slowest)</option>
-        </select>
-        <div class="form-text">Higher numbers improve compression (quality at given bitrate) at the cost of
-          <strong>increased encoding latency</strong>.<br>
-          Recommended to change only when limited by network or decoder, otherwise similar effect can be accomplished by
-          increasing bitrate.
-        </div>
-      </div>
-      <div class="mb-3">
-        <label for="nvenc_twopass" class="form-label">Two-pass mode</label>
-        <select id="nvenc_twopass" class="form-select" v-model="config.nvenc_twopass">
-          <option value="disabled">Disabled (fastest, not recommended)</option>
-          <option value="quarter_res">Quarter resolution (faster, default)</option>
-          <option value="full_res">Full resolution (slower)</option>
-        </select>
-        <div class="form-text">Adds preliminary encoding pass.<br>
-          This allows to detect more motion vectors, better distribute bitrate across the frame and more strictly adhere to
-          bitrate limits.<br>
-          Disabling it is not recommended since this can lead to occasional bitrate overshoot and subsequent packet loss.
-        </div>
-      </div>
-      <div class="accordion">
-        <div class="accordion-item">
-          <h2 class="accordion-header">
-            <button class="accordion-button" type="button" data-bs-toggle="collapse"
-              data-bs-target="#panelsStayOpen-collapseOne">
-              Miscellaneous options
-            </button>
-          </h2>
-          <div id="panelsStayOpen-collapseOne" class="accordion-collapse collapse show"
-            aria-labelledby="panelsStayOpen-headingOne">
-            <div class="accordion-body">
-              <div class="mb-3" v-if="platform === 'windows'">
-                <label for="nvenc_realtime_hags" class="form-label">Use realtime priority in hardware accelerated gpu scheduling</label>
-                <select id="nvenc_realtime_hags" class="form-select" v-model="config.nvenc_realtime_hags">
-                  <option value="disabled">Disabled</option>
-                  <option value="enabled">Enabled (default)</option>
-                </select>
-                <div class="form-text">Currently NVIDIA drivers may freeze in encoder when
-                  <a href="https://devblogs.microsoft.com/directx/hardware-accelerated-gpu-scheduling/">HAGS</a>
-                  is enabled, realtime priority is used and VRAM utilization is close to maximum.<br>
-                  Disabling this option lowers the priority to high, sidestepping the freeze at the cost of reduced capture
-                  performance when the GPU is heavily loaded.
-                </div>
-              </div>
-              <div>
-                <label for="nvenc_h264_cavlc" class="form-label">Prefer CAVLC over CABAC in H.264</label>
-                <select id="nvenc_h264_cavlc" class="form-select" v-model="config.nvenc_h264_cavlc">
-                  <option value="disabled">Disabled (default)</option>
-                  <option value="enabled">Enabled</option>
-                </select>
-                <div class="form-text">Simpler form of entropy coding.<br>
-                  CAVLC needs around 10% more bitrate for same quality.<br>
-                  Only relevant for really old decoding devices.
+                <div>
+                  <label for="nvenc_h264_cavlc" class="form-label">Prefer CAVLC over CABAC in H.264</label>
+                  <select id="nvenc_h264_cavlc" class="form-select" v-model="config.nvenc_h264_cavlc">
+                    <option value="disabled">Disabled (default)</option>
+                    <option value="enabled">Enabled</option>
+                  </select>
+                  <div class="form-text">Simpler form of entropy coding.<br>
+                    CAVLC needs around 10% more bitrate for same quality.<br>
+                    Only relevant for really old decoding devices.
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-    <!--Intel Encoder Settings-->
-    <div v-if="currentTab === 'qsv'" class="config-page">
-      <div class="mb-3">
-        <label for="qsv_preset" class="form-label">QuickSync Preset</label>
-        <select id="qsv_preset" class="form-select" v-model="config.qsv_preset">
-          <option value="veryfast">fastest (lowest quality)</option>
-          <option value="faster">faster (lower quality)</option>
-          <option value="fast">fast (low quality)</option>
-          <option value="medium">medium (default)</option>
-          <option value="slow">slow (good quality)</option>
-          <option value="slower">slower (better quality)</option>
-          <option value="slowest">slowest (best quality)</option>
-        </select>
+      <!--Intel Encoder Settings-->
+      <div v-if="currentTab === 'qsv'" class="config-page">
+        <div class="mb-3">
+          <label for="qsv_preset" class="form-label">QuickSync Preset</label>
+          <select id="qsv_preset" class="form-select" v-model="config.qsv_preset">
+            <option value="veryfast">fastest (lowest quality)</option>
+            <option value="faster">faster (lower quality)</option>
+            <option value="fast">fast (low quality)</option>
+            <option value="medium">medium (default)</option>
+            <option value="slow">slow (good quality)</option>
+            <option value="slower">slower (better quality)</option>
+            <option value="slowest">slowest (best quality)</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="qsv_coder" class="form-label">QuickSync Coder (H264)</label>
+          <select id="qsv_coder" class="form-select" v-model="config.qsv_coder">
+            <option value="auto">auto -- let ffmpeg decide (default)</option>
+            <option value="cabac">cabac -- context adaptive binary arithmetic coding - higher quality</option>
+            <option value="cavlc">cavlc -- context adaptive variable-length coding - faster decode</option>
+          </select>
+        </div>
       </div>
-      <div class="mb-3">
-        <label for="qsv_coder" class="form-label">QuickSync Coder (H264)</label>
-        <select id="qsv_coder" class="form-select" v-model="config.qsv_coder">
-          <option value="auto">auto -- let ffmpeg decide (default)</option>
-          <option value="cabac">cabac -- context adaptive binary arithmetic coding - higher quality</option>
-          <option value="cavlc">cavlc -- context adaptive variable-length coding - faster decode</option>
-        </select>
+      <!--AMD Encoder Settings-->
+      <div v-if="currentTab === 'amd'" class="config-page">
+        <!--Presets-->
+        <div class="mb-3">
+          <label for="amd_quality" class="form-label">AMF Quality</label>
+          <select id="amd_quality" class="form-select" v-model="config.amd_quality">
+            <option value="speed">speed -- prefer speed</option>
+            <option value="balanced">balanced -- balanced (default)</option>
+            <option value="quality">quality -- prefer quality</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="amd_rc" class="form-label">AMF Rate Control</label>
+          <select id="amd_rc" class="form-select" v-model="config.amd_rc">
+            <option value="cqp">cqp -- constant qp mode</option>
+            <option value="vbr_latency">vbr_latency -- latency constrained variable bitrate (default)</option>
+            <option value="vbr_peak">vbr_peak -- peak constrained variable bitrate</option>
+            <option value="cbr">cbr -- constant bitrate</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="amd_usage" class="form-label">AMF Usage</label>
+          <select id="amd_usage" class="form-select" v-model="config.amd_usage">
+            <option value="transcoding">transcoding -- transcoding (slowest)</option>
+            <option value="webcam">webcam -- webcam (slow)</option>
+            <option value="lowlatency">lowlatency - low latency (fast)</option>
+            <option value="ultralowlatency">ultralowlatency - ultra low latency (fastest)</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="amd_preanalysis" class="form-label">AMF Preanalysis</label>
+          <select id="amd_preanalysis" class="form-select" v-model="config.amd_preanalysis">
+            <option value="enabled">enabled</option>
+            <option value="disabled">disabled (default)</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="amd_vbaq" class="form-label">AMF Variance Based Adaptive Quantization (VBAQ)</label>
+          <select id="amd_vbaq" class="form-select" v-model="config.amd_vbaq">
+            <option value="enabled">enabled (default)</option>
+            <option value="disabled">disabled</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="amd_coder" class="form-label">AMF Coder (H264)</label>
+          <select id="amd_coder" class="form-select" v-model="config.amd_coder">
+            <option value="auto">auto -- let ffmpeg decide (default)</option>
+            <option value="cabac">cabac -- context adaptive variable-length coding - higher quality</option>
+            <option value="cavlc">cavlc -- context adaptive binary arithmetic coding - faster decode</option>
+          </select>
+        </div>
+      </div>
+      <!--VA-API Encoder Settings-->
+      <div v-if="currentTab === 'va-api'" class="config-page">
+        <input class="form-control" id="adapter_name" placeholder="/dev/dri/renderD128" v-model="config.adapter_name" />
+      </div>
+      <!--VideoToolbox Encoder Settings-->
+      <div v-if="currentTab === 'vt'" class="config-page">
+        <!--Presets-->
+        <div class="mb-3">
+          <label for="vt_coder" class="form-label">VideoToolbox Coder</label>
+          <select id="vt_coder" class="form-select" v-model="config.vt_coder">
+            <option value="auto">auto</option>
+            <option value="cabac">cabac</option>
+            <option value="cavlc">cavlc</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="vt_software" class="form-label">VideoToolbox Software Encoding</label>
+          <select id="vt_software" class="form-select" v-model="config.vt_software">
+            <option value="auto">auto</option>
+            <option value="disabled">disabled</option>
+            <option value="allowed">allowed</option>
+            <option value="forced">forced</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="vt_realtime" class="form-label">VideoToolbox Realtime Encoding</label>
+          <select id="vt_realtime" class="form-select" v-model="config.vt_realtime">
+            <option value="enabled">enabled</option>
+            <option value="disabled">disabled</option>
+          </select>
+        </div>
       </div>
     </div>
-    <!--AMD Encoder Settings-->
-    <div v-if="currentTab === 'amd'" class="config-page">
-      <!--Presets-->
-      <div class="mb-3">
-        <label for="amd_quality" class="form-label">AMF Quality</label>
-        <select
-          id="amd_quality"
-          class="form-select"
-          v-model="config.amd_quality">
-          <option value="speed">speed -- prefer speed</option>
-          <option value="balanced">balanced -- balanced (default)</option>
-          <option value="quality">quality -- prefer quality</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="amd_rc" class="form-label">AMF Rate Control</label>
-        <select id="amd_rc" class="form-select" v-model="config.amd_rc">
-          <option value="cqp">cqp -- constant qp mode</option>
-          <option value="vbr_latency">vbr_latency -- latency constrained variable bitrate (default)</option>
-          <option value="vbr_peak">vbr_peak -- peak constrained variable bitrate</option>
-          <option value="cbr">cbr -- constant bitrate</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="amd_usage" class="form-label">AMF Usage</label>
-        <select id="amd_usage" class="form-select" v-model="config.amd_usage">
-          <option value="transcoding">transcoding -- transcoding (slowest)</option>
-          <option value="webcam">webcam -- webcam (slow)</option>
-          <option value="lowlatency">lowlatency - low latency (fast)</option>
-          <option value="ultralowlatency">ultralowlatency - ultra low latency (fastest)</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="amd_preanalysis" class="form-label">AMF Preanalysis</label>
-        <select id="amd_preanalysis" class="form-select" v-model="config.amd_preanalysis">
-          <option value="enabled">enabled</option>
-          <option value="disabled">disabled (default)</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="amd_vbaq" class="form-label">AMF Variance Based Adaptive Quantization (VBAQ)</label>
-        <select id="amd_vbaq" class="form-select" v-model="config.amd_vbaq">
-          <option value="enabled">enabled (default)</option>
-          <option value="disabled">disabled</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="amd_coder" class="form-label">AMF Coder (H264)</label>
-        <select id="amd_coder" class="form-select" v-model="config.amd_coder">
-          <option value="auto">auto -- let ffmpeg decide (default)</option>
-          <option value="cabac">cabac -- context adaptive variable-length coding - higher quality</option>
-          <option value="cavlc">cavlc -- context adaptive binary arithmetic coding - faster decode</option>
-        </select>
-      </div>
+    <div class="alert alert-success my-4" v-if="saved && !restarted">
+      <b>Success!</b> Click 'Apply' to restart Sunshine and apply changes. This will terminate any running sessions.
     </div>
-    <!--VA-API Encoder Settings-->
-    <div v-if="currentTab === 'va-api'" class="config-page">
-      <input
-        class="form-control"
-        id="adapter_name"
-        placeholder="/dev/dri/renderD128"
-        v-model="config.adapter_name"
-      />
+    <div class="alert alert-success my-4" v-if="restarted">
+      <b>Success!</b> Sunshine is restarting to apply changes.
     </div>
-    <!--VideoToolbox Encoder Settings-->
-    <div v-if="currentTab === 'vt'" class="config-page">
-      <!--Presets-->
-      <div class="mb-3">
-        <label for="vt_coder" class="form-label">VideoToolbox Coder</label>
-        <select id="vt_coder" class="form-select" v-model="config.vt_coder">
-          <option value="auto">auto</option>
-          <option value="cabac">cabac</option>
-          <option value="cavlc">cavlc</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="vt_software" class="form-label">VideoToolbox Software Encoding</label>
-        <select id="vt_software" class="form-select" v-model="config.vt_software">
-          <option value="auto">auto</option>
-          <option value="disabled">disabled</option>
-          <option value="allowed">allowed</option>
-          <option value="forced">forced</option>
-        </select>
-      </div>
-      <div class="mb-3">
-        <label for="vt_realtime" class="form-label">VideoToolbox Realtime Encoding</label>
-        <select id="vt_realtime" class="form-select" v-model="config.vt_realtime">
-          <option value="enabled">enabled</option>
-          <option value="disabled">disabled</option>
-        </select>
-      </div>
+    <div class="mb-3 buttons">
+      <button class="btn btn-primary" @click="save">Save</button>
+      <button class="btn btn-success" @click="apply" v-if="saved && !restarted">Apply</button>
     </div>
   </div>
-  <div class="alert alert-success my-4" v-if="saved && !restarted">
-    <i class="fa-solid fa-xl fa-circle-check"></i> Click 'Apply' to restart Sunshine and apply changes.
-    This will terminate any running sessions.
-  </div>
-  <div class="alert alert-primary my-4" v-if="restarted">
-    <i class="fa-solid fa-xl fa-spinner fa-spin"></i> Sunshine is restarting to apply changes.
-  </div>
-  <div class="mb-3 buttons">
-    <button class="btn btn-primary" @click="save">Save</button>
-    <button class="btn btn-success" @click="apply" v-if="saved && !restarted">Apply</button>
-  </div>
-</div>
+</body>
+<script type="module">
+  import { createApp } from 'vue'
+  import Navbar from './Navbar.vue'
 
-<script>
   // create dictionary for defaultConfig
   const defaultConfig = {
     "address_family": "ipv4",
@@ -1189,8 +847,10 @@
     "global_prep_cmd": "[]",
   }
 
-  new Vue({
-    el: "#app",
+  const app = createApp({
+    components: {
+      Navbar
+    },
     data() {
       return {
         platform: "",
@@ -1295,7 +955,7 @@
           let resolutions = [];
           res.split(",").forEach((r) => resolutions.push(r.trim()));
           this.resolutions = resolutions;
-          
+
           this.config.global_prep_cmd = this.config.global_prep_cmd || [];
           this.global_prep_cmd = JSON.parse(this.config.global_prep_cmd);
         });
@@ -1384,8 +1044,8 @@
           undo: "",
         };
 
-        if(this.platform === 'windows'){
-          template = {...template, elevated: false};
+        if (this.platform === 'windows') {
+          template = { ...template, elevated: false };
         }
         this.global_prep_cmd.push(template);
       },
@@ -1401,22 +1061,6 @@
       },
     }
   });
+
+  app.mount("#app");
 </script>
-
-<style>
-  .config-page {
-    padding: 1em;
-    border: 1px solid #dee2e6;
-    border-top: none;
-  }
-
-  .buttons {
-    padding: 1em 0;
-  }
-
-  .ms-item {
-    background-color: #ccc;
-    font-size: 12px;
-    font-weight: bold;
-  }
-</style>
diff --git a/src_assets/common/assets/web/header-no-nav.html b/src_assets/common/assets/web/header-no-nav.html
deleted file mode 100644
index 28ef76de..00000000
--- a/src_assets/common/assets/web/header-no-nav.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Sunshine</title>
-    <link href="/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
-    <script src="/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="/node_modules/vue/dist/vue.min.js"></script>
-  </head>
-
-  <body></body>
-</html>
diff --git a/src_assets/common/assets/web/header.html b/src_assets/common/assets/web/header.html
deleted file mode 100644
index cf93a0c2..00000000
--- a/src_assets/common/assets/web/header.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Sunshine</title>
-    <link rel="icon" type="image/x-icon" href="/images/sunshine.ico">
-    <link href="/node_modules/@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet">
-    <link href="/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
-    <script src="/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="/node_modules/vue/dist/vue.min.js"></script>
-  </head>
-
-  <body>
-    <nav
-      class="navbar navbar-expand-lg navbar-light"
-      style="background-color: #ffc400"
-    >
-      <div class="container-fluid">
-        <a class="navbar-brand" href="/" title="Sunshine">
-          <img src="/images/logo-sunshine-45.png" height="45" alt="Sunshine">
-        </a>
-        <button
-          class="navbar-toggler"
-          type="button"
-          data-bs-toggle="collapse"
-          data-bs-target="#navbarSupportedContent"
-          aria-controls="navbarSupportedContent"
-          aria-expanded="false"
-          aria-label="Toggle navigation"
-        >
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-          <ul class="navbar-nav me-auto mb-2 mb-lg-0">
-            <li class="nav-item">
-              <a class="nav-link" href="/"><i class="fas fa-fw fa-home"></i> Home</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/pin"><i class="fas fa-fw fa-unlock"></i> PIN</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/apps"><i class="fas fa-fw fa-stream"></i> Applications</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/config"><i class="fas fa-fw fa-cog"></i> Configuration</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/password"><i class="fas fa-fw fa-user-shield"></i> Change Password</a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="/troubleshooting"><i class="fas fa-fw fa-info"></i> Troubleshooting</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </nav>
-  </body>
-</html>
-
-<script>
-  let el = document.querySelector("a[href='"+document.location.pathname+"']");
-  if(el)el.classList.add("active")
-</script>
-
-<style>
-  .nav-link.active {
-    font-weight: 500;
-  }
-  .form-control::placeholder {
-    opacity: 0.5;
-  }
-</style>
-
-<!-- Discord WidgetBot Crate-->
-<script src="https://cdn.jsdelivr.net/npm/@widgetbot/crate@3" async defer>
-  new Crate({
-    server: '804382334370578482',
-    channel: '804383092822900797',
-    defer: false,
-  })
-</script>
diff --git a/src_assets/common/assets/web/index.html b/src_assets/common/assets/web/index.html
index 2fe713e6..3efd27f1 100644
--- a/src_assets/common/assets/web/index.html
+++ b/src_assets/common/assets/web/index.html
@@ -1,93 +1,81 @@
-<div id="content" class="container">
-  <h1 class="my-4">Hello, Sunshine!</h1>
-  <p>Sunshine is a self-hosted game stream host for Moonlight.</p>
-  <div class="alert alert-danger" v-if="fancyLogs.find(x => x.level === 'Fatal')">
-    <div style="line-height: 32px;">
-      <i class="fas fa-circle-exclamation" style="font-size: 32px;margin-right: 0.25em;"></i>
-      <b>Attention!</b> Sunshine detected these errors during startup. These errors <b>MUST</b> be fixed before using
-      Sunshine.<br>
-    </div>
-    <ul>
-      <li v-for="v in fancyLogs.filter(x => x.level === 'Fatal')">{{v.value}}</li>
-    </ul>
-  </div>
-  <!--Version-->
-  <div class="card p-2 my-4">
-    <div class="card-body" v-if="version">
-      <h2>Version {{version}}</h2>
-      <br />
-      <div v-if="loading">
-        Loading Latest Release...
-      </div>
-      <div class="alert alert-success" v-if="buildVersionIsDirty">
-        Thank you for helping to make Sunshine a better software! 🌇
-      </div>
-      <div v-else-if="!nightlyBuildAvailable && !stableBuildAvailable && !buildVersionIsDirty">
-        <div class="alert alert-success">
-          You're running the latest version of Sunshine
-        </div>
-      </div>
-      <div v-if="nightlyBuildAvailable">
-        <div class="alert alert-warning">
-          <div class="d-flex justify-content-between">
-            <div class="my-2">A new <b>Nightly</b> Version is Available!</div>
-            <a class="btn btn-success m-1" href="https://github.com/LizardByte/Sunshine/releases/nightly-dev"
-              target="_blank">Download</a>
-          </div>
-          <pre><b>{{nightlyData.head_sha}}</b></pre>
-          <pre>{{nightlyData.display_title}}</pre>
-        </div>
-      </div>
-      <div v-if="stableBuildAvailable">
-        <div class="alert alert-warning">
-          <div class="d-flex justify-content-between">
-            <div class="my-2">A new <b>Stable</b> Version is Available!</div>
-            <a class="btn btn-success m-1" :href="githubVersion.html_url" target="_blank">Download</a>
-          </div>
-          <h3>{{githubVersion.name}}</h3>
-          <pre>{{githubVersion.body}}</pre>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--Resources-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Resources</h2>
-      <br />
-      <p>
-        Resources for Sunshine!
-      </p>
-      <div class="card-group p-4 align-items-center">
-        <a class="btn btn-success m-1" href="https://app.lizardbyte.dev" target="_blank">LizardByte Website</a>
-        <a class="btn btn-primary m-1" href="https://app.lizardbyte.dev/discord" target="_blank">
-          <i class="fab fa-fw fa-discord"></i> Discord</a>
-        <a class="btn btn-secondary m-1" href="https://github.com/LizardByte/Sunshine/discussions" target="_blank">
-          <i class="fab fa-fw fa-github"></i> Github Discussions</a>
-      </div>
-    </div>
-  </div>
-  <!--Legal-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Legal</h2>
-      <br />
-      <p>
-        By continuing to use this software you agree to the terms and conditions in the following documents.
-      </p>
-      <div class="card-group p-4 align-items-center">
-        <a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/LICENSE" target="_blank">
-          <i class="fas fa-fw fa-file-alt"></i> License</a>
-        <a class="btn btn-danger m-1" href="https://github.com/LizardByte/Sunshine/blob/master/NOTICE" target="_blank">
-          <i class="fas fa-fw fa-exclamation"></i> Third Party Notice</a>
-      </div>
-    </div>
-  </div>
-</div>
+<!DOCTYPE html>
+<html lang="en">
 
-<script>
-  new Vue({
-    el: "#content",
+<head>
+  <%- header %>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div id="content" class="container">
+    <h1 class="my-4">Hello, Sunshine!</h1>
+    <p>Sunshine is a self-hosted game stream host for Moonlight.</p>
+    <div class="alert alert-danger" v-if="fancyLogs.find(x => x.level === 'Fatal')">
+      <div style="line-height: 32px;">
+        <i class="fas fa-circle-exclamation" style="font-size: 32px;margin-right: 0.25em;"></i>
+        <b>Attention!</b> Sunshine detected these errors during startup. These errors <b>MUST</b> be fixed before using
+        Sunshine.<br>
+      </div>
+      <ul>
+        <li v-for="v in fancyLogs.filter(x => x.level === 'Fatal')">{{v.value}}</li>
+      </ul>
+    </div>
+    <!--Version-->
+    <div class="card p-2 my-4">
+      <div class="card-body" v-if="version">
+        <h2>Version {{version}}</h2>
+        <br />
+        <div v-if="loading">
+          Loading Latest Release...
+        </div>
+        <div class="alert alert-success" v-if="buildVersionIsDirty">
+          Thank you for helping to make Sunshine a better software! 🌇
+        </div>
+        <div v-else-if="!nightlyBuildAvailable && !stableBuildAvailable && !buildVersionIsDirty">
+          <div class="alert alert-success">
+            You're running the latest version of Sunshine
+          </div>
+        </div>
+        <div v-if="nightlyBuildAvailable">
+          <div class="alert alert-warning">
+            <div class="d-flex justify-content-between">
+              <div class="my-2">A new <b>Nightly</b> Version is Available!</div>
+              <a class="btn btn-success m-1" href="https://github.com/LizardByte/Sunshine/releases/nightly-dev"
+                target="_blank">Download</a>
+            </div>
+            <pre><b>{{nightlyData.head_sha}}</b></pre>
+            <pre>{{nightlyData.display_title}}</pre>
+          </div>
+        </div>
+        <div v-if="stableBuildAvailable">
+          <div class="alert alert-warning">
+            <div class="d-flex justify-content-between">
+              <div class="my-2">A new <b>Stable</b> Version is Available!</div>
+              <a class="btn btn-success m-1" :href="githubVersion.html_url" target="_blank">Download</a>
+            </div>
+            <h3>{{githubVersion.name}}</h3>
+            <pre>{{githubVersion.body}}</pre>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!--Resources-->
+    <div class="my-4">
+      <Resource-Card></Resource-Card>
+    </div>
+  </div>
+</body>
+
+<script type="module">
+  import { createApp } from 'vue'
+  import Navbar from './Navbar.vue'
+  import ResourceCard from './ResourceCard.vue'
+  console.log("Hello, Sunshine!")
+  let app = createApp({
+    components: {
+      Navbar,
+      ResourceCard
+    },
     data() {
       return {
         version: null,
@@ -165,4 +153,5 @@
       }
     }
   });
+  app.mount('#app');
 </script>
diff --git a/src_assets/common/assets/web/password.html b/src_assets/common/assets/web/password.html
index 6ad76d5e..2480c22f 100644
--- a/src_assets/common/assets/web/password.html
+++ b/src_assets/common/assets/web/password.html
@@ -1,85 +1,81 @@
-<div id="app" class="container">
-  <h1 class="my-4">Password Change</h1>
-  <form @submit.prevent="save">
-    <div class="card d-flex p-4 flex-row">
-      <div class="col-md-6 px-4">
-        <h4>Current Credentials</h4>
-        <div class="mb-3">
-          <label for="currentUsername" class="form-label">Username</label>
-          <input
-            required
-            type="text"
-            class="form-control"
-            id="currentUsername"
-            v-model="passwordData.currentUsername"
-          />
-          <div class="form-text">&nbsp;</div>
-        </div>
-        <div class="mb-3">
-          <label for="currentPassword" class="form-label">Password</label>
-          <input
-            autocomplete="current-password"
-            type="password"
-            class="form-control"
-            id="currentPassword"
-            v-model="passwordData.currentPassword"
-          />
-        </div>
-      </div>
-      <div class="col-md-6 px-4">
-        <h4>New Credentials</h4>
-        <div class="mb-3">
-          <label for="newUsername" class="form-label">New Username</label>
-          <input
-            type="text"
-            class="form-control"
-            id="newUsername"
-            v-model="passwordData.newUsername"
-          />
-          <div class="form-text">
-            If not specified, the username will not change
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <%- header %>
+  <style>
+    .config-page {
+      padding: 1em;
+      border: 1px solid #dee2e6;
+      border-top: none;
+    }
+
+    .buttons {
+      padding: 1em 0;
+    }
+  </style>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div class="container">
+    <h1 class="my-4">Password Change</h1>
+    <form @submit.prevent="save">
+      <div class="card d-flex p-4 flex-row">
+        <div class="col-md-6 px-4">
+          <h4>Current Credentials</h4>
+          <div class="mb-3">
+            <label for="currentUsername" class="form-label">Username</label>
+            <input required type="text" class="form-control" id="currentUsername"
+              v-model="passwordData.currentUsername" />
+            <div class="form-text">&nbsp;</div>
+          </div>
+          <div class="mb-3">
+            <label for="currentPassword" class="form-label">Password</label>
+            <input autocomplete="current-password" type="password" class="form-control" id="currentPassword"
+              v-model="passwordData.currentPassword" />
           </div>
         </div>
-        <div class="mb-3">
-          <label for="newPassword" class="form-label">Password</label>
-          <input
-            autocomplete="new-password"
-            required
-            type="password"
-            class="form-control"
-            id="newPassword"
-            v-model="passwordData.newPassword"
-          />
-        </div>
-        <div class="mb-3">
-          <label for="confirmNewPassword" class="form-label"
-            >Confirm Password</label
-          >
-          <input
-            autocomplete="new-password"
-            required
-            type="password"
-            class="form-control"
-            id="confirmNewPassword"
-            v-model="passwordData.confirmNewPassword"
-          />
+        <div class="col-md-6 px-4">
+          <h4>New Credentials</h4>
+          <div class="mb-3">
+            <label for="newUsername" class="form-label">New Username</label>
+            <input type="text" class="form-control" id="newUsername" v-model="passwordData.newUsername" />
+            <div class="form-text">
+              If not specified, the username will not change
+            </div>
+          </div>
+          <div class="mb-3">
+            <label for="newPassword" class="form-label">Password</label>
+            <input autocomplete="new-password" required type="password" class="form-control" id="newPassword"
+              v-model="passwordData.newPassword" />
+          </div>
+          <div class="mb-3">
+            <label for="confirmNewPassword" class="form-label">Confirm Password</label>
+            <input autocomplete="new-password" required type="password" class="form-control" id="confirmNewPassword"
+              v-model="passwordData.confirmNewPassword" />
+          </div>
         </div>
       </div>
-    </div>
-    <div class="alert alert-danger" v-if="error"><b>Error: </b>{{error}}</div>
-    <div class="alert alert-success" v-if="success">
-      <b>Success! </b>This page will reload soon, your browser will ask you for
-      the new credentials
-    </div>
-    <div class="mb-3 buttons">
-      <button class="btn btn-primary">Save</button>
-    </div>
-  </form>
-</div>
+      <div class="alert alert-danger" v-if="error"><b>Error: </b>{{error}}</div>
+      <div class="alert alert-success" v-if="success">
+        <b>Success! </b>This page will reload soon, your browser will ask you for
+        the new credentials
+      </div>
+      <div class="mb-3 buttons">
+        <button class="btn btn-primary">Save</button>
+      </div>
+    </form>
+  </div>
+</body>
+<script type="module">
+  import { createApp } from 'vue'
+  import Navbar from './Navbar.vue'
 
-<script>
-  new Vue({
-    el: "#app",
+  const app = createApp({
+    components: {
+      Navbar
+    },
     data() {
       return {
         error: null,
@@ -118,16 +114,6 @@
       },
     },
   });
+
+  app.mount("#app");
 </script>
-
-<style>
-  .config-page {
-    padding: 1em;
-    border: 1px solid #dee2e6;
-    border-top: none;
-  }
-
-  .buttons {
-    padding: 1em 0;
-  }
-</style>
diff --git a/src_assets/common/assets/web/pin.html b/src_assets/common/assets/web/pin.html
index 12911a4e..492ddd8a 100644
--- a/src_assets/common/assets/web/pin.html
+++ b/src_assets/common/assets/web/pin.html
@@ -1,25 +1,39 @@
-<div id="content" class="container">
-  <h1 class="my-4">PIN Pairing</h1>
-  <form action="" class="form d-flex flex-column align-items-center" id="form">
-    <div class="card flex-column d-flex p-4 mb-4">
-      <input
-        type="number"
-        placeholder="PIN"
-        id="pin-input"
-        class="form-control my-4"
-      />
-      <button class="btn btn-primary">Send</button>
-    </div>
-    <div class="alert alert-warning">
-      <b>Warning!</b> Make sure you have access to the client you are pairing
-      with.<br />
-      This software can give total control to your computer, so be careful!
-    </div>
-    <div id="status"></div>
-  </form>
-</div>
+<!DOCTYPE html>
+<html lang="en">
 
-<script>
+<head>
+  <%- header %>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div id="content" class="container">
+    <h1 class="my-4">PIN Pairing</h1>
+    <form action="" class="form d-flex flex-column align-items-center" id="form">
+      <div class="card flex-column d-flex p-4 mb-4">
+        <input type="text" pattern="\d*"  placeholder="PIN" id="pin-input" class="form-control my-4" />
+        <button class="btn btn-primary">Send</button>
+      </div>
+      <div class="alert alert-warning">
+        <b>Warning!</b> Make sure you have access to the client you are pairing
+        with.<br />
+        This software can give total control to your computer, so be careful!
+      </div>
+      <div id="status"></div>
+    </form>
+  </div>
+</body>
+
+<script type="module">
+  import Navbar from './Navbar.vue'
+  import {createApp} from 'vue'
+  let app = createApp({
+    components: {
+      Navbar
+    }
+  });
+  app.mount("#app");
+  
   document.querySelector("#form").addEventListener("submit", (e) => {
     e.preventDefault();
     let pin = document.querySelector("#pin-input").value;
diff --git a/src_assets/common/assets/web/images/logo-sunshine-16.png b/src_assets/common/assets/web/public/images/logo-sunshine-16.png
similarity index 100%
rename from src_assets/common/assets/web/images/logo-sunshine-16.png
rename to src_assets/common/assets/web/public/images/logo-sunshine-16.png
diff --git a/src_assets/common/assets/web/images/logo-sunshine-45.png b/src_assets/common/assets/web/public/images/logo-sunshine-45.png
similarity index 100%
rename from src_assets/common/assets/web/images/logo-sunshine-45.png
rename to src_assets/common/assets/web/public/images/logo-sunshine-45.png
diff --git a/src_assets/common/assets/web/images/sunshine-locked-16.png b/src_assets/common/assets/web/public/images/sunshine-locked-16.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-locked-16.png
rename to src_assets/common/assets/web/public/images/sunshine-locked-16.png
diff --git a/src_assets/common/assets/web/images/sunshine-locked-45.png b/src_assets/common/assets/web/public/images/sunshine-locked-45.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-locked-45.png
rename to src_assets/common/assets/web/public/images/sunshine-locked-45.png
diff --git a/src_assets/common/assets/web/images/sunshine-locked.ico b/src_assets/common/assets/web/public/images/sunshine-locked.ico
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-locked.ico
rename to src_assets/common/assets/web/public/images/sunshine-locked.ico
diff --git a/src_assets/common/assets/web/images/sunshine-locked.png b/src_assets/common/assets/web/public/images/sunshine-locked.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-locked.png
rename to src_assets/common/assets/web/public/images/sunshine-locked.png
diff --git a/src_assets/common/assets/web/images/sunshine-locked.svg b/src_assets/common/assets/web/public/images/sunshine-locked.svg
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-locked.svg
rename to src_assets/common/assets/web/public/images/sunshine-locked.svg
diff --git a/src_assets/common/assets/web/images/sunshine-pausing-16.png b/src_assets/common/assets/web/public/images/sunshine-pausing-16.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-pausing-16.png
rename to src_assets/common/assets/web/public/images/sunshine-pausing-16.png
diff --git a/src_assets/common/assets/web/images/sunshine-pausing-45.png b/src_assets/common/assets/web/public/images/sunshine-pausing-45.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-pausing-45.png
rename to src_assets/common/assets/web/public/images/sunshine-pausing-45.png
diff --git a/src_assets/common/assets/web/images/sunshine-pausing.ico b/src_assets/common/assets/web/public/images/sunshine-pausing.ico
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-pausing.ico
rename to src_assets/common/assets/web/public/images/sunshine-pausing.ico
diff --git a/src_assets/common/assets/web/images/sunshine-pausing.png b/src_assets/common/assets/web/public/images/sunshine-pausing.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-pausing.png
rename to src_assets/common/assets/web/public/images/sunshine-pausing.png
diff --git a/src_assets/common/assets/web/images/sunshine-pausing.svg b/src_assets/common/assets/web/public/images/sunshine-pausing.svg
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-pausing.svg
rename to src_assets/common/assets/web/public/images/sunshine-pausing.svg
diff --git a/src_assets/common/assets/web/images/sunshine-playing-16.png b/src_assets/common/assets/web/public/images/sunshine-playing-16.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-playing-16.png
rename to src_assets/common/assets/web/public/images/sunshine-playing-16.png
diff --git a/src_assets/common/assets/web/images/sunshine-playing-45.png b/src_assets/common/assets/web/public/images/sunshine-playing-45.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-playing-45.png
rename to src_assets/common/assets/web/public/images/sunshine-playing-45.png
diff --git a/src_assets/common/assets/web/images/sunshine-playing.ico b/src_assets/common/assets/web/public/images/sunshine-playing.ico
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-playing.ico
rename to src_assets/common/assets/web/public/images/sunshine-playing.ico
diff --git a/src_assets/common/assets/web/images/sunshine-playing.png b/src_assets/common/assets/web/public/images/sunshine-playing.png
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-playing.png
rename to src_assets/common/assets/web/public/images/sunshine-playing.png
diff --git a/src_assets/common/assets/web/images/sunshine-playing.svg b/src_assets/common/assets/web/public/images/sunshine-playing.svg
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine-playing.svg
rename to src_assets/common/assets/web/public/images/sunshine-playing.svg
diff --git a/src_assets/common/assets/web/images/sunshine.ico b/src_assets/common/assets/web/public/images/sunshine.ico
similarity index 100%
rename from src_assets/common/assets/web/images/sunshine.ico
rename to src_assets/common/assets/web/public/images/sunshine.ico
diff --git a/src_assets/common/assets/web/template_header.html b/src_assets/common/assets/web/template_header.html
new file mode 100644
index 00000000..db271b37
--- /dev/null
+++ b/src_assets/common/assets/web/template_header.html
@@ -0,0 +1,9 @@
+<!-- TEMPLATE_HEADER - Used by Every UI Page -->
+<meta charset="UTF-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Sunshine</title>
+<link rel="icon" type="image/x-icon" href="/images/favicon.ico">
+<link href="@fortawesome/fontawesome-free/css/all.min.css" rel="stylesheet">
+<link href="bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
+<script type="module" src="bootstrap/dist/js/bootstrap.bundle.min.js"></script>
diff --git a/src_assets/common/assets/web/troubleshooting.html b/src_assets/common/assets/web/troubleshooting.html
index 0ada5a8a..58fcb395 100644
--- a/src_assets/common/assets/web/troubleshooting.html
+++ b/src_assets/common/assets/web/troubleshooting.html
@@ -1,190 +1,209 @@
-<div id="app" class="container">
-  <h1 class="my-4">Troubleshooting</h1>
-  <!--Force Close App-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Force Close</h2>
-      <br />
-      <p>
-        If Moonlight complains about an app currently running, force closing the
-        app should fix the issue.
-      </p>
-      <div class="alert alert-success" v-if="closeAppStatus === true">
-        Application Closed Successfully!
-      </div>
-      <div class="alert alert-danger" v-if="closeAppStatus === false">
-        Error while closing Application
-      </div>
-      <div>
-        <button class="btn btn-warning" :disabled="closeAppPressed" @click="closeApp">
-          Force Close
-        </button>
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+      <%- header %>
+      <style>
+        .troubleshooting-logs {
+          white-space: pre;
+          font-family: monospace;
+          overflow: auto;
+          max-height: 500px;
+          min-height: 500px;
+          font-size: 16px;
+          position: relative;
+        }
+
+        .copy-icon {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          padding: 8px;
+          cursor: pointer;
+          color: rgba(0, 0, 0, 1);
+          appearance: none;
+          border: none;
+          background: none;
+        }
+
+        .copy-icon:hover {
+          color: rgba(0, 0, 0, 0.75);
+        }
+
+        .copy-icon:active {
+          color: rgba(0, 0, 0, 1);
+        }
+      </style>
+</head>
+
+<body id="app">
+  <Navbar></Navbar>
+  <div class="container">
+    <h1 class="my-4">Troubleshooting</h1>
+    <!--Force Close App-->
+    <div class="card p-2 my-4">
+      <div class="card-body">
+        <h2>Force Close</h2>
+        <br />
+        <p>
+          If Moonlight complains about an app currently running, force closing the
+          app should fix the issue.
+        </p>
+        <div class="alert alert-success" v-if="closeAppStatus === true">
+          Application Closed Successfully!
+        </div>
+        <div class="alert alert-danger" v-if="closeAppStatus === false">
+          Error while closing Application
+        </div>
+        <div>
+          <button class="btn btn-warning" :disabled="closeAppPressed" @click="closeApp">
+            Force Close
+          </button>
+        </div>
       </div>
     </div>
-  </div>
-  <!--Restart Sunshine-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Restart Sunshine</h2>
-      <br />
-      <p>
-        If Sunshine isn't working properly, you can try restarting it.
-        This will terminate any running sessions.
-      </p>
-      <div class="alert alert-success" v-if="restartPressed === true">
-        Sunshine is restarting
-      </div>
-      <div>
-        <button class="btn btn-warning" :disabled="restartPressed" @click="restart">
-          Restart Sunshine
-        </button>
+    <!--Restart Sunshine-->
+    <div class="card p-2 my-4">
+      <div class="card-body">
+        <h2>Restart Sunshine</h2>
+        <br />
+        <p>
+          If Sunshine isn't working properly, you can try restarting it.
+          This will terminate any running sessions.
+        </p>
+        <div class="alert alert-success" v-if="restartPressed === true">
+          Sunshine is restarting
+        </div>
+        <div>
+          <button class="btn btn-warning" :disabled="restartPressed" @click="restart">
+            Restart Sunshine
+          </button>
+        </div>
       </div>
     </div>
-  </div>
-  <!--Unpair all Clients-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Unpair All Clients</h2>
-      <br />
-      <p>Remove all your paired devices</p>
-      <div class="alert alert-success" v-if="unpairAllStatus === true">
-        Unpair Successful!
-      </div>
-      <div class="alert alert-danger" v-if="unpairAllStatus === false">
-        Error while unpairing
-      </div>
-      <div>
-        <button class="btn btn-danger" :disabled="unpairAllPressed" @click="unpairAll">
-          Unpair All
-        </button>
+    <!--Unpair all Clients-->
+    <div class="card p-2 my-4">
+      <div class="card-body">
+        <h2>Unpair All Clients</h2>
+        <br />
+        <p>Remove all your paired devices</p>
+        <div class="alert alert-success" v-if="unpairAllStatus === true">
+          Unpair Successful!
+        </div>
+        <div class="alert alert-danger" v-if="unpairAllStatus === false">
+          Error while unpairing
+        </div>
+        <div>
+          <button class="btn btn-danger" :disabled="unpairAllPressed" @click="unpairAll">
+            Unpair All
+          </button>
+        </div>
       </div>
     </div>
-  </div>
-  <!--Logs-->
-  <div class="card p-2 my-4">
-    <div class="card-body">
-      <h2>Logs</h2>
-      <br />
-      <div class="d-flex justify-content-between align-items-baseline py-2">
-        <p>See the logs uploaded by Sunshine</p>
-        <input type="text" class="form-control" v-model="logFilter" placeholder="Find..." style="width: 300px">
-      </div>
-      <div>
-        <div class="troubleshooting-logs">
-          <button class="copy-icon"><i class="fas fa-copy " @click="copyLogs"></i></button>{{actualLogs}}
+    <!--Logs-->
+    <div class="card p-2 my-4">
+      <div class="card-body">
+        <h2>Logs</h2>
+        <br />
+        <div class="d-flex justify-content-between align-items-baseline py-2">
+          <p>See the logs uploaded by Sunshine</p>
+          <input type="text" class="form-control" v-model="logFilter" placeholder="Find..." style="width: 300px">
+        </div>
+        <div>
+          <div class="troubleshooting-logs">
+            <button class="copy-icon"><i class="fas fa-copy " @click="copyLogs"></i></button>{{actualLogs}}
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
 
-<script>
-  new Vue({
-    el: "#app",
-    data() {
-      return {
-        closeAppPressed: false,
-        closeAppStatus: null,
-        unpairAllPressed: false,
-        unpairAllStatus: null,
-        restartPressed: false,
-        logs: 'Loading...',
-        logFilter: null,
-        logInterval: null,
-      };
-    },
-    computed: {
-      actualLogs(){
-        if(!this.logFilter)return this.logs;
-        let lines = this.logs.split("\n");
-        lines = lines.filter(x => x.indexOf(this.logFilter) != -1);
-        return lines.join("\n");
-      }
-    },
-    created() {
-      this.logInterval = setInterval(() => {
+  <script type="module">
+    import { createApp } from 'vue'
+    import Navbar from './Navbar.vue'
+
+    const app = createApp({
+      components: {
+        Navbar
+      },
+      data() {
+        return {
+          closeAppPressed: false,
+          closeAppStatus: null,
+          unpairAllPressed: false,
+          unpairAllStatus: null,
+          restartPressed: false,
+          logs: 'Loading...',
+          logFilter: null,
+          logInterval: null,
+        };
+      },
+      computed: {
+        actualLogs() {
+          if (!this.logFilter) return this.logs;
+          let lines = this.logs.split("\n");
+          lines = lines.filter(x => x.indexOf(this.logFilter) != -1);
+          return lines.join("\n");
+        }
+      },
+      created() {
+        this.logInterval = setInterval(() => {
+          this.refreshLogs();
+        }, 5000);
         this.refreshLogs();
-      }, 5000);
-      this.refreshLogs();
-    },
-    beforeDestroy(){
-      clearInterval(this.logInterval);
-    },
-    methods: {
-      refreshLogs() {
-        fetch("/api/logs",)
-          .then((r) => r.text())
-          .then((r) => {
-            this.logs = r;
-          });
       },
-      closeApp() {
-        this.closeAppPressed = true;
-        fetch("/api/apps/close", { method: "POST" })
-          .then((r) => r.json())
-          .then((r) => {
-            this.closeAppPressed = false;
-            this.closeAppStatus = r.status.toString() === "true";
-            setTimeout(() => {
-              this.closeAppStatus = null;
-            }, 5000);
-          });
+      beforeDestroy() {
+        clearInterval(this.logInterval);
       },
-      unpairAll() {
-        this.unpairAllPressed = true;
-        fetch("/api/clients/unpair", { method: "POST" })
-          .then((r) => r.json())
-          .then((r) => {
-            this.unpairAllPressed = false;
-            this.unpairAllStatus = r.status.toString() === "true";
-            setTimeout(() => {
-              this.unpairAllStatus = null;
-            }, 5000);
-          });
-      },
-      copyLogs(){
-        navigator.clipboard.writeText(this.actualLogs);
-      },
-      restart() {
-        this.restartPressed = true;
-        setTimeout(() => {
+      methods: {
+        refreshLogs() {
+          fetch("/api/logs",)
+            .then((r) => r.text())
+            .then((r) => {
+              this.logs = r;
+            });
+        },
+        closeApp() {
+          this.closeAppPressed = true;
+          fetch("/api/apps/close", { method: "POST" })
+            .then((r) => r.json())
+            .then((r) => {
+              this.closeAppPressed = false;
+              this.closeAppStatus = r.status.toString() === "true";
+              setTimeout(() => {
+                this.closeAppStatus = null;
+              }, 5000);
+            });
+        },
+        unpairAll() {
+          this.unpairAllPressed = true;
+          fetch("/api/clients/unpair", { method: "POST" })
+            .then((r) => r.json())
+            .then((r) => {
+              this.unpairAllPressed = false;
+              this.unpairAllStatus = r.status.toString() === "true";
+              setTimeout(() => {
+                this.unpairAllStatus = null;
+              }, 5000);
+            });
+        },
+        copyLogs() {
+          navigator.clipboard.writeText(this.actualLogs);
+        },
+        restart() {
+          this.restartPressed = true;
+          setTimeout(() => {
             this.restartPressed = false;
           }, 5000);
-        fetch("/api/restart", {
+          fetch("/api/restart", {
             method: "POST",
           });
+        },
       },
-    },
-  });
-</script>
+    });
 
-<style>
-  .troubleshooting-logs {
-    white-space: pre;
-    font-family: monospace;
-    overflow: auto;
-    max-height: 500px;
-    min-height: 500px;
-    font-size: 16px;
-    position: relative;
-  }
+    app.mount("#app");
+  </script>
 
-  .copy-icon {
-    position: absolute;
-    top: 8px;
-    right: 8px;
-    padding: 8px;
-    cursor: pointer;
-    color: rgba(0,0,0,1);
-    appearance: none;
-    border: none;
-    background: none;
-  }
 
-  .copy-icon:hover {
-    color: rgba(0,0,0,0.75);
-  }
-  .copy-icon:active {
-    color: rgba(0,0,0,1);
-  }
-</style>
+</body>
diff --git a/src_assets/common/assets/web/welcome.html b/src_assets/common/assets/web/welcome.html
index 8b728609..348ca96c 100644
--- a/src_assets/common/assets/web/welcome.html
+++ b/src_assets/common/assets/web/welcome.html
@@ -1,67 +1,67 @@
-<main role="main" id="app" style="max-width: 600px; margin: 0 auto">
-  <header>
-    <h1 class="mb-0">Welcome to Sunshine!</h1>
-    <p class="mb-0 align-self-start">
-      Before Getting Started, we need you to make a new username and password for accessing the Web UI.
-    </p>
-  </header>
-  <div class="alert alert-warning">
-    The credentials below are needed to access Sunshine's Web UI.<br />
-    Keep them safe, since <b>you will never see them again!</b>
-  </div>
-  <form @submit.prevent="save">
-    <div class="mb-2">
-      <label for="usernameInput" class="form-label">Username:</label>
-      <input
-        type="text"
-        class="form-control"
-        id="usernameInput"
-        autocomplete="username"
-        v-model="passwordData.newUsername"
-      />
-    </div>
-    <div class="mb-2">
-      <label for="passwordInput" class="form-label">Password:</label>
-      <input
-        type="password"
-        class="form-control"
-        id="passwordInput"
-        autocomplete="new-password"
-        v-model="passwordData.newPassword"
-        required
-      />
-    </div>
-    <div class="mb-2">
-      <label for="confirmPasswordInput" class="form-label"
-        >Password (confirm):</label
-      >
-      <input
-        type="password"
-        class="form-control"
-        id="confirmPasswordInput"
-        autocomplete="new-password"
-        v-model="passwordData.confirmNewPassword"
-        required
-      />
-    </div>
-    <button
-      type="submit"
-      class="btn btn-primary w-100 mb-2"
-      v-bind:disabled="loading"
-    >
-      Login
-    </button>
-    <div class="alert alert-danger" v-if="error"><b>Error: </b>{{error}}</div>
-    <div class="alert alert-success" v-if="success">
-      <b>Success! </b>This page will reload soon, your browser will ask you for
-      the new credentials
-    </div>
-  </form>
-</main>
+<!DOCTYPE html>
+<html lang="en">
 
-<script>
-  new Vue({
-    el: "#app",
+<head>
+  <%- header %>
+</head>
+
+<body id="app">
+  <main role="main" style="max-width: 1200px; margin: 1em auto">
+    <div class="d-flex gap-4">
+      <div class="card p-2">
+        <header>
+          <h1 class="mb-0">
+            <img src="/images/logo-sunshine-45.png" height="45" alt="">
+            Welcome to Sunshine!
+          </h1>
+        </header>
+        <p class="my-2 align-self-start">
+          Before Getting Started, we need you to make a new username and password for accessing the Web UI.
+        </p>
+        <div class="alert alert-warning">
+          The credentials below are needed to access Sunshine's Web UI.<br />
+          Keep them safe, since <b>you will never see them again!</b>
+        </div>
+        <form @submit.prevent="save">
+          <div class="mb-2">
+            <label for="usernameInput" class="form-label">Username:</label>
+            <input type="text" class="form-control" id="usernameInput" autocomplete="username"
+              v-model="passwordData.newUsername" />
+          </div>
+          <div class="mb-2">
+            <label for="passwordInput" class="form-label">Password:</label>
+            <input type="password" class="form-control" id="passwordInput" autocomplete="new-password"
+              v-model="passwordData.newPassword" required />
+          </div>
+          <div class="mb-2">
+            <label for="confirmPasswordInput" class="form-label">Password (confirm):</label>
+            <input type="password" class="form-control" id="confirmPasswordInput" autocomplete="new-password"
+              v-model="passwordData.confirmNewPassword" required />
+          </div>
+          <button type="submit" class="btn btn-primary w-100 mb-2" v-bind:disabled="loading">
+            Login
+          </button>
+          <div class="alert alert-danger" v-if="error"><b>Error: </b>{{error}}</div>
+          <div class="alert alert-success" v-if="success">
+            <b>Success! </b>This page will reload soon, your browser will ask you for
+            the new credentials
+          </div>
+        </form>
+      </div>
+      <div>
+        <Resource-Card></Resource-Card>
+      </div>
+    </div>
+  </main>
+</body>
+
+<script type="module">
+  import { createApp } from "vue"
+  import ResourceCard from './ResourceCard.vue'
+  let app = createApp({
+    components: {
+      ResourceCard
+    },
     data() {
       return {
         error: null,
@@ -101,4 +101,5 @@
       },
     },
   });
+  app.mount("#app");
 </script>
diff --git a/vite.config.js b/vite.config.js
new file mode 100644
index 00000000..a41470e4
--- /dev/null
+++ b/vite.config.js
@@ -0,0 +1,53 @@
+import { fileURLToPath, URL } from 'node:url'
+import fs from 'fs';
+import { resolve } from 'path'
+import { defineConfig } from 'vite'
+import { ViteEjsPlugin } from "vite-plugin-ejs";
+import vue from '@vitejs/plugin-vue'
+import process from 'process'
+
+/**
+ * Before actually building the pages with Vite, we do an intermediate build step using ejs
+ * Importing this separately and joining them using ejs 
+ * allows us to split some repeating HTML that cannot be added 
+ * by Vue itself (e.g. style/script loading, common meta head tags, Widgetbot)
+ * The vite-plugin-ejs handles this automatically
+ */
+let assetsSrcPath = 'src_assets/common/assets/web';
+let assetsDstPath = 'build/assets/web';
+
+if (process.env.SUNSHINE_SOURCE_ASSETS_DIR) {
+    console.log("Using srcdir from Cmake: " + resolve(process.env.SUNSHINE_SOURCE_ASSETS_DIR,"common/assets/web"));
+    assetsSrcPath = resolve(process.env.SUNSHINE_SOURCE_ASSETS_DIR,"common/assets/web")
+}
+if (process.env.SUNSHINE_ASSETS_DIR) {
+    console.log("Using destdir from Cmake: " + resolve(process.env.SUNSHINE_ASSETS_DIR,"assets/web"));
+    assetsDstPath = resolve(process.env.SUNSHINE_ASSETS_DIR,"assets/web")
+}
+
+let header = fs.readFileSync(resolve(assetsSrcPath, "template_header.html"))
+
+// https://vitejs.dev/config/
+export default defineConfig({
+    resolve: {
+        alias: {
+            vue: 'vue/dist/vue.esm-bundler.js'
+        }
+    },
+    plugins: [vue(), ViteEjsPlugin({ header })],
+    root: resolve(assetsSrcPath),
+    build: {
+        outDir: resolve(assetsDstPath),
+        rollupOptions: {
+            input: {
+                apps: resolve(assetsSrcPath, 'apps.html'),
+                config: resolve(assetsSrcPath, 'config.html'),
+                index: resolve(assetsSrcPath, 'index.html'),
+                password: resolve(assetsSrcPath, 'password.html'),
+                pin: resolve(assetsSrcPath, 'pin.html'),
+                troubleshooting: resolve(assetsSrcPath, 'troubleshooting.html'),
+                welcome: resolve(assetsSrcPath, 'welcome.html'),
+            },
+        },
+    },
+})