fix(packaging/flatpak): reload udev rules during install

feat(input/linux): DualSense adaptive trigger support (#3738 )
build(deps): bump third-party/moonlight-common-c from d3d3e6c to e95feaf (#3761 )
2025-08-10 00:52:16 +00:00 · 2025-03-26 19:32:39 -04:00 · 2025-03-26 19:16:20 -04:00 · 2025-03-26 14:57:06 +00:00 · 2025-03-26 08:43:41 -04:00 · 2025-03-25 08:26:32 -04:00
75 changed files with 1107 additions and 673 deletions
--- a/.codeql-prebuild-cpp-macOS.sh
+++ b/.codeql-prebuild-cpp-macOS.sh
@@ -1,6 +1,10 @@
 # install dependencies for C++ analysis
 set -e

+# setup homebrew for x86_64
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+eval "$(/usr/local/bin/brew shellenv)"
+
 # install dependencies
 dependencies=(
  "boost"
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,9 +5,15 @@

 blank_issues_enabled: false
 contact_links:
+  - name: Discussions
+    url: https://github.com/orgs/LizardByte/discussions
+    about: Community discussions
+  - name: Questions
+    url: https://github.com/orgs/LizardByte/discussions
+    about: Ask questions
+  - name: Feature Requests
+    url: https://github.com/orgs/LizardByte/discussions
+    about: Request new features
  - name: Support Center
    url: https://app.lizardbyte.dev/support
    about: Official LizardByte support
-  - name: Discussions
-    url: https://github.com/orgs/LizardByte/discussions
-    about: Community discussions, questions, and feature requests
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -45,43 +45,22 @@ jobs:
        with:
          github_token: ${{ secrets.GITHUB_TOKEN }}

-  setup_flatpak_matrix:
-    name: Setup Flatpak Matrix
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set release details
-        id: flatpak_matrix
-        # https://www.cynkra.com/blog/2020-12-23-dynamic-gha
-        run: |
-          # determine which architectures to build
-          if [[ "${{ github.event_name }}" == "push" ]]; then
-            matrix=$((
-              echo '{ "arch" : ["x86_64", "aarch64"] }'
-            ) | jq -c .)
-          else
-            matrix=$((
-              echo '{ "arch" : ["x86_64"] }'
-            ) | jq -c .)
-          fi
-
-          echo $matrix
-          echo $matrix | jq .
-          echo "matrix=$matrix" >> $GITHUB_OUTPUT
-
-    outputs:
-      matrix: ${{ steps.flatpak_matrix.outputs.matrix }}
-
  build_linux_flatpak:
    env:
      APP_ID: dev.lizardbyte.app.Sunshine
      NODE_VERSION: "20"
      PLATFORM_VERSION: "23.08"
    name: Linux Flatpak
-    runs-on: ubuntu-22.04
-    needs: [setup_release, setup_flatpak_matrix]
+    needs: [setup_release]
+    runs-on: ${{ matrix.runner }}
    strategy:
      fail-fast: false  # false to test all, true to fail entire job if any fail
-      matrix: ${{fromJson(needs.setup_flatpak_matrix.outputs.matrix)}}
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-22.04
+          - arch: aarch64
+            runner: ubuntu-22.04-arm

    steps:
      - name: Maximize build space
@@ -126,8 +105,7 @@ jobs:
          sudo apt-get update -y
          sudo apt-get install -y \
            cmake \
-            flatpak \
-            qemu-user-static
+            flatpak

          sudo su $(whoami) -c "flatpak --user remote-add --if-not-exists flathub \
            https://flathub.org/repo/flathub.flatpakrepo"
@@ -227,52 +205,23 @@ jobs:
      - name: Lint Flatpak
        working-directory: build
        run: |
+          exceptions_file="${{ github.workspace }}/packaging/linux/flatpak/exceptions.json"
+
          echo "Linting flatpak manifest"
          flatpak run --command=flatpak-builder-lint org.flatpak.Builder \
-            manifest ${APP_ID}.yml > _flatpak-lint-exceptions_manifest.json || true
+            --exceptions \
+            --user-exceptions "${exceptions_file}" \
+            manifest \
+            ${APP_ID}.yml

          echo "Linting flatpak repo"
          # TODO: add arg
          # --mirror-screenshots-url=https://dl.flathub.org/media \
          flatpak run --command=flatpak-builder-lint org.flatpak.Builder \
-            repo repo > _flatpak-lint-exceptions_repo.json || true
-
-          checks=(manifest repo)
-          exit_code=0
-
-          # check if files are equal
-          for check in "${checks[@]}"; do
-            echo "Validating $check"
-
-            # load baseline and result files
-            baseline="${{ github.workspace }}/packaging/linux/flatpak/flatpak-lint-baseline_${check}.json"
-            result="_flatpak-lint-exceptions_${check}.json"
-
-            # Extract errors from both JSON files
-            readarray -t result_errors < <(jq -r '.errors[]' "$result")
-            readarray -t baseline_errors < <(jq -r '.errors[]' "$baseline")
-
-            # Loop through result errors and check against baseline errors
-            for error in "${result_errors[@]}"; do
-              if printf '%s\n' "${baseline_errors[@]}" | grep -q -F "$error"; then
-                echo "::warning:: '$error'"
-              else
-                echo "::error:: '$error'"
-                exit_code=1
-              fi
-            done
-          done
-
-          # if exit code is not 0, print results
-          if [ $exit_code -ne 0 ]; then
-            echo "Manifest lint results:"
-            cat _flatpak-lint-exceptions_manifest.json
-            echo "Repo lint results:"
-            cat _flatpak-lint-exceptions_repo.json
-          fi
-
-          # exit with the correct code
-          exit $exit_code
+            --exceptions \
+            --user-exceptions "${exceptions_file}" \
+            repo \
+            repo

      - name: Package Flathub repo archive
        # copy files required to generate the Flathub repo
@@ -554,12 +503,16 @@ jobs:
          rm '/usr/local/bin/2to3-3.12'
          rm '/usr/local/bin/idle3'
          rm '/usr/local/bin/idle3.12'
+          rm '/usr/local/bin/idle3.13'
          rm '/usr/local/bin/pydoc3'
          rm '/usr/local/bin/pydoc3.12'
+          rm '/usr/local/bin/pydoc3.13'
          rm '/usr/local/bin/python3'
-          rm '/usr/local/bin/python3-config'
          rm '/usr/local/bin/python3.12'
+          rm '/usr/local/bin/python3.13'
+          rm '/usr/local/bin/python3-config'
          rm '/usr/local/bin/python3.12-config'
+          rm '/usr/local/bin/python3.13-config'
          brew install python

      - name: Setup python
@@ -887,7 +840,6 @@ jobs:
            mingw-w64-ucrt-x86_64-graphviz
            mingw-w64-ucrt-x86_64-MinHook
            mingw-w64-ucrt-x86_64-miniupnpc
-            mingw-w64-ucrt-x86_64-nlohmann-json
            mingw-w64-ucrt-x86_64-nodejs
            mingw-w64-ucrt-x86_64-nsis
            mingw-w64-ucrt-x86_64-onevpl
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -123,7 +123,7 @@ jobs:
  docker:
    needs: [check_dockerfiles, setup_release]
    if: ${{ needs.check_dockerfiles.outputs.dockerfiles }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    permissions:
      packages: write
      contents: write
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -51,32 +51,39 @@ jobs:
              "include": []
            }

+            // Track languages we've already added to avoid duplicates
+            const addedLanguages = new Set()
+
            for (let [key, value] of Object.entries(response.data)) {
              // remap language
              if (remap_languages[key.toLowerCase()]) {
                console.log(`Remapping language: ${key} to ${remap_languages[key.toLowerCase()]}`)
                key = remap_languages[key.toLowerCase()]
              }
-              if (supported_languages.includes(key.toLowerCase())) {
-                console.log(`Found supported language: ${key}`)
+
+              const normalizedKey = key.toLowerCase()
+
+              if (supported_languages.includes(normalizedKey) && !addedLanguages.has(normalizedKey)) {
+                // Mark this language as added
+                addedLanguages.add(normalizedKey)
+
+                console.log(`Found supported language: ${normalizedKey}`)
                let osList = ['ubuntu-latest'];
-                if (key.toLowerCase() === 'swift') {
+                if (normalizedKey === 'swift') {
                  osList = ['macos-latest'];
-                } else if (key.toLowerCase() === 'cpp') {
-                  // TODO: update macos to latest after the below issue is resolved
-                  // https://github.com/github/codeql-action/issues/2266
-                  osList = ['macos-13', 'ubuntu-latest', 'windows-latest'];
+                } else if (normalizedKey === 'cpp') {
+                  osList = ['macos-latest', 'ubuntu-latest', 'windows-latest'];
                }
                for (let os of osList) {
                  // set name for matrix
-                  if (osList.length == 1) {
-                    name = key.toLowerCase()
-                  } else {
-                    name = `${key.toLowerCase()}, ${os}`
-                  }
+                  let name = osList.length === 1 ? normalizedKey : `${normalizedKey}, ${os}`

                  // add to matrix
-                  matrix['include'].push({"language": key.toLowerCase(), "os": os, "name": name})
+                  matrix['include'].push({
+                    "language": normalizedKey,
+                    "os": os,
+                    "name": name
+                  })
                }
              }
            }
--- a/.github/workflows/update-flathub-repo.yml
+++ b/.github/workflows/update-flathub-repo.yml
@@ -104,7 +104,7 @@ jobs:
        if: >-
          steps.check-label.outputs.hasTopic == 'true' &&
          steps.check-release.outputs.isLatestRelease == 'true'
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
        with:
          repository: "${{ github.repository }}"
          tag: "${{ github.event.release.tag_name }}"
@@ -143,9 +143,9 @@ jobs:
          BEGIN { replaced = 0 }
          /<release version=.*>/ {
            if (!replaced) {
-              print "<release version=\"" version "\" date=\"" date "\">"
-              print "<description><p>" changelog "</p></description>"
-              print "</release>"
+              print "    <release version=\"" version "\" date=\"" date "\">"
+              print "      <description><p>" changelog "</p></description>"
+              print "    </release>"
              replaced = 1
            }
          }
--- a/.github/workflows/update-homebrew-release.yml
+++ b/.github/workflows/update-homebrew-release.yml
@@ -46,7 +46,7 @@ jobs:
        id: download
        if: >-
          steps.check-label.outputs.hasTopic == 'true'
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
        with:
          repository: "${{ github.repository }}"
          tag: "${{ github.event.release.tag_name }}"
--- a/.github/workflows/update-pacman-repo.yml
+++ b/.github/workflows/update-pacman-repo.yml
@@ -77,7 +77,7 @@ jobs:
        if: >-
          steps.check-label.outputs.hasTopic == 'true' &&
          steps.check-release.outputs.isLatestRelease == 'true'
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
        with:
          repository: "${{ github.repository }}"
          tag: "${{ github.event.release.tag_name }}"
--- a/.github/workflows/update-winget-release.yml
+++ b/.github/workflows/update-winget-release.yml
@@ -46,7 +46,7 @@ jobs:
        id: download
        if: >-
          steps.check-label.outputs.hasTopic == 'true'
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
        with:
          repository: "${{ github.repository }}"
          tag: "${{ github.event.release.tag_name }}"
--- a/.gitmodules
+++ b/.gitmodules
@@ -44,7 +44,7 @@
 	branch = sdk
 [submodule "third-party/Simple-Web-Server"]
 	path = third-party/Simple-Web-Server
-	url = https://gitlab.com/eidheim/Simple-Web-Server.git
+	url = https://github.com/LizardByte-infrastructure/Simple-Web-Server.git
 	branch = master
 [submodule "third-party/TPCircularBuffer"]
 	path = third-party/TPCircularBuffer
@@ -60,9 +60,9 @@
 	branch = master
 [submodule "third-party/wayland-protocols"]
 	path = third-party/wayland-protocols
-	url = https://gitlab.freedesktop.org/wayland/wayland-protocols.git
+	url = https://github.com/LizardByte-infrastructure/wayland-protocols.git
 	branch = main
 [submodule "third-party/wlr-protocols"]
 	path = third-party/wlr-protocols
-	url = https://gitlab.freedesktop.org/wlroots/wlr-protocols.git
+	url = https://github.com/LizardByte-infrastructure/wlr-protocols.git
 	branch = master
--- a/README.md
+++ b/README.md
@@ -5,42 +5,18 @@
 </div>

 <div align="center">
-  <a href="https://github.com/LizardByte/Sunshine">
-    <img src="https://img.shields.io/github/stars/lizardbyte/sunshine.svg?logo=github&style=for-the-badge" alt="GitHub stars">
-  </a>
-  <a href="https://github.com/LizardByte/Sunshine/releases/latest">
-    <img src="https://img.shields.io/github/downloads/lizardbyte/sunshine/total.svg?style=for-the-badge&logo=github" alt="GitHub Releases">
-  </a>
-  <a href="https://hub.docker.com/r/lizardbyte/sunshine">
-    <img src="https://img.shields.io/docker/pulls/lizardbyte/sunshine.svg?style=for-the-badge&logo=docker" alt="Docker">
-  </a>
-  <a href="https://github.com/LizardByte/Sunshine/pkgs/container/sunshine">
-    <img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2FLizardByte%2FSunshine%2Fsunshine.json&query=%24.downloads&label=ghcr%20pulls&style=for-the-badge&logo=github" alt="GHCR">
-  </a>
-  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine">
-    <img src="https://img.shields.io/flathub/downloads/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub installs">
-  </a>
-  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine">
-    <img src="https://img.shields.io/flathub/v/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub Version">
-  </a>
-  <a href="https://github.com/microsoft/winget-pkgs/tree/master/manifests/l/LizardByte/Sunshine">
-    <img src="https://img.shields.io/winget/v/LizardByte.Sunshine?style=for-the-badge&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHuSURBVFhH7ZfNTtRQGIYZiMDwN/IrCAqIhMSNKxcmymVwG+5dcDVsWHgDrtxwCYQVl+BChzDEwSnPY+eQ0sxoOz1mQuBNnpyvTdvz9jun5/SrjfxnJUkyQbMEz2ELduF1l0YUA3QyTrMAa2AnPtyOXsELeAYNyKtV2EC3k3lYgTOwg09ghy/BTp7CKBRV844BOpmmMV2+ySb4BmInG7AKY7AHH+EYqqhZo9PPBG/BVDlOizAD/XQFmnoPXzxRQX8M/CCYS48L6RIc4ygGHK9WGg9HZSZMUNRPVwNJGg5Hg2Qgqh4N3FsDsb6EmgYm07iwwvUxstdxJTwgmILf4CfZ6bb5OHANX8GN5x20IVxnG8ge94pt2xpwU3GnCwayF4Q2G2vgFLzHndFzQdk4q77nNfCdwL28qNyMtmEf3A1/QV5FjDiPWo5jrwf8TWZChTlgJvL4F9QL50/A43qVidTvLcuoM2wDQ1+IkgefgUpLcYwMVBqCKNJA2b0gKNocOIITOIef8C/F/CdMbh/GklynsSawKLHS8d9/B1x2LUqsfFyy3TMsWj5A1cLkotDbYO4JjWWZlZEGv8EbOIR1CAVN2eG8W5oNKgxaeC6DmTJjZs7ixUxpznLPLT+v4sXpoMLcLI3mzFSonDXIEI/M3QCIO4YuimBJ/gAAAABJRU5ErkJggg==" alt="Winget Version">
-  </a>
-  <a href="https://gurubase.io/g/sunshine">
-    <img src="https://img.shields.io/badge/Gurubase-Ask%20Guru-ef1a1b?style=for-the-badge&logo=data:image/jpeg;base64,/9j/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIABgAGAMBIgACEQEDEQH/xAGiAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgsQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+gEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoLEQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOLqSO3mlilljido4QGkYDIQEgAn05IH41seFo7aS+uRKlrJci2Y2cd2QImlyOGyQPu7sA8ZxXapAlvpThbPRkv7nTQWhDoIZZRc/XaSAOmcZGOnFfP06XMr3P17F5iqE+Tl1uuvf9Lde55dRW74pit4r61EcdtFdG2U3kVqQY0lyeBgkD5duQOASawqykuV2O6jV9rTU0rXLNjf3Om3QubSXy5QCudoYEEYIIOQR7GnahqV3qk6zXk3mOqhFAUKqqOyqAAByeAKqUUXdrFezhz89lfv1+8KKKKRZ//Z" alt="Gurubase">
-  </a>
-  <a href="https://github.com/LizardByte/Sunshine/actions/workflows/CI.yml?query=branch%3Amaster">
-    <img src="https://img.shields.io/github/actions/workflow/status/lizardbyte/sunshine/CI.yml.svg?branch=master&label=CI%20build&logo=github&style=for-the-badge" alt="GitHub Workflow Status (CI)">
-  </a>
-  <a href="https://github.com/LizardByte/Sunshine/actions/workflows/localize.yml?query=branch%3Amaster">
-    <img src="https://img.shields.io/github/actions/workflow/status/lizardbyte/sunshine/localize.yml.svg?branch=master&label=localize%20build&logo=github&style=for-the-badge" alt="GitHub Workflow Status (localize)">
-  </a>
-  <a href="https://docs.lizardbyte.dev/projects/sunshine">
-    <img src="https://img.shields.io/readthedocs/sunshinestream.svg?label=Docs&style=for-the-badge&logo=readthedocs" alt="Read the Docs">
-  </a>
-  <a href="https://codecov.io/gh/LizardByte/Sunshine">
-    <img src="https://img.shields.io/codecov/c/gh/LizardByte/Sunshine?token=SMGXQ5NVMJ&style=for-the-badge&logo=codecov&label=codecov" alt="Codecov">
-  </a>
+  <a href="https://github.com/LizardByte/Sunshine"><img src="https://img.shields.io/github/stars/lizardbyte/sunshine.svg?logo=github&style=for-the-badge" alt="GitHub stars"></a>
+  <a href="https://github.com/LizardByte/Sunshine/releases/latest"><img src="https://img.shields.io/github/downloads/lizardbyte/sunshine/total.svg?style=for-the-badge&logo=github" alt="GitHub Releases"></a>
+  <a href="https://hub.docker.com/r/lizardbyte/sunshine"><img src="https://img.shields.io/docker/pulls/lizardbyte/sunshine.svg?style=for-the-badge&logo=docker" alt="Docker"></a>
+  <a href="https://github.com/LizardByte/Sunshine/pkgs/container/sunshine"><img src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fipitio.github.io%2Fbackage%2FLizardByte%2FSunshine%2Fsunshine.json&query=%24.downloads&label=ghcr%20pulls&style=for-the-badge&logo=github" alt="GHCR"></a>
+  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine"><img src="https://img.shields.io/flathub/downloads/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub installs"></a>
+  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine"><img src="https://img.shields.io/flathub/v/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub Version"></a>
+  <a href="https://github.com/microsoft/winget-pkgs/tree/master/manifests/l/LizardByte/Sunshine"><img src="https://img.shields.io/winget/v/LizardByte.Sunshine?style=for-the-badge&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHuSURBVFhH7ZfNTtRQGIYZiMDwN/IrCAqIhMSNKxcmymVwG+5dcDVsWHgDrtxwCYQVl+BChzDEwSnPY+eQ0sxoOz1mQuBNnpyvTdvz9jun5/SrjfxnJUkyQbMEz2ELduF1l0YUA3QyTrMAa2AnPtyOXsELeAYNyKtV2EC3k3lYgTOwg09ghy/BTp7CKBRV844BOpmmMV2+ySb4BmInG7AKY7AHH+EYqqhZo9PPBG/BVDlOizAD/XQFmnoPXzxRQX8M/CCYS48L6RIc4ygGHK9WGg9HZSZMUNRPVwNJGg5Hg2Qgqh4N3FsDsb6EmgYm07iwwvUxstdxJTwgmILf4CfZ6bb5OHANX8GN5x20IVxnG8ge94pt2xpwU3GnCwayF4Q2G2vgFLzHndFzQdk4q77nNfCdwL28qNyMtmEf3A1/QV5FjDiPWo5jrwf8TWZChTlgJvL4F9QL50/A43qVidTvLcuoM2wDQ1+IkgefgUpLcYwMVBqCKNJA2b0gKNocOIITOIef8C/F/CdMbh/GklynsSawKLHS8d9/B1x2LUqsfFyy3TMsWj5A1cLkotDbYO4JjWWZlZEGv8EbOIR1CAVN2eG8W5oNKgxaeC6DmTJjZs7ixUxpznLPLT+v4sXpoMLcLI3mzFSonDXIEI/M3QCIO4YuimBJ/gAAAABJRU5ErkJggg==" alt="Winget Version"></a>
+  <a href="https://gurubase.io/g/sunshine"><img src="https://img.shields.io/badge/Gurubase-Ask%20Guru-ef1a1b?style=for-the-badge&logo=data:image/jpeg;base64,/9j/2wCEAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDIBCQkJDAsMGA0NGDIhHCEyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMv/AABEIABgAGAMBIgACEQEDEQH/xAGiAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgsQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+gEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoLEQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOLqSO3mlilljido4QGkYDIQEgAn05IH41seFo7aS+uRKlrJci2Y2cd2QImlyOGyQPu7sA8ZxXapAlvpThbPRkv7nTQWhDoIZZRc/XaSAOmcZGOnFfP06XMr3P17F5iqE+Tl1uuvf9Lde55dRW74pit4r61EcdtFdG2U3kVqQY0lyeBgkD5duQOASawqykuV2O6jV9rTU0rXLNjf3Om3QubSXy5QCudoYEEYIIOQR7GnahqV3qk6zXk3mOqhFAUKqqOyqAAByeAKqUUXdrFezhz89lfv1+8KKKKRZ//Z" alt="Gurubase"></a>
+  <a href="https://github.com/LizardByte/Sunshine/actions/workflows/CI.yml?query=branch%3Amaster"><img src="https://img.shields.io/github/actions/workflow/status/lizardbyte/sunshine/CI.yml.svg?branch=master&label=CI%20build&logo=github&style=for-the-badge" alt="GitHub Workflow Status (CI)"></a>
+  <a href="https://github.com/LizardByte/Sunshine/actions/workflows/localize.yml?query=branch%3Amaster"><img src="https://img.shields.io/github/actions/workflow/status/lizardbyte/sunshine/localize.yml.svg?branch=master&label=localize%20build&logo=github&style=for-the-badge" alt="GitHub Workflow Status (localize)"></a>
+  <a href="https://docs.lizardbyte.dev/projects/sunshine"><img src="https://img.shields.io/readthedocs/sunshinestream.svg?label=Docs&style=for-the-badge&logo=readthedocs" alt="Read the Docs"></a>
+  <a href="https://codecov.io/gh/LizardByte/Sunshine"><img src="https://img.shields.io/codecov/c/gh/LizardByte/Sunshine?token=SMGXQ5NVMJ&style=for-the-badge&logo=codecov&label=codecov" alt="Codecov"></a>
 </div>

 ## ℹ️ About
@@ -188,6 +164,34 @@ LizardByte has the full documentation hosted on [Read the Docs](https://docs.liz

 Our support methods are listed in our [LizardByte Docs](https://docs.lizardbyte.dev/latest/about/support.html).

+## 💲 Sponsors and Supporters
+
+<p align="center">
+  <a href="https://app.lizardbyte.dev" aria-label="Sponsor LizardByte">
+    <img src='https://raw.githubusercontent.com/LizardByte/contributors/refs/heads/dist/sponsors.svg'/>
+  </a>
+</p>
+
+## 👥 Contributors
+
+Thank you to all the contributors who have helped make Sunshine better!
+
+### GitHub
+
+<p align="center">
+  <a href="https://github.com/LizardByte/Sunshine" aria-label="GitHub">
+    <img src='https://raw.githubusercontent.com/LizardByte/contributors/refs/heads/dist/github.Sunshine.svg'/>
+  </a>
+</p>
+
+### CrowdIn
+
+<p align="center">
+  <a href="https://translate.lizardbyte.dev" aria-label="CrowdIn">
+    <img src='https://raw.githubusercontent.com/LizardByte/contributors/refs/heads/dist/crowdin.svg'/>
+  </a>
+</p>
+
 <div class="section_buttons">

 | Previous |                                       Next |
--- a/cmake/compile_definitions/common.cmake
+++ b/cmake/compile_definitions/common.cmake
@@ -149,6 +149,7 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
        ${CMAKE_THREAD_LIBS_INIT}
        enet
        libdisplaydevice::display_device
+        nlohmann_json::nlohmann_json
        opus
        ${FFMPEG_LIBRARIES}
        ${Boost_LIBRARIES}
--- a/cmake/compile_definitions/windows.cmake
+++ b/cmake/compile_definitions/windows.cmake
@@ -76,7 +76,6 @@ list(PREPEND PLATFORM_LIBRARIES
        libstdc++.a
        libwinpthread.a
        minhook::minhook
-        nlohmann_json::nlohmann_json
        ntdll
        setupapi
        shlwapi
--- a/cmake/dependencies/common.cmake
+++ b/cmake/dependencies/common.cmake
@@ -16,6 +16,7 @@ add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/Simple-Web-Server")
 add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/libdisplaydevice")

 # common dependencies
+include("${CMAKE_MODULE_PATH}/dependencies/nlohmann_json.cmake")
 find_package(OpenSSL REQUIRED)
 find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
--- a/cmake/dependencies/nlohmann_json.cmake
+++ b/cmake/dependencies/nlohmann_json.cmake
@@ -0,0 +1,18 @@
+#
+# Loads the nlohmann_json library giving the priority to the system package first, with a fallback to FetchContent.
+#
+include_guard(GLOBAL)
+
+find_package(nlohmann_json 3.11 QUIET GLOBAL)
+if(NOT nlohmann_json_FOUND)
+    message(STATUS "nlohmann_json v3.11.x package not found in the system. Falling back to FetchContent.")
+    include(FetchContent)
+
+    FetchContent_Declare(
+            json
+            URL      https://github.com/nlohmann/json/releases/download/v3.11.3/json.tar.xz
+            URL_HASH MD5=c23a33f04786d85c29fda8d16b5f0efd
+            DOWNLOAD_EXTRACT_TIMESTAMP
+    )
+    FetchContent_MakeAvailable(json)
+endif()
--- a/cmake/dependencies/windows.cmake
+++ b/cmake/dependencies/windows.cmake
@@ -1,8 +1,5 @@
 # windows specific dependencies

-# nlohmann_json
-find_package(nlohmann_json CONFIG 3.11 REQUIRED)
-
 # Make sure MinHook is installed
 find_library(MINHOOK_LIBRARY libMinHook.a REQUIRED)
 find_path(MINHOOK_INCLUDE_DIR MinHook.h PATH_SUFFIXES include REQUIRED)
--- a/cmake/packaging/windows.cmake
+++ b/cmake/packaging/windows.cmake
@@ -20,6 +20,9 @@ install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/misc/service/"
 install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/misc/migration/"
        DESTINATION "scripts"
        COMPONENT assets)
+install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/misc/path/"
+        DESTINATION "scripts"
+        COMPONENT assets)

 # Configurable options for the service
 install(DIRECTORY "${SUNSHINE_SOURCE_ASSETS_DIR}/windows/misc/autostart/"
@@ -64,6 +67,7 @@ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
        IfSilent +2 0
        ExecShell 'open' 'https://docs.lizardbyte.dev/projects/sunshine'
        nsExec::ExecToLog 'icacls \\\"$INSTDIR\\\" /reset'
+        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\update-path.bat\\\" add'
        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\migrate-config.bat\\\"'
        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\add-firewall-rule.bat\\\"'
        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\install-gamepad.bat\\\"'
@@ -78,7 +82,7 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
        "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}
        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\delete-firewall-rule.bat\\\"'
        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\uninstall-service.bat\\\"'
-        nsExec::ExecToLog '\\\"$INSTDIR\\\\sunshine.exe\\\" --restore-nvprefs-undo'
+        nsExec::ExecToLog '\\\"$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe\\\" --restore-nvprefs-undo'
        MessageBox MB_YESNO|MB_ICONQUESTION \
            'Do you want to remove Virtual Gamepad?' \
            /SD IDNO IDNO NoGamepad
@@ -88,16 +92,18 @@ set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
            'Do you want to remove $INSTDIR (this includes the configuration, cover images, and settings)?' \
            /SD IDNO IDNO NoDelete
            RMDir /r \\\"$INSTDIR\\\"; skipped if no
+        nsExec::ExecToLog '\\\"$INSTDIR\\\\scripts\\\\update-path.bat\\\" remove'
        NoDelete:
        ")

 # Adding an option for the start menu
-set(CPACK_NSIS_MODIFY_PATH "OFF")
+set(CPACK_NSIS_MODIFY_PATH OFF)
 set(CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
 # This will be shown on the installed apps Windows settings
 set(CPACK_NSIS_INSTALLED_ICON_NAME "${CMAKE_PROJECT_NAME}.exe")
 set(CPACK_NSIS_CREATE_ICONS_EXTRA
        "${CPACK_NSIS_CREATE_ICONS_EXTRA}
+        SetOutPath '\$INSTDIR'
        CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${CMAKE_PROJECT_NAME}.lnk' \
            '\$INSTDIR\\\\${CMAKE_PROJECT_NAME}.exe' '--shortcut'
        ")
--- a/docs/api.md
+++ b/docs/api.md
@@ -12,17 +12,23 @@ basic authentication with the admin username and password.
 ## GET /api/apps
@copydoc confighttp::getApps()

-## GET /api/logs
-@copydoc confighttp::getLogs()
-
 ## POST /api/apps
@copydoc confighttp::saveApp()

+## POST /api/apps/close
+@copydoc confighttp::closeApp()
+
 ## DELETE /api/apps/{index}
@copydoc confighttp::deleteApp()

-## POST /api/covers/upload
-@copydoc confighttp::uploadCover()
+## GET /api/clients/list
+@copydoc confighttp::getClients()
+
+## POST /api/clients/unpair
+@copydoc confighttp::unpair()
+
+## POST /api/clients/unpair-all
+@copydoc confighttp::unpairAll()

 ## GET /api/config
@copydoc confighttp::getConfig()
@@ -33,11 +39,11 @@ basic authentication with the admin username and password.
 ## POST /api/config
@copydoc confighttp::saveConfig()

-## POST /api/restart
-@copydoc confighttp::restart()
+## POST /api/covers/upload
+@copydoc confighttp::uploadCover()

-## POST /api/reset-display-device-persistence
-@copydoc confighttp::resetDisplayDevicePersistence()
+## GET /api/logs
+@copydoc confighttp::getLogs()

 ## POST /api/password
@copydoc confighttp::savePassword()
@@ -45,17 +51,11 @@ basic authentication with the admin username and password.
 ## POST /api/pin
@copydoc confighttp::savePin()

-## POST /api/clients/unpair-all
-@copydoc confighttp::unpairAll()
+## POST /api/reset-display-device-persistence
+@copydoc confighttp::resetDisplayDevicePersistence()

-## POST /api/clients/unpair
-@copydoc confighttp::unpair()
-
-## GET /api/clients/list
-@copydoc confighttp::listClients()
-
-## POST /api/apps/close
-@copydoc confighttp::closeApp()
+## POST /api/restart
+@copydoc confighttp::restart()

 <div class="section_buttons">

--- a/docs/app_examples.md
+++ b/docs/app_examples.md
@@ -301,22 +301,19 @@ administrative privileges. Simply enable the elevated option in the WEB UI, or a
 This is an option for both prep-cmd and regular commands and will launch the process with the current user without a
 UAC prompt.

-@note{It is important to write the values "true" and "false" as string values, not as the typical true/false
-values in most JSON.}
-
 **Example**
 ```json
 {
  "name": "Game With AntiCheat that Requires Admin",
  "output": "",
  "cmd": "ping 127.0.0.1",
-  "exclude-global-prep-cmd": "false",
-  "elevated": "true",
+  "exclude-global-prep-cmd": false,
+  "elevated": true,
  "prep-cmd": [
    {
      "do": "powershell.exe -command \"Start-Streaming\"",
      "undo": "powershell.exe -command \"Stop-Streaming\"",
-      "elevated": "false"
+      "elevated": false
    }
  ],
  "image-path": ""
--- a/docs/building.md
+++ b/docs/building.md
@@ -92,7 +92,6 @@ dependencies=(
  "mingw-w64-ucrt-x86_64-graphviz"  # Optional, for docs
  "mingw-w64-ucrt-x86_64-MinHook"
  "mingw-w64-ucrt-x86_64-miniupnpc"
-  "mingw-w64-ucrt-x86_64-nlohmann-json"
  "mingw-w64-ucrt-x86_64-nodejs"
  "mingw-w64-ucrt-x86_64-nsis"
  "mingw-w64-ucrt-x86_64-onevpl"
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -225,7 +225,7 @@ editing the `conf` file in a text editor. Use the examples as reference.
    <tr>
        <td>Example</td>
        <td colspan="2">@code{}
-            global_prep_cmd = [{"do":"nircmd.exe setdisplay 1280 720 32 144","undo":"nircmd.exe setdisplay 2560 1440 32 144"}]
+            global_prep_cmd = [{"do":"nircmd.exe setdisplay 1280 720 32 144","elevated":true,"undo":"nircmd.exe setdisplay 2560 1440 32 144"}]
            @endcode</td>
    </tr>
 </table>
@@ -974,7 +974,9 @@ editing the `conf` file in a text editor. Use the examples as reference.
    </tr>
    <tr>
        <td>Default</td>
-        <td colspan="2">@code{}verify_only@endcode</td>
+        <td colspan="2">@code{}
+            disabled
+            @endcode</td>
    </tr>
    <tr>
        <td>Example</td>
@@ -1154,14 +1156,15 @@ editing the `conf` file in a text editor. Use the examples as reference.
    </tr>
 </table>

-### dd_wa_hdr_toggle
+### dd_wa_hdr_toggle_delay

 <table>
    <tr>
        <td>Description</td>
        <td colspan="2">
-            When using virtual display device as for streaming, it might display incorrect (high-contrast) color.
-            With this option enabled, Sunshine will try to mitigate this issue.
+            When using virtual display device (VDD) for streaming, it might incorrectly display HDR color. Sunshine can try to mitigate this issue, by turning HDR off and then on again.<br>
+            If the value is set to 0, the workaround is disabled (default). If the value is between 0 and 3000 milliseconds, Sunshine will turn off HDR, wait for the specified amount of time and then turn HDR on again. The recommended delay time is around 500 milliseconds in most cases.<br>
+            DO NOT use this workaround unless you actually have issues with HDR as it directly impacts stream start time!
            @note{This option works independently of [dd_hdr_option](#dd_hdr_option)}
            @note{Applies to Windows only.}
        </td>
@@ -1169,13 +1172,13 @@ editing the `conf` file in a text editor. Use the examples as reference.
    <tr>
        <td>Default</td>
        <td colspan="2">@code{}
-            disabled
+            0
            @endcode</td>
    </tr>
    <tr>
        <td>Example</td>
        <td colspan="2">@code{}
-            dd_wa_hdr_toggle = enabled
+            dd_wa_hdr_toggle_delay = 500
            @endcode</td>
    </tr>
 </table>
@@ -1203,6 +1206,31 @@ editing the `conf` file in a text editor. Use the examples as reference.
    </tr>
 </table>

+
+### dd_config_revert_on_disconnect
+
+<table>
+    <tr>
+        <td>Description</td>
+        <td colspan="2">
+            When enabled, display configuration is reverted upon disconnect of all clients instead of app close or last session termination.
+            This can be useful for returning to physical usage of the host machine without closing the active app.
+            @warning{Some applications may not function properly when display configuration is changed while active.}
+            @note{Applies to Windows only.}
+        </td>
+    </tr>
+    <tr>
+        <td>Default</td>
+        <td colspan="2">@code{}disabled@endcode</td>
+    </tr>
+    <tr>
+        <td>Example</td>
+        <td colspan="2">@code{}
+            dd_config_revert_on_disconnect = enabled
+            @endcode</td>
+    </tr>
+</table>
+
 ### dd_mode_remapping

 <table>
@@ -1289,6 +1317,29 @@ editing the `conf` file in a text editor. Use the examples as reference.
    </tr>
 </table>

+### max_bitrate
+
+<table>
+    <tr>
+        <td>Description</td>
+        <td colspan="2">
+            The maximum bitrate (in Kbps) that Sunshine will encode the stream at. If set to 0, it will always use the bitrate requested by Moonlight.
+        </td>
+    </tr>
+    <tr>
+        <td>Default</td>
+        <td colspan="2">@code{}
+            0
+            @endcode</td>
+    </tr>
+    <tr>
+        <td>Example</td>
+        <td colspan="2">@code{}
+            max_bitrate = 5000
+            @endcode</td>
+    </tr>
+</table>
+
 ### min_fps_factor

 <table>
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -2,6 +2,12 @@
 Read our contribution guide in our organization level
 [docs](https://docs.lizardbyte.dev/latest/developers/contributing.html).

+## Recommended Tools
+
+| Tool                                                                                                                                                                           | Description                                                                                                                                                                           |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| <a href="https://www.jetbrains.com/clion/"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/CLion_icon.svg" width="30" height="30"></a><br>CLion | Recommended IDE for C++ development. Free licenses available for open source developers through the [JetBrains Open Source Program](https://www.jetbrains.com/community/opensource/). |
+
 ## Project Patterns

 ### Web UI
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -335,8 +335,6 @@ recommended for most users. No support will be provided!}
   scripts/uninstall-service.bat
   ```

-To uninstall, delete the extracted directory which contains the `sunshine.exe` file.
-
 ## Initial Setup
 After installation, some initial setup is required.

--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -118,6 +118,16 @@ system. You may also want to enable decoders, however that is not required for S
 ```
 }

+### Input not working
+After installation, the `udev` rules need to be reloaded. Our post-install script tries to do this for you
+automatically, but if it fails you may need to restart your system.
+
+If the input is still not working, you may need to add your user to the `input` group.
+
+```bash
+sudo usermod -aG input $USER
+```
+
@note{Other build options are listed in the
 [meson options](https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson_options.txt) file.}

--- a/gh-pages-template/.readthedocs.yaml
+++ b/gh-pages-template/.readthedocs.yaml
@@ -0,0 +1,25 @@
+---
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-24.04
+  tools:
+    ruby: "3.3"
+  apt_packages:
+    - 7zip
+    - jq
+  jobs:
+    install:
+      - |
+        mkdir -p "./tmp"
+        branch="master"
+        base_url="https://raw.githubusercontent.com/LizardByte/LizardByte.github.io"
+        url="${base_url}/refs/heads/${branch}/scripts/readthedocs_build.sh"
+        curl -sSL -o "./tmp/readthedocs_build.sh" "${url}"
+        chmod +x "./tmp/readthedocs_build.sh"
+    build:
+      html:
+        - "./tmp/readthedocs_build.sh"
--- a/gh-pages-template/index.html
+++ b/gh-pages-template/index.html
@@ -538,11 +538,11 @@ ext-js:
                <div class="card-footer p-3 px-4">
                    <a class="latest-button btn btn-outline-light me-3 mb-3 d-none" href="https://github.com/LizardByte/Sunshine/releases/latest" target="_blank">
                        <i class="fa-fw fab fa-github"></i>
-                            Latest: <span id="latest-version"></span>
+                            Latest: <span id="latest-version" class="crowdin-ignore"></span>
                    </a>
                    <a class="beta-button btn btn-outline-light me-3 mb-3 d-none" href="#" target="_blank">
                        <i class="fa-fw fas fa-flask"></i>
-                            Beta: <span id="beta-version"></span>
+                            Beta: <span id="beta-version" class="crowdin-ignore"></span>
                    </a>
                    <a class="btn btn-outline-light me-3 mb-3" href="https://github.com/LizardByte/pacman-repo" target="_blank">
                        <i class="fa-fw fab fa-linux"></i>
@@ -577,16 +577,21 @@ ext-js:
      // Filter the releases to get only the stable releases
      const stableReleases = data.filter(release => !release.prerelease);

+      const latestButton = document.querySelector('.latest-button');
+      const latestVersion = document.querySelector('#latest-version');
+      const betaButton = document.querySelector('.beta-button');
+      const betaVersion = document.querySelector('#beta-version');
+
      // If there are no stable releases, hide the latest download button
      if (stableReleases.length === 0) {
-        document.querySelector('.latest-button').classList.add('d-none');
+        latestButton.classList.add('d-none');
      } else {
        // Show the latest download button
-        document.querySelector('.latest-button').classList.remove('d-none');
+        latestButton.classList.remove('d-none');

        // Get the latest stable release
        const latestStableRelease = stableReleases[0];
-        document.querySelector('#latest-version').textContent = latestStableRelease.tag_name;
+        latestVersion.textContent = latestStableRelease.tag_name;

        // If there is a pre-release, update the href attribute of the anchor tag
        if (preReleases.length > 0) {
@@ -598,16 +603,16 @@ ext-js:

          // If the pre-release is newer, update the href attribute of the anchor tag
          if (preReleaseDate > stableReleaseDate) {
-            document.querySelector('.beta-button').href = latestPreRelease.html_url;
-            document.querySelector('#beta-version').textContent = latestPreRelease.tag_name;
-            document.querySelector('.beta-button').classList.remove('d-none');
+            betaButton.href = latestPreRelease.html_url;
+            betaVersion.textContent = latestPreRelease.tag_name;
+            betaButton.classList.remove('d-none');
          } else {
            // If the pre-release is older, hide the button
-            document.querySelector('.beta-button').classList.add('d-none');
+            betaButton.classList.add('d-none');
          }
        } else {
          // If there is no pre-release, hide the button
-          document.querySelector('.beta-button').classList.add('d-none');
+          betaButton.classList.add('d-none');
        }
      }
    });
--- a/package.json
+++ b/package.json
@@ -8,14 +8,14 @@
    "serve": "serve ./tests/fixtures/http --no-port-switching"
  },
  "dependencies": {
-    "@lizardbyte/shared-web": "2024.921.191855",
+    "@lizardbyte/shared-web": "2025.326.11214",
    "vue": "3.5.13",
-    "vue-i18n": "11.0.1"
+    "vue-i18n": "11.1.2"
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "4.6.2",
    "serve": "14.2.3",
-    "vite": "4.5.2",
+    "vite": "4.5.9",
    "vite-plugin-ejs": "1.6.4"
  }
 }
--- a/packaging/linux/flatpak/README.md
+++ b/packaging/linux/flatpak/README.md
@@ -1,13 +1,22 @@
-# Overview
+<div align="center">
+  <img src="https://raw.githubusercontent.com/LizardByte/Sunshine/master/sunshine.png" />
+  <h1 align="center">Sunshine</h1>
+  <h4 align="center">Self-hosted game stream host for Moonlight.</h4>
+</div>

-[![Flathub installs](https://img.shields.io/flathub/downloads/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub)](https://flathub.org/apps/dev.lizardbyte.app.Sunshine)
-[![Flathub Version](https://img.shields.io/flathub/v/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub)](https://flathub.org/apps/dev.lizardbyte.app.Sunshine)
+<div align="center">
+  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine"><img src="https://img.shields.io/flathub/downloads/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub installs"></a>
+  <a href="https://flathub.org/apps/dev.lizardbyte.app.Sunshine"><img src="https://img.shields.io/flathub/v/dev.lizardbyte.app.Sunshine?style=for-the-badge&logo=flathub" alt="Flathub Version"></a>
+</div>

-LizardByte has the full documentation hosted on [Read the Docs](https://docs.lizardbyte.dev/projects/sunshine).
-
-## About
+## ℹ️ About

 Sunshine is a self-hosted game stream host for Moonlight.

+LizardByte has the full documentation hosted on [Read the Docs](https://docs.lizardbyte.dev/projects/sunshine)
+
+* [Stable](https://docs.lizardbyte.dev/projects/sunshine/latest/)
+* [Beta](https://docs.lizardbyte.dev/projects/sunshine/master/)
+
 This repo is synced from the upstream [Sunshine](https://github.com/LizardByte/Sunshine) repo.
 Please report issues and contribute to the upstream repo.
--- a/packaging/linux/flatpak/deps/flatpak-builder-tools
+++ b/packaging/linux/flatpak/deps/flatpak-builder-tools
--- a/packaging/linux/flatpak/deps/shared-modules
+++ b/packaging/linux/flatpak/deps/shared-modules
--- a/packaging/linux/flatpak/dev.lizardbyte.app.Sunshine.metainfo.xml
+++ b/packaging/linux/flatpak/dev.lizardbyte.app.Sunshine.metainfo.xml
@@ -29,14 +29,18 @@
    </p>

    <p>NOTE: Sunshine requires additional installation steps.</p>
-    <p>flatpak run --command=additional-install.sh @PROJECT_FQDN@</p>
+    <p>
+      <code>flatpak run --command=additional-install.sh @PROJECT_FQDN@</code>
+    </p>
    <p>NOTE: Sunshine uses a self-signed certificate. The web browser will report it as not secure, but it is safe.</p>
    <p>NOTE: KMS Grab (Optional)</p>
-    <p>sudo -i PULSE_SERVER=unix:/run/user/$(id -u $whoami)/pulse/native flatpak run @PROJECT_FQDN@</p>
+    <p>
+      <code>sudo -i PULSE_SERVER=unix:/run/user/$(id -u $whoami)/pulse/native flatpak run @PROJECT_FQDN@</code>
+    </p>
  </description>

  <releases>
-    <release version="@PROJECT_VERSION@" date="1970-01-01"></release>
+    <release version="@PROJECT_VERSION@" date="1990-01-01"></release>
  </releases>

  <developer_name>LizardByte</developer_name>
--- a/packaging/linux/flatpak/exceptions.json
+++ b/packaging/linux/flatpak/exceptions.json
@@ -0,0 +1,8 @@
+{
+  "dev.lizardbyte.app.Sunshine": [
+    "appstream-missing-screenshots",
+    "appstream-screenshots-not-mirrored-in-ostree",
+    "external-gitmodule-url-found",
+    "finish-args-flatpak-spawn-access"
+  ]
+}
--- a/packaging/linux/flatpak/flatpak-lint-baseline_manifest.json
+++ b/packaging/linux/flatpak/flatpak-lint-baseline_manifest.json
@@ -1,9 +0,0 @@
-{
-    "errors": [
-        "finish-args-flatpak-spawn-access"
-    ],
-    "info": [
-        "finish-args-flatpak-spawn-access: finish-args has a talk-name access for org.freedesktop.Flatpak"
-    ],
-    "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter"
-}
--- a/packaging/linux/flatpak/flatpak-lint-baseline_repo.json
+++ b/packaging/linux/flatpak/flatpak-lint-baseline_repo.json
@@ -1,11 +0,0 @@
-{
-    "errors": [
-        "appstream-missing-screenshots",
-        "finish-args-flatpak-spawn-access"
-    ],
-    "info": [
-        "appstream-missing-screenshots: Catalogue file has no screenshots. Please check if screenshot URLs are reachable",
-        "finish-args-flatpak-spawn-access: finish-args has a talk-name access for org.freedesktop.Flatpak"
-    ],
-    "message": "Please consult the documentation at https://docs.flathub.org/docs/for-app-authors/linter"
-}
--- a/packaging/linux/flatpak/modules/xvfb/xvfb.json
+++ b/packaging/linux/flatpak/modules/xvfb/xvfb.json
@@ -11,14 +11,15 @@
  ],
  "sources": [
    {
-      "type": "archive",
-      "url": "https://gitlab.freedesktop.org/xorg/xserver/-/archive/xorg-server-21.1.13/xserver-xorg-server-21.1.13.tar.bz2",
-      "sha256": "ee2bf6d65f4b111ce86ca817c3327dc1e70d9c958aa16876f2820caf7bf7cffa",
+      "type": "git",
+      "url": "https://github.com/LizardByte-infrastructure/xserver.git",
+      "tag": "xorg-server-21.1.13",
+      "commit": "be2767845d6ed3c6dbd25a151051294d0908a995",
      "x-checker-data": {
        "type": "anitya",
        "project-id": 5250,
        "stable-only": true,
-        "url-template": "https://gitlab.freedesktop.org/xorg/xserver/-/archive/xorg-server-$version/xserver-xorg-server-$version.tar.bz2"
+        "tag-template": "xorg-server-$version"
      }
    },
    {
@@ -32,14 +33,15 @@
      "buildsystem": "meson",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/archive/libxcvt-0.1.2/libxcvt-libxcvt-0.1.2.tar.bz2",
-          "sha256": "590e5a6da87ace7aa7857026b207a2c4d378620035441e20ea97efedd15d6d4a",
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/libxcvt.git",
+          "tag": "libxcvt-0.1.2",
+          "commit": "d9ca87eea9eecddaccc3a77227bcb3acf84e89df",
          "x-checker-data": {
            "type": "anitya",
            "project-id": 235147,
            "stable-only": true,
-            "url-template": "https://gitlab.freedesktop.org/xorg/lib/libxcvt/-/archive/libxcvt-$version/libxcvt-libxcvt-$version.tar.bz2"
+            "tag-template": "libxcvt-$version"
          }
        }
      ]
@@ -48,14 +50,32 @@
      "name": "libXmu",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-1.2.1.tar.gz",
-          "sha256": "bf0902583dd1123856c11e0a5085bd3c6e9886fbbd44954464975fd7d52eb599",
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/libxmu.git",
+          "tag": "libXmu-1.2.1",
+          "commit": "792f80402ee06ce69bca3a8f2a84295999c3a170",
          "x-checker-data": {
            "type": "anitya",
            "project-id": 1785,
            "stable-only": true,
-            "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXmu-$version.tar.gz"
+            "tag-template": "libXmu-$version"
+          }
+        }
+      ]
+    },
+    {
+      "name": "font-util",
+      "sources": [
+        {
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/font-util.git",
+          "tag": "font-util-1.4.1",
+          "commit": "b5ca142f81a6f14eddb23be050291d1c25514777",
+          "x-checker-data": {
+            "type": "anitya",
+            "project-id": 15055,
+            "stable-only": true,
+            "tag-template": "font-util-$version"
          }
        }
      ]
@@ -64,14 +84,15 @@
      "name": "libfontenc",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://xorg.freedesktop.org/archive/individual/lib/libfontenc-1.1.8.tar.xz",
-          "sha256": "7b02c3d405236e0d86806b1de9d6868fe60c313628b38350b032914aa4fd14c6",
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/libfontenc.git",
+          "tag": "libfontenc-1.1.8",
+          "commit": "92a85fda2acb4e14ec0b2f6d8fe3eaf2b687218c",
          "x-checker-data": {
            "type": "anitya",
            "project-id": 1613,
            "stable-only": true,
-            "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libfontenc-$version.tar.xz"
+            "tag-template": "libfontenc-$version"
          }
        }
      ]
@@ -95,34 +116,19 @@
        }
      ]
    },
-    {
-      "name": "font-util",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://xorg.freedesktop.org/archive/individual/font/font-util-1.4.1.tar.gz",
-          "sha256": "f029ae80cdd75d89bee7f7af61c21e07982adfb9f72344a158b99f91f77ef5ed",
-          "x-checker-data": {
-            "type": "anitya",
-            "project-id": 15055,
-            "stable-only": true,
-            "url-template": "https://xorg.freedesktop.org/archive/individual/font/font-util-$version.tar.gz"
-          }
-        }
-      ]
-    },
    {
      "name": "xvfb-libXfont2",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://xorg.freedesktop.org/archive/individual/lib/libXfont2-2.0.6.tar.gz",
-          "sha256": "a944df7b6837c8fa2067f6a5fc25d89b0acc4011cd0bc085106a03557fb502fc",
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/libxfont.git",
+          "tag": "libXfont2-2.0.6",
+          "commit": "d54aaf2483df6a1f98fadc09004157e657b7f73e",
          "x-checker-data": {
            "type": "anitya",
            "project-id": 17165,
            "stable-only": true,
-            "url-template": "https://xorg.freedesktop.org/archive/individual/lib/libXfont2-$version.tar.gz"
+            "tag-template": "libXfont2-$version"
          }
        }
      ]
@@ -131,14 +137,15 @@
      "name": "xvfb-xauth",
      "sources": [
        {
-          "type": "archive",
-          "url": "https://gitlab.freedesktop.org/xorg/app/xauth/-/archive/xauth-1.1.1/xauth-xauth-1.1.3.tar.bz2",
-          "sha256": "3cee16ebe9de0e85c62513f6d6353710407c8ebb1f855b18d03807c27d38a215",
+          "type": "git",
+          "url": "https://github.com/LizardByte-infrastructure/xauth.git",
+          "tag": "xauth-1.1.3",
+          "commit": "c29eef23683f0e3575a3c60d9314de8156fbe2c2",
          "x-checker-data": {
            "type": "anitya",
            "project-id": 5253,
            "stable-only": true,
-            "url-template": "https://gitlab.freedesktop.org/xorg/app/xauth/-/archive/xauth-1.1.1/xauth-xauth-$version.tar.bz2"
+            "tag-template": "xauth-$version"
          }
        }
      ]
--- a/packaging/linux/flatpak/scripts/additional-install.sh
+++ b/packaging/linux/flatpak/scripts/additional-install.sh
@@ -2,12 +2,23 @@

 # User Service
 mkdir -p ~/.config/systemd/user
-cp /app/share/sunshine/systemd/user/sunshine.service $HOME/.config/systemd/user/sunshine.service
+cp /app/share/sunshine/systemd/user/sunshine.service "${HOME}/.config/systemd/user/sunshine.service"
 echo Sunshine User Service has been installed.
 echo Use [systemctl --user enable sunshine] once to autostart Sunshine on login.

 # Udev rule
 UDEV=$(cat /app/share/sunshine/udev/rules.d/60-sunshine.rules)
-echo Configuring mouse permission.
+echo Configuring input permissions.
 flatpak-spawn --host pkexec sh -c "echo '$UDEV' > /etc/udev/rules.d/60-sunshine.rules"
-echo Restart computer for mouse permission to take effect.
+
+# Reload udev rules
+path_to_udevadm=$(flatpak-spawn --host which udevadm)
+if [ -x "$path_to_udevadm" ] ; then
+  echo "Reloading udev rules."
+  flatpak-spawn --host "$path_to_udevadm" control --reload-rules
+  flatpak-spawn --host "$path_to_udevadm" trigger --property-match=DEVNAME=/dev/uinput
+  flatpak-spawn --host "$path_to_udevadm" trigger --property-match=DEVNAME=/dev/uhid
+  echo "Udev rules reloadeded successfully."
+else
+  echo "error: udevadm not found or not executable."
+fi
--- a/packaging/linux/flatpak/scripts/remove-additional-install.sh
+++ b/packaging/linux/flatpak/scripts/remove-additional-install.sh
@@ -2,10 +2,22 @@

 # User Service
 systemctl --user stop sunshine
-rm $HOME/.config/systemd/user/sunshine.service
+rm "${HOME}/.config/systemd/user/sunshine.service"
 systemctl --user daemon-reload
 echo Sunshine User Service has been removed.

 # Udev rule
+echo Removing input permissions.
 flatpak-spawn --host pkexec sh -c "rm /etc/udev/rules.d/60-sunshine.rules"
-echo Mouse permission removed. Restart computer to take effect.
+
+# Reload udev rules
+path_to_udevadm=$(flatpak-spawn --host which udevadm)
+if [ -x "$path_to_udevadm" ] ; then
+  echo "Reloading udev rules."
+  flatpak-spawn --host "$path_to_udevadm" control --reload-rules
+  flatpak-spawn --host "$path_to_udevadm" trigger --property-match=DEVNAME=/dev/uinput
+  flatpak-spawn --host "$path_to_udevadm" trigger --property-match=DEVNAME=/dev/uhid
+  echo "Udev rules reloadeded successfully."
+else
+  echo "error: udevadm not found or not executable."
+fi
--- a/scripts/linux_build.sh
+++ b/scripts/linux_build.sh
@@ -3,6 +3,7 @@ set -e

 # Default value for arguments
 appimage_build=0
+num_processors=$(nproc)
 publisher_name="Third Party Publisher"
 publisher_website=""
 publisher_issue_url="https://app.lizardbyte.dev/support"
@@ -27,6 +28,7 @@ Options:
  -h, --help               Display this help message.
  -s, --sudo-off           Disable sudo command.
  --appimage-build         Compile for AppImage, this will not create the AppImage, just the executable.
+  --num-processors         The number of processors to use for compilation. Default is the value of 'nproc'.
  --publisher-name         The name of the publisher (not developer) of the application.
  --publisher-website      The URL of the publisher's website.
  --publisher-issue-url    The URL of the publisher's support site or issue tracker.
@@ -53,6 +55,9 @@ while getopts ":hs-:" opt; do
          appimage_build=1
          skip_libva=1
          ;;
+        num-processors=*)
+          num_processors="${OPTARG#*=}"
+          ;;
        publisher-name=*)
          publisher_name="${OPTARG#*=}"
          ;;
@@ -367,7 +372,7 @@ function run_install() {
      tar -xzf "${build_dir}/doxygen.tar.gz"
      cd "doxygen-${doxygen_min}"
      cmake -DCMAKE_BUILD_TYPE=Release -G="Ninja" -B="build" -S="."
-      ninja -C "build"
+      ninja -C "build" -j"${num_processors}"
      ninja -C "build" install
    else
      echo "Doxygen version too low, skipping docs"
--- a/scripts/requirements.txt
+++ b/scripts/requirements.txt
@@ -1,2 +1,2 @@
-Babel==2.16.0
+Babel==2.17.0
 clang-format
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -497,18 +497,20 @@ namespace config {
    {},  // output_name

    {
-      video_t::dd_t::config_option_e::verify_only,  // configuration_option
+      video_t::dd_t::config_option_e::disabled,  // configuration_option
      video_t::dd_t::resolution_option_e::automatic,  // resolution_option
      {},  // manual_resolution
      video_t::dd_t::refresh_rate_option_e::automatic,  // refresh_rate_option
      {},  // manual_refresh_rate
      video_t::dd_t::hdr_option_e::automatic,  // hdr_option
      3s,  // config_revert_delay
+      {},  // config_revert_on_disconnect
      {},  // mode_remapping
      {}  // wa
    },  // display_device

-    1  // min_fps_factor
+    1,  // min_fps_factor
+    0  // max_bitrate
  };

  audio_t audio {
@@ -1132,10 +1134,16 @@ namespace config {
        video.dd.config_revert_delay = std::chrono::milliseconds {value};
      }
    }
+    bool_f(vars, "dd_config_revert_on_disconnect", video.dd.config_revert_on_disconnect);
    generic_f(vars, "dd_mode_remapping", video.dd.mode_remapping, dd::mode_remapping_from_view);
-    bool_f(vars, "dd_wa_hdr_toggle", video.dd.wa.hdr_toggle);
+    {
+      int value = 0;
+      int_between_f(vars, "dd_wa_hdr_toggle_delay", value, {0, 3000});
+      video.dd.wa.hdr_toggle_delay = std::chrono::milliseconds {value};
+    }

    int_between_f(vars, "min_fps_factor", video.min_fps_factor, {1, 3});
+    int_f(vars, "max_bitrate", video.max_bitrate);

    path_f(vars, "pkey", nvhttp.pkey);
    path_f(vars, "cert", nvhttp.cert);
--- a/src/config.h
+++ b/src/config.h
@@ -84,7 +84,7 @@ namespace config {

    struct dd_t {
      struct workarounds_t {
-        bool hdr_toggle;  ///< Specify whether to apply HDR high-contrast color workaround.
+        std::chrono::milliseconds hdr_toggle_delay;  ///< Specify whether to apply HDR high-contrast color workaround and what delay to use.
      };

      enum class config_option_e {
@@ -132,11 +132,13 @@ namespace config {
      std::string manual_refresh_rate;  ///< Manual refresh rate in case `refresh_rate_option == refresh_rate_option_e::manual`.
      hdr_option_e hdr_option;
      std::chrono::milliseconds config_revert_delay;  ///< Time to wait until settings are reverted (after stream ends/app exists).
+      bool config_revert_on_disconnect;  ///< Specify whether to revert display configuration on client disconnect.
      mode_remapping_t mode_remapping;
      workarounds_t wa;
    } dd;

    int min_fps_factor;  // Minimum fps target, determines minimum frame time
+    int max_bitrate;  // Maximum bitrate, sets ceiling in kbps for bitrate requested from client
  };

  struct audio_t {
--- a/src/confighttp.cpp
+++ b/src/confighttp.cpp
@@ -8,16 +8,14 @@

 // standard includes
 #include <filesystem>
+#include <fstream>
 #include <set>

 // lib includes
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ssl/context.hpp>
-#include <boost/asio/ssl/context_base.hpp>
 #include <boost/filesystem.hpp>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/xml_parser.hpp>
+#include <nlohmann/json.hpp>
 #include <Simple-Web-Server/crypto.hpp>
 #include <Simple-Web-Server/server_https.hpp>

@@ -34,7 +32,6 @@
 #include "nvhttp.h"
 #include "platform/common.h"
 #include "process.h"
-#include "rtsp.h"
 #include "utility.h"
 #include "uuid.h"
 #include "version.h"
@@ -43,7 +40,6 @@ using namespace std::literals;

 namespace confighttp {
  namespace fs = std::filesystem;
-  namespace pt = boost::property_tree;

  using https_server_t = SimpleWeb::Server<SimpleWeb::HTTPS>;

@@ -82,10 +78,11 @@ namespace confighttp {
   * @param response The HTTP response object.
   * @param output_tree The JSON tree to send.
   */
-  void send_response(resp_https_t response, const pt::ptree &output_tree) {
-    std::ostringstream data;
-    pt::write_json(data, output_tree);
-    response->write(data.str());
+  void send_response(resp_https_t response, const nlohmann::json &output_tree) {
+    SimpleWeb::CaseInsensitiveMultimap headers;
+    headers.emplace("Content-Type", "application/json");
+
+    response->write(output_tree.dump(), headers);
  }

  /**
@@ -96,10 +93,20 @@ namespace confighttp {
  void send_unauthorized(resp_https_t response, req_https_t request) {
    auto address = net::addr_to_normalized_string(request->remote_endpoint().address());
    BOOST_LOG(info) << "Web UI: ["sv << address << "] -- not authorized"sv;
+
+    constexpr SimpleWeb::StatusCode code = SimpleWeb::StatusCode::client_error_unauthorized;
+
+    nlohmann::json tree;
+    tree["status_code"] = code;
+    tree["status"] = false;
+    tree["error"] = "Unauthorized";
+
    const SimpleWeb::CaseInsensitiveMultimap headers {
+      {"Content-Type", "application/json"},
      {"WWW-Authenticate", R"(Basic realm="Sunshine Gamestream Host", charset="UTF-8")"}
    };
-    response->write(SimpleWeb::StatusCode::client_error_unauthorized, headers);
+
+    response->write(code, tree.dump(), headers);
  }

  /**
@@ -176,17 +183,14 @@ namespace confighttp {
  void not_found(resp_https_t response, [[maybe_unused]] req_https_t request) {
    constexpr SimpleWeb::StatusCode code = SimpleWeb::StatusCode::client_error_not_found;

-    pt::ptree tree;
-    tree.put("status_code", static_cast<int>(code));
-    tree.put("error", "Not Found");
-
-    std::ostringstream data;
-    pt::write_json(data, tree);
+    nlohmann::json tree;
+    tree["status_code"] = code;
+    tree["error"] = "Not Found";

    SimpleWeb::CaseInsensitiveMultimap headers;
    headers.emplace("Content-Type", "application/json");

-    response->write(code, data.str(), headers);
+    response->write(code, tree.dump(), headers);
  }

  /**
@@ -198,18 +202,15 @@ namespace confighttp {
  void bad_request(resp_https_t response, [[maybe_unused]] req_https_t request, const std::string &error_message = "Bad Request") {
    constexpr SimpleWeb::StatusCode code = SimpleWeb::StatusCode::client_error_bad_request;

-    pt::ptree tree;
-    tree.put("status_code", static_cast<int>(code));
-    tree.put("status", false);
-    tree.put("error", error_message);
-
-    std::ostringstream data;
-    pt::write_json(data, tree);
+    nlohmann::json tree;
+    tree["status_code"] = code;
+    tree["status"] = false;
+    tree["error"] = error_message;

    SimpleWeb::CaseInsensitiveMultimap headers;
    headers.emplace("Content-Type", "application/json");

-    response->write(code, data.str(), headers);
+    response->write(code, tree.dump(), headers);
  }

  /**
@@ -455,30 +456,50 @@ namespace confighttp {

    print_req(request);

-    std::string content = file_handler::read_file(config::stream.file_apps.c_str());
-    SimpleWeb::CaseInsensitiveMultimap headers;
-    headers.emplace("Content-Type", "application/json");
-    response->write(content, headers);
-  }
+    try {
+      std::string content = file_handler::read_file(config::stream.file_apps.c_str());
+      nlohmann::json file_tree = nlohmann::json::parse(content);

-  /**
-   * @brief Get the logs from the log file.
-   * @param response The HTTP response object.
-   * @param request The HTTP request object.
-   *
-   * @api_examples{/api/logs| GET| null}
-   */
-  void getLogs(resp_https_t response, req_https_t request) {
-    if (!authenticate(response, request)) {
-      return;
+      // Legacy versions of Sunshine used strings for boolean and integers, let's convert them
+      // List of keys to convert to boolean
+      std::vector<std::string> boolean_keys = {
+        "exclude-global-prep-cmd",
+        "elevated",
+        "auto-detach",
+        "wait-all"
+      };
+
+      // List of keys to convert to integers
+      std::vector<std::string> integer_keys = {
+        "exit-timeout"
+      };
+
+      // Walk fileTree and convert true/false strings to boolean or integer values
+      for (auto &app : file_tree["apps"]) {
+        for (const auto &key : boolean_keys) {
+          if (app.contains(key) && app[key].is_string()) {
+            app[key] = app[key] == "true";
+          }
+        }
+        for (const auto &key : integer_keys) {
+          if (app.contains(key) && app[key].is_string()) {
+            app[key] = std::stoi(app[key].get<std::string>());
+          }
+        }
+        if (app.contains("prep-cmd")) {
+          for (auto &prep : app["prep-cmd"]) {
+            if (prep.contains("elevated") && prep["elevated"].is_string()) {
+              prep["elevated"] = prep["elevated"] == "true";
+            }
+          }
+        }
+      }
+
+      send_response(response, file_tree);
+    } catch (std::exception &e) {
+      BOOST_LOG(warning) << "GetApps: "sv << e.what();
+      bad_request(response, request, e.what());
    }
-
-    print_req(request);
-
-    std::string content = file_handler::read_file(config::sunshine.log_file.c_str());
-    SimpleWeb::CaseInsensitiveMultimap headers;
-    headers.emplace("Content-Type", "text/plain");
-    response->write(SimpleWeb::StatusCode::success_ok, content, headers);
  }

  /**
@@ -522,74 +543,78 @@ namespace confighttp {

    std::stringstream ss;
    ss << request->content.rdbuf();
-
-    BOOST_LOG(info) << config::stream.file_apps;
    try {
      // TODO: Input Validation
-      pt::ptree fileTree;
-      pt::ptree inputTree;
-      pt::ptree outputTree;
-      pt::read_json(ss, inputTree);
-      pt::read_json(config::stream.file_apps, fileTree);
+      nlohmann::json output_tree;
+      nlohmann::json input_tree = nlohmann::json::parse(ss);
+      std::string file = file_handler::read_file(config::stream.file_apps.c_str());
+      BOOST_LOG(info) << file;
+      nlohmann::json file_tree = nlohmann::json::parse(file);

-      if (inputTree.get_child("prep-cmd").empty()) {
-        inputTree.erase("prep-cmd");
+      if (input_tree["prep-cmd"].empty()) {
+        input_tree.erase("prep-cmd");
      }

-      if (inputTree.get_child("detached").empty()) {
-        inputTree.erase("detached");
+      if (input_tree["detached"].empty()) {
+        input_tree.erase("detached");
      }

-      auto &apps_node = fileTree.get_child("apps"s);
-      int index = inputTree.get<int>("index");
+      auto &apps_node = file_tree["apps"];
+      int index = input_tree["index"].get<int>();  // this will intentionally cause exception if the provided value is the wrong type

-      inputTree.erase("index");
+      input_tree.erase("index");

      if (index == -1) {
-        apps_node.push_back(std::make_pair("", inputTree));
+        apps_node.push_back(input_tree);
      } else {
-        // Unfortunately Boost PT does not allow to directly edit the array, copy should do the trick
-        pt::ptree newApps;
-        int i = 0;
-        for (const auto &[k, v] : apps_node) {
+        nlohmann::json newApps = nlohmann::json::array();
+        for (size_t i = 0; i < apps_node.size(); ++i) {
          if (i == index) {
-            newApps.push_back(std::make_pair("", inputTree));
+            newApps.push_back(input_tree);
          } else {
-            newApps.push_back(std::make_pair("", v));
+            newApps.push_back(apps_node[i]);
          }
-          i++;
        }
-        fileTree.erase("apps");
-        fileTree.push_back(std::make_pair("apps", newApps));
+        file_tree["apps"] = newApps;
      }

      // Sort the apps array by name
-      std::vector<pt::ptree> apps_vector;
-      for (const auto &[k, v] : fileTree.get_child("apps")) {
-        apps_vector.push_back(v);
-      }
-      std::ranges::sort(apps_vector, [](const pt::ptree &a, const pt::ptree &b) {
-        return a.get<std::string>("name") < b.get<std::string>("name");
+      std::sort(apps_node.begin(), apps_node.end(), [](const nlohmann::json &a, const nlohmann::json &b) {
+        return a["name"].get<std::string>() < b["name"].get<std::string>();
      });

-      pt::ptree sorted_apps;
-      for (const auto &app : apps_vector) {
-        sorted_apps.push_back(std::make_pair("", app));
-      }
-      fileTree.erase("apps");
-      fileTree.add_child("apps", sorted_apps);
-
-      pt::write_json(config::stream.file_apps, fileTree);
+      file_handler::write_file(config::stream.file_apps.c_str(), file_tree.dump(4));
      proc::refresh(config::stream.file_apps);

-      outputTree.put("status", true);
-      send_response(response, outputTree);
+      output_tree["status"] = true;
+      send_response(response, output_tree);
    } catch (std::exception &e) {
      BOOST_LOG(warning) << "SaveApp: "sv << e.what();
      bad_request(response, request, e.what());
    }
  }

+  /**
+   * @brief Close the currently running application.
+   * @param response The HTTP response object.
+   * @param request The HTTP request object.
+   *
+   * @api_examples{/api/apps/close| POST| null}
+   */
+  void closeApp(resp_https_t response, req_https_t request) {
+    if (!authenticate(response, request)) {
+      return;
+    }
+
+    print_req(request);
+
+    proc::proc.terminate();
+
+    nlohmann::json output_tree;
+    output_tree["status"] = true;
+    send_response(response, output_tree);
+  }
+
  /**
   * @brief Delete an application.
   * @param response The HTTP response object.
@@ -604,13 +629,13 @@ namespace confighttp {

    print_req(request);

-    pt::ptree outputTree;
    try {
-      pt::ptree fileTree;
-      pt::ptree newApps;
-      pt::read_json(config::stream.file_apps, fileTree);
-      auto &apps_node = fileTree.get_child("apps"s);
-      int index = stoi(request->path_match[1]);
+      nlohmann::json output_tree;
+      nlohmann::json new_apps = nlohmann::json::array();
+      std::string file = file_handler::read_file(config::stream.file_apps.c_str());
+      nlohmann::json file_tree = nlohmann::json::parse(file);
+      auto &apps_node = file_tree["apps"];
+      const int index = std::stoi(request->path_match[1]);

      if (index < 0 || index >= static_cast<int>(apps_node.size())) {
        std::string error;
@@ -623,22 +648,19 @@ namespace confighttp {
        return;
      }

-      // Unfortunately Boost PT does not allow to directly edit the array, copy should do the trick
-      int i = 0;
-      for (const auto &[k, v] : apps_node) {
-        if (i++ != index) {
-          newApps.push_back(std::make_pair("", v));
+      for (size_t i = 0; i < apps_node.size(); ++i) {
+        if (i != index) {
+          new_apps.push_back(apps_node[i]);
        }
      }
-      fileTree.erase("apps");
-      fileTree.push_back(std::make_pair("apps", newApps));
+      file_tree["apps"] = new_apps;

-      pt::write_json(config::stream.file_apps, fileTree);
+      file_handler::write_file(config::stream.file_apps.c_str(), file_tree.dump(4));
      proc::refresh(config::stream.file_apps);

-      outputTree.put("status", true);
-      outputTree.put("result", "application "s + std::to_string(index) + " deleted");
-      send_response(response, outputTree);
+      output_tree["status"] = true;
+      output_tree["result"] = "application " + std::to_string(index) + " deleted";
+      send_response(response, output_tree);
    } catch (std::exception &e) {
      BOOST_LOG(warning) << "DeleteApp: "sv << e.what();
      bad_request(response, request, e.what());
@@ -646,66 +668,83 @@ namespace confighttp {
  }

  /**
-   * @brief Upload a cover image.
+   * @brief Get the list of paired clients.
+   * @param response The HTTP response object.
+   * @param request The HTTP request object.
+   *
+   * @api_examples{/api/clients/list| GET| null}
+   */
+  void getClients(resp_https_t response, req_https_t request) {
+    if (!authenticate(response, request)) {
+      return;
+    }
+
+    print_req(request);
+
+    const nlohmann::json named_certs = nvhttp::get_all_clients();
+
+    nlohmann::json output_tree;
+    output_tree["named_certs"] = named_certs;
+    output_tree["status"] = true;
+    send_response(response, output_tree);
+  }
+
+  /**
+   * @brief Unpair a client.
   * @param response The HTTP response object.
   * @param request The HTTP request object.
   * The body for the post request should be JSON serialized in the following format:
   * @code{.json}
   * {
-   *   "key": "igdb_<game_id>",
-   *   "url": "https://images.igdb.com/igdb/image/upload/t_cover_big_2x/<slug>.png"
+   *  "uuid": "<uuid>"
   * }
   * @endcode
   *
-   * @api_examples{/api/covers/upload| POST| {"key":"igdb_1234","url":"https://images.igdb.com/igdb/image/upload/t_cover_big_2x/abc123.png"}}
+   * @api_examples{/api/unpair| POST| {"uuid":"1234"}}
   */
-  void uploadCover(resp_https_t response, req_https_t request) {
+  void unpair(resp_https_t response, req_https_t request) {
    if (!authenticate(response, request)) {
      return;
    }

+    print_req(request);
+
    std::stringstream ss;
-    std::stringstream configStream;
    ss << request->content.rdbuf();
-    pt::ptree outputTree;
-    pt::ptree inputTree;
+
    try {
-      pt::read_json(ss, inputTree);
+      // TODO: Input Validation
+      nlohmann::json output_tree;
+      const nlohmann::json input_tree = nlohmann::json::parse(ss);
+      const std::string uuid = input_tree.value("uuid", "");
+      output_tree["status"] = nvhttp::unpair_client(uuid);
+      send_response(response, output_tree);
    } catch (std::exception &e) {
-      BOOST_LOG(warning) << "UploadCover: "sv << e.what();
+      BOOST_LOG(warning) << "Unpair: "sv << e.what();
      bad_request(response, request, e.what());
+    }
+  }
+
+  /**
+   * @brief Unpair all clients.
+   * @param response The HTTP response object.
+   * @param request The HTTP request object.
+   *
+   * @api_examples{/api/clients/unpair-all| POST| null}
+   */
+  void unpairAll(resp_https_t response, req_https_t request) {
+    if (!authenticate(response, request)) {
      return;
    }

-    auto key = inputTree.get("key", "");
-    if (key.empty()) {
-      bad_request(response, request, "Cover key is required");
-      return;
-    }
-    auto url = inputTree.get("url", "");
+    print_req(request);

-    const std::string coverdir = platf::appdata().string() + "/covers/";
-    file_handler::make_directory(coverdir);
+    nvhttp::erase_all_clients();
+    proc::proc.terminate();

-    std::basic_string path = coverdir + http::url_escape(key) + ".png";
-    if (!url.empty()) {
-      if (http::url_get_host(url) != "images.igdb.com") {
-        bad_request(response, request, "Only images.igdb.com is allowed");
-        return;
-      }
-      if (!http::download_file(url, path)) {
-        bad_request(response, request, "Failed to download cover");
-        return;
-      }
-    } else {
-      auto data = SimpleWeb::Crypto::Base64::decode(inputTree.get<std::string>("data"));
-
-      std::ofstream imgfile(path);
-      imgfile.write(data.data(), (int) data.size());
-    }
-    outputTree.put("status", true);
-    outputTree.put("path", path);
-    send_response(response, outputTree);
+    nlohmann::json output_tree;
+    output_tree["status"] = true;
+    send_response(response, output_tree);
  }

  /**
@@ -722,18 +761,18 @@ namespace confighttp {

    print_req(request);

-    pt::ptree outputTree;
-    outputTree.put("status", true);
-    outputTree.put("platform", SUNSHINE_PLATFORM);
-    outputTree.put("version", PROJECT_VER);
+    nlohmann::json output_tree;
+    output_tree["status"] = true;
+    output_tree["platform"] = SUNSHINE_PLATFORM;
+    output_tree["version"] = PROJECT_VER;

    auto vars = config::parse_config(file_handler::read_file(config::sunshine.config_file.c_str()));

    for (auto &[name, value] : vars) {
-      outputTree.put(std::move(name), std::move(value));
+      output_tree[name] = std::move(value);
    }

-    send_response(response, outputTree);
+    send_response(response, output_tree);
  }

  /**
@@ -748,10 +787,10 @@ namespace confighttp {

    print_req(request);

-    pt::ptree outputTree;
-    outputTree.put("status", true);
-    outputTree.put("locale", config::sunshine.locale);
-    send_response(response, outputTree);
+    nlohmann::json output_tree;
+    output_tree["status"] = true;
+    output_tree["locale"] = config::sunshine.locale;
+    send_response(response, output_tree);
  }

  /**
@@ -777,24 +816,24 @@ namespace confighttp {
    print_req(request);

    std::stringstream ss;
-    std::stringstream configStream;
    ss << request->content.rdbuf();
    try {
      // TODO: Input Validation
-      pt::ptree inputTree;
-      pt::ptree outputTree;
-      pt::read_json(ss, inputTree);
-      for (const auto &[k, v] : inputTree) {
-        std::string value = inputTree.get<std::string>(k);
-        if (value.length() == 0 || value.compare("null") == 0) {
+      std::stringstream config_stream;
+      nlohmann::json output_tree;
+      nlohmann::json input_tree = nlohmann::json::parse(ss);
+      for (const auto &[k, v] : input_tree.items()) {
+        if (v.is_null() || (v.is_string() && v.get<std::string>().empty())) {
          continue;
        }

-        configStream << k << " = " << value << std::endl;
+        // v.dump() will dump valid json, which we do not want for strings in the config right now
+        // we should migrate the config file to straight json and get rid of all this nonsense
+        config_stream << k << " = " << (v.is_string() ? v.get<std::string>() : v.dump()) << std::endl;
      }
-      file_handler::write_file(config::sunshine.config_file.c_str(), configStream.str());
-      outputTree.put("status", true);
-      send_response(response, outputTree);
+      file_handler::write_file(config::sunshine.config_file.c_str(), config_stream.str());
+      output_tree["status"] = true;
+      send_response(response, output_tree);
    } catch (std::exception &e) {
      BOOST_LOG(warning) << "SaveConfig: "sv << e.what();
      bad_request(response, request, e.what());
@@ -802,40 +841,83 @@ namespace confighttp {
  }

  /**
-   * @brief Restart Sunshine.
+   * @brief Upload a cover image.
   * @param response The HTTP response object.
   * @param request The HTTP request object.
+   * The body for the post request should be JSON serialized in the following format:
+   * @code{.json}
+   * {
+   *   "key": "igdb_<game_id>",
+   *   "url": "https://images.igdb.com/igdb/image/upload/t_cover_big_2x/<slug>.png"
+   * }
+   * @endcode
   *
-   * @api_examples{/api/restart| POST| null}
+   * @api_examples{/api/covers/upload| POST| {"key":"igdb_1234","url":"https://images.igdb.com/igdb/image/upload/t_cover_big_2x/abc123.png"}}
   */
-  void restart(resp_https_t response, req_https_t request) {
+  void uploadCover(resp_https_t response, req_https_t request) {
    if (!authenticate(response, request)) {
      return;
    }

-    print_req(request);
+    std::stringstream ss;
+    ss << request->content.rdbuf();
+    try {
+      nlohmann::json output_tree;
+      nlohmann::json input_tree = nlohmann::json::parse(ss);

-    // We may not return from this call
-    platf::restart();
+      std::string key = input_tree.value("key", "");
+      if (key.empty()) {
+        bad_request(response, request, "Cover key is required");
+        return;
+      }
+      std::string url = input_tree.value("url", "");
+
+      const std::string coverdir = platf::appdata().string() + "/covers/";
+      file_handler::make_directory(coverdir);
+
+      std::basic_string path = coverdir + http::url_escape(key) + ".png";
+      if (!url.empty()) {
+        if (http::url_get_host(url) != "images.igdb.com") {
+          bad_request(response, request, "Only images.igdb.com is allowed");
+          return;
+        }
+        if (!http::download_file(url, path)) {
+          bad_request(response, request, "Failed to download cover");
+          return;
+        }
+      } else {
+        auto data = SimpleWeb::Crypto::Base64::decode(input_tree.value("data", ""));
+
+        std::ofstream imgfile(path);
+        imgfile.write(data.data(), static_cast<int>(data.size()));
+      }
+      output_tree["status"] = true;
+      output_tree["path"] = path;
+      send_response(response, output_tree);
+    } catch (std::exception &e) {
+      BOOST_LOG(warning) << "UploadCover: "sv << e.what();
+      bad_request(response, request, e.what());
+    }
  }

  /**
-   * @brief Reset the display device persistence.
+   * @brief Get the logs from the log file.
   * @param response The HTTP response object.
   * @param request The HTTP request object.
   *
-   * @api_examples{/api/reset-display-device-persistence| POST| null}
+   * @api_examples{/api/logs| GET| null}
   */
-  void resetDisplayDevicePersistence(resp_https_t response, req_https_t request) {
+  void getLogs(resp_https_t response, req_https_t request) {
    if (!authenticate(response, request)) {
      return;
    }

    print_req(request);

-    pt::ptree outputTree;
-    outputTree.put("status", display_device::reset_persistence());
-    send_response(response, outputTree);
+    std::string content = file_handler::read_file(config::sunshine.log_file.c_str());
+    SimpleWeb::CaseInsensitiveMultimap headers;
+    headers.emplace("Content-Type", "text/plain");
+    response->write(SimpleWeb::StatusCode::success_ok, content, headers);
  }

  /**
@@ -864,23 +946,21 @@ namespace confighttp {

    std::vector<std::string> errors = {};
    std::stringstream ss;
-    std::stringstream configStream;
+    std::stringstream config_stream;
    ss << request->content.rdbuf();
-
    try {
      // TODO: Input Validation
-      pt::ptree inputTree;
-      pt::ptree outputTree;
-      pt::read_json(ss, inputTree);
-      auto username = inputTree.count("currentUsername") > 0 ? inputTree.get<std::string>("currentUsername") : "";
-      auto newUsername = inputTree.get<std::string>("newUsername");
-      auto password = inputTree.count("currentPassword") > 0 ? inputTree.get<std::string>("currentPassword") : "";
-      auto newPassword = inputTree.count("newPassword") > 0 ? inputTree.get<std::string>("newPassword") : "";
-      auto confirmPassword = inputTree.count("confirmNewPassword") > 0 ? inputTree.get<std::string>("confirmNewPassword") : "";
-      if (newUsername.length() == 0) {
+      nlohmann::json output_tree;
+      nlohmann::json input_tree = nlohmann::json::parse(ss);
+      std::string username = input_tree.value("currentUsername", "");
+      std::string newUsername = input_tree.value("newUsername", "");
+      std::string password = input_tree.value("currentPassword", "");
+      std::string newPassword = input_tree.value("newPassword", "");
+      std::string confirmPassword = input_tree.value("confirmNewPassword", "");
+      if (newUsername.empty()) {
        newUsername = username;
      }
-      if (newUsername.length() == 0) {
+      if (newUsername.empty()) {
        errors.emplace_back("Invalid Username");
      } else {
        auto hash = util::hex(crypto::hash(password + config::sunshine.salt)).to_string();
@@ -890,7 +970,7 @@ namespace confighttp {
          } else {
            http::save_user_creds(config::sunshine.credentials_file, newUsername, newPassword);
            http::reload_user_creds(config::sunshine.credentials_file);
-            outputTree.put("status", true);
+            output_tree["status"] = true;
          }
        } else {
          errors.emplace_back("Invalid Current Credentials");
@@ -906,7 +986,7 @@ namespace confighttp {
        return;
      }

-      send_response(response, outputTree);
+      send_response(response, output_tree);
    } catch (std::exception &e) {
      BOOST_LOG(warning) << "SavePassword: "sv << e.what();
      bad_request(response, request, e.what());
@@ -936,16 +1016,20 @@ namespace confighttp {

    std::stringstream ss;
    ss << request->content.rdbuf();
-
    try {
-      // TODO: Input Validation
-      pt::ptree inputTree;
-      pt::ptree outputTree;
-      pt::read_json(ss, inputTree);
-      std::string pin = inputTree.get<std::string>("pin");
-      std::string name = inputTree.get<std::string>("name");
-      outputTree.put("status", nvhttp::pin(pin, name));
-      send_response(response, outputTree);
+      nlohmann::json output_tree;
+      nlohmann::json input_tree = nlohmann::json::parse(ss);
+      const std::string name = input_tree.value("name", "");
+      const std::string pin = input_tree.value("pin", "");
+
+      int _pin = 0;
+      _pin = std::stoi(pin);
+      if (_pin < 0 || _pin > 9999) {
+        bad_request(response, request, "PIN must be between 0000 and 9999");
+      }
+
+      output_tree["status"] = nvhttp::pin(pin, name);
+      send_response(response, output_tree);
    } catch (std::exception &e) {
      BOOST_LOG(warning) << "SavePin: "sv << e.what();
      bad_request(response, request, e.what());
@@ -953,106 +1037,40 @@ namespace confighttp {
  }

  /**
-   * @brief Unpair all clients.
+   * @brief Reset the display device persistence.
   * @param response The HTTP response object.
   * @param request The HTTP request object.
   *
-   * @api_examples{/api/clients/unpair-all| POST| null}
+   * @api_examples{/api/reset-display-device-persistence| POST| null}
   */
-  void unpairAll(resp_https_t response, req_https_t request) {
+  void resetDisplayDevicePersistence(resp_https_t response, req_https_t request) {
    if (!authenticate(response, request)) {
      return;
    }

    print_req(request);

-    nvhttp::erase_all_clients();
-    proc::proc.terminate();
-
-    pt::ptree outputTree;
-    outputTree.put("status", true);
-    send_response(response, outputTree);
+    nlohmann::json output_tree;
+    output_tree["status"] = display_device::reset_persistence();
+    send_response(response, output_tree);
  }

  /**
-   * @brief Unpair a client.
+   * @brief Restart Sunshine.
   * @param response The HTTP response object.
   * @param request The HTTP request object.
-   * The body for the post request should be JSON serialized in the following format:
-   * @code{.json}
-   * {
-   *  "uuid": "<uuid>"
-   * }
-   * @endcode
   *
-   * @api_examples{/api/unpair| POST| {"uuid":"1234"}}
+   * @api_examples{/api/restart| POST| null}
   */
-  void unpair(resp_https_t response, req_https_t request) {
+  void restart(resp_https_t response, req_https_t request) {
    if (!authenticate(response, request)) {
      return;
    }

    print_req(request);

-    std::stringstream ss;
-    ss << request->content.rdbuf();
-
-    try {
-      // TODO: Input Validation
-      pt::ptree inputTree;
-      pt::ptree outputTree;
-      pt::read_json(ss, inputTree);
-      std::string uuid = inputTree.get<std::string>("uuid");
-      outputTree.put("status", nvhttp::unpair_client(uuid));
-      send_response(response, outputTree);
-    } catch (std::exception &e) {
-      BOOST_LOG(warning) << "Unpair: "sv << e.what();
-      bad_request(response, request, e.what());
-    }
-  }
-
-  /**
-   * @brief Get the list of paired clients.
-   * @param response The HTTP response object.
-   * @param request The HTTP request object.
-   *
-   * @api_examples{/api/clients/list| GET| null}
-   */
-  void listClients(resp_https_t response, req_https_t request) {
-    if (!authenticate(response, request)) {
-      return;
-    }
-
-    print_req(request);
-
-    const pt::ptree named_certs = nvhttp::get_all_clients();
-
-    pt::ptree outputTree;
-    outputTree.put("status", false);
-    outputTree.add_child("named_certs", named_certs);
-    outputTree.put("status", true);
-    send_response(response, outputTree);
-  }
-
-  /**
-   * @brief Close the currently running application.
-   * @param response The HTTP response object.
-   * @param request The HTTP request object.
-   *
-   * @api_examples{/api/apps/close| POST| null}
-   */
-  void closeApp(resp_https_t response, req_https_t request) {
-    if (!authenticate(response, request)) {
-      return;
-    }
-
-    print_req(request);
-
-    proc::proc.terminate();
-
-    pt::ptree outputTree;
-    outputTree.put("status", true);
-    send_response(response, outputTree);
+    // We may not return from this call
+    platf::restart();
  }

  void start() {
@@ -1095,7 +1113,7 @@ namespace confighttp {
    server.resource["^/api/password$"]["POST"] = savePassword;
    server.resource["^/api/apps/([0-9]+)$"]["DELETE"] = deleteApp;
    server.resource["^/api/clients/unpair-all$"]["POST"] = unpairAll;
-    server.resource["^/api/clients/list$"]["GET"] = listClients;
+    server.resource["^/api/clients/list$"]["GET"] = getClients;
    server.resource["^/api/clients/unpair$"]["POST"] = unpair;
    server.resource["^/api/apps/close$"]["POST"] = closeApp;
    server.resource["^/api/covers/upload$"]["POST"] = uploadCover;
--- a/src/confighttp.h
+++ b/src/confighttp.h
@@ -5,7 +5,6 @@
 #pragma once

 // standard includes
-#include <functional>
 #include <string>

 // local includes
--- a/src/display_device.cpp
+++ b/src/display_device.cpp
@@ -621,7 +621,7 @@ namespace display_device {
          std::make_shared<FileSettingsPersistence>(persistence_filepath)
        ),
        WinWorkarounds {
-          .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle ? std::make_optional(500ms) : std::nullopt
+          .m_hdr_blank_delay = video_config.dd.wa.hdr_toggle_delay != std::chrono::milliseconds::zero() ? std::make_optional(video_config.dd.wa.hdr_toggle_delay) : std::nullopt
        }
      );
 #else
@@ -810,6 +810,18 @@ namespace display_device {
    });
  }

+  EnumeratedDeviceList enumerate_devices() {
+    std::lock_guard lock {DD_DATA.mutex};
+    if (!DD_DATA.sm_instance) {
+      // Platform is not supported.
+      return {};
+    }
+
+    return DD_DATA.sm_instance->execute([](auto &settings_iface) {
+      return settings_iface.enumAvailableDevices();
+    });
+  }
+
  std::variant<failed_to_parse_tag_t, configuration_disabled_tag_t, SingleDisplayConfiguration> parse_configuration(const config::video_t &video_config, const rtsp_stream::launch_session_t &session) {
    const auto device_prep {parse_device_prep_option(video_config)};
    if (!device_prep) {
--- a/src/display_device.h
+++ b/src/display_device.h
@@ -110,8 +110,8 @@ namespace display_device {
   * The user then accepts that Sunshine is not able to restore the state and "agrees" to
   * do it manually.
   *
-   * @return
-   * @note Whether the function succeeds or fails, the any of the scheduled "retries" from
+   * @return True if persistence was reset, false otherwise.
+   * @note Whether the function succeeds or fails, any of the scheduled "retries" from
   *       other methods will be stopped to not interfere with the user actions.
   *
   * @examples
@@ -120,6 +120,16 @@ namespace display_device {
   */
  [[nodiscard]] bool reset_persistence();

+  /**
+   * @brief Enumerate the available devices.
+   * @return A list of devices.
+   *
+   * @examples
+   * const auto devices = enumerate_devices();
+   * @examples_end
+   */
+  [[nodiscard]] EnumeratedDeviceList enumerate_devices();
+
  /**
   * @brief A tag structure indicating that configuration parsing has failed.
   */
--- a/src/httpcommon.h
+++ b/src/httpcommon.h
@@ -23,7 +23,7 @@ namespace http {
  );

  int reload_user_creds(const std::string &file);
-  bool download_file(const std::string &url, const std::string &file, long ssl_version = CURL_SSLVERSION_TLSv1_3);
+  bool download_file(const std::string &url, const std::string &file, long ssl_version = CURL_SSLVERSION_TLSv1_2);
  std::string url_escape(const std::string &url);
  std::string url_get_host(const std::string &url);

--- a/src/nvenc/nvenc_base.cpp
+++ b/src/nvenc/nvenc_base.cpp
@@ -528,7 +528,7 @@ namespace nvenc {

    NV_ENC_LOCK_BITSTREAM lock_bitstream = {min_struct_version(NV_ENC_LOCK_BITSTREAM_VER, 1, 2)};
    lock_bitstream.outputBitstream = output_bitstream;
-    lock_bitstream.doNotWait = 0;
+    lock_bitstream.doNotWait = async_event_handle ? 1 : 0;

    if (async_event_handle && !wait_for_async_event(100)) {
      BOOST_LOG(error) << "NvEnc: frame " << frame_index << " encode wait timeout";
--- a/src/nvenc/nvenc_d3d11.cpp
+++ b/src/nvenc/nvenc_d3d11.cpp
@@ -10,11 +10,19 @@

 namespace nvenc {

+  nvenc_d3d11::nvenc_d3d11(NV_ENC_DEVICE_TYPE device_type):
+      nvenc_base(device_type) {
+    async_event_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
+  }
+
  nvenc_d3d11::~nvenc_d3d11() {
    if (dll) {
      FreeLibrary(dll);
      dll = NULL;
    }
+    if (async_event_handle) {
+      CloseHandle(async_event_handle);
+    }
  }

  bool nvenc_d3d11::init_library() {
@@ -53,5 +61,9 @@ namespace nvenc {
    return false;
  }

+  bool nvenc_d3d11::wait_for_async_event(uint32_t timeout_ms) {
+    return WaitForSingleObject(async_event_handle, timeout_ms) == WAIT_OBJECT_0;
+  }
+
 }  // namespace nvenc
 #endif
--- a/src/nvenc/nvenc_d3d11.h
+++ b/src/nvenc/nvenc_d3d11.h
@@ -25,10 +25,7 @@ namespace nvenc {
   */
  class nvenc_d3d11: public nvenc_base {
  public:
-    explicit nvenc_d3d11(NV_ENC_DEVICE_TYPE device_type):
-        nvenc_base(device_type) {
-    }
-
+    explicit nvenc_d3d11(NV_ENC_DEVICE_TYPE device_type);
    ~nvenc_d3d11();

    /**
@@ -39,6 +36,7 @@ namespace nvenc {

  protected:
    bool init_library() override;
+    bool wait_for_async_event(uint32_t timeout_ms) override;

  private:
    HMODULE dll = NULL;
--- a/src/nvhttp.cpp
+++ b/src/nvhttp.cpp
@@ -765,14 +765,14 @@ namespace nvhttp {
    response->close_connection_after_response = true;
  }

-  pt::ptree get_all_clients() {
-    pt::ptree named_cert_nodes;
+  nlohmann::json get_all_clients() {
+    nlohmann::json named_cert_nodes = nlohmann::json::array();
    client_t &client = client_root;
    for (auto &named_cert : client.named_devices) {
-      pt::ptree named_cert_node;
-      named_cert_node.put("name"s, named_cert.name);
-      named_cert_node.put("uuid"s, named_cert.uuid);
-      named_cert_nodes.push_back(std::make_pair(""s, named_cert_node));
+      nlohmann::json named_cert_node;
+      named_cert_node["name"] = named_cert.name;
+      named_cert_node["uuid"] = named_cert.uuid;
+      named_cert_nodes.push_back(named_cert_node);
    }

    return named_cert_nodes;
@@ -852,14 +852,14 @@ namespace nvhttp {
    auto launch_session = make_launch_session(host_audio, args);

    if (rtsp_stream::session_count() == 0) {
+      // The display should be restored in case something fails as there are no other sessions.
+      revert_display_configuration = true;
+
      // We want to prepare display only if there are no active sessions at
      // the moment. This should be done before probing encoders as it could
      // change the active displays.
      display_device::configure_display(config::video, *launch_session);

-      // The display should be restored in case something fails as there are no other sessions.
-      revert_display_configuration = true;
-
      // Probe encoders again before streaming to ensure our chosen
      // encoder matches the active GPU (which could have changed
      // due to hotplugging, driver crash, primary monitor change,
@@ -1177,13 +1177,13 @@ namespace nvhttp {
    save_state();
  }

-  int unpair_client(std::string uuid) {
-    int removed = 0;
+  bool unpair_client(const std::string_view uuid) {
+    bool removed = false;
    client_t &client = client_root;
    for (auto it = client.named_devices.begin(); it != client.named_devices.end();) {
      if ((*it).uuid == uuid) {
        it = client.named_devices.erase(it);
-        removed++;
+        removed = true;
      } else {
        ++it;
      }
--- a/src/nvhttp.h
+++ b/src/nvhttp.h
@@ -10,6 +10,7 @@

 // lib includes
 #include <boost/property_tree/ptree.hpp>
+#include <nlohmann/json.hpp>
 #include <Simple-Web-Server/server_https.hpp>

 // local includes
@@ -176,20 +177,21 @@ namespace nvhttp {

  /**
   * @brief Remove single client.
+   * @param uuid The UUID of the client to remove.
   * @examples
   * nvhttp::unpair_client("4D7BB2DD-5704-A405-B41C-891A022932E1");
   * @examples_end
   */
-  int unpair_client(std::string uniqueid);
+  bool unpair_client(std::string_view uuid);

  /**
   * @brief Get all paired clients.
   * @return The list of all paired clients.
   * @examples
-   * boost::property_tree::ptree clients = nvhttp::get_all_clients();
+   * nlohmann::json clients = nvhttp::get_all_clients();
   * @examples_end
   */
-  boost::property_tree::ptree get_all_clients();
+  nlohmann::json get_all_clients();

  /**
   * @brief Remove all paired clients.
--- a/src/platform/common.h
+++ b/src/platform/common.h
@@ -106,6 +106,7 @@ namespace platf {
    rumble_triggers,  ///< Rumble triggers
    set_motion_event_state,  ///< Set motion event state
    set_rgb_led,  ///< Set RGB LED
+    set_adaptive_triggers,  ///< Set adaptive triggers
  };

  struct gamepad_feedback_msg_t {
@@ -142,6 +143,14 @@ namespace platf {
      return msg;
    }

+    static gamepad_feedback_msg_t make_adaptive_triggers(std::uint16_t id, uint8_t event_flags, uint8_t type_left, uint8_t type_right, const std::array<uint8_t, 10> &left, const std::array<uint8_t, 10> &right) {
+      gamepad_feedback_msg_t msg;
+      msg.type = gamepad_feedback_e::set_adaptive_triggers;
+      msg.id = id;
+      msg.data.adaptive_triggers = {.event_flags = event_flags, .type_left = type_left, .type_right = type_right, .left = left, .right = right};
+      return msg;
+    }
+
    gamepad_feedback_e type;
    std::uint16_t id;

@@ -166,6 +175,15 @@ namespace platf {
        std::uint8_t g;
        std::uint8_t b;
      } rgb_led;
+
+      struct {
+        uint16_t controllerNumber;
+        uint8_t event_flags;
+        uint8_t type_left;
+        uint8_t type_right;
+        std::array<uint8_t, 10> left;
+        std::array<uint8_t, 10> right;
+      } adaptive_triggers;
    } data;
  };

--- a/src/platform/linux/input/inputtino_gamepad.cpp
+++ b/src/platform/linux/input/inputtino_gamepad.cpp
@@ -43,7 +43,7 @@ namespace platf::gamepad {
  }

  auto create_ds5() {
-    return inputtino::PS5Joypad::create({.name = "Sunshine DualSense (virtual) pad", .vendor_id = 0x054C, .product_id = 0x0CE6, .version = 0x8111});
+    return inputtino::PS5Joypad::create({.name = "Sunshine PS5 (virtual) pad", .vendor_id = 0x054C, .product_id = 0x0CE6, .version = 0x8111});
  }

  int alloc(input_raw_t *raw, const gamepad_id_t &id, const gamepad_arrival_t &metadata, feedback_queue_t feedback_queue) {
@@ -152,6 +152,10 @@ namespace platf::gamepad {
              gamepad->last_rgb_led = msg;
            });

+            (*ds5).set_on_trigger_effect([feedback_queue, idx = id.clientRelativeIndex](const inputtino::PS5Joypad::TriggerEffect &trigger_effect) {
+              feedback_queue->raise(gamepad_feedback_msg_t::make_adaptive_triggers(idx, trigger_effect.event_flags, trigger_effect.type_left, trigger_effect.type_right, trigger_effect.left, trigger_effect.right));
+            });
+
            // Activate the motion sensors
            feedback_queue->raise(gamepad_feedback_msg_t::make_motion_event_state(id.clientRelativeIndex, LI_MOTION_TYPE_ACCEL, 100));
            feedback_queue->raise(gamepad_feedback_msg_t::make_motion_event_state(id.clientRelativeIndex, LI_MOTION_TYPE_GYRO, 100));
--- a/src/stream.cpp
+++ b/src/stream.cpp
@@ -48,6 +48,7 @@ extern "C" {
 #define IDX_RUMBLE_TRIGGER_DATA 12
 #define IDX_SET_MOTION_EVENT 13
 #define IDX_SET_RGB_LED 14
+#define IDX_SET_ADAPTIVE_TRIGGERS 15

 static const short packetTypes[] = {
  0x0305,  // Start A
@@ -65,6 +66,7 @@ static const short packetTypes[] = {
  0x5500,  // Rumble triggers (Sunshine protocol extension)
  0x5501,  // Set motion event (Sunshine protocol extension)
  0x5502,  // Set RGB LED (Sunshine protocol extension)
+  0x5503,  // Set Adaptive triggers (Sunshine protocol extension)
 };

 namespace asio = boost::asio;
@@ -186,6 +188,21 @@ namespace stream {
    std::uint8_t b;
  };

+  struct control_adaptive_triggers_t {
+    control_header_v2 header;
+
+    std::uint16_t id;
+    /**
+     * 0x04 - Right trigger
+     * 0x08 - Left trigger
+     */
+    std::uint8_t event_flags;
+    std::uint8_t type_left;
+    std::uint8_t type_right;
+    std::uint8_t left[DS_EFFECT_PAYLOAD_SIZE];
+    std::uint8_t right[DS_EFFECT_PAYLOAD_SIZE];
+  };
+
  struct control_hdr_mode_t {
    control_header_v2 header;

@@ -833,6 +850,22 @@ namespace stream {
      plaintext.b = data.b;

      BOOST_LOG(verbose) << "RGB: "sv << msg.id << " :: "sv << util::hex(data.r).to_string_view() << util::hex(data.g).to_string_view() << util::hex(data.b).to_string_view();
+      std::array<std::uint8_t, sizeof(control_encrypted_t) + crypto::cipher::round_to_pkcs7_padded(sizeof(plaintext)) + crypto::cipher::tag_size>
+        encrypted_payload;
+
+      payload = encode_control(session, util::view(plaintext), encrypted_payload);
+    } else if (msg.type == platf::gamepad_feedback_e::set_adaptive_triggers) {
+      control_adaptive_triggers_t plaintext;
+      plaintext.header.type = packetTypes[IDX_SET_ADAPTIVE_TRIGGERS];
+      plaintext.header.payloadLength = sizeof(plaintext) - sizeof(control_header_v2);
+
+      plaintext.id = util::endian::little(msg.id);
+      plaintext.event_flags = msg.data.adaptive_triggers.event_flags;
+      plaintext.type_left = msg.data.adaptive_triggers.type_left;
+      std::ranges::copy(msg.data.adaptive_triggers.left, plaintext.left);
+      plaintext.type_right = msg.data.adaptive_triggers.type_right;
+      std::ranges::copy(msg.data.adaptive_triggers.right, plaintext.right);
+
      std::array<std::uint8_t, sizeof(control_encrypted_t) + crypto::cipher::round_to_pkcs7_padded(sizeof(plaintext)) + crypto::cipher::tag_size>
        encrypted_payload;

@@ -1882,11 +1915,17 @@ namespace stream {

      // If this is the last session, invoke the platform callbacks
      if (--running_sessions == 0) {
+        bool revert_display_config {config::video.dd.config_revert_on_disconnect};
        if (proc::proc.running()) {
 #if defined SUNSHINE_TRAY && SUNSHINE_TRAY >= 1
          system_tray::update_tray_pausing(proc::proc.get_last_run_app_name());
 #endif
        } else {
+          // We have no app running and also no clients anymore.
+          revert_display_config = true;
+        }
+
+        if (revert_display_config) {
          display_device::revert_configuration();
        }

--- a/src/video.cpp
+++ b/src/video.cpp
@@ -40,6 +40,37 @@ using namespace std::literals;

 namespace video {

+  namespace {
+    /**
+     * @brief Check if we can allow probing for the encoders.
+     * @return True if there should be no issues with the probing, false if we should prevent it.
+     */
+    bool allow_encoder_probing() {
+      const auto devices {display_device::enumerate_devices()};
+
+      // If there are no devices, then either the API is not working correctly or OS does not support the lib.
+      // Either way we should not block the probing in this case as we can't tell what's wrong.
+      if (devices.empty()) {
+        return true;
+      }
+
+      // Since Windows 11 24H2, it is possible that there will be no active devices present
+      // for some reason (probably a bug). Trying to probe encoders in such a state locks/breaks the DXGI
+      // and also the display device for Windows. So we must have at least 1 active device.
+      const bool at_least_one_device_is_active = std::any_of(std::begin(devices), std::end(devices), [](const auto &device) {
+        // If device has additional info, it is active.
+        return static_cast<bool>(device.m_info);
+      });
+
+      if (at_least_one_device_is_active) {
+        return true;
+      }
+
+      BOOST_LOG(error) << "No display devices are active at the moment! Cannot probe the encoders.";
+      return false;
+    }
+  }  // namespace
+
  void free_ctx(AVCodecContext *ctx) {
    avcodec_free_context(&ctx);
  }
@@ -268,6 +299,7 @@ namespace video {
    REF_FRAMES_INVALIDATION = 1 << 8,  ///< Support reference frames invalidation
    ALWAYS_REPROBE = 1 << 9,  ///< This is an encoder of last resort and we want to aggressively probe for a better one
    YUV444_SUPPORT = 1 << 10,  ///< Encoder may support 4:4:4 chroma sampling depending on hardware
+    ASYNC_TEARDOWN = 1 << 11,  ///< Encoder supports async teardown on a different thread
  };

  class avcodec_encode_session_t: public encode_session_t {
@@ -472,7 +504,7 @@ namespace video {
      {},  // Fallback options
      "h264_nvenc"s,
    },
-    PARALLEL_ENCODING | REF_FRAMES_INVALIDATION | YUV444_SUPPORT  // flags
+    PARALLEL_ENCODING | REF_FRAMES_INVALIDATION | YUV444_SUPPORT | ASYNC_TEARDOWN  // flags
  };
 #elif !defined(__APPLE__)
  encoder_t nvenc {
@@ -1655,7 +1687,8 @@ namespace video {
        }
      }

-      auto bitrate = config.bitrate * 1000;
+      auto bitrate = ((config::video.max_bitrate > 0) ? std::min(config.bitrate, config::video.max_bitrate) : config.bitrate) * 1000;
+      BOOST_LOG(info) << "Streaming bitrate is " << bitrate;
      ctx->rc_max_rate = bitrate;
      ctx->bit_rate = bitrate;

@@ -1825,6 +1858,23 @@ namespace video {
      return;
    }

+    // As a workaround for NVENC hangs and to generally speed up encoder reinit,
+    // we will complete the encoder teardown in a separate thread if supported.
+    // This will move expensive processing off the encoder thread to allow us
+    // to restart encoding as soon as possible. For cases where the NVENC driver
+    // hang occurs, this thread may probably never exit, but it will allow
+    // streaming to continue without requiring a full restart of Sunshine.
+    auto fail_guard = util::fail_guard([&encoder, &session] {
+      if (encoder.flags & ASYNC_TEARDOWN) {
+        std::thread encoder_teardown_thread {[session = std::move(session)]() mutable {
+          BOOST_LOG(info) << "Starting async encoder teardown";
+          session.reset();
+          BOOST_LOG(info) << "Async encoder teardown complete";
+        }};
+        encoder_teardown_thread.detach();
+      }
+    });
+
    // set minimum frame time, avoiding violation of client-requested target framerate
    auto minimum_frame_time = std::chrono::milliseconds(1000 / std::min(config.framerate, (config::video.min_fps_factor * 10)));
    BOOST_LOG(debug) << "Minimum frame time set to "sv << minimum_frame_time.count() << "ms, based on min fps factor of "sv << config::video.min_fps_factor << "."sv;
@@ -2550,6 +2600,11 @@ namespace video {
  }

  int probe_encoders() {
+    if (!allow_encoder_probing()) {
+      // Error already logged
+      return -1;
+    }
+
    auto encoder_list = encoders;

    // If we already have a good encoder, check to see if another probe is required
--- a/src_assets/common/assets/web/apps.html
+++ b/src_assets/common/assets/web/apps.html
@@ -234,8 +234,8 @@
        <!-- exit timeout -->
        <div class="mb-3">
          <label for="exitTimeout" class="form-label">{{ $t('apps.exit_timeout') }}</label>
-          <input type="text" class="form-control monospace" id="exitTimeout" aria-describedby="exitTimeoutHelp"
-            v-model="editForm['exit-timeout']" />
+          <input type="number" class="form-control monospace" id="exitTimeout" aria-describedby="exitTimeoutHelp"
+                 v-model="editForm['exit-timeout']" min="0" placeholder="5" />
          <div id="exitTimeoutHelp" class="form-text">{{ $t('apps.exit_timeout_desc') }}</div>
        </div>
        <div class="mb-3">
@@ -441,7 +441,7 @@
        );
        if (resp) {
          fetch("./api/apps/" + id, { method: "DELETE" }).then((r) => {
-            if (r.status == 200) document.location.reload();
+            if (r.status === 200) document.location.reload();
          });
        }
      },
@@ -557,7 +557,7 @@
          method: "POST",
          body: JSON.stringify(this.editForm),
        }).then((r) => {
-          if (r.status == 200) document.location.reload();
+          if (r.status === 200) document.location.reload();
        });
      },
    },
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -135,27 +135,27 @@
              "sunshine_name": "",
              "min_log_level": 2,
              "global_prep_cmd": [],
-              "notify_pre_releases": false,
+              "notify_pre_releases": "disabled",
            },
          },
          {
            id: "input",
            name: "Input",
            options: {
-              "controller": true,
+              "controller": "enabled",
              "gamepad": "auto",
-              "ds4_back_as_touchpad_click": true,
-              "motion_as_ds4": true,
-              "touchpad_as_ds4": true,
+              "ds4_back_as_touchpad_click": "enabled",
+              "motion_as_ds4": "enabled",
+              "touchpad_as_ds4": "enabled",
              "back_button_timeout": -1,
-              "keyboard": true,
+              "keyboard": "enabled",
              "key_repeat_delay": 500,
              "key_repeat_frequency": 24.9,
-              "always_send_scancodes": true,
-              "key_rightalt_to_key_win": false,
-              "mouse": true,
-              "high_resolution_scrolling": true,
-              "native_pen_touch": true,
+              "always_send_scancodes": "enabled",
+              "key_rightalt_to_key_win": "disabled",
+              "mouse": "enabled",
+              "high_resolution_scrolling": "enabled",
+              "native_pen_touch": "enabled",
              "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]",  // todo: add this to UI
            },
          },
@@ -165,26 +165,28 @@
            options: {
              "audio_sink": "",
              "virtual_sink": "",
-              "install_steam_audio_drivers": true,
+              "install_steam_audio_drivers": "enabled",
              "adapter_name": "",
              "output_name": "",
-              "dd_configuration_option": "verify_only",
+              "dd_configuration_option": "disabled",
              "dd_resolution_option": "auto",
              "dd_manual_resolution": "",
              "dd_refresh_rate_option": "auto",
              "dd_manual_refresh_rate": "",
              "dd_hdr_option": "auto",
              "dd_config_revert_delay": 3000,
+              "dd_config_revert_on_disconnect": "disabled",
              "dd_mode_remapping": {"mixed": [], "resolution_only": [], "refresh_rate_only": []},
-              "dd_wa_hdr_toggle": false,
+              "dd_wa_hdr_toggle_delay": 0,
              "min_fps_factor": 1,
+              "max_bitrate": 0,
            },
          },
          {
            id: "network",
            name: "Network",
            options: {
-              "upnp": false,
+              "upnp": "disabled",
              "address_family": "ipv4",
              "port": 47989,
              "origin_web_ui_allowed": "lan",
@@ -225,12 +227,12 @@
            options: {
              "nvenc_preset": 1,
              "nvenc_twopass": "quarter_res",
-              "nvenc_spatial_aq": false,
+              "nvenc_spatial_aq": "disabled",
              "nvenc_vbv_increase": 0,
-              "nvenc_realtime_hags": true,
-              "nvenc_latency_over_power": true,
-              "nvenc_opengl_vulkan_on_dxgi": true,
-              "nvenc_h264_cavlc": false,
+              "nvenc_realtime_hags": "enabled",
+              "nvenc_latency_over_power": "enabled",
+              "nvenc_opengl_vulkan_on_dxgi": "enabled",
+              "nvenc_h264_cavlc": "disabled",
            },
          },
          {
@@ -239,7 +241,7 @@
            options: {
              "qsv_preset": "medium",
              "qsv_coder": "auto",
-              "qsv_slow_hevc": false,
+              "qsv_slow_hevc": "disabled",
            },
          },
          {
@@ -248,10 +250,10 @@
            options: {
              "amd_usage": "ultralowlatency",
              "amd_rc": "vbr_latency",
-              "amd_enforce_hrd": false,
+              "amd_enforce_hrd": "disabled",
              "amd_quality": "balanced",
-              "amd_preanalysis": false,
-              "amd_vbaq": true,
+              "amd_preanalysis": "disabled",
+              "amd_vbaq": "enabled",
              "amd_coder": "auto",
            },
          },
@@ -261,14 +263,14 @@
            options: {
              "vt_coder": "auto",
              "vt_software": "auto",
-              "vt_realtime": true,
+              "vt_realtime": "enabled",
            },
          },
          {
            id: "vaapi",
            name: "VA-API Encoder",
            options: {
-              "vaapi_strict_rc_buffer": false,
+              "vaapi_strict_rc_buffer": "disabled",
            },
          },
          {
@@ -342,10 +344,7 @@
        this.$forceUpdate()
      },
      serialize() {
-        let config = JSON.parse(JSON.stringify(this.config));
-        config.global_prep_cmd = JSON.stringify(config.global_prep_cmd);
-        config.dd_mode_remapping = JSON.stringify(config.dd_mode_remapping);
-        return config;
+        return JSON.parse(JSON.stringify(this.config));
      },
      save() {
        this.saved = false;
@@ -359,17 +358,8 @@
          Object.keys(tab.options).forEach(optionKey => {
            let delete_value = false

-            if (["global_prep_cmd", "dd_mode_remapping"].includes(optionKey)) {
-              const config_value = config[optionKey]
-              const default_value = JSON.stringify(tab.options[optionKey])
-
-              if (config_value === default_value) {
-                delete_value = true
-              }
-            }
-
            // todo: add proper type checking
-            if (String(config[optionKey]) === String(tab.options[optionKey])) {
+            if (JSON.stringify(config[optionKey]) === JSON.stringify(tab.options[optionKey])) {
              delete_value = true
            }

--- a/src_assets/common/assets/web/configs/tabs/Inputs.vue
+++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue
@@ -22,7 +22,7 @@ const config = ref(props.config)
    ></Checkbox>

    <!-- Emulated Gamepad Type -->
-    <div class="mb-3" v-if="config.controller === true && platform !== 'macos'">
+    <div class="mb-3" v-if="config.controller === 'enabled' && platform !== 'macos'">
      <label for="gamepad" class="form-label">{{ $t('config.gamepad') }}</label>
      <select id="gamepad" class="form-select" v-model="config.gamepad">
        <option value="auto">{{ $t('_common.auto') }}</option>
@@ -33,7 +33,7 @@ const config = ref(props.config)
            <option value="switch">{{ $t("config.gamepad_switch") }}</option>
            <option value="xone">{{ $t("config.gamepad_xone") }}</option>
          </template>
-
+          
          <template #windows>
            <option value="ds4">{{ $t('config.gamepad_ds4') }}</option>
            <option value="x360">{{ $t('config.gamepad_x360') }}</option>
@@ -44,7 +44,7 @@ const config = ref(props.config)
    </div>

    <!-- Additional options based on gamepad type -->
-    <template v-if="config.controller === true">
+    <template v-if="config.controller === 'enabled'">
      <template v-if="config.gamepad === 'ds4' || (config.gamepad === 'auto' && platform === 'windows')">
        <div class="mb-3 accordion">
          <div class="accordion-item">
@@ -92,7 +92,7 @@ const config = ref(props.config)
    </template>

    <!-- Home/Guide Button Emulation Timeout -->
-    <div class="mb-3" v-if="config.controller === true">
+    <div class="mb-3" v-if="config.controller === 'enabled'">
      <label for="back_button_timeout" class="form-label">{{ $t('config.back_button_timeout') }}</label>
      <input type="text" class="form-control" id="back_button_timeout" placeholder="-1"
             v-model="config.back_button_timeout" />
@@ -109,7 +109,7 @@ const config = ref(props.config)
    ></Checkbox>

    <!-- Key Repeat Delay-->
-    <div class="mb-3" v-if="config.keyboard === true && platform === 'windows'">
+    <div class="mb-3" v-if="config.keyboard === 'enabled' && platform === 'windows'">
      <label for="key_repeat_delay" class="form-label">{{ $t('config.key_repeat_delay') }}</label>
      <input type="text" class="form-control" id="key_repeat_delay" placeholder="500"
             v-model="config.key_repeat_delay" />
@@ -117,7 +117,7 @@ const config = ref(props.config)
    </div>

    <!-- Key Repeat Frequency-->
-    <div class="mb-3" v-if="config.keyboard === true && platform === 'windows'">
+    <div class="mb-3" v-if="config.keyboard === 'enabled' && platform === 'windows'">
      <label for="key_repeat_frequency" class="form-label">{{ $t('config.key_repeat_frequency') }}</label>
      <input type="text" class="form-control" id="key_repeat_frequency" placeholder="24.9"
             v-model="config.key_repeat_frequency" />
@@ -125,7 +125,7 @@ const config = ref(props.config)
    </div>

    <!-- Always send scancodes -->
-    <Checkbox v-if="config.keyboard === true && platform === 'windows'"
+    <Checkbox v-if="config.keyboard === 'enabled' && platform === 'windows'"
              class="mb-3"
              id="always_send_scancodes"
              locale-prefix="config"
@@ -134,7 +134,7 @@ const config = ref(props.config)
    ></Checkbox>

    <!-- Mapping Key AltRight to Key Windows -->
-    <Checkbox v-if="config.keyboard === true"
+    <Checkbox v-if="config.keyboard === 'enabled'"
              class="mb-3"
              id="key_rightalt_to_key_win"
              locale-prefix="config"
@@ -152,7 +152,7 @@ const config = ref(props.config)
    ></Checkbox>

    <!-- High resolution scrolling support -->
-    <Checkbox v-if="config.mouse === true"
+    <Checkbox v-if="config.mouse === 'enabled'"
              class="mb-3"
              id="high_resolution_scrolling"
              locale-prefix="config"
@@ -161,7 +161,7 @@ const config = ref(props.config)
    ></Checkbox>

    <!-- Native pen/touch support -->
-    <Checkbox v-if="config.mouse === true"
+    <Checkbox v-if="config.mouse === 'enabled'"
              class="mb-3"
              id="native_pen_touch"
              locale-prefix="config"
--- a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
+++ b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayDeviceOptions.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { ref } from 'vue'
 import PlatformLayout from '../../../PlatformLayout.vue'
-import Checkbox from "../../../Checkbox.vue";

 const props = defineProps({
  platform: String,
@@ -68,7 +67,7 @@ function addRemappingEntry() {
                  {{ $t('config.dd_config_label') }}
                </label>
                <select id="dd_configuration_option" class="form-select" v-model="config.dd_configuration_option">
-                  <option value="disabled">{{ $t('_common.disabled') }}</option>
+                  <option value="disabled">{{ $t('_common.disabled_def') }}</option>
                  <option value="verify_only">{{ $t('config.dd_config_verify_only') }}</option>
                  <option value="ensure_active">{{ $t('config.dd_config_ensure_active') }}</option>
                  <option value="ensure_primary">{{ $t('config.dd_config_ensure_primary') }}</option>
@@ -132,11 +131,18 @@ function addRemappingEntry() {
                  <option value="auto">{{ $t('config.dd_hdr_option_auto') }}</option>
                </select>
                <!-- HDR toggle -->
-                <Checkbox id="dd_wa_hdr_toggle"
-                          locale-prefix="config"
-                          v-model="config.dd_wa_hdr_toggle"
-                          default="false"
-                ></Checkbox>
+                <label for="dd_wa_hdr_toggle_delay" class="form-label">
+                  {{ $t('config.dd_wa_hdr_toggle_delay') }}
+                </label>
+                <input type="number" class="form-control" id="dd_wa_hdr_toggle_delay" placeholder="0" min="0" max="3000"
+                       v-model="config.dd_wa_hdr_toggle_delay" />
+                <div class="form-text">
+                  {{ $t('config.dd_wa_hdr_toggle_delay_desc_1') }}
+                  <br>
+                  {{ $t('config.dd_wa_hdr_toggle_delay_desc_2') }}
+                  <br>
+                  {{ $t('config.dd_wa_hdr_toggle_delay_desc_3') }}
+                </div>
              </div>

              <!-- Config revert delay -->
@@ -151,6 +157,15 @@ function addRemappingEntry() {
                </div>
              </div>

+              <!-- Config revert on disconnect -->
+              <div class="mb-3" v-if="config.dd_configuration_option !== 'disabled'">
+                <Checkbox id="dd_config_revert_on_disconnect"
+                  locale-prefix="config"
+                  v-model="config.dd_config_revert_on_disconnect"
+                  default="false"
+                ></Checkbox>
+              </div>
+
              <!-- Display mode remapping -->
              <div class="mb-3" v-if="canBeRemapped()">
                <label for="dd_mode_remapping" class="form-label">
--- a/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayModesSettings.vue
+++ b/src_assets/common/assets/web/configs/tabs/audiovideo/DisplayModesSettings.vue
@@ -17,6 +17,13 @@ const config = ref(props.config)
    <input type="number" min="1" max="3" class="form-control" id="min_fps_factor" placeholder="1" v-model="config.min_fps_factor" />
    <div class="form-text">{{ $t('config.min_fps_factor_desc') }}</div>
  </div>
+
+  <!--max_bitrate-->
+  <div class="mb-3">
+    <label for="max_bitrate" class="form-label">{{ $t("config.max_bitrate") }}</label>
+    <input type="number" class="form-control" id="max_bitrate" placeholder="0" v-model="config.max_bitrate" />
+    <div class="form-text">{{ $t("config.max_bitrate_desc") }}</div>
+  </div>
 </template>

 <style scoped>
--- a/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue
+++ b/src_assets/common/assets/web/configs/tabs/encoders/NvidiaNvencEncoder.vue
@@ -39,14 +39,12 @@ const config = ref(props.config)
    </div>

    <!-- Spatial AQ -->
-    <div class="mb-3">
-      <label for="nvenc_spatial_aq" class="form-label">{{ $t('config.nvenc_spatial_aq') }}</label>
-      <select id="nvenc_spatial_aq" class="form-select" v-model="config.nvenc_spatial_aq">
-        <option value="disabled">{{ $t('config.nvenc_spatial_aq_disabled') }}</option>
-        <option value="enabled">{{ $t('config.nvenc_spatial_aq_enabled') }}</option>
-      </select>
-      <div class="form-text">{{ $t('config.nvenc_spatial_aq_desc') }}</div>
-    </div>
+    <Checkbox class="mb-3"
+              id="nvenc_spatial_aq"
+              locale-prefix="config"
+              v-model="config.nvenc_spatial_aq"
+              default="false"
+    ></Checkbox>

    <!-- Single-frame VBV/HRD percentage increase -->
    <div class="mb-3">
--- a/src_assets/common/assets/web/password.html
+++ b/src_assets/common/assets/web/password.html
@@ -94,10 +94,10 @@
          method: "POST",
          body: JSON.stringify(this.passwordData),
        }).then((r) => {
-          if (r.status == 200) {
+          if (r.status === 200) {
            r.json().then((rj) => {
-              if (rj.status.toString() === "true") {
-                this.success = true;
+              this.success = rj.status;
+              if (this.success === true) {
                setTimeout(() => {
                  document.location.reload();
                }, 5000);
--- a/src_assets/common/assets/web/pin.html
+++ b/src_assets/common/assets/web/pin.html
@@ -42,7 +42,7 @@
        fetch("./api/pin", {method: "POST", body: b})
          .then((response) => response.json())
          .then((response) => {
-            if (response.status.toString().toLowerCase() === "true") {
+            if (response.status === true) {
              document.querySelector(
                "#status"
              ).innerHTML = `<div class="alert alert-success" role="alert">${this.i18n.t('pin.pair_success')}</div>`;
--- a/src_assets/common/assets/web/public/assets/locale/en.json
+++ b/src_assets/common/assets/web/public/assets/locale/en.json
@@ -65,7 +65,7 @@
    "env_vars_desc": "All commands get these environment variables by default:",
    "env_xrandr_example": "Example - Xrandr for Resolution Automation:",
    "exit_timeout": "Exit Timeout",
-    "exit_timeout_desc": "Number of seconds to wait for all app processes to gracefully exit when requested to quit. If unset, the default is to wait up to 5 seconds. If set to zero or a negative value, the app will be immediately terminated.",
+    "exit_timeout_desc": "Number of seconds to wait for all app processes to gracefully exit when requested to quit. If unset, the default is to wait up to 5 seconds. If set to 0, the app will be immediately terminated.",
    "find_cover": "Find Cover",
    "global_prep_desc": "Enable/Disable the execution of Global Prep Commands for this application.",
    "global_prep_name": "Global Prep Commands",
@@ -158,7 +158,9 @@
    "dd_config_label": "Device configuration",
    "dd_config_revert_delay": "Config revert delay",
    "dd_config_revert_delay_desc": "Additional delay in milliseconds to wait before reverting configuration when the app has been closed or the last session terminated. Main purpose is to provide a smoother transition when quickly switching between apps.",
-    "dd_config_verify_only": "Verify that the display is enabled (default)",
+    "dd_config_revert_on_disconnect": "Config revert on disconnect",
+    "dd_config_revert_on_disconnect_desc": "Revert configuration upon disconnect of all clients instead of app close or last session termination.",
+    "dd_config_verify_only": "Verify that the display is enabled",
    "dd_hdr_option": "HDR",
    "dd_hdr_option_auto": "Switch on/off the HDR mode as requested by the client (default)",
    "dd_hdr_option_disabled": "Do not change HDR settings",
@@ -187,8 +189,10 @@
    "dd_resolution_option_manual": "Use manually entered resolution",
    "dd_resolution_option_manual_desc": "Enter the resolution to be used",
    "dd_resolution_option_ogs_desc": "\"Optimize game settings\" option must be enabled on the Moonlight client for this to work.",
-    "dd_wa_hdr_toggle_desc": "When using virtual display device as for streaming, it might display incorrect HDR color. With this option enabled, Sunshine will try to mitigate this issue.",
-    "dd_wa_hdr_toggle": "Enable high-contrast workaround for HDR",
+    "dd_wa_hdr_toggle_delay_desc_1": "When using virtual display device (VDD) for streaming, it might incorrectly display HDR color. Sunshine can try to mitigate this issue, by turning HDR off and then on again.",
+    "dd_wa_hdr_toggle_delay_desc_2": "If the value is set to 0, the workaround is disabled (default). If the value is between 0 and 3000 milliseconds, Sunshine will turn off HDR, wait for the specified amount of time and then turn HDR on again. The recommended delay time is around 500 milliseconds in most cases.",
+    "dd_wa_hdr_toggle_delay_desc_3": "DO NOT use this workaround unless you actually have issues with HDR as it directly impacts stream start time!",
+    "dd_wa_hdr_toggle_delay": "High-contrast workaround for HDR",
    "ds4_back_as_touchpad_click": "Map Back/Select to Touchpad Click",
    "ds4_back_as_touchpad_click_desc": "When forcing DS4 emulation, map Back/Select to Touchpad Click",
    "encoder": "Force a Specific Encoder",
@@ -250,6 +254,8 @@
    "log_level_desc": "The minimum log level printed to standard out",
    "log_path": "Logfile Path",
    "log_path_desc": "The file where the current logs of Sunshine are stored.",
+    "max_bitrate": "Maximum Bitrate",
+    "max_bitrate_desc": "The maximum bitrate (in Kbps) that Sunshine will encode the stream at. If set to 0, it will always use the bitrate requested by Moonlight.",
    "min_fps_factor": "Minimum FPS Factor",
    "min_fps_factor_desc": "Sunshine will use this factor to calculate the minimum time between frames. Increasing this value slightly may help when streaming mostly static content. Higher values will consume more bandwidth.",
    "min_threads": "Minimum CPU Thread Count",
@@ -277,8 +283,6 @@
    "nvenc_realtime_hags_desc": "Currently NVIDIA drivers may freeze in encoder when HAGS is enabled, realtime priority is used and VRAM utilization is close to maximum. Disabling this option lowers the priority to high, sidestepping the freeze at the cost of reduced capture performance when the GPU is heavily loaded.",
    "nvenc_spatial_aq": "Spatial AQ",
    "nvenc_spatial_aq_desc": "Assign higher QP values to flat regions of the video. Recommended to enable when streaming at lower bitrates.",
-    "nvenc_spatial_aq_disabled": "Disabled (faster, default)",
-    "nvenc_spatial_aq_enabled": "Enabled (slower)",
    "nvenc_twopass": "Two-pass mode",
    "nvenc_twopass_desc": "Adds preliminary encoding pass. This allows to detect more motion vectors, better distribute bitrate across the frame and more strictly adhere to bitrate limits. Disabling it is not recommended since this can lead to occasional bitrate overshoot and subsequent packet loss.",
    "nvenc_twopass_disabled": "Disabled (fastest, not recommended)",
--- a/src_assets/common/assets/web/troubleshooting.html
+++ b/src_assets/common/assets/web/troubleshooting.html
@@ -120,13 +120,14 @@
      </div>
      <ul id="client-list" class="list-group list-group-flush list-group-item-light" v-if="clients && clients.length > 0">
        <div v-for="client in clients" class="list-group-item d-flex">
-          <div class="p-2 flex-grow-1">{{client.name != "" ? client.name : $t('troubleshooting.unpair_single_unknown')}}</div><div class="me-2 ms-auto btn btn-danger" @click="unpairSingle(client.uuid)"><i class="fas fa-trash"></i></div>
+          <div class="p-2 flex-grow-1">{{ client.name !== "" ? client.name : $t('troubleshooting.unpair_single_unknown') }}</div>
+          <div class="me-2 ms-auto btn btn-danger" @click="unpairSingle(client.uuid)"><i class="fas fa-trash"></i></div>
        </div>
      </ul>
      <ul v-else class="list-group list-group-flush list-group-item-light">
        <div class="list-group-item p-3 text-center"><em>{{ $t('troubleshooting.unpair_single_no_devices') }}</em></div>
      </ul>
-      
+
    </div>
    <!-- Logs -->
    <div class="card p-2 my-4">
@@ -176,7 +177,7 @@
        actualLogs() {
          if (!this.logFilter) return this.logs;
          let lines = this.logs.split("\n");
-          lines = lines.filter(x => x.indexOf(this.logFilter) != -1);
+          lines = lines.filter(x => x.indexOf(this.logFilter) !== -1);
          return lines.join("\n");
        }
      },
@@ -210,7 +211,7 @@
            .then((r) => r.json())
            .then((r) => {
              this.closeAppPressed = false;
-              this.closeAppStatus = r.status.toString() === "true";
+              this.closeAppStatus = r.status;
              setTimeout(() => {
                this.closeAppStatus = null;
              }, 5000);
@@ -222,7 +223,7 @@
            .then((r) => r.json())
            .then((r) => {
              this.unpairAllPressed = false;
-              this.unpairAllStatus = r.status.toString() === "true";
+              this.unpairAllStatus = r.status;
              setTimeout(() => {
                this.unpairAllStatus = null;
              }, 5000);
@@ -240,9 +241,9 @@
            .then((response) => response.json())
            .then((response) => {
              const clientList = document.querySelector("#client-list");
-              if (response.status === 'true' && response.named_certs && response.named_certs.length) {
+              if (response.status === true && response.named_certs && response.named_certs.length) {
                this.clients = response.named_certs.sort((a, b) => {
-                  return (a.name.toLowerCase() > b.name.toLowerCase() || a.name == "" ? 1 : -1)
+                  return (a.name.toLowerCase() > b.name.toLowerCase() || a.name === "" ? 1 : -1)
                });
              } else {
                this.clients = [];
@@ -270,7 +271,7 @@
            .then((r) => r.json())
            .then((r) => {
              this.ddResetPressed = false;
-              this.ddResetStatus = r.status.toString() === "true";
+              this.ddResetStatus = r.status;
              setTimeout(() => {
                this.ddResetStatus = null;
              }, 5000);
--- a/src_assets/common/assets/web/welcome.html
+++ b/src_assets/common/assets/web/welcome.html
@@ -81,10 +81,10 @@
          body: JSON.stringify(this.passwordData),
        }).then((r) => {
          this.loading = false;
-          if (r.status == 200) {
+          if (r.status === 200) {
            r.json().then((rj) => {
-              if (rj.status.toString() === "true") {
-                this.success = true;
+              this.success = rj.status;
+              if (this.success === true) {
                setTimeout(() => {
                  document.location.reload();
                }, 5000);
--- a/src_assets/linux/misc/60-sunshine.rules
+++ b/src_assets/linux/misc/60-sunshine.rules
@@ -1,2 +1,11 @@
+# Allows Sunshine to acces /dev/uinput
 KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"
+
+# Allows Sunshine to access /dev/uhid
 KERNEL=="uhid", TAG+="uaccess"
+
+# Joypads
+KERNEL=="hidraw*" ATTRS{name}=="Sunshine PS5 (virtual) pad" MODE="0660", TAG+="uaccess"
+SUBSYSTEMS=="input", ATTRS{name}=="Sunshine X-Box One (virtual) pad", MODE="0660", TAG+="uaccess"
+SUBSYSTEMS=="input", ATTRS{name}=="Sunshine gamepad (virtual) motion sensors", MODE="0660", TAG+="uaccess"
+SUBSYSTEMS=="input", ATTRS{name}=="Sunshine Nintendo (virtual) pad", MODE="0660", TAG+="uaccess"
--- a/src_assets/windows/assets/apps.json
+++ b/src_assets/windows/assets/apps.json
@@ -8,8 +8,8 @@
    {
      "name": "Steam Big Picture",
      "cmd": "steam://open/bigpicture",
-      "auto-detach": "true",
-      "wait-all": "true",
+      "auto-detach": true,
+      "wait-all": true,
      "image-path": "steam.png"
    }
  ]
--- a/src_assets/windows/misc/path/update-path.bat
+++ b/src_assets/windows/misc/path/update-path.bat
@@ -0,0 +1,111 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+rem Check if parameter is provided
+if "%~1"=="" (
+    echo Usage: %0 [add^|remove]
+    echo   add    - Adds Sunshine directories to system PATH
+    echo   remove - Removes Sunshine directories from system PATH
+    exit /b 1
+)
+
+rem Get sunshine root directory
+for %%I in ("%~dp0\..") do set "ROOT_DIR=%%~fI"
+echo Sunshine root directory: !ROOT_DIR!
+
+rem Define directories to add to path
+set "PATHS_TO_MANAGE[0]=!ROOT_DIR!"
+set "PATHS_TO_MANAGE[1]=!ROOT_DIR!\tools"
+
+rem System path registry location
+set "KEY_NAME=HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment"
+set "VALUE_NAME=Path"
+
+rem Get the current path
+for /f "tokens=2*" %%A in ('reg query "%KEY_NAME%" /v "%VALUE_NAME%"') do set "CURRENT_PATH=%%B"
+echo Current path: !CURRENT_PATH!
+
+rem Check if adding to path
+if /i "%~1"=="add" (
+    set "NEW_PATH=!CURRENT_PATH!"
+
+    rem Process each directory to add
+    for /L %%i in (0,1,1) do (
+        set "DIR_TO_ADD=!PATHS_TO_MANAGE[%%i]!"
+
+        rem Check if path already contains this directory
+        echo "!CURRENT_PATH!" | findstr /i /c:"!DIR_TO_ADD!" > nul
+        if !ERRORLEVEL!==0 (
+            echo !DIR_TO_ADD! already in path
+        ) else (
+            echo Adding to path: !DIR_TO_ADD!
+            set "NEW_PATH=!NEW_PATH!;!DIR_TO_ADD!"
+        )
+    )
+
+    rem Only update if path was changed
+    if "!NEW_PATH!" neq "!CURRENT_PATH!" (
+        rem Set the new path in the registry
+        reg add "%KEY_NAME%" /v "%VALUE_NAME%" /t REG_EXPAND_SZ /d "!NEW_PATH!" /f
+        if !ERRORLEVEL!==0 (
+            echo Successfully added Sunshine directories to PATH
+        ) else (
+            echo Failed to add Sunshine directories to PATH
+        )
+    ) else (
+        echo No changes needed to PATH
+    )
+    exit /b !ERRORLEVEL!
+)
+
+rem Check if removing from path
+if /i "%~1"=="remove" (
+    set "CHANGES_MADE=0"
+
+    rem Process each directory to remove
+    for /L %%i in (0,1,1) do (
+        set "DIR_TO_REMOVE=!PATHS_TO_MANAGE[%%i]!"
+
+        rem Check if path contains this directory
+        echo "!CURRENT_PATH!" | findstr /i /c:"!DIR_TO_REMOVE!" > nul
+        if !ERRORLEVEL!==0 (
+            echo Removing from path: !DIR_TO_REMOVE!
+
+            rem Build a new path by parsing and filtering the current path
+            set "NEW_PATH="
+            for %%p in ("!CURRENT_PATH:;=" "!") do (
+                set "PART=%%~p"
+                if /i "!PART!" NEQ "!DIR_TO_REMOVE!" (
+                    if defined NEW_PATH (
+                        set "NEW_PATH=!NEW_PATH!;!PART!"
+                    ) else (
+                        set "NEW_PATH=!PART!"
+                    )
+                )
+            )
+
+            set "CURRENT_PATH=!NEW_PATH!"
+            set "CHANGES_MADE=1"
+        ) else (
+            echo !DIR_TO_REMOVE! not found in path
+        )
+    )
+
+    rem Only update if path was changed
+    if "!CHANGES_MADE!"=="1" (
+        rem Set the new path in the registry
+        reg add "%KEY_NAME%" /v "%VALUE_NAME%" /t REG_EXPAND_SZ /d "!CURRENT_PATH!" /f
+        if !ERRORLEVEL!==0 (
+            echo Successfully removed Sunshine directories from PATH
+        ) else (
+            echo Failed to remove Sunshine directories from PATH
+        )
+    ) else (
+        echo No changes needed to PATH
+    )
+    exit /b !ERRORLEVEL!
+)
+
+echo Unknown parameter: %~1
+echo Usage: %0 [add^|remove]
+exit /b 1
--- a/third-party/build-deps
+++ b/third-party/build-deps
--- a/third-party/googletest
+++ b/third-party/googletest
--- a/third-party/inputtino
+++ b/third-party/inputtino
--- a/third-party/libdisplaydevice
+++ b/third-party/libdisplaydevice
--- a/third-party/moonlight-common-c
+++ b/third-party/moonlight-common-c
--- a/third-party/wayland-protocols
+++ b/third-party/wayland-protocols