2025-06-07 16:17:20 +02:00
243 changed files with 20725 additions and 34728 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
--- a/.github/ISSUE_TEMPLATE/01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@ -7,52 +7,9 @@ body:
  - type: markdown
    attributes:
      value: |
-        > [!note]
-        > - Use `Discussions` if you want to ask for question.
-        > - Non-English reports will be deleted. No exceptions.
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Checklist
-      options:
-        - label: I will only use English in my report.
-          required: true
-        - label: I have used the search function for [**open and closed issues**](https://github.com/redphx/better-xcloud/issues?q=is%3Aissue) to see if someone else has already submitted the same bug report.
-          required: true
-        - label: I will describe the problem with as much detail as possible.
-          required: true
-
-  - type: dropdown
-    id: question_01
-    attributes:
-      label: xCloud officially supports your country/region
-      options:
-        - "No"
-        - "Yes"
-    validations:
-      required: true
-
-  - type: dropdown
-    id: question_02
-    attributes:
-      label: "The bug doesn't happen when you disable Better xCloud script"
-      options:
-        - "No"
-        - "Yes"
-    validations:
-      required: true
-
-  - type: dropdown
-    id: question_03
-    attributes:
-      label: "Previous Better xCloud versions didn't have this bug (name which one)"
-      options:
-        - "No"
-        - "Yes"
-    validations:
-      required: true
-
+        Please fill out the following information to help us resolve the issue.
+        > [!warning]
+        > Only use English. Any other languages will be deleted.
  - type: dropdown
    id: device_type
    attributes:
@ -67,34 +24,42 @@ body:
      multiple: false
    validations:
      required: true
-
-  - type: input
-    id: device_name
-    attributes:
-      label: "Device"
-      description: "Name of the device"
-      placeholder: "e.g., Google Pixel 8"
-    validations:
-      required: true
-
-  - type: input
+  - type: dropdown
    id: os
    attributes:
      label: "Operating System"
      description: "Which operating system is it running?"
-      placeholder: "e.g., Android 14"
+      options:
+        - Windows
+        - macOS
+        - Linux
+        - Android
+        - iOS/iPadOS
+        - Other
+      multiple: false
+    validations:
+      required: true
+  - type: dropdown
+    id: browser
+    attributes:
+      label: "Browser"
+      description: "Which browser are you using?"
+      options:
+        - Chrome/Edge/Chromium
+        - Kiwi Browser
+        - Safari
+        - Other
+      multiple: false
    validations:
      required: true
-  
  - type: input
    id: browser_version
    attributes:
-      label: "Android app/Browser Version"
-      description: "What is the name and version of the browser/Android app?"
-      placeholder: "e.g., Chrome 124.0, Android app 0.15.0"
+      label: "Browser Version"
+      description: "What is the version of the browser?"
+      placeholder: "e.g., 122.0"
    validations:
      required: true
-  
  - type: input
    id: extension_version
    attributes:
@ -103,22 +68,12 @@ body:
      placeholder: "e.g., 3.5.0"
    validations:
      required: true
-  
-  - type: input
-    id: game_list
-    attributes:
-      label: "Game list"
-      description: "Name the game(s) where you saw this bug"
-      placeholder: "e.g., Halo"
-    validations:
-      required: false
-  
  - type: textarea
-    id: reproduction
+    id: repro
    attributes:
      label: "Reproduction Steps"
      description: |
-        How did you trigger this bug?
+        How did you trigger this bug? Please provide screenshot/video if possible.
      placeholder: |
        Example:
        1. Open game X
@ -126,12 +81,3 @@ body:
        3. Error
    validations:
      required: true
-
-  - type: textarea
-    id: media
-    attributes:
-      label: "Screenshot/video"
-      description: |
-        Please provide screenshot/video if possible.
-    validations:
-      required: false
--- a/.github/ISSUE_TEMPLATE/02-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/02-feature-request.yml
@ -13,30 +13,49 @@ body:
  - type: dropdown
    id: device_type
    attributes:
-      label: Device type
-      description: "Which device type is this feature for?"
+      label: Device
+      description: "Which device are you using?"
      options:
-        - All devices
        - Phone/Tablet
+        - Laptop
        - Desktop
        - TV
+        - Other
      multiple: false
    validations:
      required: true
-
-  - type: input
-    id: device_name
+  - type: dropdown
+    id: os
    attributes:
-      label: "Device"
-      description: "Name of the device"
-      placeholder: "e.g., Google Pixel 8"
+      label: "Operating System"
+      description: "Which operating system is it running?"
+      options:
+        - Windows
+        - macOS
+        - Linux
+        - Android
+        - iOS/iPadOS
+        - Other
+      multiple: false
+    validations:
+      required: true
+  - type: dropdown
+    id: browser
+    attributes:
+      label: "Browser"
+      description: "Which browser are you using?"
+      options:
+        - Chrome/Edge/Chromium
+        - Kiwi Browser
+        - Safari
+        - Other
+      multiple: false
    validations:
      required: true
-  
  - type: textarea
    id: suggestion
    attributes:
      label: "Suggestion"
-      description: "What do you want to suggest? Include (mockup) screenshot if possible."
+      description: "What do you want to suggest?"
    validations:
      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@ -1 +0,0 @@
-blank_issues_enabled: false
--- a/.github/workflows/stale.yaml
+++ b/.github/workflows/stale.yaml
@ -1,25 +0,0 @@
-name: 'Mark stale bug issues'
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 0 * * *'  # Runs daily at midnight UTC
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-issue-message: |
-            This issue has been marked `stale` due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days.
-          close-issue-message: |
-            This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
-          days-before-stale: 60
-          days-before-close: 30
-          stale-issue-label: 'stale'
-          only-issues: true
-          only-labels: 'bug'
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,3 @@
-src/modules/patcher/patches/*.js
-
 # Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore

 # Logs
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,12 +0,0 @@
-{
-  "files.readonlyInclude": {
-    "dist/**/*": true,
-    "src/modules/patcher/patches/controller-customization.js": true,
-    "src/modules/patcher/patches/expose-stream-session.js": true,
-    "src/modules/patcher/patches/game-card-icons.js": true,
-    "src/modules/patcher/patches/local-co-op-enable.js": true,
-    "src/modules/patcher/patches/poll-gamepad.js": true,
-    "src/modules/patcher/patches/remote-play-keep-alive.js": true,
-    "src/modules/patcher/patches/vibration-adjust.js": true
-  }
-}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -1,15 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "typescript",
-      "tsconfig": "tsconfig.json",
-      "option": "watch",
-      "problemMatcher": [
-        "$tsc-watch"
-      ],
-      "group": "build",
-      "label": "tsc: watch - tsconfig.json"
-    }
-  ]
-}
--- a/1
+++ b/1
@ -1,7 +1,6 @@
 MIT License

 Copyright (c) 2023 redphx
-Copyright (c) 2023 Advanced Micro Devices, Inc.
 Copyright (c) 2020 Phosphor Icons

 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/README.md
+++ b/README.md
@ -1,40 +1,70 @@
-<div align="center">
-    <img src="https://raw.githubusercontent.com/redphx/better-xcloud/refs/heads/typescript/resources/logos/better-xcloud.png" width="256"/>  
-    <h1>Better xCloud</h1>
-    <!-- Latest Version Badge -->
-    <a href="https://github.com/redphx/better-xcloud/releases"><img src="https://img.shields.io/github/v/release/redphx/better-xcloud?label=latest" alt="Latest version" /></a>
-    <!-- Total Downloads Badge -->
-    <a href="https://github.com/redphx/better-xcloud/releases"><img src="https://img.shields.io/github/downloads/redphx/better-xcloud/total?color=%23e15f2c" alt="Total downloads" /></a>
-    <!-- Total Stars Badge -->
-    <a href="https://github.com/redphx/better-xcloud/stargazers"><img src="https://img.shields.io/github/stars/redphx/better-xcloud?color=%23cca400" alt="Total stars" /></a>
-</div>
+# Better xCloud
+Improve Xbox Cloud Gaming (xCloud) experience on [xbox.com/play](https://www.xbox.com/play). It also allows you to use Remote Play on the xCloud website.  

-### Improve Xbox Cloud Gaming (xCloud) experience on [xbox.com/play](https://www.xbox.com/play). It also allows you to use Remote Play on the xCloud website.  
+> [!TIP]
+> The Android app is in development at [redphx/better-xcloud-android](https://github.com/redphx/better-xcloud-android)

-> [!IMPORTANT]  
-> I only accept pull requests for:
-> - Custom touch controls
-> - Bug fixes
+> [!IMPORTANT]
+> I don't accept pull requests at the moment (except PR for custom touch controls)

 **Supported platforms:**  
 - Windows
 - macOS
 - Linux, SteamOS (including Steam Deck)
- Android, Android TV (including Meta Quest VR Headsets): [redphx/better-xcloud-android](https://github.com/redphx/better-xcloud-android)
+- Android, Android TV (including Meta Quest VR Headsets)
 - iOS, iPadOS

 This script makes me spend more time with xCloud, and I hope the same thing happens to you.  
 If you like this project please give it a 🌟. Thank you 🙏.

-## How to install
-Visit the [home page](https://better-xcloud.github.io) to know how to install Better xCloud on your device.
+[![Latest version](https://img.shields.io/github/v/release/redphx/better-xcloud?label=latest)](https://github.com/redphx/better-xcloud/releases) 
+[![Total downloads](https://img.shields.io/github/downloads/redphx/better-xcloud/total?color=%23e15f2c)](https://github.com/redphx/better-xcloud/releases) 
+[![Total stars](https://img.shields.io/github/stars/redphx/better-xcloud?color=%23cca400)](https://github.com/redphx/better-xcloud/stargazers)  

 ## Full documentations
- For the full details please visit: [**better-xcloud.github.io**](https://better-xcloud.github.io)  
+- For the full details please visit: https://better-xcloud.github.io  
 - [Demo video](https://youtu.be/hyp69Jrb2sQ)

 ⚠️ Please DO NOT report **Better xCloud**'s bugs on [/r/xcloud subreddit](https://reddit.com/r/xcloud/). Report bugs in [Issues](https://github.com/redphx/better-xcloud/issues) or [Telegram channel](https://t.me/betterxcloud) instead.

+## Table of Contents
+- [**How to install**](#how-to-install)
+- [**Features**](#features)
+- [**Donation**](#donation)
+- [**Acknowledgements**](#acknowledgements)
+- [**Disclaimers**](#disclaimers)
+
+## How to install
+Visit [this page](https://better-xcloud.github.io/browsers) to know how to install Better xCloud on your device.
+
+## Features
+
+<img width="400" alt="Settings UI" src="https://github.com/redphx/better-xcloud/assets/96280/4bec2d62-31df-499c-9aad-2485626b6925">
+<br>
+<img width="400" alt="Remote Play dialog" src="https://github.com/redphx/better-xcloud/assets/96280/daf7f698-a228-4f9c-8f23-9669e061a64c">
+<br>
+<img width="600" alt="Stream HUD" src="https://github.com/redphx/better-xcloud/assets/96280/51bdb96c-79ab-402f-902a-a9e6229973b2">
+<br>
+<img width="600" alt="Stream settings" src="https://github.com/redphx/better-xcloud/assets/96280/ed513cb3-6e6c-4e8e-9e06-c62e71e41c90">
+<br>
+<img width="600" alt="Remapper" src="https://github.com/redphx/better-xcloud/assets/96280/f2e2bc51-f673-4b24-b127-c7169b86462b">
+
+
+&nbsp;  
+  
+**Demo video:** [https://youtu.be/oDr5Eddp55E  ](https://youtu.be/AYb-EUcz72U)  
+- **🔥 Totally free and open-source**
+- **🔥 Allow playing with [Mouse & Keyboard](https://better-xcloud.github.io/mouse-and-keyboard)**
+- **🔥 Enable [Remote Play](https://better-xcloud.github.io/remote-play) support**  
+  > 1080p resolution and can stream Xbox 360 games.  
+- **🔥 [Improve visual quality](https://better-xcloud.github.io/ingame-features/#improve-streams-clarity) of the stream**  
+  > Similar to (but not as good as) the "Clarity Boost" of xCloud on Edge browser. [Demo video](https://youtu.be/ZhW2choAHUs). 
+- **🔥 Show [Stream stats](https://better-xcloud.github.io/stream-stats)**  
+- **🔥 [Screenshot capture](https://better-xcloud.github.io/screenshot-capture)**
+- **🔥 [Touch controller](https://better-xcloud.github.io/features/#touch-controller)**
+  > Enable touch controller support for all games.
+- [And more...](https://better-xcloud.github.io/features/)
+
 ## Donation
 If you think this project is useful and want to support future developments, please consider making a donate via [my Ko-fi page](https://ko-fi.com/redphx).  
 Or you can give this project a star, that's also helpful.  
--- a/build.sh
+++ b/build.sh
@ -1,17 +0,0 @@
-#!/bin/bash
-
-build_all () {
-    # Clear screen
-    printf "\033c"
-
-    # Build all variants
-    bun build.ts --version $1 --variant full --pretty
-    bun build.ts --version $1 --variant full --meta
-    # bun build.ts --version $1 --variant lite
-
-    # Wait for key
-    read -p ">> Press Enter to build again..."
-    build_all $1
-}
-
-build_all $1
--- a/build.ts
+++ b/build.ts
@ -1,78 +1,18 @@
 #!/usr/bin/env bun
-import { readFile, readdir } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 import { sys } from "typescript";
-// @ts-ignore
 import txtScriptHeader from "./src/assets/header_script.txt" with { type: "text" };
-// @ts-ignore
-import txtScriptHeaderLite from "./src/assets/header_script.lite.txt" with { type: "text" };
-// @ts-ignore
 import txtMetaHeader from "./src/assets/header_meta.txt" with { type: "text" };
-import { assert } from "node:console";
-import { ESLint } from "eslint";

 enum BuildTarget {
-    ALL = 'all',
-    ANDROID_APP = 'android-app',
-    MOBILE = 'mobile',
-    WEBOS = 'webos',
+	ALL = 'all',
+	ANDROID_APP = 'android-app',
+	MOBILE = 'mobile',
+	WEBOS = 'webos',
 }

-type BuildVariant = 'full' | 'lite';
-
-const MINIFY_SYNTAX = true;
-
-function minifySvgImports(str: string): string {
-    // Minify SVG imports
-    const svgMap = {};
-    str = str.replaceAll(/var ([\w_]+) = `(<svg.*?\n)`;\n\n/gsm, (match, p1, p2) => {
-        // Remove new lines in SVG
-        p2 = p2.replaceAll(/\n\s*/g, '');
-        svgMap[p1] = '"' + p2.trim() + '"';
-
-        return '';
-    });
-
-    for (const name in svgMap) {
-        str = str.replace(name + ',', svgMap[name] + ',');
-        str = str.replace(name + '\n', svgMap[name] + '\n');
-    }
-
-    return str;
-}
-
-function minifyCodeImports(str: string): string {
-    str = str.replaceAll(/var ([\w_]+_default\d?) = `(.*?)`;/gsm, (match, p1, p2) => {
-        // Remove new lines in SVG
-        p2 = p2.replaceAll(/\n\s*/g, '\n');
-        p2 = p2.replaceAll(/\n\/\/.*/g, '\n');
-        p2 = p2.replaceAll(/^\/\/.*/g, '\n');
-        p2 = p2.replaceAll(/\n+/g, '\n');
-        p2 = p2.trim();
-
-        return `var ${p1} = \`${p2}\`;`;
-    });
-
-    return str;
-}
-
-function minifyIfElse(str: string): string {
-    // Collapse if/else blocks without curly braces
-    return str.replaceAll(/((if \(.*?\)|else)\n\s+)/g, '$2 ');
-}
-
-function removeComments(str: string): string {
-    // Remove enum's inlining comments
-    str = str.replaceAll(/ \/\* [A-Z0-9_:]+ \*\//g, '');
-    str = str.replaceAll('/* @__PURE__ */ ', '');
-
-    // Remove comments from import
-    str = str.replaceAll(/\/\/ src.*\n/g, '');
-
-    return str;
-}
-
-function postProcess(str: string, pretty: boolean): string {
+const postProcess = (str: string): string => {
    // Unescape unicode charaters
    str = unescape((str.replace(/\\u/g, '%u')));
    // Replace \x00 to normal character
@ -81,269 +21,83 @@ function postProcess(str: string, pretty: boolean): string {
    // Replace "globalThis." with "var";
    str = str.replaceAll('globalThis.', 'var ');

-    str = removeComments(str);
-
-    // Add ADDITIONAL CODE block
-    str = str.replace('var DEFAULT_FLAGS', '\n/* ADDITIONAL CODE */\n\nvar DEFAULT_FLAGS');
-
-    str = str.replaceAll('(e) => `', 'e => `');
-
-    // Simplify object definitions
-    // {[1]: "a"} => {1: "a"}
-    str = str.replaceAll(/\[(\d+)\]: /g, '$1: ');
-    // {["a"]: 1, ["b-c"]: 2} => {a: 1, "b-c": 2}
-    str = str.replaceAll(/\["([^"]+)"\]: /g, function(match, p1) {
-        if (p1.includes('-') || p1.match(/^\d/)) {
-            p1 = `"${p1}"`;
-        }
-
-        return p1 + ': ';
-    });
-
-    str = minifySvgImports(str);
-    str = minifyCodeImports(str);
-
-    // Collapse empty brackets
-    str = str.replaceAll(/\{[\s\n]+\}/g, '{}');
-
-    // Remove blank lines
-    str = str.replaceAll(/\n([\s]*)\n/g, "\n");
-
-    // Minify WebGL shaders & JS strings
-    // Replace "\n     " with "\n"
-    str = str.replaceAll(/\\n+\s*/g, '\\n');
-    // Remove comment line
-    str = str.replaceAll(/\\n\/\/.*?(?=\\n)/g, '');
-
-    // Replace ${"time".toUpperCase()} with "TIME"
-    // str = str.replaceAll(/\$\{"([^"]+)"\.toUpperCase\(\)\}/g, (match, p1) => {
-    //    return p1.toUpperCase();
-    // });
-
-    // Replace " (e) =>" to " e =>"
-    // str = str.replaceAll(/ \(([^\s,.$()]+)\) =>/g, ' $1 =>');
-
-    // Set indent to 1 space
-    if (MINIFY_SYNTAX) {
-        str = minifyIfElse(str);
-
-        str = str.replaceAll(/\n(\s+|\})/g, (match, p1) => {
-            if (pretty) {
-                if (p1 === '}') {
-                    return '\n}';
-                } else {
-                    const len = p1.length / 2;
-                    return '\n' + ' '.repeat(len);
-                }
-            } else {
-                return (p1 === '}') ? '}' : '';
-            }
-        });
-    }
-
-    // Fix unicode regex in Patcher.optimizeGameSlugGenerator
-    str = str.replaceAll('^\\™', '^\\\\u2122');
-
-    assert(str.includes('/* ADDITIONAL CODE */'));
-    assert(str.includes('window.BX_EXPOSED = BxExposed'));
-    assert(str.includes('window.BxEvent = BxEvent'));
-    assert(str.includes('window.BX_FETCH = window.fetch'));
+	// Add ADDITIONAL CODE block
+	str = str.replace('var DEFAULT_FLAGS', '\n/* ADDITIONAL CODE */\n\nvar DEFAULT_FLAGS');

    return str;
 }

-async function buildPatches() {
-    const inputDir = './src/modules/patcher/patches/src';
-    const outputDir = './src/modules/patcher/patches';
+const build = async (target: BuildTarget, version: string, config: any={}) => {
+	console.log('-- Target:', target);
+	const startTime = performance.now();

-    const files = await readdir(inputDir);
-    const tsFiles = files.filter(file => file.endsWith('.ts'));
+	let outputScriptName = 'better-xcloud';
+	if (target !== BuildTarget.ALL) {
+		outputScriptName += `.${target}`;
+	}
+	let outputMetaName = outputScriptName;
+	outputScriptName += '.user.js';
+	outputMetaName += '.meta.js';

-    tsFiles.forEach(async file => {
-        // You can perform any operation with each TypeScript file
-        console.log(`Building patch: ${file}`);
-        const filePath = `${inputDir}/${file}`;
+	const outDir = './dist';

-        await Bun.build({
-            entrypoints: [filePath],
-            outdir: outputDir,
-            target: 'browser',
-            format: 'esm',
-            minify: {
-                syntax: true,
-                whitespace: true,
-            },
-        });
+	let output = await Bun.build({
+		entrypoints: ['src/index.ts'],
+		outdir: outDir,
+		naming: outputScriptName,
+		define: {
+			'Bun.env.BUILD_TARGET': JSON.stringify(target),
+			'Bun.env.SCRIPT_VERSION': JSON.stringify(version),
+		},
+	});

-        const outputFile = `${outputDir}/${file.replace('.ts', '.js')}`;
+	if (!output.success) {
+		console.log(output);
+		process.exit(1);
+	}

-        let code = await readFile(outputFile, 'utf-8');
+	const {path} = output.outputs[0];
+	// Get generated file
+	let result = postProcess(await readFile(path, 'utf-8'));

-        // Replace "$this$" to "this"
-        code = code.replaceAll('$this$', 'this');
+	// Replace [[VERSION]] with real value
+	const scriptHeader = txtScriptHeader.replace('[[VERSION]]', version);

-        // Minify code
-        code = removeComments(code);
-        code = minifyIfElse(code);
+	// Save to script
+	await Bun.write(path, scriptHeader + result);
+	console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);

-        // Save
-        await Bun.write(outputFile, code);
-        console.log(`Patch built successfully: ${file}`)
-      });
-}
-
-async function build(target: BuildTarget, params: { version: string, variant: BuildVariant, pretty: boolean, meta: boolean }, config: any={}) {
-    const { version, variant, pretty, meta } = params;
-
-    console.log('-- Target:', target);
-    const startTime = performance.now();
-
-    let outputScriptName = 'better-xcloud';
-    if (target !== BuildTarget.ALL) {
-        outputScriptName += `.${target}`;
-    }
-
-    if (variant !== 'full') {
-        outputScriptName += `.${variant}`;
-    }
-
-    let outputMetaName = outputScriptName;
-    if (pretty) {
-        outputScriptName += '.pretty';
-    }
-    outputScriptName += '.user.js';
-    outputMetaName += '.meta.js';
-
-    const outDir = './dist';
-
-    await buildPatches();
-
-    let output = await Bun.build({
-        entrypoints: ['src/index.ts'],
-        outdir: outDir,
-        naming: outputScriptName,
-        minify: {
-            syntax: MINIFY_SYNTAX,
-        },
-        define: {
-            'Bun.env.BUILD_TARGET': JSON.stringify(target),
-            'Bun.env.BUILD_VARIANT': JSON.stringify(variant),
-            'Bun.env.SCRIPT_VERSION': JSON.stringify(version),
-        },
-    });
-
-    if (!output.success) {
-        console.log(output);
-        process.exit(1);
-    }
-
-    const {path} = output.outputs[0];
-    // Get generated file
-    let result = postProcess(await readFile(path, 'utf-8'), pretty);
-
-    // Replace [[VERSION]] with real value
-    let scriptHeader: string;
-    if (variant === 'full') {
-        scriptHeader = txtScriptHeader;
-    } else {
-        scriptHeader = txtScriptHeaderLite;
-    }
-    scriptHeader = scriptHeader.replace('[[VERSION]]', version);
-
-    // Save to script
-    await Bun.write(path, scriptHeader + result);
-
-    // Create meta file (don't build if it's beta version)
-    if (meta && !version.includes('beta') && variant === 'full') {
-        await Bun.write(outDir + '/' + outputMetaName, txtMetaHeader.replace('[[VERSION]]', version));
-    }
-
-    // Check with ESLint
-    const eslint = new ESLint();
-    const results = await eslint.lintFiles([path]);
-    results[0].messages.forEach((msg: any) => {
-        console.error(`${path}#${msg.line}: ${msg.message}`);
-    });
-
-    console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);
-    console.log(`---- [${target}] ${new Date()}`);
+	// Create meta file
+	await Bun.write(outDir + '/' + outputMetaName, txtMetaHeader.replace('[[VERSION]]', version));
 }

 const buildTargets = [
-    BuildTarget.ALL,
-    // BuildTarget.ANDROID_APP,
-    // BuildTarget.MOBILE,
-    // BuildTarget.WEBOS,
+	BuildTarget.ALL,
+	// BuildTarget.ANDROID_APP,
+	// BuildTarget.MOBILE,
+	// BuildTarget.WEBOS,
 ];

 const { values, positionals } = parseArgs({
-    args: Bun.argv,
-    options: {
-        version: {
-            type: 'string',
-        },
+	args: Bun.argv,
+	options: {
+	  version: {
+		type: 'string',

-        variant: {
-            type: 'string',
-            default: 'full',
-        },
-
-        pretty: {
-            type: 'boolean',
-            default: false,
-        },
-
-        meta: {
-            type: 'boolean',
-            default: false,
-        },
-    },
-    strict: true,
-    allowPositionals: true,
-}) as {
-    values: {
-        version: string,
-        variant: BuildVariant,
-        pretty: boolean,
-        meta: boolean,
-    },
-    positionals: string[],
-};
+	  },
+	},
+	strict: true,
+	allowPositionals: true,
+  });

 if (!values['version']) {
-    console.log('Missing --version param');
-    sys.exit(-1);
+	console.log('Missing --version param');
+	sys.exit(-1);
 }

-if (values['variant'] !== 'full' && values['variant'] !== 'lite') {
-    console.log('--variant param must be either "full" or "lite"');
-    sys.exit(-1);
+console.log('Building: ', values['version']);
+
+const config = {};
+for (const target of buildTargets) {
+	await build(target, values['version'], config);
 }
-
-async function main() {
-    const config = {};
-    console.log(`Building: VERSION=${values['version']}, VARIANT=${values['variant']}`);
-    for (const target of buildTargets) {
-        await build(target, values, config);
-    }
-
-    console.log('')
-    // console.log('\n** Press Enter to build or Esc to exit');
-}
-
-function onKeyPress(data: any) {
-    const keyCode = data[0];
-    if (keyCode === 13) {  // Enter key
-        main();
-    } else if (keyCode === 27) {  // Esc key
-        process.exit(0);
-    }
-}
-
-main();
-
-/*
-process.stdin.setRawMode(true);
-process.stdin.resume();
-process.stdin.on('data', onKeyPress);
-*/
--- a/bun.lock
+++ b/bun.lock
@ -1,310 +0,0 @@
-{
-  "lockfileVersion": 1,
-  "workspaces": {
-    "": {
-      "devDependencies": {
-        "@types/bun": "^1.2.10",
-        "@types/node": "^22.14.1",
-        "@types/stylus": "^0.48.43",
-        "@webgpu/types": "^0.1.60",
-        "eslint": "^9.25.0",
-        "eslint-plugin-compat": "^6.0.2",
-        "stylus": "^0.64.0",
-      },
-      "peerDependencies": {
-        "typescript": "^5.7.2",
-      },
-    },
-  },
-  "packages": {
-    "@adobe/css-tools": ["@adobe/css-tools@4.3.3", "", {}, "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ=="],
-
-    "@eslint-community/eslint-utils": ["@eslint-community/eslint-utils@4.4.0", "", { "dependencies": { "eslint-visitor-keys": "^3.3.0" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="],
-
-    "@eslint-community/regexpp": ["@eslint-community/regexpp@4.12.1", "", {}, "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ=="],
-
-    "@eslint/config-array": ["@eslint/config-array@0.20.0", "", { "dependencies": { "@eslint/object-schema": "^2.1.6", "debug": "^4.3.1", "minimatch": "^3.1.2" } }, "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ=="],
-
-    "@eslint/config-helpers": ["@eslint/config-helpers@0.2.1", "", {}, "sha512-RI17tsD2frtDu/3dmI7QRrD4bedNKPM08ziRYaC5AhkGrzIAJelm9kJU1TznK+apx6V+cqRz8tfpEeG3oIyjxw=="],
-
-    "@eslint/core": ["@eslint/core@0.14.0", "", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg=="],
-
-    "@eslint/eslintrc": ["@eslint/eslintrc@3.3.1", "", { "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" } }, "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ=="],
-
-    "@eslint/js": ["@eslint/js@9.27.0", "", {}, "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA=="],
-
-    "@eslint/object-schema": ["@eslint/object-schema@2.1.6", "", {}, "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA=="],
-
-    "@eslint/plugin-kit": ["@eslint/plugin-kit@0.3.1", "", { "dependencies": { "@eslint/core": "^0.14.0", "levn": "^0.4.1" } }, "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w=="],
-
-    "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="],
-
-    "@humanfs/node": ["@humanfs/node@0.16.6", "", { "dependencies": { "@humanfs/core": "^0.19.1", "@humanwhocodes/retry": "^0.3.0" } }, "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw=="],
-
-    "@humanwhocodes/module-importer": ["@humanwhocodes/module-importer@1.0.1", "", {}, "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="],
-
-    "@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.2", "", {}, "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ=="],
-
-    "@isaacs/cliui": ["@isaacs/cliui@8.0.2", "", { "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", "strip-ansi": "^7.0.1", "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", "wrap-ansi": "^8.1.0", "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" } }, "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="],
-
-    "@mdn/browser-compat-data": ["@mdn/browser-compat-data@5.5.42", "", {}, "sha512-qhHVgb2dxaFNT00Z1upHaDCstUEjjrgtIkrk4tr+YnDSGbTIKncbdydIpSed+RCXz0f6nb4UDD4eKEWokNom6g=="],
-
-    "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="],
-
-    "@types/bun": ["@types/bun@1.2.15", "", { "dependencies": { "bun-types": "1.2.15" } }, "sha512-U1ljPdBEphF0nw1MIk0hI7kPg7dFdPyM7EenHsp6W5loNHl7zqy6JQf/RKCgnUn2KDzUpkBwHPnEJEjII594bA=="],
-
-    "@types/estree": ["@types/estree@1.0.6", "", {}, "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="],
-
-    "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
-
-    "@types/node": ["@types/node@22.15.24", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-w9CZGm9RDjzTh/D+hFwlBJ3ziUaVw7oufKA3vOFSOZlzmW9AkZnfjPb+DLnrV6qtgL/LNmP0/2zBNCFHL3F0ng=="],
-
-    "@types/stylus": ["@types/stylus@0.48.43", "", { "dependencies": { "@types/node": "*" } }, "sha512-72dv/zdhuyXWVHUXG2VTPEQdOG+oen95/DNFx2aMFFaY6LoITI6PwEqf5x31JF49kp2w9hvUzkNfTGBIeg61LQ=="],
-
-    "@webgpu/types": ["@webgpu/types@0.1.61", "", {}, "sha512-w2HbBvH+qO19SB5pJOJFKs533CdZqxl3fcGonqL321VHkW7W/iBo6H8bjDy6pr/+pbMwIu5dnuaAxH7NxBqUrQ=="],
-
-    "acorn": ["acorn@8.14.0", "", { "bin": { "acorn": "bin/acorn" } }, "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA=="],
-
-    "acorn-jsx": ["acorn-jsx@5.3.2", "", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
-
-    "ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="],
-
-    "ansi-regex": ["ansi-regex@6.1.0", "", {}, "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA=="],
-
-    "ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
-
-    "argparse": ["argparse@2.0.1", "", {}, "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="],
-
-    "ast-metadata-inferer": ["ast-metadata-inferer@0.8.1", "", { "dependencies": { "@mdn/browser-compat-data": "^5.6.19" } }, "sha512-ht3Dm6Zr7SXv6t1Ra6gFo0+kLDglHGrEbYihTkcycrbHw7WCcuhBzPlJYHEsIpycaUwzsJHje+vUcxXUX4ztTA=="],
-
-    "balanced-match": ["balanced-match@1.0.2", "", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
-
-    "brace-expansion": ["brace-expansion@1.1.11", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="],
-
-    "browserslist": ["browserslist@4.24.3", "", { "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", "node-releases": "^2.0.19", "update-browserslist-db": "^1.1.1" }, "bin": { "browserslist": "cli.js" } }, "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA=="],
-
-    "bun-types": ["bun-types@1.2.15", "", { "dependencies": { "@types/node": "*" } }, "sha512-NarRIaS+iOaQU1JPfyKhZm4AsUOrwUOqRNHY0XxI8GI8jYxiLXLcdjYMG9UKS+fwWasc1uw1htV9AX24dD+p4w=="],
-
-    "callsites": ["callsites@3.1.0", "", {}, "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="],
-
-    "caniuse-lite": ["caniuse-lite@1.0.30001690", "", {}, "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w=="],
-
-    "chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
-
-    "color-convert": ["color-convert@2.0.1", "", { "dependencies": { "color-name": "~1.1.4" } }, "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="],
-
-    "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
-
-    "concat-map": ["concat-map@0.0.1", "", {}, "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="],
-
-    "cross-spawn": ["cross-spawn@7.0.6", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
-
-    "debug": ["debug@4.3.5", "", { "dependencies": { "ms": "2.1.2" } }, "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg=="],
-
-    "deep-is": ["deep-is@0.1.4", "", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="],
-
-    "eastasianwidth": ["eastasianwidth@0.2.0", "", {}, "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="],
-
-    "electron-to-chromium": ["electron-to-chromium@1.5.75", "", {}, "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q=="],
-
-    "emoji-regex": ["emoji-regex@9.2.2", "", {}, "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="],
-
-    "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],
-
-    "escape-string-regexp": ["escape-string-regexp@4.0.0", "", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
-
-    "eslint": ["eslint@9.27.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.20.0", "@eslint/config-helpers": "^0.2.1", "@eslint/core": "^0.14.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.27.0", "@eslint/plugin-kit": "^0.3.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.3.0", "eslint-visitor-keys": "^4.2.0", "espree": "^10.3.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q=="],
-
-    "eslint-plugin-compat": ["eslint-plugin-compat@6.0.2", "", { "dependencies": { "@mdn/browser-compat-data": "^5.5.35", "ast-metadata-inferer": "^0.8.1", "browserslist": "^4.24.2", "caniuse-lite": "^1.0.30001687", "find-up": "^5.0.0", "globals": "^15.7.0", "lodash.memoize": "^4.1.2", "semver": "^7.6.2" }, "peerDependencies": { "eslint": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" } }, "sha512-1ME+YfJjmOz1blH0nPZpHgjMGK4kjgEeoYqGCqoBPQ/mGu/dJzdoP0f1C8H2jcWZjzhZjAMccbM/VdXhPORIfA=="],
-
-    "eslint-scope": ["eslint-scope@8.3.0", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ=="],
-
-    "eslint-visitor-keys": ["eslint-visitor-keys@4.2.0", "", {}, "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw=="],
-
-    "espree": ["espree@10.3.0", "", { "dependencies": { "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^4.2.0" } }, "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg=="],
-
-    "esquery": ["esquery@1.6.0", "", { "dependencies": { "estraverse": "^5.1.0" } }, "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg=="],
-
-    "esrecurse": ["esrecurse@4.3.0", "", { "dependencies": { "estraverse": "^5.2.0" } }, "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="],
-
-    "estraverse": ["estraverse@5.3.0", "", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="],
-
-    "esutils": ["esutils@2.0.3", "", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="],
-
-    "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="],
-
-    "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="],
-
-    "fast-levenshtein": ["fast-levenshtein@2.0.6", "", {}, "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="],
-
-    "file-entry-cache": ["file-entry-cache@8.0.0", "", { "dependencies": { "flat-cache": "^4.0.0" } }, "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ=="],
-
-    "find-up": ["find-up@5.0.0", "", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="],
-
-    "flat-cache": ["flat-cache@4.0.1", "", { "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.4" } }, "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw=="],
-
-    "flatted": ["flatted@3.3.1", "", {}, "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw=="],
-
-    "foreground-child": ["foreground-child@3.3.0", "", { "dependencies": { "cross-spawn": "^7.0.0", "signal-exit": "^4.0.1" } }, "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg=="],
-
-    "glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
-
-    "glob-parent": ["glob-parent@6.0.2", "", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="],
-
-    "globals": ["globals@15.8.0", "", {}, "sha512-VZAJ4cewHTExBWDHR6yptdIBlx9YSSZuwojj9Nt5mBRXQzrKakDsVKQ1J63sklLvzAJm0X5+RpO4i3Y2hcOnFw=="],
-
-    "has-flag": ["has-flag@4.0.0", "", {}, "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="],
-
-    "ignore": ["ignore@5.3.1", "", {}, "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="],
-
-    "import-fresh": ["import-fresh@3.3.0", "", { "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="],
-
-    "imurmurhash": ["imurmurhash@0.1.4", "", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="],
-
-    "is-extglob": ["is-extglob@2.1.1", "", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="],
-
-    "is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
-
-    "is-glob": ["is-glob@4.0.3", "", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="],
-
-    "isexe": ["isexe@2.0.0", "", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
-
-    "jackspeak": ["jackspeak@3.4.3", "", { "dependencies": { "@isaacs/cliui": "^8.0.2" }, "optionalDependencies": { "@pkgjs/parseargs": "^0.11.0" } }, "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw=="],
-
-    "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],
-
-    "json-buffer": ["json-buffer@3.0.1", "", {}, "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="],
-
-    "json-schema-traverse": ["json-schema-traverse@0.4.1", "", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
-
-    "json-stable-stringify-without-jsonify": ["json-stable-stringify-without-jsonify@1.0.1", "", {}, "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="],
-
-    "keyv": ["keyv@4.5.4", "", { "dependencies": { "json-buffer": "3.0.1" } }, "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw=="],
-
-    "levn": ["levn@0.4.1", "", { "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="],
-
-    "locate-path": ["locate-path@6.0.0", "", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],
-
-    "lodash.memoize": ["lodash.memoize@4.1.2", "", {}, "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="],
-
-    "lodash.merge": ["lodash.merge@4.6.2", "", {}, "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="],
-
-    "lru-cache": ["lru-cache@10.4.3", "", {}, "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="],
-
-    "minimatch": ["minimatch@3.1.2", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="],
-
-    "minipass": ["minipass@7.1.2", "", {}, "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="],
-
-    "ms": ["ms@2.1.2", "", {}, "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="],
-
-    "natural-compare": ["natural-compare@1.4.0", "", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="],
-
-    "node-releases": ["node-releases@2.0.19", "", {}, "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="],
-
-    "optionator": ["optionator@0.9.4", "", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="],
-
-    "p-limit": ["p-limit@3.1.0", "", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
-
-    "p-locate": ["p-locate@5.0.0", "", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
-
-    "package-json-from-dist": ["package-json-from-dist@1.0.1", "", {}, "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="],
-
-    "parent-module": ["parent-module@1.0.1", "", { "dependencies": { "callsites": "^3.0.0" } }, "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="],
-
-    "path-exists": ["path-exists@4.0.0", "", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="],
-
-    "path-key": ["path-key@3.1.1", "", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="],
-
-    "path-scurry": ["path-scurry@1.11.1", "", { "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" } }, "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA=="],
-
-    "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="],
-
-    "prelude-ls": ["prelude-ls@1.2.1", "", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="],
-
-    "punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],
-
-    "resolve-from": ["resolve-from@4.0.0", "", {}, "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="],
-
-    "sax": ["sax@1.4.1", "", {}, "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="],
-
-    "semver": ["semver@7.6.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="],
-
-    "shebang-command": ["shebang-command@2.0.0", "", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
-
-    "shebang-regex": ["shebang-regex@3.0.0", "", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="],
-
-    "signal-exit": ["signal-exit@4.1.0", "", {}, "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="],
-
-    "source-map": ["source-map@0.7.4", "", {}, "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="],
-
-    "string-width": ["string-width@5.1.2", "", { "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", "strip-ansi": "^7.0.1" } }, "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="],
-
-    "string-width-cjs": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
-    "strip-ansi": ["strip-ansi@7.1.0", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="],
-
-    "strip-ansi-cjs": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "strip-json-comments": ["strip-json-comments@3.1.1", "", {}, "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="],
-
-    "stylus": ["stylus@0.64.0", "", { "dependencies": { "@adobe/css-tools": "~4.3.3", "debug": "^4.3.2", "glob": "^10.4.5", "sax": "~1.4.1", "source-map": "^0.7.3" }, "bin": { "stylus": "bin/stylus" } }, "sha512-ZIdT8eUv8tegmqy1tTIdJv9We2DumkNZFdCF5mz/Kpq3OcTaxSuCAYZge6HKK2CmNC02G1eJig2RV7XTw5hQrA=="],
-
-    "supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
-
-    "type-check": ["type-check@0.4.0", "", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="],
-
-    "typescript": ["typescript@5.7.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg=="],
-
-    "undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
-
-    "update-browserslist-db": ["update-browserslist-db@1.1.1", "", { "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.0" }, "peerDependencies": { "browserslist": ">= 4.21.0" }, "bin": { "update-browserslist-db": "cli.js" } }, "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A=="],
-
-    "uri-js": ["uri-js@4.4.1", "", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
-
-    "which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
-
-    "word-wrap": ["word-wrap@1.2.5", "", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="],
-
-    "wrap-ansi": ["wrap-ansi@8.1.0", "", { "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", "strip-ansi": "^7.0.1" } }, "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="],
-
-    "wrap-ansi-cjs": ["wrap-ansi@7.0.0", "", { "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", "strip-ansi": "^6.0.0" } }, "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="],
-
-    "yocto-queue": ["yocto-queue@0.1.0", "", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
-
-    "@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],
-
-    "@eslint/eslintrc/globals": ["globals@14.0.0", "", {}, "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ=="],
-
-    "@humanfs/node/@humanwhocodes/retry": ["@humanwhocodes/retry@0.3.1", "", {}, "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA=="],
-
-    "@types/stylus/@types/node": ["@types/node@22.5.5", "", { "dependencies": { "undici-types": "~6.19.2" } }, "sha512-Xjs4y5UPO/CLdzpgR6GirZJx36yScjh73+2NlLlkFRSoQN8B0DpfXPdZGnvVmLRLOsqDpOfTNv7D9trgGhmOIA=="],
-
-    "ast-metadata-inferer/@mdn/browser-compat-data": ["@mdn/browser-compat-data@5.6.26", "", {}, "sha512-7NdgdOR7lkzrN70zGSULmrcvKyi/aJjpTJRCbuy8IZuHiLkPTvsr10jW0MJgWzK2l2wTmhdQvegTw6yNU5AVNQ=="],
-
-    "foreground-child/cross-spawn": ["cross-spawn@7.0.3", "", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="],
-
-    "glob/minimatch": ["minimatch@9.0.5", "", { "dependencies": { "brace-expansion": "^2.0.1" } }, "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow=="],
-
-    "string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "strip-ansi-cjs/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "wrap-ansi/ansi-styles": ["ansi-styles@6.2.1", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="],
-
-    "wrap-ansi-cjs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
-    "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
-
-    "@types/stylus/@types/node/undici-types": ["undici-types@6.19.8", "", {}, "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw=="],
-
-    "glob/minimatch/brace-expansion": ["brace-expansion@2.0.1", "", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="],
-
-    "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "wrap-ansi-cjs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "wrap-ansi-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-  }
-}
--- a/dist/better-xcloud.meta.js
+++ b/dist/better-xcloud.meta.js
@ -1,5 +1,5 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      6.6.2
+// @version      4.0.1
 // ==/UserScript==
--- a/dist/better-xcloud.pretty.user.js
+++ b/dist/better-xcloud.pretty.user.js
--- a/dist/better-xcloud.user.js
+++ b/dist/better-xcloud.user.js
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -1,3 +0,0 @@
-import compat from "eslint-plugin-compat";
-
-export default [compat.configs['flat/recommended']];
--- a/package.json
+++ b/package.json
@ -2,23 +2,16 @@
  "name": "better-xcloud",
  "module": "src/index.ts",
  "type": "module",
-  "sideEffects": false,
-  "browserslist": [
-    "Chrome >= 80"
-  ],
  "bin": {
    "build": "build.ts"
  },
  "devDependencies": {
-    "@types/bun": "^1.2.15",
-    "@types/node": "^22.15.24",
-    "@types/stylus": "^0.48.43",
-    "@webgpu/types": "^0.1.61",
-    "eslint": "^9.27.0",
-    "eslint-plugin-compat": "^6.0.2",
-    "stylus": "^0.64.0"
+    "@types/bun": "latest",
+    "@types/node": "^20.12.7",
+    "@types/stylus": "^0.48.42",
+    "stylus": "^0.63.0"
  },
  "peerDependencies": {
-    "typescript": "^5.7.2"
+    "typescript": "^5.0.0"
  }
 }
--- a/resources/logos/better-xcloud-transparent.png
+++ b/resources/logos/better-xcloud-transparent.png
--- a/resources/logos/better-xcloud.png
+++ b/resources/logos/better-xcloud.png
--- a/scripts/custom-flags.user.js
+++ b/scripts/custom-flags.user.js
@ -1,45 +0,0 @@
-// ==UserScript==
-// @name         Better xCloud - Custom flags
-// @namespace    https://github.com/redphx
-// @version      1.0.0
-// @description  Customize Better xCloud script
-// @author       redphx
-// @license      MIT
-// @match        https://www.xbox.com/*/play*
-// @run-at       document-start
-// @grant        none
-// ==/UserScript==
-'use strict';
-
-/*
-Make sure this script is being loaded before the Better xCloud script.
-
-How to:
-1. Uninstall Better xCloud script.
-2. Install this script.
-3. Reinstall Better xCloud script. All your settings are still there.
-*/
-
-// Change this to `false` if you want to temporary disable the script
-const enabled = true;
-
-enabled && (window.BX_FLAGS = {
-    // Toggle WebGPU Renderer
-    // https://github.com/redphx/better-xcloud/discussions/657
-    EnableWebGPURenderer: false,
-    
-    /*
-    Add titleId of the game(s) you want to test native M&KB support here.
-    Keep in mind: this method only works with some games.
-
-    Example:
-        - Flight Simulator has this link: /play/games/microsoft-flight-simulator-standard-40th-anniversa/9PMQDM08SNK9
-        - That means its titleId is "9PMQDM08SNK9"
-        - So it becomes:
-            ForceNativeMkbTitles: [
-                "9PMQDM08SNK9",
-            ],
-    */
-    ForceNativeMkbTitles: [
-    ],
-});
--- a/src/assets/css/button.styl
+++ b/src/assets/css/button.styl
@ -1,10 +1,5 @@
 .bx-button {
-    --button-rgb: var(--bx-default-button-rgb);
-    --button-hover-rgb: var(--bx-default-button-hover-rgb);
-    --button-active-rgb: var(--bx-default-button-active-rgb);
-    --button-disabled-rgb: var(--bx-default-button-disabled-rgb);
-
-    background-color: unquote('rgb(var(--button-rgb))');
+    background-color: var(--bx-default-button-color);
    user-select: none;
    -webkit-user-select: none;
    color: #fff;
@ -19,188 +14,87 @@
    cursor: pointer;
    overflow: hidden;

-    &:not([disabled]):active {
-        background-color: unquote('rgb(var(--button-active-rgb))');
-    }
-
    &:focus {
        outline: none !important;
    }

-    &:not([disabled]):not(:active) {
-        &:hover, &.bx-focusable:focus {
-            background-color: unquote('rgb(var(--button-hover-rgb))');
-        }
+    &:hover, &.bx-focusable:focus {
+        background-color: var(--bx-default-button-hover-color);
    }

-
    &:disabled {
        cursor: default;
-        background-color: unquote('rgb(var(--button-disabled-rgb))');
-        opacity: 0.5;
+        background-color: var(--bx-default-button-disabled-color);
    }

    &.bx-ghost {
        background-color: transparent;

-        &:not([disabled]):not(:active) {
-            &:hover, &.bx-focusable:focus {
-                background-color: unquote('rgb(var(--button-hover-rgb))');
-            }
+        &:hover, &.bx-focusable:focus {
+            background-color: var(--bx-default-button-hover-color);
        }
    }

    &.bx-primary {
-        --button-rgb: var(--bx-primary-button-rgb);
+        background-color: var(--bx-primary-button-color);

-        &:not([disabled]):active {
-            --button-active-rgb: var(--bx-primary-button-active-rgb);
-        }
-
-        &:not([disabled]):not(:active) {
-            &:hover, &.bx-focusable:focus {
-                --button-hover-rgb: var(--bx-primary-button-hover-rgb);
-            }
+        &:hover, &.bx-focusable:focus {
+            background-color: var(--bx-primary-button-hover-color);
        }

        &:disabled {
-            --button-disabled-rgb: var(--bx-primary-button-disabled-rgb);
-        }
-    }
-
-    &.bx-warning {
-        --button-rgb: var(--bx-warning-button-rgb);
-
-        &:not([disabled]):active {
-            --button-active-rgb: var(--bx-warning-button-active-rgb);
-        }
-
-        &:not([disabled]):not(:active) {
-            &:hover, &.bx-focusable:focus {
-                --button-hover-rgb: var(--bx-warning-button-hover-rgb);
-            }
-        }
-
-        &:disabled {
-            --button-disabled-rgb: var(--bx-warning-button-disabled-rgb);
+            background-color: var(--bx-primary-button-disabled-color);
        }
    }

    &.bx-danger {
-        --button-rgb: var(--bx-danger-button-rgb);
+        background-color: var(--bx-danger-button-color);

-        &:not([disabled]):active {
-            --button-active-rgb: var(--bx-danger-button-active-rgb);
-        }
-
-        &:not([disabled]):not(:active) {
-            &:hover, &.bx-focusable:focus {
-                --button-hover-rgb: var(--bx-danger-button-hover-rgb);
-            }
+        &:hover, &.bx-focusable:focus {
+            background-color: var(--bx-danger-button-hover-color);
        }

        &:disabled {
-            --button-disabled-rgb: var(--bx-danger-button-disabled-rgb);
+            background-color: var(--bx-danger-button-disabled-color);
        }
    }

-    &.bx-frosted {
-        --button-alpha: 0.2;
-        background-color: unquote('rgba(var(--button-rgb), var(--button-alpha))');
-
-        &:not([disabled]):not(:active) {
-            &:hover, &.bx-focusable:focus {
-                background-color: unquote('rgba(var(--button-hover-rgb), var(--button-alpha))');
-            }
-        }
-    }
-
-    &.bx-drop-shadow {
-        box-shadow: 0 0 4px #00000080;
-    }
-
-    &.bx-tall {
-        height: calc(var(--bx-button-height) * 1.5) !important;
-    }
-
-    &.bx-circular {
-        border-radius: var(--bx-button-height);
-        width: var(--bx-button-height);
-        height: var(--bx-button-height);
-    }
-
    svg {
        display: inline-block;
        width: 16px;
        height: var(--bx-button-height);
+
+        &:not(:only-child) {
+            margin-right: 4px;
+        }
    }

    span {
        display: inline-block;
-        /* height: var(--bx-button-height); */
+        height: calc(var(--bx-button-height) - 2px);
        line-height: var(--bx-button-height);
        vertical-align: middle;
-        /* vertical-align: -webkit-baseline-middle; */
        color: #fff;
        overflow: hidden;
        white-space: nowrap;
-
-        // Text with icon
-        &:not(:only-child) {
-            margin-inline-start: 8px;
-        }
    }

-    &.bx-button-multi-lines {
-        height: auto;
-        text-align: left;
-        padding: 10px;
+    &.bx-focusable {
+        position: relative;

-        span {
-            line-height: unset;
-            display: block;
-
-            &:last-of-type {
-                    text-transform: none;
-                    font-weight: normal;
-                    font-family: "Segoe Sans Variable Text";
-                    font-size: 12px;
-                    margin-top: 4px;
-            }
-        }
-    }
-}
-
-.bx-focusable {
-    position: relative;
-    overflow: visible;
-
-    &::after {
-        border: 2px solid transparent;
-        border-radius: 10px;
-    }
-
-    &:focus::after {
-        offset = -6px;
-        content: '';
-        border-color: white;
-        position: absolute;
-        top: offset;
-        left: offset;
-        right: offset;
-        bottom: offset;
-    }
-
-    html[data-active-input=touch] &,
-    html[data-active-input=mouse] & {
-        &:focus::after {
-            border-color: transparent !important;
-        }
-    }
-
-    &.bx-circular {
        &::after {
-            border-radius: var(--bx-button-height);
+            border: 2px solid transparent;
+            border-radius: 4px;
+        }
+
+        &:focus::after {
+            content: '';
+            border-color: white;
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
        }
    }
 }
@ -212,9 +106,3 @@ a.bx-button {
        text-align: center;
    }
 }
-
-button.bx-inactive {
-    pointer-events: none;
-    opacity: 0.2;
-    background: transparent !important;
-}
--- a/src/assets/css/controller.styl
+++ b/src/assets/css/controller.styl
@ -1,89 +0,0 @@
-.bx-controller-customizations-container {
-    .bx-btn-detect {
-        display: block;
-        margin-bottom: 20px;
-
-        &.bx-monospaced {
-            background: none;
-            font-weight: bold;
-            font-size: 12px;
-        }
-    }
-
-    .bx-buttons-grid {
-        display: grid;
-        grid-template-columns: auto auto;
-        column-gap: 20px;
-        row-gap: 10px;
-        margin-bottom: 20px;
-    }
-
-}
-
-.bx-controller-key-row {
-    display: flex;
-    align-items: stretch;
-
-    > label {
-        margin-bottom: 0;
-        font-family: var(--bx-promptfont-font);
-        font-size: 32px;
-        text-align: center;
-        min-width: 50px;
-        flex-shrink: 0;
-        display: flex;
-        align-self: center;
-
-        &::after {
-            content: '❯';
-            margin: 0 12px;
-            font-size: 16px;
-            align-self: center;
-        }
-    }
-
-    .bx-select {
-        width: 100% !important;
-
-        > div {
-            min-width: 50px;
-        }
-
-        label {
-            font-family: var(--bx-promptfont-font), var(--bx-normal-font);
-            font-size: 32px;
-            text-align: center;
-            margin-bottom: 6px;
-            height: 40px;
-            line-height: 40px;
-        }
-    }
-
-    &:hover {
-        > label {
-            color: #ffe64b;
-
-            &::after {
-                color: #fff;
-            }
-        }
-    }
-}
-
-.bx-controller-customization-summary {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 8px;
-    margin-top: 10px;
-
-    span {
-        font-family: var(--bx-promptfont);
-        font-size: 24px;
-        border-radius: 6px;
-        background: #131313;
-        color: #fff;
-        display: inline-block;
-        padding: 2px;
-        text-align: center;
-    }
-}
--- a/src/assets/css/key-binding-dialog.styl
+++ b/src/assets/css/key-binding-dialog.styl
@ -1,12 +1,12 @@
-.bx-key-binding-dialog-overlay {
+.bx-dialog-overlay {
    position: fixed;
    inset: 0;
-    z-index: var(--bx-key-binding-dialog-overlay-z-index);
+    z-index: var(--bx-dialog-overlay-z-index);
    background: black;
    opacity: 50%;
 }

-.bx-key-binding-dialog {
+.bx-dialog {
    display: flex;
    flex-flow: column;
    max-height: 90vh;
@ -16,9 +16,9 @@
    margin-right: -50%;
    transform: translate(-50%, -50%);
    min-width: 420px;
-    padding: 16px;
+    padding: 20px;
    border-radius: 8px;
-    z-index: var(--bx-key-binding-dialog-z-index);
+    z-index: var(--bx-dialog-z-index);
    background: #1a1b1e;
    color: #fff;
    font-weight: 400;
@ -33,13 +33,26 @@
    }

    h2 {
+        display: flex;
        margin-bottom: 12px;
-        color: #fff;
-        display: block;
-        font-family: var(--bx-title-font);
-        font-size: 32px;
-        font-weight: 400;
-        line-height: var(--bx-button-height);
+
+        b {
+            flex: 1;
+            color: #fff;
+            display: block;
+            font-family: var(--bx-title-font);
+            font-size: 26px;
+            font-weight: 400;
+            line-height: var(--bx-button-height);
+        }
+    }
+
+    &.bx-binding-dialog {
+        h2 {
+            b {
+                font-family: var(--bx-promptfont-font) !important;
+            }
+        }
    }

    > div {
@ -72,26 +85,11 @@
            background-color: #515863;
        }
    }
-
-    ul {
-        margin-bottom: 1rem;
-
-        li {
-            display: none;
-        }
-
-        &[data-flags*="[1]"] > li[data-flag="1"],
-        &[data-flags*="[2]"] > li[data-flag="2"],
-        &[data-flags*="[4]"] > li[data-flag="4"],
-        &[data-flags*="[8]"] > li[data-flag="8"] {
-            display: list-item;
-        }
-    }
 }


@media screen and (max-width: 450px) {
-    .bx-key-binding-dialog {
+    .bx-dialog {
        min-width: 100%;
    }
 }
--- a/src/assets/css/game-bar.styl
+++ b/src/assets/css/game-bar.styl
@ -1,118 +0,0 @@
-#bx-game-bar {
-    z-index: var(--bx-game-bar-z-index);
-    position: fixed;
-    bottom: 0;
-    width: 40px;
-    height: 90px;
-    overflow: visible;
-    cursor: pointer;
-
-    > svg {
-        display: none;
-        pointer-events: none;
-        position: absolute;
-        height: 28px;
-        margin-top: 16px;
-    }
-
-    @media (hover: hover) {
-        &:hover {
-            > svg {
-                display: block;
-            }
-        }
-    }
-
-    .bx-game-bar-container {
-        opacity: 0;
-        position absolute;
-        display: flex;
-        overflow: hidden;
-        background: #1a1b1ee8;
-        box-shadow: 0px 0px 6px #1c1c1c;
-        transition: opacity 0.1s ease-in;
-
-        &.bx-show {
-            opacity: 0.9;
-
-            + svg {
-                display: none !important;
-            }
-        }
-
-        &.bx-hide {
-            opacity: 0;
-            pointer-events: none;
-        }
-
-        button {
-            width: 60px;
-            height: 60px;
-            border-radius: 0;
-
-            svg {
-                width: 28px;
-                height: 28px;
-                transition: transform 0.08s ease 0s;
-            }
-
-            &:hover {
-                border-radius: 0;
-            }
-
-            &:active {
-                svg {
-                    transform: scale(0.75);
-                }
-            }
-
-            &.bx-activated {
-                background-color: white;
-
-                svg {
-                    filter: invert(1);
-                }
-            }
-        }
-
-        /* Touch controller buttons */
-        div[data-activated] {
-            button {
-                display: none;
-            }
-        }
-
-        /* Show default button */
-        div[data-activated='false'] {
-            button:first-of-type {
-                display: block;
-            }
-        }
-
-        /* Show activated button */
-        div[data-activated='true'] {
-            button:last-of-type {
-                display: block;
-            }
-        }
-    }
-
-    &[data-position="bottom-left"] {
-        left: 0;
-        direction: ltr;
-
-        .bx-game-bar-container {
-            border-radius: 0 10px 10px 0;
-        }
-    }
-
-    &[data-position="bottom-right"] {
-        right: 0;
-        direction: rtl;
-
-        .bx-game-bar-container {
-            direction: ltr;
-            border-radius: 10px 0 0 10px;
-        }
-    }
-}
--- a/src/assets/css/global-settings.styl
+++ b/src/assets/css/global-settings.styl
@ -0,0 +1,169 @@
+.bx-settings-reload-button-wrapper {
+    z-index: var(--bx-reload-button-z-index);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    text-align: center;
+    background: #000000cf;
+    padding: 10px;
+
+    button {
+        max-width: 450px;
+        margin: 0 !important;
+    }
+}
+
+.bx-settings-container {
+    background-color: #151515;
+    user-select: none;
+    -webkit-user-select: none;
+    color: #fff;
+    font-family: var(--bx-normal-font);
+}
+
+@media (hover: hover) {
+    .bx-settings-wrapper a.bx-settings-title:hover {
+        color: #83f73a;
+    }
+}
+
+.bx-settings-wrapper {
+    width: 450px;
+    margin: auto;
+    padding: 12px 6px;
+
+    @media screen and (max-width: 450px) {
+        width: 100%;
+    }
+
+    *:focus {
+        outline: none !important;
+    }
+
+    .bx-settings-title-wrapper {
+        display: flex;
+        margin-bottom: 10px;
+        align-items: center;
+    }
+
+    a.bx-settings-title {
+        font-family: var(--bx-title-font);
+        font-size: 1.4rem;
+        text-decoration: none;
+        font-weight: bold;
+        display: block;
+        color: #5dc21e;
+        flex: 1;
+
+        &:focus {
+            color: #83f73a;
+        }
+    }
+
+    .bx-button.bx-primary {
+        margin-top: 8px;
+    }
+
+    a.bx-settings-update {
+        display: block;
+        color: #ff834b;
+        text-decoration: none;
+        margin-bottom: 8px;
+        text-align: center;
+        background: #222;
+        border-radius: 4px;
+        padding: 4px;
+
+        &:hover {
+            @media (hover: hover) {
+                color: #ff9869;
+                text-decoration: underline;
+            }
+        }
+
+        &:focus {
+            color: #ff9869;
+            text-decoration: underline;
+        }
+    }
+}
+
+.bx-settings-group-label {
+    font-weight: bold;
+    display: block;
+    font-size: 1.1rem;
+}
+
+
+.bx-settings-row {
+    display: flex;
+    margin-bottom: 8px;
+    padding: 2px 4px;
+
+    label {
+        flex: 1;
+        align-self: center;
+        margin-bottom: 0;
+        padding-left: 10px;
+    }
+
+
+    &:focus-within {
+        @media (hover: none) {
+            background-color: #242424;
+        }
+    }
+
+    input {
+        align-self: center;
+        accent-color: var(--bx-primary-button-color);
+    }
+
+    select:disabled {
+        -webkit-appearance: none;
+        background: transparent;
+        text-align-last: right;
+        border: none;
+        color: #fff;
+    }
+}
+
+.bx-settings-group-label b, .bx-settings-row label b {
+    display: block;
+    font-size: 12px;
+    font-style: italic;
+    font-weight: normal;
+    color: #828282;
+}
+
+.bx-settings-group-label b {
+    margin-bottom: 8px;
+}
+
+.bx-settings-app-version {
+    margin-top: 10px;
+    text-align: center;
+    color: #747474;
+    font-size: 12px;
+}
+
+.bx-donation-link {
+    display: block;
+    text-align: center;
+    text-decoration: none;
+    height: 20px;
+    line-height: 20px;
+    font-size: 14px;
+    margin-top: 10px;
+    color: #5dc21e;
+
+    &:hover {
+        color: #6dd72b;
+    }
+}
+
+.bx-settings-custom-user-agent {
+    display: block;
+    width: 100%;
+}
--- a/src/assets/css/guide-menu.styl
+++ b/src/assets/css/guide-menu.styl
@ -1,65 +0,0 @@
-.bx-guide-home-achievements-progress {
-    display: flex;
-    gap: 10px;
-    flex-direction: row;
-
-    .bx-button {
-        margin-bottom: 0 !important;
-    }
-
-    body[data-bx-media-type=tv] & {
-        flex-direction: column;
-    }
-
-    body:not([data-bx-media-type=tv]) & {
-        flex-direction: row;
-
-        > button:first-of-type {
-            flex: 1;
-        }
-
-        > button:last-of-type {
-            width: 40px;
-
-            span {
-                display: none;
-            }
-        }
-    }
-}
-
-.bx-guide-home-buttons {
-    > div {
-        display: flex;
-        flex-direction: row;
-        gap: 12px;
-
-        body[data-bx-media-type=tv] & {
-            flex-direction: column;
-
-            button {
-                margin-bottom: 0 !important;
-            }
-        }
-
-        body:not([data-bx-media-type=tv]) & {
-            button {
-                span {
-                    display: none;
-                }
-            }
-        }
-    }
-
-    &[data-is-playing="true"] {
-        button[data-state='normal'] {
-            display: none;
-        }
-    }
-
-    &[data-is-playing="false"] {
-        button[data-state='playing'] {
-            display: none;
-        }
-    }
-}
--- a/src/assets/css/header.styl
+++ b/src/assets/css/header.styl
@ -4,7 +4,7 @@

    svg {
        width: 24px;
-        height: 24px;
+        height: 46px;
    }
 }

--- a/src/assets/css/loading-screen.styl
+++ b/src/assets/css/loading-screen.styl
--- a/src/assets/css/misc.styl
+++ b/src/assets/css/misc.styl
@ -1,30 +0,0 @@
-.bx-product-details-icons {
-    padding: 8px;
-    border-radius: 4px;
-
-    svg {
-        margin-right: 8px;
-    }
-}
-
-.bx-product-details-buttons {
-    display: flex;
-    gap: 10px;
-    flex-direction: row;
-
-    button {
-        max-width: max-content;
-        margin: 10px 0 0 0;
-        display: flex;
-    }
-}
-
-@media (min-width: 568px) and (max-height: 480px) {
-    .bx-product-details-buttons {
-        flex-direction: column;
-
-        button {
-            margin: 8px 0 0 10px;
-        }
-    }
-}
--- a/src/assets/css/mkb.styl
+++ b/src/assets/css/mkb.styl
@ -4,19 +4,31 @@
    flex: 1;
    padding-bottom: 10px;
    overflow: hidden;
+
+    select:disabled {
+        -webkit-appearance: none;
+        background: transparent;
+        text-align-last: right;
+        text-align: right;
+        border: none;
+        color: #fff;
+    }
 }

 .bx-mkb-pointer-lock-msg {
+    display: flex;
+    cursor: pointer;
    user-select: none;
    -webkit-user-select: none;
    position: fixed;
    left: 50%;
-    bottom: 40px;
-    transform: translateX(-50%);
+    top: 50%;
+    transform: translateX(-50%) translateY(-50%);
    margin: auto;
-    background: #151515;
+    background: #000000e5;
    z-index: var(--bx-mkb-pointer-lock-msg-z-index);
    color: #fff;
+    text-align: center;
    font-weight: 400;
    font-family: "Segoe UI", Arial, Helvetica, sans-serif;
    font-size: 1.3rem;
@ -24,55 +36,91 @@
    border-radius: 8px;
    align-items: center;
    box-shadow: 0 0 6px #000;
-    min-width: 300px;
-    opacity: 0.9;
-    display: flex;
-    flex-direction: column;
-    gap: 10px;

    &:hover {
-        opacity: 1;
+        background: #151515;
    }

-    > p {
-        margin: 0;
-        width: 100%;
-        font-size: 22px;
-        margin-bottom: 4px;
-        font-weight: bold;
+    button {
+        margin-right: 12px;
+        height: 60px;
+    }
+
+    svg {
+        width: 32px;
+    }
+
+    div {
+        display: flex;
+        flex-direction: column;
        text-align: left;
    }

-    > div {
-        width: 100%;
-        display: flex;
-        flex-direction: row;
+    p {
+        margin: 0;

-        gap: 10px;
-        button {
-            &:first-of-type {
-                flex-shrink: 1;
-            }
+        &:first-child {
+            font-size: 22px;
+            margin-bottom: 8px;
+        }

-            &:last-of-type {
-                flex-grow: 1;
-            }
+        &:last-child {
+            font-size: 14px;
+            font-style: italic;
        }
    }
 }

+.bx-mkb-preset-tools {
+    display: flex;
+    margin-bottom: 12px;
+
+    select {
+        flex: 1;
+    }
+
+    button {
+        margin-left: 6px;
+    }
+}
+
+
+.bx-mkb-settings-rows {
+    flex: 1;
+    overflow: scroll;
+}
+
 .bx-mkb-key-row {
    display: flex;
    margin-bottom: 10px;
    align-items: center;
-    gap: 20px;


    label {
        margin-bottom: 0;
        font-family: var(--bx-promptfont-font);
-        font-size: 32px;
+        font-size: 26px;
        text-align: center;
+        width: 26px;
+        height: 32px;
+        line-height: 32px;
+    }
+
+    button {
+        flex: 1;
+        height: 32px;
+        line-height: 32px;
+        margin: 0 0 0 10px;
+        background: transparent;
+        border: none;
+        color: white;
+        border-radius: 0;
+        border-left: 1px solid #373737;
+
+        &:hover {
+            background: transparent;
+            cursor: default;
+        }
    }
 }

@ -109,58 +157,10 @@

 .bx-mkb-note {
    display: block;
-    margin: 0 0 10px;
+    margin: 16px 0 10px;
    font-size: 12px;
-    text-align: center;
-}

-button.bx-binding-button {
-    flex: 1;
-    min-height: 38px;
-    border: none;
-    border-radius: 4px;
-    font-size: 14px;
-    color: #fff;
-    display: flex;
-    align-items: center;
-    align-self: center;
-    padding: 0 6px;
-
-    &:disabled {
-        background: #131416;
-        padding: 0 8px;
-    }
-
-    &:not(:disabled) {
-        border: 2px solid transparent;
-        border-top: none;
-        border-bottom: 4px solid #252525;
-        background: #3b3b3b;
-        cursor: pointer;
-
-        &:hover, &.bx-focusable:focus {
-            background: #20b217;
-            border-bottom-color: #186c13;
-        }
-
-        &:active {
-            background: #16900f;
-            border-bottom: 3px solid #0c4e08;
-            border-left-width: 2px;
-            border-right-width: 2px;
-        }
-
-        &.bx-focusable:focus {
-            &::after {
-                top: -6px;
-                left: -8px;
-                right: -8px;
-                bottom: -10px;
-            }
-        }
-    }
-
-    .bx-settings-row .bx-binding-button-wrapper & {
-        min-width: 60px;
+    &:first-of-type {
+        margin-top: 0;
    }
 }
--- a/src/assets/css/navigation-dialog.styl
+++ b/src/assets/css/navigation-dialog.styl
@ -1,217 +0,0 @@
-.bx-navigation-dialog {
-    position: absolute;
-    z-index: var(--bx-navigation-dialog-z-index);
-    font-family: var(--bx-title-font);
-
-    *:focus {
-        outline: none !important;
-    }
-
-    select:disabled {
-        -webkit-appearance: none;
-        text-align-last: right;
-        text-align: right;
-        color: #fff;
-        background: #131416;
-        border: none;
-        border-radius: 4px;
-        padding: 0 5px;
-    }
-
-    .bx-focusable {
-        &::after {
-            border-radius: 4px;
-        }
-
-        &:focus::after {
-            offset = 0;
-
-            top: offset;
-            left: offset;
-            right: offset;
-            bottom: offset;
-        }
-    }
-}
-
-.bx-navigation-dialog-overlay {
-    position: fixed;
-    background: #0b0b0be3;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: var(--bx-navigation-dialog-overlay-z-index);
-
-    &[data-is-playing="true"] {
-        background: transparent;
-    }
-}
-
-.bx-centered-dialog {
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-
-    color: white;
-    background: #1a1b1e;
-    border-radius: 10px;
-    min-width: @css{ min(calc(100vw - 20px), 500px) };
-    max-width: calc(100vw - 20px);
-    margin: 0 0 0 auto;
-    padding: 16px;
-
-    max-height: 95vh;
-    flex-direction: column;
-    overflow: hidden;
-    display: flex;
-    flex-direction: column;
-
-    .bx-dialog-title {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        margin-bottom: 10px;
-
-        p {
-            padding: 0;
-            margin: 0;
-            flex: 1;
-            font-size: 1.5rem;
-            font-weight: bold;
-        }
-
-        button {
-            flex-shrink: 0;
-        }
-    }
-
-    .bx-dialog-content {
-        flex: 1;
-        padding: 6px;
-        overflow: auto;
-        overflow-x: hidden;
-    }
-
-    .bx-dialog-preset-tools {
-        display: flex;
-        margin-bottom: 12px;
-        gap: 6px;
-
-        button {
-            align-self: center;
-            min-height: 50px;
-        }
-    }
-
-    .bx-default-preset-note {
-        font-size: 12px;
-        font-style: italic;
-        text-align: center;
-        margin-bottom: 10px;
-    }
-}
-
-.bx-centered-dialog,
-.bx-settings-dialog {
-    input {
-        accent-color: var(--bx-primary-button-color);
-
-        &:focus {
-            accent-color: var(--bx-danger-button-color);
-        }
-    }
-
-    select:disabled {
-        -webkit-appearance: none;
-        background: transparent;
-        text-align-last: right;
-        border: none;
-        color: #fff;
-    }
-
-    select option:disabled {
-        display: none;
-    }
-
-    input[type=checkbox],
-    select {
-        &:focus {
-            filter: drop-shadow(1px 0 0 #fff) drop-shadow(-1px 0 0 #fff) drop-shadow(0 1px 0 #fff) drop-shadow(0 -1px 0 #fff);
-        }
-    }
-
-    a {
-        color: #1c9d1c;
-        text-decoration: none;
-
-        &:hover, &:focus {
-            color: #5dc21e;
-        }
-    }
-
-    label {
-        margin: 0;
-    }
-}
-
-.bx-controller-shortcuts-manager-container {
-    .bx-shortcut-note {
-        margin-top: 10px;
-        font-size: 14px;
-        text-align: center;
-    }
-
-    .bx-shortcut-row {
-        display: flex;
-        gap: 10px;
-        margin-bottom: 10px;
-        align-items: center;
-
-        label.bx-prompt {
-            flex-shrink: 0;
-            font-size: 32px;
-            margin: 0;
-
-            &::first-letter {
-                letter-spacing: 6px;
-            }
-        }
-    }
-
-    select:disabled {
-        text-align: left;
-        text-align-last: left;
-    }
-}
-
-.bx-keyboard-shortcuts-manager-container {
-    display: flex;
-    flex-direction: column;
-    gap: 16px;
-
-    fieldset {
-        background: #2a2a2a;
-        border: 1px solid #2a2a2a;
-        border-radius: 4px;
-        padding: 4px;
-    }
-
-    legend {
-        width: auto;
-        padding: 4px 8px;
-        margin: 0 4px 4px;
-        background: #004f87;
-        box-shadow: 0px 2px 0px #071e3d;
-        border-radius: 4px;
-        font-size: 14px;
-        font-weight: bold;
-        text-transform: uppercase;
-    }
-
-    .bx-settings-row {
-        background: none;
-        padding: 10px;
-    }
-}
--- a/src/assets/css/number-stepper.styl
+++ b/src/assets/css/number-stepper.styl
@ -1,153 +1,41 @@
 .bx-number-stepper {
-    text-align: center;
-
-    > div {
-        display: flex;
-        align-items: center;
-
-        span {
-            flex: 1;
-            display: inline-block;
-            min-width: 40px;
-            font-family: var(--bx-monospaced-font);
-            white-space: pre;
-            font-size: 13px;
-            margin: 0 4px;
-        }
-
-        button {
-            flex-shrink: 0;
-            border: none;
-            width: 24px;
-            height: 24px;
-            margin: 0;
-            line-height: 24px;
-            background-color: var(--bx-default-button-color);
-            color: #fff;
-            border-radius: 4px;
-            font-weight: bold;
-            font-size: 14px;
-            font-family: var(--bx-monospaced-font);
-
-            &:hover {
-                @media (hover: hover) {
-                    background-color: var(--bx-default-button-hover-color);
-                }
-            }
-
-            &:active {
-                background-color: var(--bx-default-button-hover-color);
-            }
-
-            &:disabled + span {
-                font-family: var(--bx-title-font);
-            }
-        }
+    span {
+        display: inline-block;
+        width: 40px;
+        font-family: var(--bx-monospaced-font);
+        font-size: 14px;
    }

-    input[type=range] {
-        display: block;
-        margin: 8px 0 2px auto;
-        min-width: 180px;
-        width: 100%;
-        color: #959595 !important;
+    button {
+        border: none;
+        width: 24px;
+        height: 24px;
+        margin: 0 4px;
+        line-height: 24px;
+        background-color: var(--bx-default-button-color);
+        color: #fff;
+        border-radius: 4px;
+        font-weight: bold;
+        font-size: 14px;
+        font-family: var(--bx-monospaced-font);
+        color: #fff;
+
+        &:hover {
+            @media (hover: hover) {
+                background-color: var(--bx-default-button-hover-color);
+            }
+        }
+
+        &:active {
+            background-color: var(--bx-default-button-hover-color);
+        }
+
+        &:disabled + span {
+            font-family: var(--bx-title-font);
+        }
    }

    input[type=range]:disabled, button:disabled {
        display: none;
    }
-
-    &[data-disabled=true], &[disabled=true] {
-        input[type=range], button {
-            display: none;
-        }
-    }
-}
-
-
-.bx-dual-number-stepper {
-    > span {
-        display: block;
-        font-family: var(--bx-monospaced-font);
-        font-size: 13px;
-        white-space: pre;
-        margin: 0 4px;
-        text-align: center;
-    }
-
-    > div {
-        input[type=range] {
-            display: block;
-            width: 100%;
-            min-width: 180px;
-            background: transparent;
-            color: #959595 !important;
-            appearance: none;
-            padding: 8px 0;
-
-            range-track() {
-                background: linear-gradient(90deg, #fff var(--from), var(--bx-primary-button-color) var(--from) var(--to), #fff var(--to) 100%);
-                height: 8px;
-                border-radius: 2px;
-            }
-
-            range-track-hover() {
-                background: linear-gradient(90deg, #fff var(--from), #006635 var(--from) var(--to), #fff var(--to) 100%);
-            }
-
-            thumb() {
-                margin-top: -4px;
-                appearance: none;
-                width: 4px;
-                height: 16px;
-                background: #00b85f;
-                border: none;
-                border-radius: 2px;
-            }
-
-            thumb-hover() {
-                background: #fb3232;
-            }
-
-            &::-webkit-slider-runnable-track {
-                range-track()
-            }
-
-            &::-moz-range-track {
-                range-track()
-            }
-
-            &::-webkit-slider-thumb {
-                thumb();
-            }
-
-            &::-moz-range-thumb {
-                thumb();
-            }
-
-            &:hover, &&:active, &:focus {
-                &::-webkit-slider-runnable-track {
-                    range-track-hover();
-                }
-
-                &::-moz-range-track {
-                    range-track-hover();
-                }
-
-                &::-webkit-slider-thumb {
-                    thumb-hover();
-                }
-
-                &::-moz-range-thumb {
-                    thumb-hover();
-                }
-            }
-        }
-    }
-
-    &[data-disabled=true], &[disabled=true] {
-        input[type=range] {
-            display: none;
-        }
-    }
 }
--- a/src/assets/css/remote-play.styl
+++ b/src/assets/css/remote-play.styl
@ -1,3 +1,43 @@
+.bx-remote-play-popup {
+    width: 100%;
+    max-width: 1920px;
+    margin: auto;
+    position: relative;
+    height: 0.1px;
+    overflow: visible;
+    z-index: var(--bx-remote-play-popup-z-index);
+}
+
+.bx-remote-play-container {
+    position: absolute;
+    right: 10px;
+    top: 0;
+    background: #1a1b1e;
+    border-radius: 10px;
+    width: 420px;
+    max-width: calc(100vw - 20px);
+    margin: 0 0 0 auto;
+    padding: 20px;
+    box-shadow: #00000080 0px 0px 12px 0px;
+
+    @media (min-width:480px) and (min-height:calc(480px + 1px)) {
+        right: calc(env(safe-area-inset-right, 0px) + 32px);
+    }
+
+    @media (min-width:768px) and (min-height:calc(480px + 1px)) {
+        right: calc(env(safe-area-inset-right, 0px) + 48px);
+    }
+
+    @media (min-width:1920px) and (min-height:calc(480px + 1px)) {
+        right: calc(env(safe-area-inset-right, 0px) + 80px);
+    }
+
+    > .bx-button {
+        display: table;
+        margin: 0 0 0 auto;
+    }
+}
+
 .bx-remote-play-settings {
    margin-bottom: 12px;
    padding-bottom: 12px;
@ -9,7 +49,6 @@

    label {
        flex: 1;
-        font-size: 14px;

        p {
            margin: 4px 0 0;
@ -18,6 +57,14 @@
            font-size: 12px;
        }
    }
+
+    span {
+        font-weight: bold;
+        font-size: 18px;
+        display: block;
+        margin-bottom: 8px;
+        text-align: center;
+    }
 }

 .bx-remote-play-resolution {
@ -44,39 +91,33 @@

 .bx-remote-play-device-info {
    flex: 1;
-    align-self: center;
    padding: 4px 0;
 }

 .bx-remote-play-device-name {
-    font-size: 14px;
+    font-size: 20px;
    font-weight: bold;
    display: inline-block;
    vertical-align: middle;
 }

 .bx-remote-play-console-type {
-    font-size: 8px;
+    font-size: 12px;
    background: #004c87;
    color: #fff;
    display: inline-block;
-    border-radius: 8px;
-    padding: 2px 6px;
+    border-radius: 14px;
+    padding: 2px 10px;
    margin-left: 8px;
    vertical-align: middle;
 }

 .bx-remote-play-power-state {
    color: #888;
-    font-size: 12px;
+    font-size: 14px;
 }

 .bx-remote-play-connect-button {
    min-height: 100%;
    margin: 4px 0;
 }
-
-.bx-remote-play-buttons {
-    display: flex;
-    justify-content: space-between;
-}
--- a/src/assets/css/root.styl
+++ b/src/assets/css/root.styl
@ -1,18 +1,3 @@
-button_color(name, normal, hover, active, disabled)
-    prefix = unquote('--bx-' + name + '-button');
-    {prefix + '-color'}: normal;
-    {prefix + '-rgb'}: red(normal), green(normal), blue(normal);
-
-    {prefix + '-hover-color'}: hover;
-    {prefix + '-hover-rgb'}: red(hover), green(hover), blue(hover);
-
-    {prefix + '-active-color'}: active;
-    {prefix + '-active-rgb'}: red(active), green(active), blue(active);
-
-    {prefix + '-disabled-color'}: disabled;
-    {prefix + '-disabled-rgb'}: red(disabled), green(disabled), blue(disabled);
-
-
 :root {
    --bx-title-font: Bahnschrift, Arial, Helvetica, sans-serif;
    --bx-title-font-semibold: Bahnschrift Semibold, Arial, Helvetica, sans-serif;
@ -20,38 +5,40 @@ button_color(name, normal, hover, active, disabled)
    --bx-monospaced-font: Consolas, "Courier New", Courier, monospace;
    --bx-promptfont-font: promptfont;

-    --bx-button-height: 40px;
+    --bx-button-height: 36px;

-    button_color('default', #2d3036, #515863, #222428, #8e8e8e);
-    button_color('primary', #008746, #04b358, #044e2a, #448262);
-    button_color('warning', #c16e04, #fa9005, #965603, #a2816c);
-    button_color('danger', #c10404, #e61d1d, #a26c6c, #bd8282);
+    --bx-default-button-color: #2d3036;
+    --bx-default-button-hover-color: #515863;
+    --bx-default-button-disabled-color: #8e8e8e;

-    --bx-fullscreen-text-z-index: 9999;
-    --bx-toast-z-index: 6000;
-    --bx-key-binding-dialog-z-index: 5010;
-    --bx-key-binding-dialog-overlay-z-index: 5000;
+    --bx-primary-button-color: #008746;
+    --bx-primary-button-hover-color: #04b358;
+    --bx-primary-button-disabled-color: #448262;

-    --bx-stats-bar-z-index: 4010;
+    --bx-danger-button-color: #c10404;
+    --bx-danger-button-hover-color: #e61d1d;
+    --bx-danger-button-disabled-color: #a26c6c;

-    --bx-navigation-dialog-z-index: 3010;
-    --bx-navigation-dialog-overlay-z-index: 3000;
-
-    --bx-mkb-pointer-lock-msg-z-index: 2000;
-
-    --bx-game-bar-z-index: 1000;
-    --bx-screenshot-animation-z-index: 200;
+    --bx-toast-z-index: 9999;
+    --bx-reload-button-z-index: 9200;
+    --bx-dialog-z-index: 9101;
+    --bx-dialog-overlay-z-index: 9100;
+    --bx-remote-play-popup-z-index: 9090;
+    --bx-stats-bar-z-index: 9001;
+    --bx-stream-settings-z-index: 9000;
+    --bx-mkb-pointer-lock-msg-z-index: 8999;
+    --bx-screenshot-z-index: 8888;
+    --bx-touch-controller-bar-z-index: 5555;
    --bx-wait-time-box-z-index: 100;
 }

@font-face {
    font-family: 'promptfont';
    src: url('https://redphx.github.io/better-xcloud/fonts/promptfont.otf');
-    unicode-range: U+2196-E011, U+27F6, U+FF31;
 }

 /* Fix Stream menu buttons not hiding */
-#StreamHud div[class^=HUDButton-module__hiddenContainer] ~ div:not([class^=HUDButton-module__hiddenContainer]) {
+div[class^=HUDButton-module__hiddenContainer] ~ div:not([class^=HUDButton-module__hiddenContainer]) {
    opacity: 0;
    pointer-events: none !important;
    position: absolute;
@ -60,35 +47,9 @@ button_color(name, normal, hover, active, disabled)
 }

 /* Remove the "Cloud Gaming" text in header when the screen is too small */
-@media screen and (min-width: 641px) and (max-width: 767px) {
-    header {
-        button[class^="ExperienceDropdown-module__toggleButton"],
-        button[class^="XboxButton-module__headerXboxButton"] {
-            margin-right: 10px !important;
-        }
-
-        a[href="/play"],
-        button[class^="ExperienceDropdown-module__toggleButton"] {
-            > div {
-                > div {
-                    font-size: 12px;
-                }
-
-                > svg {
-                    width: 20px;
-                    height: 20px;
-                }
-            }
-        }
-    }
-}
-
-@media screen and (max-width: 640px) {
-    header {
-        a[href="/play"],
-        button[class^="ExperienceDropdown-module__toggleButton"] {
-            display: none;
-        }
+@media screen and (max-width: 600px) {
+    header a[href="/play"] {
+        display: none;
    }
 }

@ -100,22 +61,10 @@ button_color(name, normal, hover, active, disabled)
    height: 100% !important;
 }

-.bx-auto-height {
-    height: auto !important;
-}
-
 .bx-no-scroll {
    overflow: hidden !important;
 }

-.bx-hide-scroll-bar {
-    scrollbar-width: none;
-
-    &::-webkit-scrollbar {
-        display: none;
-    }
-}
-
 .bx-gone {
    display: none !important;
 }
@ -131,19 +80,6 @@ button_color(name, normal, hover, active, disabled)
    visibility: hidden !important;
 }

-.bx-invisible {
-    opacity: 0;
-}
-
-.bx-unclickable {
-    pointer-events: none;
-}
-
-.bx-pixel {
-    width: 1px !important;
-    height: 1px !important;
-}
-
 .bx-no-margin {
    margin: 0 !important;
 }
@ -152,166 +88,19 @@ button_color(name, normal, hover, active, disabled)
    padding: 0 !important;
 }

-.bx-prompt {
-    font-family: var(--bx-promptfont-font) !important;
-}
-
-.bx-monospaced {
-    font-family: var(--bx-monospaced-font) !important;
-}
-
-.bx-line-through {
-    text-decoration: line-through !important;
-}
-
-.bx-normal-case {
-    text-transform: none !important;
-}
-
-.bx-normal-link {
-    text-transform: none !important;
-    text-align: left !important;
-    font-weight: 400 !important;
-    font-family: var(--bx-normal-font) !important;
-}
-
-.bx-frosted {
-    backdrop-filter: blur(4px) brightness(1.5);
-}
-
-select[multiple], select[multiple]:focus {
-    overflow: auto;
-    border: none;
-
-    option {
-        padding: 4px 6px;
-
-        &:checked {
-            color = #1a7bc0;
-            background: color linear-gradient(0deg, color 0%, color 100%);
-
-            &::before {
-                content: '☑️';
-                font-size: 12px;
-                display: inline-block;
-                margin-right: 6px;
-                height: 100%;
-                line-height: 100%;
-                vertical-align: middle;
-            }
-        }
-    }
-}
-
 /* Hide UI elements */
 #headerArea, #uhfSkipToMain, .uhf-footer {
    display: none;
 }

-#game-stream {
-    div[class^=NotFocusedDialog] {
-        position: absolute !important;
-        top: -9999px !important;
-        left: -9999px !important;
-        width: 0px !important;
-        height: 0px !important;
-    }
-
-    video:not([src]) {
-        visibility: hidden;
-    }
+div[class*=NotFocusedDialog] {
+    position: absolute !important;
+    top: -9999px !important;
+    left: -9999px !important;
+    width: 0px !important;
+    height: 0px !important;
 }

-.bx-game-tile-wait-time {
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1;
-    background: rgba(0, 0, 0, 0.5);
-    display: flex;
-    border-radius: 4px 0 4px 0;
-    align-items: center;
-    padding: 4px 8px;
-
-    svg {
-        width: 14px;
-        height: 16px;
-        margin-right: 2px;
-    }
-
-    span {
-        display: inline-block;
-        height: 16px;
-        line-height: 16px;
-        font-size: 12px;
-        font-weight: bold;
-        margin-left: 2px;
-    }
-
-    &[data-duration=short] {
-        background-color: rgba(0, 133, 133, 0.75);
-    }
-
-    &[data-duration=medium] {
-        background-color: rgba(213, 133, 0, 0.75);
-    }
-
-    &[data-duration=long] {
-        background-color: rgba(150, 0, 0, 0.75);
-    }
-}
-
-
-.bx-fullscreen-text {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background: #000000cc;
-    z-index: var(--bx-fullscreen-text-z-index);
-    line-height: 100vh;
-    color: #fff;
-    text-align: center;
-    font-weight: 400;
-    font-family: var(--bx-normal-font);
-    font-size: 1.3rem;
-    user-select: none;
-    -webkit-user-select: none;
-}
-
-/* Device Code page */
-#root {
-    section[class*=DeviceCodePage-module__page] {
-        margin-left: 20px !important;
-        margin-right: 20px !important;
-        margin-top: 20px !important;
-        max-width: 800px !important;
-    }
-
-    div[class*=DeviceCodePage-module__back] {
-        display: none;
-    }
-}
-
-.bx-blink-me {
-  animation: bx-blinker 1s linear infinite;
-}
-
-@keyframes bx-blinker {
-  100% {
-    opacity: 0;
-  }
-}
-
-.bx-horizontal-shaking {
-    animation: bx-horizontal-shaking .4s ease-in-out 2;
-}
-
-@keyframes bx-horizontal-shaking {
-    0% { transform: translateX(0) }
-    25% { transform: translateX(5px) }
-    50% { transform: translateX(-5px) }
-    75% { transform: translateX(5px) }
-    100% { transform: translateX(0) }
+#game-stream video:not([src]) {
+    visibility: hidden;
 }
--- a/src/assets/css/settings-dialog.styl
+++ b/src/assets/css/settings-dialog.styl
@ -1,589 +0,0 @@
-.bx-settings-dialog {
-    display: flex;
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    opacity: 0.98;
-    user-select: none;
-    -webkit-user-select: none;
-
-    .bx-settings-reload-note {
-        font-size: 0.8rem;
-        display: block;
-        padding: 8px;
-        font-style: italic;
-        font-weight: normal;
-        height: var(--bx-button-height);
-    }
-}
-
-.bx-settings-tabs-container {
-    position: fixed;
-    width: 48px;
-    max-height: 100vh;
-    display: flex;
-    flex-direction: column;
-
-    > div:last-of-type {
-        display: flex;
-        flex-direction: column;
-        align-items: end;
-
-        button {
-            flex-shrink: 0;
-            border-top-right-radius: 0;
-            border-bottom-right-radius: 0;
-            margin-top: 8px;
-            height: unset;
-            padding: 8px 10px;
-
-            svg {
-                size = 16px;
-
-                width: size;
-                height: size;
-            }
-        }
-    }
-}
-
-.bx-settings-tabs {
-    display: flex;
-    flex-direction: column;
-    border-radius: 0 0 0 8px;
-    box-shadow: 0 0 6px #000;
-    overflow: overlay;
-    flex: 1;
-
-    svg {
-        size = 24px;
-        width: size;
-        height: size;
-        padding: 10px;
-        flex-shrink: 0;
-        box-sizing: content-box;
-        background: #131313;
-        cursor: pointer;
-        border-left: 4px solid #1e1e1e;
-
-        &.bx-active {
-            background: #222;
-            border-color: #008746;
-        }
-
-        &:not(.bx-active):hover {
-            background: #2f2f2f;
-            border-color: #484848;
-        }
-
-        &:focus {
-            border-color: #fff;
-        }
-
-        &[data-group=global] {
-            &[data-need-refresh=true] {
-                background: var(--bx-danger-button-color) !important;
-
-                &:hover {
-                    background: var(--bx-danger-button-hover-color) !important;
-                }
-            }
-        }
-    }
-}
-
-
-.bx-settings-tab-contents {
-    tabsWidth = 48px;
-
-    flex-direction: column;
-    margin-left: tabsWidth;
-    width: 450px;
-    background: #1a1b1e;
-    color: #fff;
-    font-weight: 400;
-    font-size: 16px;
-    font-family: var(--bx-title-font);
-    text-align: center;
-    box-shadow: 0px 0px 6px #000;
-    overflow: overlay;
-    z-index: 1;
-
-    .bx-top-buttons {
-        display: flex;
-        flex-direction: column;
-        gap: 8px;
-        margin-bottom: 8px;
-
-        .bx-button {
-            display: block;
-        }
-    }
-
-    h2 {
-        margin: 16px 0 8px 0;
-        display: flex;
-        align-items: center;
-
-        &:first-of-type {
-            margin-top: 0;
-        }
-
-        span {
-            display: inline-block;
-            font-size: 20px;
-            font-weight: bold;
-            text-align: left;
-            flex: 1;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            white-space: nowrap;
-            min-height: var(--bx-button-height);
-            align-content: center;
-        }
-    }
-}
-
-@media (max-width: 500px) {
-    .bx-settings-tab-contents {
-        width: calc(100vw - 48px);
-    }
-}
-
-.bx-settings-row {
-    display: flex;
-    gap: 10px;
-    padding: 16px 10px;
-    background: #2a2a2a;
-    border-bottom: 1px solid #343434;
-
-    &:hover, &:focus-within {
-        background-color: #242424;
-    }
-
-    &:not(:has(> input[type=checkbox])) {
-        flex-wrap: wrap;
-    }
-
-    /*
-    &:has(input:focus), &:has(select:focus), &:has(button:focus) {
-        border-left-color: white;
-    }
-    */
-
-    > span.bx-settings-label {
-        font-size: 14px;
-        display: block;
-        text-align: left;
-        align-self: center;
-        margin-bottom: 0 !important;
-        flex: 1;
-
-        svg {
-            width: 20px;
-            height: 20px;
-            margin-inline-end: 8px;
-        }
-
-        + * {
-            margin: 0 0 0 auto;
-        }
-    }
-
-    &[data-multi-lines="true"] {
-        flex-direction: column;
-
-        > span.bx-settings-label {
-            align-self: start;
-
-            + * {
-                margin: unset;
-            }
-        }
-    }
-
-    &.bx-settings-important-row {
-        background: #733b00;
-    }
-}
-
-.bx-settings-dialog-note {
-    display: block;
-    color: #afafb0;
-    font-size: 12px;
-    font-weight: lighter;
-    font-style: italic;
-
-    &:not(:has(a)) {
-        margin-top: 4px;
-    }
-
-    a {
-        display: inline-block;
-        padding: 4px;
-    }
-}
-
-.bx-settings-custom-user-agent {
-    display: block;
-    width: 100%;
-    padding: 6px;
-}
-
-.bx-donation-link {
-    display: block;
-    text-align: center;
-    text-decoration: none;
-    height: 20px;
-    line-height: 20px;
-    font-size: 14px;
-    margin-top: 10px;
-    margin-bottom: 10px;
-}
-
-.bx-debug-info {
-    button {
-        margin-top: 10px;
-    }
-
-    pre {
-        margin-top: 10px;
-        cursor: copy;
-        color: white;
-        padding: 8px;
-        border: 1px solid #2d2d2d;
-        background: #212121;
-        white-space: break-spaces;
-        text-align: left;
-
-        &:hover {
-            background: #272727;
-        }
-    }
-}
-
-.bx-settings-app-version {
-    margin-top: 10px;
-    text-align: center;
-    color: #747474;
-    font-size: 12px;
-}
-
-.bx-note-unsupported {
-    display: block;
-    font-size: 12px;
-    font-style: italic;
-    font-weight: normal;
-    color: #828282;
-}
-
-.bx-settings-tab-content {
-    padding: 10px;
-    border-radius-size = 6px;
-
-    > div {
-        // Label at the beginning
-        *:not(.bx-settings-row):has(+ .bx-settings-row) + .bx-settings-row:has(+ .bx-settings-row) {
-            border-top-left-radius: border-radius-size;
-            border-top-right-radius: border-radius-size;
-        }
-
-        // Label at the end
-        .bx-settings-row:not(:has(+ .bx-settings-row)) {
-            border: none;
-            border-bottom-left-radius: border-radius-size;
-            border-bottom-right-radius: border-radius-size;
-        }
-
-        // Single label
-        *:not(.bx-settings-row):has(+ .bx-settings-row) + .bx-settings-row:not(:has(+ .bx-settings-row)) {
-            border: none;
-            border-radius: border-radius-size;
-        }
-    }
-
-    &:not([data-game-id="-1"]) {
-        .bx-settings-row[data-override=true], .bx-settings-row:has(*[data-override=true]) {
-            border-left: 4px solid orange !important;
-            border-top-left-radius: 0 !important;
-            border-bottom-left-radius: 0 !important;
-            padding-left: 6px !important;
-        }
-    }
-}
-
-.bx-suggest-toggler {
-    text-align: left;
-    display: flex;
-    border-radius: 4px;
-    overflow: hidden;
-    background: #003861;
-    height: 45px;
-    align-items: center;
-
-    label {
-        flex: 1;
-        align-content: center;
-        padding: 0 10px;
-        background: #004f87;
-        height: 100%;
-    }
-
-    span {
-        display: inline-block;
-        align-self: center;
-        padding: 10px;
-        width: 45px;
-        text-align: center;
-    }
-
-    &:hover, &:focus {
-        cursor: pointer;
-        background: #005da1;
-
-        label {
-            background: #006fbe;
-        }
-    }
-
-    &[bx-open] {
-        span {
-            transform: rotate(90deg);
-        }
-
-        &+ .bx-suggest-box {
-            display: block;
-        }
-    }
-}
-
-.bx-suggest-box {
-    display: none;
-}
-
-.bx-suggest-wrapper {
-    display: flex;
-    flex-direction: column;
-    gap: 10px;
-    margin: 10px;
-}
-
-.bx-suggest-note {
-    font-size: 11px;
-    color: #8c8c8c;
-    font-style: italic;
-    font-weight: 100;
-}
-
-.bx-suggest-link {
-    font-size: 14px;
-    display: inline-block;
-    margin-top: 4px;
-    padding: 4px;
-}
-
-.bx-suggest-row {
-    display: flex;
-    flex-direction: row;
-    gap: 10px;
-
-    label {
-        flex: 1;
-        overflow: overlay;
-        border-radius: 4px;
-
-        .bx-suggest-label {
-            background: #323232;
-            padding: 4px 10px;
-            font-size: 12px;
-            text-align: left;
-        }
-
-        .bx-suggest-value {
-            padding: 6px;
-            font-size: 14px;
-
-            &.bx-suggest-change {
-                background-color: var(--bx-warning-color);
-            }
-        }
-    }
-
-    &.bx-suggest-ok {
-        input {
-            visibility: hidden;
-        }
-
-        .bx-suggest-label {
-            background-color: #008114;
-        }
-
-        .bx-suggest-value {
-            background-color: #13a72a;
-        }
-    }
-
-    &.bx-suggest-change {
-        .bx-suggest-label {
-            background-color: #a65e08;
-        }
-
-        .bx-suggest-value {
-            background-color: #d57f18;
-        }
-
-        &:hover {
-            label {
-                cursor: pointer;
-            }
-
-            .bx-suggest-label {
-                background-color: #995707;
-            }
-
-            .bx-suggest-value {
-                background-color: #bd7115;
-            }
-        }
-
-        // Unchecked setting
-        input:not(:checked) + label {
-            opacity: 0.5;
-
-            .bx-suggest-label {
-                background-color: #2a2a2a;
-            }
-
-            .bx-suggest-value {
-                background-color: #393939;
-            }
-        }
-
-        &:hover {
-            input:not(:checked) + label {
-                opacity: 1;
-
-                .bx-suggest-label {
-                    background-color: #202020;
-                }
-
-                .bx-suggest-value {
-                    background-color: #303030;
-                }
-            }
-        }
-    }
-}
-
-.bx-sub-content-box {
-    background: #161616;
-    padding: 10px;
-    box-shadow: 0px 0px 12px #0f0f0f inset;
-    border-radius: 10px;
-
-    .bx-settings-row & {
-        background: #202020;
-        padding: 12px;
-        box-shadow: 0 0 4px #000000 inset;
-        border-radius: 6px;
-    }
-}
-
-.bx-controller-extra-settings {
-    &[data-has-gamepad=true] {
-        > :first-child {
-            display: none;
-        }
-
-        > :last-child {
-            display: block;
-        }
-    }
-
-    &[data-has-gamepad=false] {
-        > :first-child {
-            display: block;
-        }
-
-        > :last-child {
-            display: none;
-        }
-    }
-
-    .bx-controller-extra-wrapper {
-        flex: 1;
-        min-width: 1px;
-    }
-
-    .bx-sub-content-box {
-        flex: 1;
-        text-align: left;
-        display: flex;
-        flex-direction: column;
-        margin-top: 10px;
-
-        > label {
-            font-size: 14px;
-        }
-    }
-}
-
-.bx-preset-row {
-    display: flex;
-    gap: 8px;
-
-    .bx-select {
-        flex: 1;
-    }
-}
-
-.bx-stream-settings-selection {
-    margin-bottom: 8px;
-    position: sticky;
-    z-index: 1000;
-    top: 0;
-
-    > div {
-        display: flex;
-        gap: 8px;
-        background: #222222;
-        padding: 10px;
-        border-bottom: 4px solid #353638;
-        box-shadow: 0 0 6px #000;
-        position: relative;
-        z-index: 1;
-
-        .bx-select {
-            flex: 1;
-
-            label {
-                font-weight: bold;
-                font-size: 1.1rem;
-                line-height: initial;
-
-                span {
-                    line-height: initial;
-                }
-            }
-
-            .bx-select-indicators {
-                display: none;
-            }
-        }
-    }
-
-    p {
-        font-family: var(--bx-promptfont-font), var(--bx-normal-font);
-        margin: 0;
-        font-size: 13px;
-        background: #505050f2;
-        height: 25px;
-        line-height: 23px;
-        position: absolute;
-        bottom: -25px;
-        left: 0;
-        right: 0;
-        text-shadow: 0 1px #000;
-    }
-}
--- a/src/assets/css/stream-actions.styl
+++ b/src/assets/css/stream-actions.styl
@ -0,0 +1,46 @@
+.bx-screenshot-button {
+    display: none;
+    opacity: 0;
+    position: fixed;
+    bottom: 0;
+    box-sizing: border-box;
+    width: 60px;
+    height: 90px;
+    padding: 16px 16px 46px 16px;
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-origin: content-box;
+    filter: drop-shadow(0 0 2px #000000B0);
+    transition: opacity 0.1s ease-in-out 0s, padding 0.1s ease-in 0s;
+    z-index: var(--bx-screenshot-z-index);
+
+    /* Credit: https://phosphoricons.com */
+    background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDMyIDMyIiBmaWxsPSIjZmZmIj48cGF0aCBkPSJNMjguMzA4IDUuMDM4aC00LjI2NWwtMi4wOTctMy4xNDVhMS4yMyAxLjIzIDAgMCAwLTEuMDIzLS41NDhoLTkuODQ2YTEuMjMgMS4yMyAwIDAgMC0xLjAyMy41NDhMNy45NTYgNS4wMzhIMy42OTJBMy43MSAzLjcxIDAgMCAwIDAgOC43MzF2MTcuMjMxYTMuNzEgMy43MSAwIDAgMCAzLjY5MiAzLjY5MmgyNC42MTVBMy43MSAzLjcxIDAgMCAwIDMyIDI1Ljk2MlY4LjczMWEzLjcxIDMuNzEgMCAwIDAtMy42OTItMy42OTJ6bS02Ljc2OSAxMS42OTJjMCAzLjAzOS0yLjUgNS41MzgtNS41MzggNS41MzhzLTUuNTM4LTIuNS01LjUzOC01LjUzOCAyLjUtNS41MzggNS41MzgtNS41MzggNS41MzggMi41IDUuNTM4IDUuNTM4eiIvPjwvc3ZnPgo=');
+
+    &[data-showing=true] {
+        opacity: 0.9;
+    }
+
+    &[data-capturing=true] {
+        padding: 8px 8px 38px 8px;
+    }
+}
+
+.bx-screenshot-canvas {
+    display: none;
+}
+
+#bx-touch-controller-bar {
+    display: none;
+    opacity: 0;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    height: 6vh;
+    z-index: var(--bx-touch-controller-bar-z-index);
+
+    &[data-showing=true] {
+        display: block;
+    }
+}
--- a/src/assets/css/stream-settings.styl
+++ b/src/assets/css/stream-settings.styl
@ -0,0 +1,133 @@
+.bx-quick-settings-bar {
+    display: flex;
+    position: fixed;
+    z-index: var(--bx-stream-settings-z-index);
+    opacity: 0.98;
+    user-select: none;
+    -webkit-user-select: none;
+}
+
+.bx-quick-settings-tabs {
+    position: fixed;
+    top: 0;
+    right: 420px;
+    display: flex;
+    flex-direction: column;
+    border-radius: 0 0 0 8px;
+    box-shadow: 0px 0px 6px #000;
+    overflow: clip;
+
+    svg {
+        width: 32px;
+        height: 32px;
+        padding: 10px;
+        box-sizing: content-box;
+        background: #131313;
+        cursor: pointer;
+        border-left: 4px solid #1e1e1e;
+
+        &.bx-active {
+            background: #222;
+            border-color: #008746;
+        }
+
+        &:not(.bx-active):hover {
+            background: #2f2f2f;
+            border-color: #484848;
+        }
+    }
+}
+
+
+.bx-quick-settings-tab-contents {
+    flex-direction: column;
+    position: fixed;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    padding: 14px 14px 0;
+    width: 420px;
+    background: #1a1b1e;
+    color: #fff;
+    font-weight: 400;
+    font-size: 16px;
+    font-family: var(--bx-title-font);
+    text-align: center;
+    box-shadow: 0px 0px 6px #000;
+    overflow: overlay;
+
+    > div[data-group=mkb] {
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+        overflow: hidden;
+    }
+
+    *:focus {
+        outline: none !important;
+    }
+
+    h2 {
+        margin-bottom: 8px;
+        display: flex;
+        align-item: center;
+
+        span {
+            display: inline-block;
+            font-size: 24px;
+            font-weight: bold;
+            text-transform: uppercase;
+            text-align: left;
+            flex: 1;
+            height: var(--bx-button-height);
+            line-height: calc(var(--bx-button-height) + 4px);
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+    }
+
+    input[type="range"] {
+        display: block;
+        margin: 12px auto 2px;
+        width: 180px;
+        color: #959595 !important;
+    }
+}
+
+
+.bx-quick-settings-row {
+    display: flex;
+    border-bottom: 1px solid #40404080;
+    margin-bottom: 16px;
+    padding-bottom: 16px;
+
+    label {
+        font-size: 16px;
+        display: block;
+        text-align: left;
+        flex: 1;
+        align-self: center;
+        margin-bottom: 0 !important;
+    }
+
+    input {
+        accent-color: var(--bx-primary-button-color);
+    }
+
+    select:disabled {
+        -webkit-appearance: none;
+        background: transparent;
+        text-align-last: right;
+        border: none;
+    }
+}
+
+.bx-quick-settings-bar-note {
+    display: block;
+    text-align: center;
+    font-size: 12px;
+    font-weight: lighter;
+    font-style: italic;
+    padding-top: 16px;
+}
--- a/src/assets/css/stream-stats.styl
+++ b/src/assets/css/stream-stats.styl
@ -1,5 +1,6 @@
 /* STATS BADGE */
 .bx-badges {
+    position: absolute;
    margin-left: 0px;
    user-select: none;
    -webkit-user-select: none;
@ -20,60 +21,26 @@

 .bx-badge-name {
    background-color: #2d3036;
+    display: inline-block;
+    padding: 2px 8px;
    border-radius: 4px 0 0 4px;
-
-    svg {
-        width: 16px;
-        height: 16px;
-    }
+    text-transform: uppercase;
 }

 .bx-badge-value {
    background-color: grey;
-    border-radius: 0 4px 4px 0;
-}
-
-.bx-badge-name, .bx-badge-value {
    display: inline-block;
-    padding: 0 8px;
-    /* height: 30px; */
-    line-height: 30px;
-    vertical-align: bottom;
+    padding: 2px 8px;
+    border-radius: 0 4px 4px 0;
 }

 .bx-badge-battery[data-charging=true] span:first-of-type::after {
    content: ' ⚡️';
 }

-div[class^=StreamMenu-module__container] .bx-badges {
-    position: absolute;
-    max-width: 500px;
-}
-
-#gamepass-dialog-root .bx-badges {
-    position: fixed;
-    top: 60px;
-    left: 460px;
-    max-width: 500px;
-
-    @media (min-width: 568px) and (max-height: 480px) {
-        position: unset;
-        top: unset;
-        left: unset;
-        margin: 8px 0;
-    }
-
-    @media (min-width: 480px) and (min-height: calc(481px)) {
-
-    }
-}
-
-
 /* STATS BAR */
 .bx-stats-bar {
-    display: flex;
-    flex-direction: row;
-    gap: 8px;
+    display: block;
    user-select: none;
    -webkit-user-select: none;
    position: fixed;
@ -86,34 +53,22 @@ div[class^=StreamMenu-module__container] .bx-badges {
    z-index: var(--bx-stats-bar-z-index);
    text-wrap: nowrap;

-    &[data-stats*="[time]"] > .bx-stat-time,
-    &[data-stats*="[play]"] > .bx-stat-play,
-    &[data-stats*="[batt]"] > .bx-stat-batt,
    &[data-stats*="[fps]"] > .bx-stat-fps,
    &[data-stats*="[ping]"] > .bx-stat-ping,
-    &[data-stats*="[jit]"] > .bx-stat-jit,
    &[data-stats*="[btr]"] > .bx-stat-btr,
    &[data-stats*="[dt]"] > .bx-stat-dt,
    &[data-stats*="[pl]"] > .bx-stat-pl,
-    &[data-stats*="[fl]"] > .bx-stat-fl,
-    &[data-stats*="[dl]"] > .bx-stat-dl,
-    &[data-stats*="[ul]"] > .bx-stat-ul {
-        display: inline-flex;
-        align-items: baseline;
+    &[data-stats*="[fl]"] > .bx-stat-fl {
+        display: inline-block;
    }

-    &[data-stats$="[time]"] > .bx-stat-time,
-    &[data-stats$="[play]"] > .bx-stat-play,
-    &[data-stats$="[batt]"] > .bx-stat-batt,
    &[data-stats$="[fps]"] > .bx-stat-fps,
    &[data-stats$="[ping]"] > .bx-stat-ping,
-    &[data-stats$="[jit]"] > .bx-stat-jit,
    &[data-stats$="[btr]"] > .bx-stat-btr,
    &[data-stats$="[dt]"] > .bx-stat-dt,
    &[data-stats$="[pl]"] > .bx-stat-pl,
-    &[data-stats$="[fl]"] > .bx-stat-fl,
-    &[data-stats$="[dl]"] > .bx-stat-dl,
-    &[data-stats$="[ul]"] > .bx-stat-ul {
+    &[data-stats$="[fl]"] > .bx-stat-fl {
+        margin-right: 0;
        border-right: none;
    }

@ -144,13 +99,14 @@ div[class^=StreamMenu-module__container] .bx-badges {
        border-radius: 0 0 4px 4px;
    }

-    &[data-shadow=true] {
+    &[data-transparent=true] {
        background: none;
        filter: drop-shadow(1px 0 0 #000000f0) drop-shadow(-1px 0 0 #000000f0) drop-shadow(0 1px 0 #000000f0) drop-shadow(0 -1px 0 #000000f0);
    }

    > div {
        display: none;
+        margin-right: 8px;
        border-right: 1px solid #fff;
        padding-right: 8px;
    }
@ -158,17 +114,17 @@ div[class^=StreamMenu-module__container] .bx-badges {
    label {
        margin: 0 8px 0 0;
        font-family: var(--bx-title-font);
-        font-size: 70%;
+        font-size: inherit;
        font-weight: bold;
        vertical-align: middle;
        cursor: help;
    }

    span {
+        min-width: 60px;
        display: inline-block;
        text-align: right;
        vertical-align: middle;
-        white-space: pre;

        &[data-grade=good] {
            color: #6bffff;
@ -181,5 +137,9 @@ div[class^=StreamMenu-module__container] .bx-badges {
        &[data-grade=bad] {
            color: #ff5f5f;
        }
+
+        &:first-of-type {
+            min-width: 22px;
+        }
    }
 }
--- a/src/assets/css/stream.styl
+++ b/src/assets/css/stream.styl
@ -1,4 +1,4 @@
-#game-stream div[class^=StreamMenu-module__menuContainer] > div[class^=Menu-module] {
+div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module] {
    overflow: visible;
 }

@ -7,95 +7,3 @@
    background-color: #2d2d2d !important;
    color: #000 !important;
 }
-
-.bx-stream-refresh-button {
-    top: calc(env(safe-area-inset-top, 0px) + 10px + 50px) !important;
-}
-
-body[data-media-type=default] .bx-stream-refresh-button {
-    left: calc(env(safe-area-inset-left, 0px) + 11px) !important;
-}
-
-body[data-media-type=tv] .bx-stream-refresh-button {
-    top: calc(var(--gds-focus-borderSize) + 80px) !important;
-}
-
-.bx-stream-home-button {
-    top: calc(env(safe-area-inset-top, 0px) + 10px + 50px * 2) !important;
-}
-
-body[data-media-type=default] .bx-stream-home-button {
-    left: calc(env(safe-area-inset-left, 0px) + 12px) !important;
-}
-
-body[data-media-type=tv] .bx-stream-home-button {
-    top: calc(var(--gds-focus-borderSize) + 80px * 2) !important;
-}
-
-@keyframes bx-anim-taking-screenshot {
-    0% {
-        border: 0px solid #ffffff80;
-    }
-
-    50% {
-        border: 8px solid #ffffff80;
-    }
-
-    100% {
-        border: 0px solid #ffffff80;
-    }
-}
-
-div[data-testid=media-container] {
-    &[data-position=center] {
-        display: flex;
-    }
-
-    &[data-position=top] {
-        video, canvas {
-            top: 0;
-        }
-    }
-
-    &[data-position=bottom] {
-        video, canvas {
-            bottom: 0;
-        }
-    }
-}
-
-
-#game-stream {
-    video {
-        margin: auto;
-        align-self: center;
-        background: #000;
-        position: absolute;
-        left: 0;
-        right: 0;
-    }
-
-    canvas {
-        align-self: center;
-        margin: auto;
-        position: absolute;
-        left: 0;
-        right: 0;
-    }
-
-    &.bx-taking-screenshot:before {
-        animation: bx-anim-taking-screenshot 0.5s ease;
-        content: ' ';
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        z-index: var(--bx-screenshot-animation-z-index);
-    }
-}
-
-#gamepass-dialog-root div[class^=Guide-module__guide] {
-    .bx-button {
-        overflow: visible;
-        margin-bottom: 12px;
-    }
-}
--- a/src/assets/css/styles.styl
+++ b/src/assets/css/styles.styl
@ -2,19 +2,15 @@

@import 'button.styl';
@import 'header.styl';
-@import 'key-binding-dialog.styl';
-@import 'navigation-dialog.styl';
-@import 'settings-dialog.styl';
+@import 'global-settings.styl';
+@import 'dialog.styl';
@import 'toast.styl';
@import 'loading-screen.styl';
@import 'remote-play.styl';
-@import 'web-components.styl';
-@import 'guide-menu.styl';

@import 'stream.styl';
@import 'number-stepper.styl';
-@import 'game-bar.styl';
+@import 'stream-actions.styl';
@import 'stream-stats.styl';
+@import 'stream-settings.styl';
@import 'mkb.styl';
-@import 'controller.styl';
-@import 'misc.styl';
--- a/src/assets/css/toast.styl
+++ b/src/assets/css/toast.styl
@ -5,8 +5,8 @@
    left: 50%;
    top: 24px;
    transform: translate(-50%, 0);
-    background: #212121;
-    border-radius: 10px;
+    background: #000000;
+    border-radius: 16px;
    color: white;
    z-index: var(--bx-toast-z-index);
    font-family: var(--bx-normal-font);
@ -16,15 +16,13 @@
    opacity: 0;
    overflow: clip;
    transition: opacity 0.2s ease-in;
-    box-shadow: 0 0 6px #000;

    &.bx-show {
-        opacity: 0.95;
+        opacity: 0.85;
    }

    &.bx-hide {
        opacity: 0;
-        pointer-events: none;
    }
 }

@ -40,8 +38,8 @@
    font-size: 14px;
    text-transform: uppercase;
    display: inline-block;
-    background: #fff;
+    background: #515863;
    padding: 12px 16px;
-    color: #212121;
+    color: #fff;
    white-space: pre;
 }
--- a/src/assets/css/web-components.styl
+++ b/src/assets/css/web-components.styl
@ -1,216 +0,0 @@
-select.bx-select {
-    min-height: 30px;
-}
-
-div.bx-select {
-    display: flex;
-    align-items: stretch;
-    flex: 0 1 auto;
-    gap: 8px;
-
-    select {
-        &:disabled {
-            & ~ button {
-                display: none;
-            }
-
-            & ~ div {
-                background: #131416;
-                color: white;
-                pointer-events: none;
-
-                .bx-select-indicators {
-                    visibility: hidden;
-                }
-            }
-        }
-    }
-
-    > div, button.bx-select-value {
-        min-width: 120px;
-        text-align: left;
-        line-height: 24px;
-        vertical-align: middle;
-        background: #fff;
-        color: #000;
-        border-radius: 4px;
-        padding: 2px 8px;
-        display: flex;
-        flex: 1;
-        flex-direction: column;
-    }
-
-    > div {
-        min-height: 24px;
-
-        input {
-            display: inline-block;
-            margin-right: 8px;
-        }
-
-        label {
-            margin-bottom: 0;
-            font-size: 14px;
-            width: 100%;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            min-height: 15px;
-
-            span {
-                display: block;
-                font-size: 10px;
-                font-weight: bold;
-                text-align: left;
-                line-height: 20px;
-                white-space: pre;
-                min-height: 15px;
-                align-content: center;
-            }
-        }
-    }
-
-    button.bx-select-value {
-        border: none;
-        cursor: pointer;
-        min-height: 30px;
-        font-size: 0.9rem;
-        align-items: center;
-
-        > div {
-            display: flex;
-            width: 100%;
-        }
-
-        span {
-            flex: 1;
-            text-align: left;
-            display: inline-block;
-        }
-
-        input {
-            margin: 0 4px;
-            accent-color: var(--bx-primary-button-color);
-            pointer-events: none;
-        }
-
-        &:hover,
-        &:focus {
-            input {
-                accent-color: var(--bx-danger-button-color);
-            }
-
-            &::after {
-                border-color: #4d4d4d !important;
-            }
-        }
-    }
-
-    button.bx-button {
-        border: none;
-        width: 24px;
-        height: auto;
-        padding: 0;
-        color: #fff;
-        border-radius: 4px;
-        font-weight: bold;
-        font-size: 12px;
-        font-family: var(--bx-monospaced-font);
-        flex-shrink: 0;
-
-        span {
-            line-height: unset;
-        }
-    }
-
-    &[data-controller-friendly=true] {
-        > div {
-            box-sizing: content-box;
-        }
-
-        select {
-            // Render offscreen instead of "display: none" so we could get its size
-            position: absolute !important;
-            top: -9999px !important;
-            left: -9999px !important;
-            visibility: hidden !important;
-        }
-    }
-
-    &[data-controller-friendly=false] {
-        position: relative;
-
-        > div {
-            box-sizing: border-box;
-
-            label {
-                margin-right: 24px;
-            }
-        }
-
-        select {
-            &:disabled {
-                display: none;
-            }
-
-            &:not(:disabled) {
-                cursor: pointer;
-                position: absolute;
-                top: 0;
-                right: 0;
-                bottom: 0;
-                display: block;
-
-                opacity: 0;
-                z-index: calc(var(--bx-settings-z-index) + 1);
-
-                &:hover {
-                    + div {
-                        background: #f0f0f0;
-                    }
-                }
-
-                + div {
-                    label {
-                        &::after {
-                            content: '▾';
-                            font-size: 14px;
-                            position: absolute;
-                            right: 8px;
-                            pointer-events: none;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-.bx-select-indicators {
-    display: flex;
-    height: 4px;
-    gap: 2px;
-    margin-bottom: 2px;
-
-    span {
-        content: ' ';
-        display: inline-block;
-        flex: 1;
-        background: #cfcfcf;
-        border-radius: 4px;
-        min-width: 1px;
-
-        &[data-highlighted] {
-            background: #9c9c9c;
-            min-width: 6px;
-        }
-
-        &[data-selected] {
-            background: #aacfe7;
-        }
-
-        &[data-highlighted][data-selected] {
-            background: #5fa3d0;
-        }
-    }
-}
--- a/src/assets/header_meta.txt
+++ b/src/assets/header_meta.txt
--- a/src/assets/header_script.lite.txt
+++ b/src/assets/header_script.lite.txt
@ -1,13 +0,0 @@
-// ==UserScript==
-// @name         Better xCloud (Lite)
-// @namespace    https://github.com/redphx
-// @version      [[VERSION]]
-// @description  Improve Xbox Cloud Gaming (xCloud) experience
-// @author       redphx
-// @license      MIT
-// @match        https://www.xbox.com/*/play*
-// @match        https://www.xbox.com/*/auth/msa?*loggedIn*
-// @run-at       document-end
-// @grant        none
-// ==/UserScript==
-"use strict";
--- a/src/assets/header_script.txt
+++ b/src/assets/header_script.txt
@ -7,10 +7,9 @@
 // @license      MIT
 // @match        https://www.xbox.com/*/play*
 // @match        https://www.xbox.com/*/auth/msa?*loggedIn*
-// @exclude      https://www.xbox.com/*/xbox-game-pass/play-day-one
 // @run-at       document-start
 // @grant        none
 // @updateURL    https://raw.githubusercontent.com/redphx/better-xcloud/typescript/dist/better-xcloud.meta.js
 // @downloadURL  https://github.com/redphx/better-xcloud/releases/latest/download/better-xcloud.user.js
 // ==/UserScript==
-"use strict";
+'use strict';
--- a/src/assets/svg/battery-full.svg
+++ b/src/assets/svg/battery-full.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' stroke-miterlimit='2' viewBox='0 0 32 32'>
-    <path d='M24.774 6.71H3.097C1.398 6.71 0 8.108 0 9.806v12.387c0 1.699 1.398 3.097 3.097 3.097h21.677c1.699 0 3.097-1.398 3.097-3.097V9.806c0-1.699-1.398-3.097-3.097-3.097zm1.032 15.484a1.04 1.04 0 0 1-1.032 1.032H3.097a1.04 1.04 0 0 1-1.032-1.032V9.806a1.04 1.04 0 0 1 1.032-1.032h21.677a1.04 1.04 0 0 1 1.032 1.032v12.387zm-2.065-10.323v8.258a1.04 1.04 0 0 1-1.032 1.032H5.161a1.04 1.04 0 0 1-1.032-1.032v-8.258a1.04 1.04 0 0 1 1.032-1.032H22.71a1.04 1.04 0 0 1 1.032 1.032zm8.258 0v8.258a1.04 1.04 0 0 1-1.032 1.032 1.04 1.04 0 0 1-1.032-1.032v-8.258a1.04 1.04 0 0 1 1.032-1.032A1.04 1.04 0 0 1 32 11.871z' fill-rule='nonzero'/>
-</svg>
--- a/src/assets/svg/better-xcloud.svg
+++ b/src/assets/svg/better-xcloud.svg
@ -1,8 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='none' fill-rule='evenodd' viewBox='0 0 32 32'>
-    <clipPath id='svg-bx-logo'>
-        <path d='M0 0h32v32H0z'/>
-    </clipPath>
-    <g clip-path='url(#svg-bx-logo)'>
-        <path d='M19.959 18.286l3.959 2.285-3.959 2.286V32L16 29.714v-9.143l3.959-2.285zM16 16V6.857l3.959-2.286 3.959 2.286-3.959 2.286v9.143L16 16zm-3.959-2.286L16 16l-3.959 2.286v9.143l-3.959-2.286V16l3.959-2.286zM8.082 2.286L12.041 0 16 2.286l-3.959 2.285v9.143l-3.959-2.285V2.286zm8.846 19.535c-.171-.098-.309-.018-.309.179s.138.437.309.536.309.018.309-.179-.138-.437-.309-.536zm0-13.714c-.171-.098-.309-.018-.309.179s.138.437.309.535.309.019.309-.178-.138-.437-.309-.536zM9.01 17.25c-.171-.099-.309-.019-.309.179s.138.437.309.535.309.019.309-.178-.138-.437-.309-.536zm0-13.714c-.171-.099-.309-.019-.309.178s.138.437.309.536.309.019.309-.179-.138-.437-.309-.535z' fill='#fff'/>
-    </g>
-</svg>
--- a/src/assets/svg/camera.svg
+++ b/src/assets/svg/camera.svg
@ -1,6 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <g transform='matrix(.150985 0 0 .150985 -3.32603 -2.72209)' fill='none' stroke='#fff' stroke-width='16'>
-        <path d='M208 208H48c-8.777 0-16-7.223-16-16V80c0-8.777 7.223-16 16-16h32l16-24h64l16 24h32c8.777 0 16 7.223 16 16v112c0 8.777-7.223 16-16 16z'/>
-        <circle cx='128' cy='132' r='36'/>
-    </g>
-</svg>
--- a/src/assets/svg/caret-left.svg
+++ b/src/assets/svg/caret-left.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='100%' stroke='#fff' fill='#fff' height='100%' viewBox='0 0 32 32' fill-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2'>
-    <path d='M6.755 1.924l-6 13.649c-.119.27-.119.578 0 .849l6 13.649c.234.533.857.775 1.389.541s.775-.857.541-1.389L2.871 15.997 8.685 2.773c.234-.533-.008-1.155-.541-1.389s-1.155.008-1.389.541z'/>
-</svg>
--- a/src/assets/svg/caret-right.svg
+++ b/src/assets/svg/caret-right.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='100%' stroke='#fff' fill='#fff' height='100%' viewBox='0 0 32 32' fill-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2'>
-    <path d='M2.685 1.924l6 13.649c.119.27.119.578 0 .849l-6 13.649c-.234.533-.857.775-1.389.541s-.775-.857-.541-1.389l5.813-13.225L.755 2.773c-.234-.533.008-1.155.541-1.389s1.155.008 1.389.541z'/>
-</svg>
--- a/src/assets/svg/clock.svg
+++ b/src/assets/svg/clock.svg
@ -1,6 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <g transform='matrix(.150026 0 0 .150026 -3.20332 -3.20332)' fill='none' stroke='#fff' stroke-width='16'>
-        <circle cx='128' cy='128' r='96'/>
-        <path d='M128 72v56h56'/>
-    </g>
-</svg>
--- a/src/assets/svg/close.svg
+++ b/src/assets/svg/close.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M29.928,2.072L2.072,29.928'/>
-    <path d='M29.928,29.928L2.072,2.072'/>
-</svg>
--- a/src/assets/svg/cloud.svg
+++ b/src/assets/svg/cloud.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M9.773 16c0-5.694 4.685-10.379 10.379-10.379S30.53 10.306 30.53 16s-4.685 10.379-10.379 10.379H8.735c-3.982-.005-7.256-3.283-7.256-7.265s3.28-7.265 7.265-7.265c.606 0 1.21.076 1.797.226' fill='none' stroke='#fff' stroke-width='2.076'/>
-</svg>
--- a/src/assets/svg/command.svg
+++ b/src/assets/svg/command.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M25.425 1.5c2.784 0 5.075 2.291 5.075 5.075s-2.291 5.075-5.075 5.075H20.35V6.575c0-2.784 2.291-5.075 5.075-5.075zM11.65 11.65H6.575C3.791 11.65 1.5 9.359 1.5 6.575S3.791 1.5 6.575 1.5s5.075 2.291 5.075 5.075v5.075zm8.7 8.7h5.075c2.784 0 5.075 2.291 5.075 5.075S28.209 30.5 25.425 30.5s-5.075-2.291-5.075-5.075V20.35zM6.575 30.5c-2.784 0-5.075-2.291-5.075-5.075s2.291-5.075 5.075-5.075h5.075v5.075c0 2.784-2.291 5.075-5.075 5.075z'/>
-    <path d='M11.65 11.65h8.7v8.7h-8.7z'/>
-</svg>
--- a/src/assets/svg/controller.svg
+++ b/src/assets/svg/controller.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M19.193 12.807h3.193m-13.836 0h4.257'/><path d='M10.678 10.678v4.257'/><path d='M13.061 19.193l-5.602 6.359c-.698.698-1.646 1.09-2.633 1.09-2.044 0-3.725-1.682-3.725-3.725a3.73 3.73 0 0 1 .056-.646l2.177-11.194a6.94 6.94 0 0 1 6.799-5.721h11.722c3.795 0 6.918 3.123 6.918 6.918s-3.123 6.918-6.918 6.918h-8.793z'/><path d='M18.939 19.193l5.602 6.359c.698.698 1.646 1.09 2.633 1.09 2.044 0 3.725-1.682 3.725-3.725a3.73 3.73 0 0 0-.056-.646l-2.177-11.194'/>
-</svg>
--- a/src/assets/svg/copy.svg
+++ b/src/assets/svg/copy.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <path d='M1.498 6.772h23.73v23.73H1.498zm5.274-5.274h23.73v23.73'/>
-</svg>
--- a/src/assets/svg/create-shortcut.svg
+++ b/src/assets/svg/create-shortcut.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M13.253 3.639c0-.758-.615-1.373-1.373-1.373H3.639c-.758 0-1.373.615-1.373 1.373v8.241c0 .758.615 1.373 1.373 1.373h8.241c.758 0 1.373-.615 1.373-1.373V3.639zm0 16.481c0-.758-.615-1.373-1.373-1.373H3.639c-.758 0-1.373.615-1.373 1.373v8.241c0 .758.615 1.373 1.373 1.373h8.241c.758 0 1.373-.615 1.373-1.373V20.12zm16.481 0c0-.758-.615-1.373-1.373-1.373H20.12c-.758 0-1.373.615-1.373 1.373v8.241c0 .758.615 1.373 1.373 1.373h8.241c.758 0 1.373-.615 1.373-1.373V20.12zM19.262 7.76h9.957'/>
-    <path d='M24.24 2.781v9.957'/>
-</svg>
--- a/src/assets/svg/cursor-text.svg
+++ b/src/assets/svg/cursor-text.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <path d='M16 7.3a5.83 5.83 0 0 1 5.8-5.8h2.9m0 29h-2.9a5.83 5.83 0 0 1-5.8-5.8'/><path d='M7.3 30.5h2.9a5.83 5.83 0 0 0 5.8-5.8V7.3a5.83 5.83 0 0 0-5.8-5.8H7.3'/><path d='M11.65 16h8.7'/>
-</svg>
--- a/src/assets/svg/display.svg
+++ b/src/assets/svg/display.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M1.238 21.119c0 1.928 1.565 3.493 3.493 3.493H27.27c1.928 0 3.493-1.565 3.493-3.493V5.961c0-1.928-1.565-3.493-3.493-3.493H4.731c-1.928 0-3.493 1.565-3.493 3.493v15.158zm19.683 8.413H11.08'/>
-</svg>
--- a/src/assets/svg/download.svg
+++ b/src/assets/svg/download.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M16 19.955V1.5m14.5 18.455v9.227c0 .723-.595 1.318-1.318 1.318H2.818c-.723 0-1.318-.595-1.318-1.318v-9.227'/>
-    <path d='M22.591 13.364L16 19.955l-6.591-6.591'/>
-</svg>
--- a/src/assets/svg/eye-slash.svg
+++ b/src/assets/svg/eye-slash.svg
@ -1,8 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' stroke='none ' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <clipPath id='A'>
-        <path d='M0 0h32v32H0z'/>
-    </clipPath>
-    <g clip-path='url(#A)'>
-        <path d='M6.123 3.549a1.07 1.07 0 0 0-.798-.359c-.585 0-1.067.482-1.067 1.067 0 .27.102.53.286.727l2.565 2.823C2.267 10.779.184 15.36.092 15.568c-.123.276-.123.591 0 .867.047.105 1.176 2.609 3.687 5.12 3.345 3.344 7.57 5.112 12.221 5.112a16.97 16.97 0 0 0 6.943-1.444l2.933 3.228c.202.228.493.359.798.359.585 0 1.067-.482 1.067-1.067a1.07 1.07 0 0 0-.286-.727L6.123 3.549zm6.31 10.112l5.556 6.114c-.612.322-1.294.49-1.986.49a4.29 4.29 0 0 1-4.267-4.266c0-.831.242-1.643.697-2.338zM16 24.533c-4.104 0-7.689-1.492-10.657-4.433A17.73 17.73 0 0 1 2.267 16c.625-1.172 2.621-4.452 6.313-6.584l2.4 2.633c-.878 1.125-1.356 2.512-1.356 3.939 0 3.511 2.89 6.4 6.4 6.4 1.221 0 2.416-.349 3.444-1.005l1.964 2.16a14.92 14.92 0 0 1-5.432.99zm.8-12.724a1.07 1.07 0 0 1-.867-1.048c0-.585.482-1.067 1.067-1.067a1.12 1.12 0 0 1 .2.019c2.784.54 4.896 2.863 5.169 5.686a1.07 1.07 0 0 1-.962 1.161c-.034.002-.067.002-.1 0a1.07 1.07 0 0 1-1.067-.968 4.29 4.29 0 0 0-3.44-3.783zm15.104 4.626c-.056.125-1.407 3.116-4.448 5.84a1.07 1.07 0 0 1-.724.283c-.585 0-1.067-.482-1.067-1.067a1.07 1.07 0 0 1 .368-.806A17.7 17.7 0 0 0 29.74 16a17.73 17.73 0 0 0-3.083-4.103C23.689 8.959 20.104 7.467 16 7.467a15.82 15.82 0 0 0-2.581.209 1.06 1.06 0 0 1-.186.016 1.07 1.07 0 0 1-1.067-1.066 1.07 1.07 0 0 1 .901-1.054A17.89 17.89 0 0 1 16 5.333c4.651 0 8.876 1.768 12.221 5.114 2.511 2.51 3.64 5.016 3.687 5.121.123.276.123.591 0 .867h-.004z' fill-rule='nonzero'/>
-    </g>
-</svg>
--- a/src/assets/svg/eye.svg
+++ b/src/assets/svg/eye.svg
@ -1,8 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' stroke='none ' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <clipPath id='A'>
-        <path d='M0 0h32v32H0z'/>
-    </clipPath>
-    <g clip-path='url(#A)'>
-        <path d='M31.908 15.568c-.047-.105-1.176-2.611-3.687-5.121C24.876 7.101 20.651 5.333 16 5.333S7.124 7.101 3.779 10.447c-2.511 2.51-3.646 5.02-3.687 5.121-.123.276-.123.591 0 .867.047.105 1.176 2.609 3.687 5.12 3.345 3.344 7.57 5.112 12.221 5.112s8.876-1.768 12.221-5.112c2.511-2.511 3.64-5.015 3.687-5.12.123-.276.123-.591 0-.867zM16 24.533c-4.104 0-7.689-1.492-10.657-4.433-1.218-1.211-2.254-2.592-3.076-4.1.822-1.508 1.858-2.889 3.076-4.1C8.311 8.959 11.896 7.467 16 7.467s7.689 1.492 10.657 4.433c1.221 1.211 2.259 2.592 3.083 4.1-.961 1.795-5.149 8.533-13.74 8.533zM16 9.6c-3.511 0-6.4 2.889-6.4 6.4s2.889 6.4 6.4 6.4 6.4-2.889 6.4-6.4A6.44 6.44 0 0 0 16 9.6zm0 10.667A4.29 4.29 0 0 1 11.733 16 4.29 4.29 0 0 1 16 11.733 4.29 4.29 0 0 1 20.267 16 4.29 4.29 0 0 1 16 20.267z' fill-rule='nonzero'/>
-    </g>
-</svg>
--- a/src/assets/svg/global-restore.svg
+++ b/src/assets/svg/global-restore.svg
@ -1,6 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M1.681 16h28.638'/>
-    <path d='M16 30.319C8.145 30.319 1.681 23.855 1.681 16S8.145 1.681 16 1.681 30.319 8.145 30.319 16'/>
-    <path d='M16 30.319S10.034 25.546 10.034 16 16 1.681 16 1.681 21.966 6.454 21.966 16m-.238 8.592l-2.864 2.864 2.864 2.863'/>
-    <path d='M21.728 20.773h5.25a3.36 3.36 0 0 1 3.341 3.341 3.36 3.36 0 0 1-3.341 3.342h-8.114'/>
-</svg>
--- a/src/assets/svg/home.svg
+++ b/src/assets/svg/home.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M12.217 30.503V20.414h7.567v10.089h10.089V15.37a1.26 1.26 0 0 0-.369-.892L16.892 1.867a1.26 1.26 0 0 0-1.784 0L2.497 14.478a1.26 1.26 0 0 0-.369.892v15.133h10.089z'/>
-</svg>
--- a/src/assets/svg/local-co-op.svg
+++ b/src/assets/svg/local-co-op.svg
@ -1,7 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' width='1em' height='1em' viewBox='0 0 32 32' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round'>
-    <g>
-        <path d='M24.272 11.165h-3.294l-3.14 3.564c-.391.391-.922.611-1.476.611a2.1 2.1 0 0 1-2.087-2.088 2.09 2.09 0 0 1 .031-.362l1.22-6.274a3.89 3.89 0 0 1 3.81-3.206h6.57c1.834 0 3.439 1.573 3.833 3.295l1.205 6.185a2.09 2.09 0 0 1 .031.362 2.1 2.1 0 0 1-2.087 2.088c-.554 0-1.085-.22-1.476-.611l-3.14-3.564' fill='none' stroke='#fff' stroke-width='2'/>
-        <circle cx='22.625' cy='5.874' r='.879'/><path d='M11.022 24.415H7.728l-3.14 3.564c-.391.391-.922.611-1.476.611a2.1 2.1 0 0 1-2.087-2.088 2.09 2.09 0 0 1 .031-.362l1.22-6.274a3.89 3.89 0 0 1 3.81-3.206h6.57c1.834 0 3.439 1.573 3.833 3.295l1.205 6.185a2.09 2.09 0 0 1 .031.362 2.1 2.1 0 0 1-2.087 2.088c-.554 0-1.085-.22-1.476-.611l-3.14-3.564' fill='none' stroke='#fff' stroke-width='2'/>
-        <circle cx='9.375' cy='19.124' r='.879'/>
-    </g>
-</svg>
--- a/src/assets/svg/microphone-slash.svg
+++ b/src/assets/svg/microphone-slash.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M16 25.125v5.368M5.265 4.728l21.471 23.618m-4.789-5.267c-1.698 1.326-3.793 2.047-5.947 2.047-5.3 0-9.662-4.362-9.662-9.662'/>
-    <path d='M25.662 15.463a9.62 9.62 0 0 1-.978 4.242m-5.64.187c-.895.616-1.957.943-3.043.939-2.945 0-5.368-2.423-5.368-5.368v-4.831m.442-5.896A5.38 5.38 0 0 1 16 1.507c2.945 0 5.368 2.423 5.368 5.368v8.588c0 .188-.01.375-.03.562'/>
-</svg>
--- a/src/assets/svg/microphone.svg
+++ b/src/assets/svg/microphone.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M21.368 6.875A5.37 5.37 0 0 0 16 1.507a5.37 5.37 0 0 0-5.368 5.368v8.588A5.37 5.37 0 0 0 16 20.831a5.37 5.37 0 0 0 5.368-5.368V6.875zM16 25.125v5.368m9.662-15.03c0 5.3-4.362 9.662-9.662 9.662s-9.662-4.362-9.662-9.662'/>
-</svg>
--- a/src/assets/svg/mouse-settings.svg
+++ b/src/assets/svg/mouse-settings.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <g transform='matrix(1.10403 0 0 1.10403 -4.17656 -.560429)' fill='none' stroke='#fff'><g stroke-width='1.755'><path d='M24.49 16.255l.01-8.612A6.15 6.15 0 0 0 18.357 1.5h-5.714A6.15 6.15 0 0 0 6.5 7.643v13.715a6.15 6.15 0 0 0 6.143 6.143h5.714'/><path d='M15.5 12.501v-6'/></g><circle cx='48' cy='48' r='15' stroke-width='7.02' transform='matrix(.142357 0 0 .142357 17.667421 16.541885)'/><path d='M24.61 27.545h-.214l-1.711.955c-.666-.224-1.284-.572-1.821-1.025l-.006-1.922-.107-.182-1.701-.969c-.134-.678-.134-1.375 0-2.053l1.7-.966.107-.182.009-1.922c.537-.454 1.154-.803 1.82-1.029l1.708.955h.214l1.708-.955c.666.224 1.284.572 1.821 1.025l.006 1.922.107.182 1.7.968c.134.678.134 1.375 0 2.053l-1.7.966-.107.182-.009 1.922c-.536.455-1.154.804-1.819 1.029l-1.706-.955z' stroke-width='.999'/></g>
-</svg>
--- a/src/assets/svg/mouse.svg
+++ b/src/assets/svg/mouse.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M26.256 8.185c0-3.863-3.137-7-7-7h-6.512c-3.863 0-7 3.137-7 7v15.629c0 3.863 3.137 7 7 7h6.512c3.863 0 7-3.137 7-7V8.185z'/><path d='M16 13.721V6.883'/>
-</svg>
--- a/src/assets/svg/native-mkb.svg
+++ b/src/assets/svg/native-mkb.svg
@ -1,10 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <g stroke-width='2.1'>
-        <path d='m15.817 6h-10.604c-2.215 0-4.013 1.798-4.013 4.013v12.213c0 2.215 1.798 4.013 4.013 4.013h11.21'/>
-        <path d='m5.698 20.617h1.124m-1.124-4.517h7.9m-7.881-4.5h7.9m-2.3 9h2.2'/>
-    </g>
-    <g stroke-width='2.13'>
-        <path d='m30.805 13.1c0-3.919-3.181-7.1-7.1-7.1s-7.1 3.181-7.1 7.1v6.4c0 3.919 3.182 7.1 7.1 7.1s7.1-3.181 7.1-7.1z'/>
-        <path d='m23.705 14.715v-4.753'/>
-    </g>
-</svg>
--- a/src/assets/svg/new.svg
+++ b/src/assets/svg/new.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <path d='M26.875 30.5H5.125c-.663 0-1.208-.545-1.208-1.208V2.708c0-.663.545-1.208 1.208-1.208h14.5l8.458 8.458v19.333c0 .663-.545 1.208-1.208 1.208z'/><path d='M19.625 1.5v8.458h8.458m-15.708 9.667h7.25'/><path d='M16 16v7.25'/>
-</svg>
--- a/src/assets/svg/pencil-simple-line.svg
+++ b/src/assets/svg/pencil-simple-line.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' viewBox='0 0 32 32'>
-    <path d='M10.417 30.271H2.97a1.25 1.25 0 0 1-1.241-1.241v-6.933c.001-.329.131-.644.363-.877L21.223 2.09c.481-.481 1.273-.481 1.754 0l6.933 6.928a1.25 1.25 0 0 1 0 1.755L10.417 30.271z'/>
-    <path d='M29.032 30.271H10.417m6.205-23.58l8.687 8.687'/>
-</svg>
--- a/src/assets/svg/power.svg
+++ b/src/assets/svg/power.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M16 2.445v12.91m7.746-11.619C27.631 6.27 30.2 10.37 30.2 15.355c0 7.79-6.41 14.2-14.2 14.2s-14.2-6.41-14.2-14.2c0-4.985 2.569-9.085 6.454-11.619'/>
-</svg>
--- a/src/assets/svg/question.svg
+++ b/src/assets/svg/question.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <g transform='matrix(.256867 0 0 .256867 -16.878964 -18.049342)'><circle cx='128' cy='180' r='12' fill='#fff'/><path d='M128 144v-8c17.67 0 32-12.54 32-28s-14.33-28-32-28-32 12.54-32 28v4' fill='none' stroke='#fff' stroke-width='16'/></g>
-</svg>
--- a/src/assets/svg/refresh.svg
+++ b/src/assets/svg/refresh.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M23.247 12.377h7.247V5.13'/><path d='M23.911 25.663a13.29 13.29 0 0 1-9.119 3.623C7.504 29.286 1.506 23.289 1.506 16S7.504 2.713 14.792 2.713a13.29 13.29 0 0 1 9.395 3.891l6.307 5.772'/>
-</svg>
--- a/src/assets/svg/remote-play.svg
+++ b/src/assets/svg/remote-play.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <g transform='matrix(.492308 0 0 .581818 -14.7692 -11.6364)'><clipPath id='A'><path d='M30 20h65v55H30z'/></clipPath><g clip-path='url(#A)'><g transform='matrix(.395211 0 0 .334409 11.913 7.01124)'><g transform='matrix(.555556 0 0 .555556 57.8889 -20.2417)' fill='none' stroke='#fff' stroke-width='13.88'><path d='M200 140.564c-42.045-33.285-101.955-33.285-144 0M168 165c-23.783-17.3-56.217-17.3-80 0'/></g><g transform='matrix(-.555556 0 0 -.555556 200.111 262.393)'><g transform='matrix(1 0 0 1 0 11.5642)'><path d='M200 129c-17.342-13.728-37.723-21.795-58.636-24.198C111.574 101.378 80.703 109.444 56 129' fill='none' stroke='#fff' stroke-width='13.88'/></g><path d='M168 165c-23.783-17.3-56.217-17.3-80 0' fill='none' stroke='#fff' stroke-width='13.88'/></g><g transform='matrix(.75 0 0 .75 32 32)'><path d='M24 72h208v93.881H24z' fill='none' stroke='#fff' stroke-linejoin='miter' stroke-width='9.485'/><circle cx='188' cy='128' r='12' stroke-width='10' transform='matrix(.708333 0 0 .708333 71.8333 12.8333)'/><path d='M24.358 103.5h110' fill='none' stroke='#fff' stroke-linecap='butt' stroke-width='10.282'/></g></g></g></g>
-</svg>
--- a/src/assets/svg/speaker-high.svg
+++ b/src/assets/svg/speaker-high.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M8.964 21.417h-6.5a1.09 1.09 0 0 1-1.083-1.083v-8.667a1.09 1.09 0 0 1 1.083-1.083h6.5L18.714 3v26l-9.75-7.583z'/>
-    <path d='M8.964 10.583v10.833m15.167-8.28a4.35 4.35 0 0 1 0 5.728M28.149 9.5a9.79 9.79 0 0 1 0 13'/>
-</svg>
--- a/src/assets/svg/speaker-slash.svg
+++ b/src/assets/svg/speaker-slash.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' stroke='none' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M5.462 3.4c-.205-.23-.499-.363-.808-.363-.592 0-1.079.488-1.079 1.08a1.08 1.08 0 0 0 .289.736l4.247 4.672H2.504a2.17 2.17 0 0 0-2.16 2.16v8.637a2.17 2.17 0 0 0 2.16 2.16h6.107l9.426 7.33a1.08 1.08 0 0 0 .662.227c.592 0 1.08-.487 1.08-1.079v-6.601l5.679 6.247a1.08 1.08 0 0 0 .808.363c.592 0 1.08-.487 1.08-1.079a1.08 1.08 0 0 0-.29-.736L5.462 3.4zm-2.958 8.285h5.398v8.637H2.504v-8.637zM17.62 26.752l-7.558-5.878V11.67l7.558 8.313v6.769zm5.668-8.607c1.072-1.218 1.072-3.063 0-4.281a1.08 1.08 0 0 1-.293-.74c0-.592.487-1.079 1.079-1.079a1.08 1.08 0 0 1 .834.393 5.42 5.42 0 0 1 0 7.137 1.08 1.08 0 0 1-.81.365c-.593 0-1.08-.488-1.08-1.08 0-.263.096-.517.27-.715zM12.469 7.888c-.147-.19-.228-.423-.228-.663a1.08 1.08 0 0 1 .417-.853l5.379-4.184a1.08 1.08 0 0 1 .662-.227c.593 0 1.08.488 1.08 1.08v10.105c0 .593-.487 1.08-1.08 1.08s-1.079-.487-1.079-1.08V5.255l-3.636 2.834c-.469.362-1.153.273-1.515-.196v-.005zm19.187 8.115a10.79 10.79 0 0 1-2.749 7.199 1.08 1.08 0 0 1-.793.347c-.593 0-1.08-.487-1.08-1.079 0-.26.094-.511.264-.708 2.918-3.262 2.918-8.253 0-11.516-.184-.2-.287-.461-.287-.733 0-.592.487-1.08 1.08-1.08a1.08 1.08 0 0 1 .816.373 10.78 10.78 0 0 1 2.749 7.197z' fill-rule='nonzero'/>
-</svg>
--- a/src/assets/svg/stream-settings.svg
+++ b/src/assets/svg/stream-settings.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <g transform='matrix(.142357 0 0 .142357 -2.22021 -2.22164)' fill='none' stroke='#fff' stroke-width='16'><circle cx='128' cy='128' r='40'/><path d='M130.05 206.11h-4L94 224c-12.477-4.197-24.049-10.711-34.11-19.2l-.12-36c-.71-1.12-1.38-2.25-2-3.41L25.9 147.24a99.16 99.16 0 0 1 0-38.46l31.84-18.1c.65-1.15 1.32-2.29 2-3.41l.16-36C69.951 42.757 81.521 36.218 94 32l32 17.89h4L162 32c12.477 4.197 24.049 10.711 34.11 19.2l.12 36c.71 1.12 1.38 2.25 2 3.41l31.85 18.14a99.16 99.16 0 0 1 0 38.46l-31.84 18.1c-.65 1.15-1.32 2.29-2 3.41l-.16 36A104.59 104.59 0 0 1 162 224l-31.95-17.89z'/></g>
-</svg>
--- a/src/assets/svg/stream-stats.svg
+++ b/src/assets/svg/stream-stats.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M1.181 24.55v-3.259c0-8.19 6.576-14.952 14.767-14.98H16c8.13 0 14.819 6.69 14.819 14.819v3.42c0 .625-.515 1.14-1.14 1.14H2.321c-.625 0-1.14-.515-1.14-1.14z'/><path d='M16 6.311v4.56M12.58 25.69l9.12-12.54m4.559 5.7h4.386m-29.266 0H5.74'/>
-</svg>
--- a/src/assets/svg/touch-control-disable.svg
+++ b/src/assets/svg/touch-control-disable.svg
@ -1,9 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' viewBox='0 0 32 32' fill-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2'>
-    <g fill='none' stroke='#fff'>
-        <path d='M6.021 5.021l20 22' stroke-width='2'/>
-        <path d='M8.735 8.559H2.909a.89.89 0 0 0-.889.889v13.146a.89.89 0 0 0 .889.888h19.34m4.289 0h2.594a.89.89 0 0 0 .889-.888V9.448a.89.89 0 0 0-.889-.889H12.971' stroke-miterlimit='1.5' stroke-width='2.083'/>
-    </g>
-    <path d='M8.147 11.981l-.053-.001-.054.001c-.55.028-.988.483-.988 1.04v6c0 .575.467 1.042 1.042 1.042l.053-.001c.55-.028.988-.484.988-1.04v-6a1.04 1.04 0 0 0-.988-1.04z'/>
-    <path d='M11.147 14.981l-.054-.001h-6a1.04 1.04 0 1 0 0 2.083h6c.575 0 1.042-.467 1.042-1.042a1.04 1.04 0 0 0-.988-1.04z'/>
-    <circle cx='25.345' cy='18.582' r='2.561' fill='none' stroke='#fff' stroke-width='1.78' transform='matrix(1.17131 0 0 1.17131 -5.74235 -5.74456)'/>
-</svg>
--- a/src/assets/svg/touch-control-enable.svg
+++ b/src/assets/svg/touch-control-enable.svg
@ -1,6 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' viewBox='0 0 32 32' fill-rule='evenodd' stroke-linejoin='round' stroke-miterlimit='2'>
-    <path d='M30.021 9.448a.89.89 0 0 0-.889-.889H2.909a.89.89 0 0 0-.889.889v13.146a.89.89 0 0 0 .889.888h26.223a.89.89 0 0 0 .889-.888V9.448z' fill='none' stroke='#fff' stroke-width='2.083'/>
-    <path d='M8.147 11.981l-.053-.001-.054.001c-.55.028-.988.483-.988 1.04v6c0 .575.467 1.042 1.042 1.042l.053-.001c.55-.028.988-.484.988-1.04v-6a1.04 1.04 0 0 0-.988-1.04z'/>
-    <path d='M11.147 14.981l-.054-.001h-6a1.04 1.04 0 1 0 0 2.083h6c.575 0 1.042-.467 1.042-1.042a1.04 1.04 0 0 0-.988-1.04z'/>
-    <circle cx='25.345' cy='18.582' r='2.561' fill='none' stroke='#fff' stroke-width='1.78' transform='matrix(1.17131 0 0 1.17131 -5.74235 -5.74456)'/>
-</svg>
--- a/src/assets/svg/trash.svg
+++ b/src/assets/svg/trash.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='4' viewBox='0 0 32 32'>
-    <path d='M29.5 6.182h-27m9.818 7.363v9.818m7.364-9.818v9.818'/><path d='M27.045 6.182V29.5c0 .673-.554 1.227-1.227 1.227H6.182c-.673 0-1.227-.554-1.227-1.227V6.182m17.181 0V3.727a2.47 2.47 0 0 0-2.455-2.455h-7.364a2.47 2.47 0 0 0-2.455 2.455v2.455'/>
-</svg>
--- a/src/assets/svg/true-achievements.svg
+++ b/src/assets/svg/true-achievements.svg
@ -1,3 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='#fff' stroke='nons' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M2.497 14.127c.781-6.01 5.542-10.849 11.551-11.708V0C6.634.858.858 6.712 0 14.127h2.497zM17.952 2.419V0C25.366.858 31.142 6.712 32 14.127h-2.497c-.781-6.01-5.542-10.849-11.551-11.708zM2.497 17.873c.781 6.01 5.542 10.849 11.551 11.708V32C6.634 31.142.858 25.288 0 17.873h2.497zm27.006 0H32C31.142 25.288 25.366 31.142 17.952 32v-2.419c6.009-.859 10.77-5.698 11.551-11.708zm-19.2-4.527h2.028a.702.702 0 1 0 0-1.404h-2.107a1.37 1.37 0 0 1-1.326-1.327V9.21a.7.7 0 0 0-.703-.703c-.387 0-.703.316-.703.7v1.408c.079 1.483 1.25 2.731 2.811 2.731zm2.809 7.337h-2.888a1.37 1.37 0 0 1-1.326-1.327v-4.917c0-.387-.316-.703-.7-.703a.7.7 0 0 0-.706.703v4.917a2.77 2.77 0 0 0 2.732 2.732h2.81c.387 0 .702-.316.702-.7.078-.393-.234-.705-.624-.705zM25.6 19.2a.7.7 0 0 0-.702-.702c-.387 0-.703.316-.703.699v.081c0 .702-.546 1.326-1.248 1.326H19.98c-.702-.078-1.248-.624-1.248-1.326v-.312c0-.78.624-1.327 1.326-1.327h2.811a2.77 2.77 0 0 0 2.731-2.732v-.312a2.68 2.68 0 0 0-2.576-2.732h-4.76a.702.702 0 1 0 0 1.405h4.526a1.37 1.37 0 0 1 1.327 1.327v.234c0 .781-.624 1.327-1.327 1.327h-2.81a2.77 2.77 0 0 0-2.731 2.732v.312a2.77 2.77 0 0 0 2.731 2.732h2.967a2.74 2.74 0 0 0 2.575-2.732s.078.078.078 0z'/>
-</svg>
--- a/src/assets/svg/upload.svg
+++ b/src/assets/svg/upload.svg
@ -1,4 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <path d='M16 19.905V1.682m14.318 18.223v9.112a1.31 1.31 0 0 1-1.302 1.302H2.983a1.31 1.31 0 0 1-1.302-1.302v-9.112'/>
-    <path d='M9.492 8.19L16 1.682l6.508 6.508'/>
-</svg>
--- a/src/assets/svg/virtual-controller.svg
+++ b/src/assets/svg/virtual-controller.svg
@ -1,11 +0,0 @@
-<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
-    <g stroke-width='2.06'>
-        <path d='M8.417 13.218h4.124'/>
-        <path d='M10.479 11.155v4.125'/>
-        <path d='M12.787 19.404L7.36 25.565a3.61 3.61 0 0 1-2.551 1.056A3.63 3.63 0 0 1 1.2 23.013c0-.21.018-.42.055-.626l2.108-10.845C3.923 8.356 6.714 6.007 9.949 6h5.192'/>
-    </g>
-    <g stroke-width='2.11'>
-        <path d='M30.8 13.1c0-3.919-3.181-7.1-7.1-7.1s-7.1 3.181-7.1 7.1v6.421c0 3.919 3.181 7.1 7.1 7.1s7.1-3.181 7.1-7.1V13.1z'/>
-        <path d='M23.7 14.724V9.966'/>
-    </g>
-</svg>
--- a/src/build-config.ts
+++ b/src/build-config.ts
--- a/src/enums/bypass-servers.ts
+++ b/src/enums/bypass-servers.ts
@ -1,17 +0,0 @@
-import { t } from "@/utils/translation"
-
-export const BypassServers = {
-    br: t('brazil'),
-    jp: t('japan'),
-    kr: t('korea'),
-    pl: t('poland'),
-    us: t('united-states'),
-} as const;
-
-export const BypassServerIps: Record<keyof typeof BypassServers, string> = {
-    br: '169.150.198.66',
-    kr: '121.125.60.151',
-    jp: '138.199.21.239',
-    pl: '45.134.212.66',
-    us: '143.244.47.65',
-} as const;
--- a/src/enums/game-pass-gallery.ts
+++ b/src/enums/game-pass-gallery.ts
@ -1,9 +0,0 @@
-export enum GamePassCloudGallery {
-    ALL = '29a81209-df6f-41fd-a528-2ae6b91f719c',
-    ALL_WITH_BYGO = 'ce573635-7c18-4d0c-9d68-90b932393470',
-    LEAVING_SOON = '393f05bf-e596-4ef6-9487-6d4fa0eab987',
-    MOST_POPULAR = 'e7590b22-e299-44db-ae22-25c61405454c',
-    NATIVE_MKB = '8fa264dd-124f-4af3-97e8-596fcdf4b486',
-    RECENTLY_ADDED = '44a55037-770f-4bbf-bde5-a9fa27dba1da',
-    TOUCH = '9c86f07a-f3e8-45ad-82a0-a1f759597059',
-}
--- a/src/enums/gamepad.ts
+++ b/src/enums/gamepad.ts
@ -1,77 +0,0 @@
-import { PrompFont } from "./prompt-font";
-
-export enum GamepadKey {
-    A = 0,
-    B = 1,
-    X = 2,
-    Y = 3,
-    LB = 4,
-    RB = 5,
-    LT = 6,
-    RT = 7,
-    SELECT = 8,
-    START = 9,
-    L3 = 10,
-    R3 = 11,
-    UP = 12,
-    DOWN = 13,
-    LEFT = 14,
-    RIGHT = 15,
-    HOME = 16,
-    SHARE = 17,
-
-    LS_UP = 100,
-    LS_DOWN = 101,
-    LS_LEFT = 102,
-    LS_RIGHT = 103,
-    LS = 104,
-
-    RS_UP = 200,
-    RS_DOWN = 201,
-    RS_LEFT = 202,
-    RS_RIGHT = 203,
-    RS = 204,
-};
-
-export const GamepadKeyName: Record<number, [string, PrompFont]> = {
-    [GamepadKey.A]: ['A', PrompFont.A],
-    [GamepadKey.B]: ['B', PrompFont.B],
-    [GamepadKey.X]: ['X', PrompFont.X],
-    [GamepadKey.Y]: ['Y', PrompFont.Y],
-
-    [GamepadKey.LB]: ['LB', PrompFont.LB],
-    [GamepadKey.RB]: ['RB', PrompFont.RB],
-    [GamepadKey.LT]: ['LT', PrompFont.LT],
-    [GamepadKey.RT]: ['RT', PrompFont.RT],
-
-    [GamepadKey.SELECT]: ['Select', PrompFont.SELECT],
-    [GamepadKey.START]: ['Start', PrompFont.START],
-    [GamepadKey.HOME]: ['Home', PrompFont.HOME],
-
-    [GamepadKey.UP]: ['D-Pad Up', PrompFont.UP],
-    [GamepadKey.DOWN]: ['D-Pad Down', PrompFont.DOWN],
-    [GamepadKey.LEFT]: ['D-Pad Left', PrompFont.LEFT],
-    [GamepadKey.RIGHT]: ['D-Pad Right', PrompFont.RIGHT],
-
-    [GamepadKey.L3]: ['L3', PrompFont.L3],
-    [GamepadKey.LS_UP]: ['Left Stick Up', PrompFont.LS_UP],
-    [GamepadKey.LS_DOWN]: ['Left Stick Down', PrompFont.LS_DOWN],
-    [GamepadKey.LS_LEFT]: ['Left Stick Left', PrompFont.LS_LEFT],
-    [GamepadKey.LS_RIGHT]: ['Left Stick Right', PrompFont.LS_RIGHT],
-    [GamepadKey.LS]: ['Left Stick', PrompFont.LS],
-
-    [GamepadKey.R3]: ['R3', PrompFont.R3],
-    [GamepadKey.RS_UP]: ['Right Stick Up', PrompFont.RS_UP],
-    [GamepadKey.RS_DOWN]: ['Right Stick Down', PrompFont.RS_DOWN],
-    [GamepadKey.RS_LEFT]: ['Right Stick Left', PrompFont.RS_LEFT],
-    [GamepadKey.RS_RIGHT]: ['Right Stick Right', PrompFont.RS_RIGHT],
-    [GamepadKey.RS]: ['Right Stick', PrompFont.RS],
-
-    [GamepadKey.SHARE]: ['Screenshot', PrompFont.SHARE],
-};
-
-
-export enum GamepadStick {
-    LEFT = 0,
-    RIGHT = 1,
-};
--- a/src/enums/mkb.ts
+++ b/src/enums/mkb.ts
@ -1,44 +0,0 @@
-export const enum MouseConstant {
-    DEFAULT_PANNING_SENSITIVITY = 0.0010,
-    DEFAULT_DEADZONE_COUNTERWEIGHT = 0.01,
-    MAXIMUM_STICK_RANGE = 1.1,
-}
-
-
-export const enum MouseButtonCode {
-    LEFT_CLICK = 'Mouse0',
-    RIGHT_CLICK = 'Mouse2',
-    MIDDLE_CLICK = 'Mouse1',
-};
-
-
-export const enum MouseMapTo {
-    OFF = 0,
-    LS = 1,
-    RS = 2,
-}
-
-
-export const enum WheelCode {
-    SCROLL_UP = 'ScrollUp',
-    SCROLL_DOWN = 'ScrollDown',
-    SCROLL_LEFT = 'ScrollLeft',
-    SCROLL_RIGHT = 'ScrollRight',
-};
-
-
-export const enum MkbPresetKey {
-    MOUSE_MAP_TO = 'mapTo',
-
-    MOUSE_SENSITIVITY_X = 'sensitivityX',
-    MOUSE_SENSITIVITY_Y = 'sensitivityY',
-
-    MOUSE_DEADZONE_COUNTERWEIGHT = 'deadzoneCounterweight',
-}
-
-
-export const enum KeyModifier {
-    CTRL = 1,
-    ALT = 2,
-    SHIFT = 4,
-}
--- a/src/enums/pref-keys.ts
+++ b/src/enums/pref-keys.ts
@ -1,313 +0,0 @@
-import type { BaseSettingsStorage } from "@/utils/settings-storages/base-settings-storage";
-import type { BlockFeature, CodecProfile, DeviceVibrationMode, GameBarPosition, LoadingScreenRocket, NativeMkbMode, StreamPlayerType, StreamResolution, StreamStat, StreamStatPosition, StreamVideoProcessing, StreamVideoProcessingMode, TouchControllerMode, TouchControllerStyleCustom, TouchControllerStyleStandard, UiLayout, UiSection, UiTheme, VideoPosition, VideoPowerPreference, VideoRatio } from "./pref-values"
-
-export const enum StorageKey {
-    GLOBAL = 'BetterXcloud',
-    STREAM = 'BetterXcloud.Stream',
-
-    LOCALE = 'BetterXcloud.Locale',
-    LOCALE_TRANSLATIONS = 'BetterXcloud.Locale.Translations',
-    PATCHES_CACHE = 'BetterXcloud.Patches.Cache',
-    PATCHES_SIGNATURE = 'BetterXcloud.Patches.Cache.Signature',
-    USER_AGENT = 'BetterXcloud.UserAgent',
-
-    GH_PAGES_COMMIT_HASH = 'BetterXcloud.GhPages.CommitHash',
-    LIST_CUSTOM_TOUCH_LAYOUTS = 'BetterXcloud.GhPages.CustomTouchLayouts',
-    LIST_FORCE_NATIVE_MKB = 'BetterXcloud.GhPages.ForceNativeMkb',
-    LIST_LOCAL_CO_OP = 'BetterXcloud.GhPages.LocalCoOp',
-}
-
-
-export const enum GlobalPref {
-    VERSION_LAST_CHECK = 'version.lastCheck',
-    VERSION_LATEST = 'version.latest',
-    VERSION_CURRENT = 'version.current',
-
-    SCRIPT_LOCALE = 'bx.locale',
-
-    SERVER_REGION = 'server.region',
-    SERVER_BYPASS_RESTRICTION = 'server.bypassRestriction',
-    SERVER_PREFER_IPV6 = 'server.ipv6.prefer',
-
-    STREAM_PREFERRED_LOCALE = 'stream.locale',
-    STREAM_RESOLUTION = 'stream.video.resolution',
-    STREAM_CODEC_PROFILE = 'stream.video.codecProfile',
-    STREAM_MAX_VIDEO_BITRATE = 'stream.video.maxBitrate',
-    STREAM_COMBINE_SOURCES = 'stream.video.combineAudio',
-
-    USER_AGENT_PROFILE = 'userAgent.profile',
-
-    TOUCH_CONTROLLER_MODE = 'touchController.mode',
-    TOUCH_CONTROLLER_AUTO_OFF = 'touchController.autoOff',
-    TOUCH_CONTROLLER_DEFAULT_OPACITY = 'touchController.opacity.default',
-    TOUCH_CONTROLLER_STYLE_STANDARD = 'touchController.style.standard',
-    TOUCH_CONTROLLER_STYLE_CUSTOM = 'touchController.style.custom',
-
-    GAME_BAR_POSITION = 'gameBar.position',
-
-    NATIVE_MKB_MODE = 'nativeMkb.mode',
-    NATIVE_MKB_FORCED_GAMES = 'nativeMkb.forcedGames',
-
-    MKB_ENABLED = 'mkb.enabled',
-    MKB_HIDE_IDLE_CURSOR = 'mkb.cursor.hideIdle',
-
-    SCREENSHOT_APPLY_FILTERS = 'screenshot.applyFilters',
-
-    BLOCK_TRACKING = 'block.tracking',
-    BLOCK_FEATURES = 'block.features',
-
-    LOADING_SCREEN_GAME_ART = 'loadingScreen.gameArt.show',
-    LOADING_SCREEN_SHOW_WAIT_TIME = 'loadingScreen.waitTime.show',
-    LOADING_SCREEN_ROCKET = 'loadingScreen.rocket',
-
-    UI_CONTROLLER_FRIENDLY = 'ui.controllerFriendly',
-    UI_LAYOUT = 'ui.layout',
-    UI_SCROLLBAR_HIDE = 'ui.hideScrollbar',
-    UI_HIDE_SECTIONS = 'ui.hideSections',
-
-    UI_GAME_CARD_SHOW_WAIT_TIME = 'ui.gameCard.waitTime.show',
-    UI_SIMPLIFY_STREAM_MENU = 'ui.streamMenu.simplify',
-    UI_DISABLE_FEEDBACK_DIALOG = 'ui.feedbackDialog.disabled',
-    UI_CONTROLLER_SHOW_STATUS = 'ui.controllerStatus.show',
-
-    UI_SKIP_SPLASH_VIDEO = 'ui.splashVideo.skip',
-    UI_HIDE_SYSTEM_MENU_ICON = 'ui.systemMenu.hideHandle',
-    UI_REDUCE_ANIMATIONS = 'ui.reduceAnimations',
-    UI_IMAGE_QUALITY = 'ui.imageQuality',
-    UI_THEME = 'ui.theme',
-
-    AUDIO_MIC_ON_PLAYING = 'audio.mic.onPlaying',
-    AUDIO_VOLUME_CONTROL_ENABLED = 'audio.volume.booster.enabled',
-
-    REMOTE_PLAY_STREAM_RESOLUTION = 'xhome.video.resolution',
-
-    GAME_FORTNITE_FORCE_CONSOLE = 'game.fortnite.forceConsole',
-}
-
-export type GlobalPrefTypeMap = {
-    [GlobalPref.AUDIO_MIC_ON_PLAYING]: boolean;
-    [GlobalPref.AUDIO_VOLUME_CONTROL_ENABLED]: boolean;
-    [GlobalPref.BLOCK_FEATURES]: BlockFeature[];
-    [GlobalPref.BLOCK_TRACKING]: boolean;
-    [GlobalPref.GAME_BAR_POSITION]: GameBarPosition;
-    [GlobalPref.GAME_FORTNITE_FORCE_CONSOLE]: boolean;
-    [GlobalPref.LOADING_SCREEN_GAME_ART]: boolean;
-    [GlobalPref.LOADING_SCREEN_ROCKET]: LoadingScreenRocket;
-    [GlobalPref.LOADING_SCREEN_SHOW_WAIT_TIME]: boolean;
-    [GlobalPref.MKB_ENABLED]: boolean;
-    [GlobalPref.MKB_HIDE_IDLE_CURSOR]: boolean;
-    [GlobalPref.NATIVE_MKB_FORCED_GAMES]: string[];
-    [GlobalPref.NATIVE_MKB_MODE]: NativeMkbMode;
-    [GlobalPref.REMOTE_PLAY_STREAM_RESOLUTION]: StreamResolution;
-    [GlobalPref.SCREENSHOT_APPLY_FILTERS]: boolean;
-    [GlobalPref.SERVER_BYPASS_RESTRICTION]: string;
-    [GlobalPref.SERVER_PREFER_IPV6]: boolean;
-    [GlobalPref.SERVER_REGION]: string;
-    [GlobalPref.STREAM_CODEC_PROFILE]: CodecProfile;
-    [GlobalPref.STREAM_COMBINE_SOURCES]: boolean;
-    [GlobalPref.STREAM_MAX_VIDEO_BITRATE]: number;
-    [GlobalPref.STREAM_PREFERRED_LOCALE]: StreamPreferredLocale;
-    [GlobalPref.STREAM_RESOLUTION]: StreamResolution;
-    [GlobalPref.TOUCH_CONTROLLER_AUTO_OFF]: boolean;
-    [GlobalPref.TOUCH_CONTROLLER_DEFAULT_OPACITY]: number;
-    [GlobalPref.TOUCH_CONTROLLER_MODE]: TouchControllerMode;
-    [GlobalPref.TOUCH_CONTROLLER_STYLE_CUSTOM]: TouchControllerStyleCustom;
-    [GlobalPref.TOUCH_CONTROLLER_STYLE_STANDARD]: TouchControllerStyleStandard;
-    [GlobalPref.UI_CONTROLLER_FRIENDLY]: boolean;
-    [GlobalPref.UI_CONTROLLER_SHOW_STATUS]: boolean;
-    [GlobalPref.UI_DISABLE_FEEDBACK_DIALOG]: boolean;
-    [GlobalPref.UI_GAME_CARD_SHOW_WAIT_TIME]: boolean;
-    [GlobalPref.UI_HIDE_SECTIONS]: UiSection[];
-    [GlobalPref.UI_HIDE_SYSTEM_MENU_ICON]: boolean;
-    [GlobalPref.UI_IMAGE_QUALITY]: number;
-    [GlobalPref.UI_LAYOUT]: UiLayout;
-    [GlobalPref.UI_REDUCE_ANIMATIONS]: boolean;
-    [GlobalPref.UI_SCROLLBAR_HIDE]: boolean;
-    [GlobalPref.UI_SIMPLIFY_STREAM_MENU]: boolean;
-    [GlobalPref.UI_SKIP_SPLASH_VIDEO]: boolean;
-    [GlobalPref.UI_THEME]: UiTheme;
-    [GlobalPref.VERSION_CURRENT]: string;
-    [GlobalPref.VERSION_LAST_CHECK]: number;
-    [GlobalPref.VERSION_LATEST]: string;
-
-    [GlobalPref.SCRIPT_LOCALE]: string;
-    [GlobalPref.USER_AGENT_PROFILE]: string;
-}
-
-export const enum StreamPref {
-    LOCAL_CO_OP_ENABLED = 'localCoOp.enabled',
-
-    DEVICE_VIBRATION_MODE = 'deviceVibration.mode',
-    DEVICE_VIBRATION_INTENSITY = 'deviceVibration.intensity',
-
-    CONTROLLER_POLLING_RATE = 'controller.pollingRate',
-    CONTROLLER_SETTINGS = 'controller.settings',
-
-    NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY = 'nativeMkb.scroll.sensitivityX',
-    NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY = 'nativeMkb.scroll.sensitivityY',
-
-    MKB_P1_MAPPING_PRESET_ID = 'mkb.p1.preset.mappingId',
-    MKB_P1_SLOT = 'mkb.p1.slot',
-    MKB_P2_MAPPING_PRESET_ID = 'mkb.p2.preset.mappingId',
-    MKB_P2_SLOT = 'mkb.p2.slot',
-
-    KEYBOARD_SHORTCUTS_IN_GAME_PRESET_ID = 'keyboardShortcuts.preset.inGameId',
-
-    VIDEO_PLAYER_TYPE = 'video.player.type',
-    VIDEO_POWER_PREFERENCE = 'video.player.powerPreference',
-    VIDEO_PROCESSING = 'video.processing',
-    VIDEO_PROCESSING_MODE = 'video.processing.mode',
-    VIDEO_SHARPNESS = 'video.processing.sharpness',
-    VIDEO_MAX_FPS = 'video.maxFps',
-    VIDEO_RATIO = 'video.ratio',
-    VIDEO_BRIGHTNESS = 'video.brightness',
-    VIDEO_CONTRAST = 'video.contrast',
-    VIDEO_SATURATION = 'video.saturation',
-    VIDEO_POSITION = 'video.position',
-
-    AUDIO_VOLUME = 'audio.volume',
-
-    STATS_ITEMS = 'stats.items',
-    STATS_SHOW_WHEN_PLAYING = 'stats.showWhenPlaying',
-    STATS_QUICK_GLANCE_ENABLED = 'stats.quickGlance.enabled',
-    STATS_POSITION = 'stats.position',
-    STATS_TEXT_SIZE = 'stats.textSize',
-    STATS_OPACITY_ALL = 'stats.opacity.all',
-    STATS_OPACITY_BACKGROUND = 'stats.opacity.background',
-    STATS_CONDITIONAL_FORMATTING = 'stats.colors',
-}
-
-export type StreamPrefTypeMap = {
-    [StreamPref.AUDIO_VOLUME]: number;
-    [StreamPref.CONTROLLER_POLLING_RATE]: number;
-    [StreamPref.CONTROLLER_SETTINGS]: ControllerSettings;
-    [StreamPref.DEVICE_VIBRATION_INTENSITY]: number;
-    [StreamPref.DEVICE_VIBRATION_MODE]: DeviceVibrationMode;
-    [StreamPref.KEYBOARD_SHORTCUTS_IN_GAME_PRESET_ID]: number;
-    [StreamPref.LOCAL_CO_OP_ENABLED]: boolean;
-    [StreamPref.MKB_P1_MAPPING_PRESET_ID]: number;
-    [StreamPref.MKB_P1_SLOT]: number;
-    [StreamPref.MKB_P2_MAPPING_PRESET_ID]: number;
-    [StreamPref.MKB_P2_SLOT]: number;
-    [StreamPref.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY]: number;
-    [StreamPref.NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY]: number;
-    [StreamPref.STATS_CONDITIONAL_FORMATTING]: boolean;
-    [StreamPref.STATS_ITEMS]: StreamStat[];
-    [StreamPref.STATS_OPACITY_ALL]: number;
-    [StreamPref.STATS_OPACITY_BACKGROUND]: number;
-    [StreamPref.STATS_POSITION]: StreamStatPosition;
-    [StreamPref.STATS_QUICK_GLANCE_ENABLED]: boolean;
-    [StreamPref.STATS_SHOW_WHEN_PLAYING]: boolean;
-    [StreamPref.STATS_TEXT_SIZE]: string;
-    [StreamPref.VIDEO_BRIGHTNESS]: number;
-    [StreamPref.VIDEO_CONTRAST]: number;
-    [StreamPref.VIDEO_MAX_FPS]: number;
-    [StreamPref.VIDEO_PLAYER_TYPE]: StreamPlayerType;
-    [StreamPref.VIDEO_POSITION]: VideoPosition;
-    [StreamPref.VIDEO_POWER_PREFERENCE]: VideoPowerPreference;
-    [StreamPref.VIDEO_PROCESSING]: StreamVideoProcessing;
-    [StreamPref.VIDEO_PROCESSING_MODE]: StreamVideoProcessingMode;
-    [StreamPref.VIDEO_RATIO]: VideoRatio;
-    [StreamPref.VIDEO_SATURATION]: number;
-    [StreamPref.VIDEO_SHARPNESS]: number;
-}
-
-export type AllPrefs = GlobalPref | StreamPref;
-
-export const ALL_PREFS: {
-    global: GlobalPref[],
-    stream: StreamPref[],
-} = {
-    global: [
-        GlobalPref.AUDIO_MIC_ON_PLAYING,
-        GlobalPref.AUDIO_VOLUME_CONTROL_ENABLED,
-        GlobalPref.BLOCK_FEATURES,
-        GlobalPref.BLOCK_TRACKING,
-        GlobalPref.GAME_BAR_POSITION,
-        GlobalPref.GAME_FORTNITE_FORCE_CONSOLE,
-        GlobalPref.LOADING_SCREEN_GAME_ART,
-        GlobalPref.LOADING_SCREEN_ROCKET,
-        GlobalPref.LOADING_SCREEN_SHOW_WAIT_TIME,
-        GlobalPref.MKB_ENABLED,
-        GlobalPref.MKB_HIDE_IDLE_CURSOR,
-        GlobalPref.NATIVE_MKB_FORCED_GAMES,
-        GlobalPref.NATIVE_MKB_MODE,
-        GlobalPref.REMOTE_PLAY_STREAM_RESOLUTION,
-        GlobalPref.SCREENSHOT_APPLY_FILTERS,
-        GlobalPref.SERVER_BYPASS_RESTRICTION,
-        GlobalPref.SERVER_PREFER_IPV6,
-        GlobalPref.SERVER_REGION,
-        GlobalPref.STREAM_CODEC_PROFILE,
-        GlobalPref.STREAM_COMBINE_SOURCES,
-        GlobalPref.STREAM_MAX_VIDEO_BITRATE,
-        GlobalPref.STREAM_PREFERRED_LOCALE,
-        GlobalPref.STREAM_RESOLUTION,
-        GlobalPref.TOUCH_CONTROLLER_AUTO_OFF,
-        GlobalPref.TOUCH_CONTROLLER_DEFAULT_OPACITY,
-        GlobalPref.TOUCH_CONTROLLER_MODE,
-        GlobalPref.TOUCH_CONTROLLER_STYLE_CUSTOM,
-        GlobalPref.TOUCH_CONTROLLER_STYLE_STANDARD,
-        GlobalPref.UI_CONTROLLER_FRIENDLY,
-        GlobalPref.UI_CONTROLLER_SHOW_STATUS,
-        GlobalPref.UI_DISABLE_FEEDBACK_DIALOG,
-        GlobalPref.UI_GAME_CARD_SHOW_WAIT_TIME,
-        GlobalPref.UI_HIDE_SECTIONS,
-        GlobalPref.UI_HIDE_SYSTEM_MENU_ICON,
-        GlobalPref.UI_IMAGE_QUALITY,
-        GlobalPref.UI_LAYOUT,
-        GlobalPref.UI_REDUCE_ANIMATIONS,
-        GlobalPref.UI_SCROLLBAR_HIDE,
-        GlobalPref.UI_SIMPLIFY_STREAM_MENU,
-        GlobalPref.UI_SKIP_SPLASH_VIDEO,
-        GlobalPref.UI_THEME,
-        GlobalPref.VERSION_CURRENT,
-        GlobalPref.VERSION_LAST_CHECK,
-        GlobalPref.VERSION_LATEST,
-
-        GlobalPref.SCRIPT_LOCALE,
-        GlobalPref.USER_AGENT_PROFILE,
-    ],
-    stream: [
-        StreamPref.AUDIO_VOLUME,
-        StreamPref.CONTROLLER_POLLING_RATE,
-        StreamPref.CONTROLLER_SETTINGS,
-        StreamPref.DEVICE_VIBRATION_INTENSITY,
-        StreamPref.DEVICE_VIBRATION_MODE,
-        StreamPref.KEYBOARD_SHORTCUTS_IN_GAME_PRESET_ID,
-        StreamPref.LOCAL_CO_OP_ENABLED,
-        StreamPref.MKB_P1_MAPPING_PRESET_ID,
-        StreamPref.MKB_P1_SLOT,
-        StreamPref.MKB_P2_MAPPING_PRESET_ID,
-        StreamPref.MKB_P2_SLOT,
-        StreamPref.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY,
-        StreamPref.NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY,
-        StreamPref.STATS_CONDITIONAL_FORMATTING,
-        StreamPref.STATS_ITEMS,
-        StreamPref.STATS_OPACITY_ALL,
-        StreamPref.STATS_OPACITY_BACKGROUND,
-        StreamPref.STATS_POSITION,
-        StreamPref.STATS_QUICK_GLANCE_ENABLED,
-        StreamPref.STATS_SHOW_WHEN_PLAYING,
-        StreamPref.STATS_TEXT_SIZE,
-        StreamPref.VIDEO_BRIGHTNESS,
-        StreamPref.VIDEO_CONTRAST,
-        StreamPref.VIDEO_MAX_FPS,
-        StreamPref.VIDEO_PLAYER_TYPE,
-        StreamPref.VIDEO_POSITION,
-        StreamPref.VIDEO_POWER_PREFERENCE,
-        StreamPref.VIDEO_PROCESSING,
-        StreamPref.VIDEO_PROCESSING_MODE,
-        StreamPref.VIDEO_RATIO,
-        StreamPref.VIDEO_SATURATION,
-        StreamPref.VIDEO_SHARPNESS,
-    ],
-} as const;
-
-export type AnySettingsStorage = BaseSettingsStorage<GlobalPref> | BaseSettingsStorage<StreamPref>;
-export type AnyPref = GlobalPref | StreamPref;
-
-export type PrefTypeMap<Key> = Key extends GlobalPref
-  ? GlobalPrefTypeMap
-  : Key extends StreamPref
-  ? StreamPrefTypeMap
-  : never;
--- a/src/enums/pref-values.ts
+++ b/src/enums/pref-values.ts
@ -1,150 +0,0 @@
-export const enum UiSection {
-    ALL_GAMES = 'all-games',
-    FRIENDS = 'friends',
-    MOST_POPULAR = 'most-popular',
-    NATIVE_MKB = 'native-mkb',
-    NEWS = 'news',
-    TOUCH = 'touch',
-    BOYG = 'byog',
-    RECENTLY_ADDED = 'recently-added',
-    LEAVING_SOON = 'leaving-soon',
-    GENRES = 'genres',
-}
-
-export const enum GameBarPosition {
-    BOTTOM_LEFT = 'bottom-left',
-    BOTTOM_RIGHT = 'bottom-right',
-    OFF = 'off',
-};
-
-export const enum UiLayout {
-    TV = 'tv',
-    NORMAL = 'normal',
-    DEFAULT = 'default',
-}
-
-export const enum LoadingScreenRocket {
-    SHOW = 'show',
-    HIDE = 'hide',
-    HIDE_QUEUE = 'hide-queue',
-}
-
-export const enum StreamResolution {
-    DIM_720P = '720p',
-    DIM_1080P = '1080p',
-    DIM_1080P_HQ = '1080p-hq',
-    AUTO = 'auto',
-}
-
-export const enum CodecProfile {
-    DEFAULT = 'default',
-    LOW = 'low',
-    NORMAL = 'normal',
-    HIGH = 'high',
-};
-
-export const enum TouchControllerMode {
-    DEFAULT = 'default',
-    ALL = 'all',
-    OFF = 'off',
-}
-
-export const enum TouchControllerStyleStandard {
-    DEFAULT = 'default',
-    WHITE = 'white',
-    MUTED = 'muted',
-}
-
-export const enum TouchControllerStyleCustom {
-    DEFAULT = 'default',
-    MUTED = 'muted',
-}
-
-export const enum DeviceVibrationMode {
-    ON = 'on',
-    AUTO = 'auto',
-    OFF = 'off',
-}
-
-export const enum NativeMkbMode {
-    DEFAULT = 'default',
-    ON = 'on',
-    OFF = 'off',
-}
-
-export const enum StreamStat {
-    PING = 'ping',
-    JITTER = 'jit',
-    FPS = 'fps',
-    BITRATE = 'btr',
-    DECODE_TIME = 'dt',
-    PACKETS_LOST = 'pl',
-    FRAMES_LOST = 'fl',
-    DOWNLOAD = 'dl',
-    UPLOAD = 'ul',
-    PLAYTIME = 'play',
-    BATTERY = 'batt',
-    CLOCK = 'time',
-};
-
-export const enum StreamStatPosition {
-    TOP_LEFT = 'top-left',
-    TOP_CENTER = 'top-center',
-    TOP_RIGHT = 'top-right',
-}
-
-export const enum VideoRatio {
-    '16:9' = '16:9',
-    '16:10' = '16:10',
-    '18:9' = '18:9',
-    '20:9' = '20:9',
-    '21:9' = '21:9',
-    '3:2' = '3:2',
-    '4:3' = '4:3',
-    '5:4' = '5:4',
-    FILL = 'fill',
-}
-
-export const enum VideoPosition {
-    CENTER = 'center',
-    TOP = 'top',
-    TOP_HALF = 'top-half',
-    BOTTOM = 'bottom',
-    BOTTOM_HALF = 'bottom-half',
-}
-
-export const enum VideoPowerPreference {
-    DEFAULT = 'default',
-    LOW_POWER = 'low-power',
-    HIGH_PERFORMANCE = 'high-performance',
-}
-
-export const enum StreamPlayerType {
-    VIDEO = 'default',
-    WEBGL2 = 'webgl2',
-    WEBGPU = 'webgpu',
-}
-
-export const enum StreamVideoProcessing {
-    USM = 'usm',
-    CAS = 'cas',
-}
-
-export const enum StreamVideoProcessingMode {
-    QUALITY = 'quality',
-    PERFORMANCE = 'performance',
-}
-
-export const enum BlockFeature {
-    CHAT = 'chat',
-    FRIENDS = 'friends',
-    BYOG = 'byog',
-    NOTIFICATIONS_INVITES = 'notifications-invites',
-    NOTIFICATIONS_ACHIEVEMENTS = 'notifications-achievements',
-    REMOTE_PLAY = 'remote-play',
-}
-
-export const enum UiTheme {
-    DEFAULT = 'default',
-    DARK_OLED = 'dark-oled',
-}
--- a/src/enums/prompt-font.ts
+++ b/src/enums/prompt-font.ts
@ -1,36 +0,0 @@
-export enum PrompFont {
-    A = '⇓',
-    B = '⇒',
-    X = '⇐',
-    Y = '⇑',
-
-    LB = '↘',
-    RB = '↙',
-    LT = '↖',
-    RT = '↗',
-
-    SELECT = '⇺',
-    START = '⇻',
-    HOME = '',
-
-    UP = '≻',
-    DOWN = '≽',
-    LEFT = '≺',
-    RIGHT = '≼',
-
-    LS = '⇱',
-    L3 = '↺',
-    LS_UP = '↾',
-    LS_DOWN = '⇂',
-    LS_LEFT = '↼',
-    LS_RIGHT = '⇀',
-
-    RS = '⇲',
-    R3 = '↻',
-    RS_UP = '↿',
-    RS_DOWN = '⇃',
-    RS_LEFT = '↽',
-    RS_RIGHT = '⇁',
-
-    SHARE = '⇧',
-}
--- a/src/enums/shortcut-actions.ts
+++ b/src/enums/shortcut-actions.ts
@ -1,27 +0,0 @@
-export const enum ShortcutAction {
-    BETTER_XCLOUD_SETTINGS_SHOW = 'bx.settings.show',
-
-    CONTROLLER_XBOX_BUTTON_PRESS = 'controller.xbox.press',
-
-    STREAM_VIDEO_TOGGLE = 'stream.video.toggle',
-    STREAM_SCREENSHOT_CAPTURE = 'stream.screenshot.capture',
-
-    STREAM_MENU_SHOW = 'stream.menu.show',
-    STREAM_STATS_TOGGLE = 'stream.stats.toggle',
-    STREAM_SOUND_TOGGLE = 'stream.sound.toggle',
-    STREAM_MICROPHONE_TOGGLE = 'stream.microphone.toggle',
-
-    STREAM_VOLUME_INC = 'stream.volume.inc',
-    STREAM_VOLUME_DEC = 'stream.volume.dec',
-
-    DEVICE_SOUND_TOGGLE = 'device.sound.toggle',
-    DEVICE_VOLUME_INC = 'device.volume.inc',
-    DEVICE_VOLUME_DEC = 'device.volume.dec',
-
-    DEVICE_BRIGHTNESS_INC = 'device.brightness.inc',
-    DEVICE_BRIGHTNESS_DEC = 'device.brightness.dec',
-
-    MKB_TOGGLE = 'mkb.toggle',
-
-    TRUE_ACHIEVEMENTS_OPEN = 'ta.open',
-};
--- a/src/enums/user-agent.ts
+++ b/src/enums/user-agent.ts
@ -1,9 +0,0 @@
-export enum UserAgentProfile {
-    WINDOWS_EDGE = 'windows-edge',
-    MACOS_SAFARI = 'macos-safari',
-    SMART_TV_GENERIC = 'smarttv-generic',
-    SMART_TV_TIZEN = 'smarttv-tizen',
-    VR_OCULUS = 'vr-oculus',
-    DEFAULT = 'default',
-    CUSTOM = 'custom',
-}
--- a/src/index.ts
+++ b/src/index.ts
@ -1,160 +1,83 @@
-import { compressCss, isFullVersion } from "@macros/build" with { type: "macro" };
-
-import "@utils/global";
-import { BxEvent } from "@utils/bx-event";
-import { BX_FLAGS } from "@utils/bx-flags";
-import { BxExposed } from "@utils/bx-exposed";
-import { t } from "@utils/translation";
-import { interceptHttpRequests } from "@utils/network";
-import { CE } from "@utils/html";
-import { showGamepadToast } from "@utils/gamepad";
-import { EmulatedMkbHandler } from "@modules/mkb/mkb-handler";
-import { StreamBadges } from "@modules/stream/stream-badges";
-import { StreamStats } from "@modules/stream/stream-stats";
-import { addCss, preloadFonts } from "@utils/css";
-import { LoadingScreen } from "@modules/loading-screen";
-import { MouseCursorHider } from "@modules/mkb/mouse-cursor-hider";
-import { TouchController } from "@modules/touch-controller";
-import { checkForUpdate, disablePwa, productTitleToSlug } from "@utils/utils";
-import { Patcher } from "@/modules/patcher/patcher";
-import { RemotePlayManager } from "@/modules/remote-play-manager";
-import { onHistoryChanged, patchHistoryMethod } from "@utils/history";
-import { disableAdobeAudienceManager, patchAudioContext, patchCanvasContext, patchMeControl, patchPointerLockApi, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
-import { AppInterface, STATES } from "@utils/global";
-import { BxLogger } from "@utils/bx-logger";
-import { GameBar } from "./modules/game-bar/game-bar";
-import { ScreenshotManager } from "./utils/screenshot-manager";
-import { NativeMkbHandler } from "./modules/mkb/native-mkb-handler";
-import { GuideMenu } from "./modules/ui/guide-menu";
-import { updateVideoPlayer } from "./modules/stream/stream-settings-utils";
-import { BlockFeature, NativeMkbMode, TouchControllerMode, UiSection } from "./enums/pref-values";
-import { HeaderSection } from "./modules/ui/header";
-import { GameTile } from "./modules/ui/game-tile";
-import { ProductDetailsPage } from "./modules/ui/product-details";
-import { NavigationDialogManager } from "./modules/ui/dialog/navigation-dialog";
-import { GlobalPref, StreamPref } from "./enums/pref-keys";
-import { UserAgent } from "./utils/user-agent";
-import { XboxApi } from "./utils/xbox-api";
-import { StreamStatsCollector } from "./utils/stream-stats-collector";
-import { StreamSettings } from "./utils/stream-settings";
-import { KeyboardShortcutHandler } from "./modules/mkb/keyboard-shortcut-handler";
-import { GhPagesUtils } from "./utils/gh-pages";
-import { DeviceVibrationManager } from "./modules/device-vibration-manager";
-import { BxEventBus } from "./utils/bx-event-bus";
-import { getGlobalPref, getStreamPref } from "./utils/pref-utils";
-import { SettingsManager } from "./modules/settings-manager";
+import "./utils/global";
+import { BxEvent } from "./utils/bx-event";
+import { BX_FLAGS } from "./utils/bx-flags";
+import { BxExposed } from "./utils/bx-exposed";
+import { t } from "./utils/translation";
+import { interceptHttpRequests } from "./utils/network";
+import { CE } from "./utils/html";
+import { showGamepadToast } from "./utils/gamepad";
+import { MkbHandler } from "./modules/mkb/mkb-handler";
+import { StreamBadges } from "./modules/stream/stream-badges";
+import { StreamStats } from "./modules/stream/stream-stats";
+import { addCss } from "./utils/css";
 import { Toast } from "./utils/toast";
-import { WebGPUPlayer } from "./modules/player/webgpu/webgpu-player";
-import { StreamUiHandler } from "./modules/stream/stream-ui";
-import { TrueAchievements } from "./utils/true-achievements";
-
-SettingsManager.getInstance();
+import { setupBxUi, updateVideoPlayerCss } from "./modules/ui/ui";
+import { PrefKey, getPref } from "./utils/preferences";
+import { LoadingScreen } from "./modules/loading-screen";
+import { MouseCursorHider } from "./modules/mkb/mouse-cursor-hider";
+import { TouchController } from "./modules/touch-controller";
+import { watchHeader } from "./modules/ui/header";
+import { checkForUpdate, disablePwa } from "./utils/utils";
+import { Patcher } from "./modules/patcher";
+import { RemotePlay } from "./modules/remote-play";
+import { onHistoryChanged, patchHistoryMethod } from "./utils/history";
+import { VibrationManager } from "./modules/vibration-manager";
+import { PreloadedState } from "./utils/titles-info";
+import { patchAudioContext, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "./utils/monkey-patches";
+import { STATES } from "./utils/global";
+import { injectStreamMenuButtons } from "./modules/stream/stream-ui";

 // Handle login page
 if (window.location.pathname.includes('/auth/msa')) {
-    const nativePushState = window.history['pushState'];
-    window.history['pushState'] = function(...args: any[]) {
-        const url = args[2];
-        if (url && (url.startsWith('/play') || url.substring(6).startsWith('/play'))) {
-            console.log('Redirecting to xbox.com/play');
-            window.stop();
-            window.location.href = 'https://www.xbox.com' + url;
-            return;
-        }
-
-        // @ts-ignore
-        return nativePushState.apply(this, arguments);
-    }
+    window.addEventListener('load', e => {
+            window.location.search.includes('loggedIn') && window.setTimeout(() => {
+                const location = window.location;
+                // @ts-ignore
+                location.pathname.includes('/play') && location.reload(true);
+            }, 2000);
+        });
    // Stop processing the script
    throw new Error('[Better xCloud] Refreshing the page after logging in');
 }

-BxLogger.info('readyState', document.readyState);
+console.log(`[Better xCloud] readyState: ${document.readyState}`);

-if (isFullVersion() && BX_FLAGS.SafariWorkaround && document.readyState !== 'loading') {
+if (BX_FLAGS.SafariWorkaround && document.readyState !== 'loading') {
    // Stop loading
    window.stop();

-    // We need to set it to an empty string first to work around Bun's bug
-    // https://github.com/oven-sh/bun/issues/12067
-    let css = '';
-    css += compressCss(`
+    // Show the reloading overlay
+    const css = `
 .bx-reload-overlay {
    position: fixed;
    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    display: flex;
-    align-items: center;
    background: #000000cc;
    z-index: 9999;
+    width: 100%;
+    line-height: 100vh;
    color: #fff;
    text-align: center;
    font-weight: 400;
    font-family: "Segoe UI", Arial, Helvetica, sans-serif;
    font-size: 1.3rem;
 }
-
-.bx-reload-overlay *:focus {
-    outline: none !important;
-}
-
-.bx-reload-overlay > div {
-    margin: 0 auto;
-}
-
-.bx-reload-overlay a {
-    text-decoration: none;
-    display: inline-block;
-    background: #107c10;
-    color: white;
-    border-radius: 4px;
-    padding: 6px;
-}
-`);
-
-    const isSafari = UserAgent.isSafari();
-    let $secondaryAction: HTMLElement;
-    if (isSafari) {
-        $secondaryAction = CE('p', false, t('settings-reloading'));
-    } else {
-        $secondaryAction = CE('a', {
-            href: 'https://better-xcloud.github.io/troubleshooting',
-            target: '_blank',
-        }, '🤓 ' + t('how-to-fix'));
-    }
-
-    // Show the reloading overlay
+`;
    const $fragment = document.createDocumentFragment();
-    $fragment.appendChild(CE('style', false, css));
-    $fragment.appendChild(CE('div',{
-        class: 'bx-reload-overlay',
-    },
-        CE('div', false,
-            CE('p', false, t('load-failed-message')),
-            $secondaryAction,
-        ),
-    ));
+    $fragment.appendChild(CE('style', {}, css));
+    $fragment.appendChild(CE('div', {'class': 'bx-reload-overlay'}, t('safari-failed-message')));

    document.documentElement.appendChild($fragment);

-    // Reload the page if using Safari
+    // Reload the page
    // @ts-ignore
-    isSafari && window.location.reload(true);
+    window.location.reload(true);

    // Stop processing the script
    throw new Error('[Better xCloud] Executing workaround for Safari');
 }

-// Make sure it only run on /play
-if (!window.location.pathname.match(/^\/[a-zA-Z]{2}-[a-zA-Z]{2}\/play/)) {
-    throw new Error('[Better xCloud] Not xCloud page');
-}
-
-
+// Automatically reload the page when running into the "We are sorry..." error message
 window.addEventListener('load', e => {
-    // Automatically reload the page when running into the "We are sorry..." error message
    window.setTimeout(() => {
        if (document.body.classList.contains('legacyBackground')) {
            // Has error message -> reload page
@ -165,33 +88,6 @@ window.addEventListener('load', e => {
    }, 3000);
 });

-document.addEventListener('readystatechange', e => {
-    if (document.readyState !== 'interactive') {
-        return;
-    }
-
-    STATES.isSignedIn = !!window.xbcUser?.isSignedIn;
-
-    if (STATES.isSignedIn) {
-        // Preload Remote Play
-        if (isFullVersion()) {
-            RemotePlayManager.getInstance()?.initialize();
-        }
-    } else {
-        // Show Settings button in the header when not signed in
-        // window.setTimeout(HeaderSection.watchHeader, 2000);
-    }
-
-    // Hide "Play with Friends" skeleton section
-    if (getGlobalPref(GlobalPref.UI_HIDE_SECTIONS).includes(UiSection.FRIENDS) || getGlobalPref(GlobalPref.BLOCK_FEATURES).includes(BlockFeature.FRIENDS)) {
-        const $parent = document.querySelector('div[class*=PlayWithFriendsSkeleton]')?.closest<HTMLElement>('div[class*=HomePage-module]');
-        $parent && ($parent.style.display = 'none');
-    }
-
-    // Preload fonts
-    preloadFonts();
-})
-
 window.BX_EXPOSED = BxExposed;

 // Hide Settings UI when navigate to another page
@ -203,271 +99,153 @@ window.addEventListener('popstate', onHistoryChanged);
 window.history.pushState = patchHistoryMethod('pushState');
 window.history.replaceState = patchHistoryMethod('replaceState');

-BxEventBus.Script.on('ui.header.rendered', () => {
-    HeaderSection.getInstance().checkHeader();
+window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => {
+    // Start rendering UI
+    if (document.querySelector('div[class^=UnsupportedMarketPage]')) {
+        window.setTimeout(watchHeader, 2000);
+    } else {
+        watchHeader();
+    }
 });

-BxEventBus.Stream.on('state.loading', () => {
+window.addEventListener(BxEvent.STREAM_LOADING, e => {
    // Get title ID for screenshot's name
-    if (window.location.pathname.includes('/launch/') && STATES.currentStream.titleInfo) {
-        STATES.currentStream.titleSlug = productTitleToSlug(STATES.currentStream.titleInfo.productInfo.title);
+    if (window.location.pathname.includes('/launch/')) {
+        const matches = /\/launch\/(?<title_id>[^\/]+)\/(?<product_id>\w+)/.exec(window.location.pathname);
+        if (matches?.groups) {
+            STATES.currentStream.titleId = matches.groups.title_id;
+            STATES.currentStream.productId = matches.groups.product_id;
+        }
    } else {
-        STATES.currentStream.titleSlug = 'remote-play';
+        STATES.currentStream.titleId = 'remote-play';
+        STATES.currentStream.productId = '';
    }
+
+    // Setup UI
+    setupBxUi();
+
+
 });

 // Setup loading screen
-getGlobalPref(GlobalPref.LOADING_SCREEN_GAME_ART) && BxEventBus.Script.on('titleInfo.ready', LoadingScreen.setup);
+getPref(PrefKey.UI_LOADING_SCREEN_GAME_ART) && window.addEventListener(BxEvent.TITLE_INFO_READY, LoadingScreen.setup);

-BxEventBus.Stream.on('state.starting', () => {
+window.addEventListener(BxEvent.STREAM_STARTING, e => {
    // Hide loading screen
    LoadingScreen.hide();

-    if (isFullVersion()) {
-        // Start hiding cursor
-        const cursorHider = MouseCursorHider.getInstance();
-        if (cursorHider) {
-            cursorHider.start();
-            cursorHider.hide();
-        }
+    // Start hiding cursor
+    if (!getPref(PrefKey.MKB_ENABLED) && getPref(PrefKey.MKB_HIDE_IDLE_CURSOR)) {
+        MouseCursorHider.start();
+        MouseCursorHider.hide();
    }
 });

-BxEventBus.Stream.on('state.playing', payload => {
-    if (isFullVersion()) {
-        window.BX_STREAM_SETTINGS = StreamSettings.settings;
-        StreamSettings.refreshAllSettings();
-    }
+window.addEventListener(BxEvent.STREAM_PLAYING, e => {
+    const $video = (e as any).$video;
+    STATES.currentStream.$video = $video;

    STATES.isPlaying = true;
-
-    if (isFullVersion()) {
-        const gameBar = GameBar.getInstance();
-        if (gameBar) {
-            gameBar.reset();
-            gameBar.enable();
-            gameBar.showBar();
-        }
-
-        // Setup Keyboard shortcuts
-        KeyboardShortcutHandler.getInstance().start();
-
-        // Setup screenshot
-        const $video = payload.$video as HTMLVideoElement;
-        ScreenshotManager.getInstance().updateCanvasSize($video.videoWidth, $video.videoHeight);
-
-        // Setup local co-op
-        if (getStreamPref(StreamPref.LOCAL_CO_OP_ENABLED)) {
-            BxExposed.toggleLocalCoOp(true);
-            Toast.show(t('local-co-op'), t('enabled'));
-        }
+    injectStreamMenuButtons();
+    /*
+    if (getPref(Preferences.CONTROLLER_ENABLE_SHORTCUTS)) {
+        GamepadHandler.startPolling();
    }
+    */

-    updateVideoPlayer();
-});
+    const PREF_SCREENSHOT_BUTTON_POSITION = getPref(PrefKey.SCREENSHOT_BUTTON_POSITION);
+    STATES.currentStream.$screenshotCanvas!.width = $video.videoWidth;
+    STATES.currentStream.$screenshotCanvas!.height = $video.videoHeight;
+    updateVideoPlayerCss();

-BxEventBus.Script.on('ui.error.rendered', () => {
-    BxEventBus.Stream.emit('state.stopped', {});
-});
+    // Setup screenshot button
+    if (PREF_SCREENSHOT_BUTTON_POSITION !== 'none') {
+        const $btn = document.querySelector('.bx-screenshot-button')! as HTMLElement;
+        $btn.style.display = 'block';

-BxEventBus.Script.on('ui.guideHome.rendered', () => {
-    const $root = document.querySelector<HTMLElement>('#gamepass-dialog-root div[role=dialog] div[role=tabpanel] div[class*=HomeLandingPage]');
-    $root && GuideMenu.getInstance().injectHome($root, STATES.isPlaying);
-});
-
-BxEventBus.Script.on('ui.guideAchievementProgress.rendered', () => {
-    const $elm = document.querySelector('#gamepass-dialog-root button[class*=AchievementsButton-module__progressBarContainer]');
-    if ($elm) {
-        TrueAchievements.getInstance().injectAchievementsProgress($elm as HTMLElement);
+        if (PREF_SCREENSHOT_BUTTON_POSITION === 'bottom-right') {
+            $btn.style.right = '0';
+        } else {
+            $btn.style.left = '0';
+        }
    }
 });

-BxEventBus.Script.on('ui.guideAchievementDetail.rendered', () => {
-    const $elm = document.querySelector('#gamepass-dialog-root div[class^=AchievementDetailPage-module]');
-    if ($elm) {
-        TrueAchievements.getInstance().injectAchievementDetailPage($elm as HTMLElement);
-    }
+window.addEventListener(BxEvent.STREAM_ERROR_PAGE, e => {
+    BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
 });

-BxEventBus.Stream.on('ui.streamMenu.rendered', async () => {
-    await StreamUiHandler.handleStreamMenu();
-});
-
-BxEventBus.Stream.on('ui.streamHud.rendered', async () => {
-    const $elm = document.querySelector<HTMLElement>('#StreamHud');
-    $elm && StreamUiHandler.handleSystemMenu($elm);
-});
-
-
-isFullVersion() && window.addEventListener(BxEvent.XCLOUD_RENDERING_COMPONENT, e => {
-    const component = (e as any).component;
-    if (component === 'product-detail') {
-        ProductDetailsPage.injectButtons();
-    }
-});
-
-// Detect game change
-BxEventBus.Stream.on('dataChannelCreated', payload => {
-    const { dataChannel } = payload;
-    if (dataChannel?.label !== 'message') {
-        return;
-    }
-
-    dataChannel.addEventListener('message', async (msg: MessageEvent) => {
-        if (msg.origin === 'better-xcloud' || typeof msg.data !== 'string') {
-            return;
-        }
-
-        if (!msg.data.includes('/titleinfo')) {
-            return;
-        }
-
-        // Get xboxTitleId from message
-        const currentStream = STATES.currentStream;
-        const json = JSON.parse(JSON.parse(msg.data).content);
-        const currentId = currentStream.xboxTitleId ?? null;
-        let newId: number = parseInt(json.titleid, 16);
-
-        // Get titleSlug for Remote Play
-        if (window.location.pathname.includes('/play/consoles/launch/')) {
-            currentStream.titleSlug = 'remote-play';
-            if (json.focused) {
-                const productTitle = await XboxApi.getProductTitle(newId);
-                if (productTitle) {
-                    currentStream.titleSlug = productTitleToSlug(productTitle);
-                } else {
-                    newId = -1;
-                }
-            } else {
-                newId = 0;
-            }
-        }
-
-        if (currentId !== newId) {
-            currentStream.xboxTitleId = newId;
-            BxEventBus.Stream.emit('xboxTitleId.changed', {
-                id: newId,
-            });
-        }
-    });
-});
-
-
-function unload() {
+window.addEventListener(BxEvent.STREAM_STOPPED, e => {
    if (!STATES.isPlaying) {
        return;
    }

-    BxLogger.warning('Unloading');
-    if (isFullVersion()) {
-        KeyboardShortcutHandler.getInstance().stop();
-
-        // Stop MKB listeners
-        EmulatedMkbHandler.getInstance()?.destroy();
-        NativeMkbHandler.getInstance()?.destroy();
-
-        DeviceVibrationManager.getInstance()?.reset();
-    }
-
-    // Destroy StreamPlayer
-    STATES.currentStream.streamPlayerManager?.destroy();
-
    STATES.isPlaying = false;
-    STATES.currentStream = {};
-    window.BX_EXPOSED.shouldShowSensorControls = false;
-    window.BX_EXPOSED.stopTakRendering = false;

-    NavigationDialogManager.getInstance().hide();
-    StreamStats.getInstance().destroy();
-    StreamBadges.getInstance().destroy();
+    // Stop MKB listeners
+    getPref(PrefKey.MKB_ENABLED) && MkbHandler.INSTANCE.destroy();

-    if (isFullVersion()) {
-        MouseCursorHider.getInstance()?.stop();
-        TouchController.reset();
-
-        GameBar.getInstance()?.disable();
-
-        BxEventBus.Stream.emit('xboxTitleId.changed', { id: -1 });
+    const $quickBar = document.querySelector('.bx-quick-settings-bar');
+    if ($quickBar) {
+        $quickBar.classList.add('bx-gone');
    }
-}

-BxEventBus.Stream.on('state.stopped', unload);
-window.addEventListener('pagehide', e => {
-    BxEventBus.Stream.emit('state.stopped', {});
-});
+    STATES.currentStream.audioGainNode = null;
+    STATES.currentStream.$video = null;
+    StreamStats.onStoppedPlaying();

-isFullVersion() && window.addEventListener(BxEvent.CAPTURE_SCREENSHOT, e => {
-    ScreenshotManager.getInstance().takeScreenshot();
+    const $screenshotBtn = document.querySelector('.bx-screenshot-button');
+    if ($screenshotBtn) {
+        $screenshotBtn.removeAttribute('style');
+    }
+
+    MouseCursorHider.stop();
+    TouchController.reset();
 });


 function main() {
-    GhPagesUtils.fetchLatestCommit();
-
-    if (isFullVersion()) {
-        if (getGlobalPref(GlobalPref.NATIVE_MKB_MODE) !== NativeMkbMode.OFF) {
-            const customList = getGlobalPref(GlobalPref.NATIVE_MKB_FORCED_GAMES);
-            BX_FLAGS.ForceNativeMkbTitles.push(...customList);
-        }
-    }
-
-    StreamSettings.setup();
-
    // Monkey patches
    patchRtcPeerConnection();
    patchRtcCodecs();
    interceptHttpRequests();
    patchVideoApi();
-    patchCanvasContext();
-    isFullVersion() && AppInterface && patchPointerLockApi();

-    getGlobalPref(GlobalPref.AUDIO_VOLUME_CONTROL_ENABLED) && patchAudioContext();
-
-    if (getGlobalPref(GlobalPref.BLOCK_TRACKING)) {
-        patchMeControl();
-        disableAdobeAudienceManager();
+    if (getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL)) {
+        patchAudioContext();
    }

+    PreloadedState.override();
+
+    VibrationManager.initialSetup();
+
+    // Check for Update
+    BX_FLAGS.CheckForUpdate && checkForUpdate();
+
    // Setup UI
    addCss();
+    Toast.setup();
+    BX_FLAGS.PreloadUi && setupBxUi();

-    StreamStatsCollector.setupEvents();
    StreamBadges.setupEvents();
    StreamStats.setupEvents();
+    MkbHandler.setupEvents();

-    if (isFullVersion()) {
-        WebGPUPlayer.prepare();
+    Patcher.initialize();

-        STATES.userAgent.capabilities.touch && TouchController.updateCustomList();
-
-        DeviceVibrationManager.getInstance();
-
-        // Check for Update
-        BX_FLAGS.CheckForUpdate && checkForUpdate();
-
-        Patcher.init();
-        disablePwa();
-
-        if (getGlobalPref(GlobalPref.TOUCH_CONTROLLER_MODE) === TouchControllerMode.ALL) {
-            TouchController.setup();
-        }
-
-        // Start PointerProviderServer
-        if (AppInterface && (getGlobalPref(GlobalPref.MKB_ENABLED) || getGlobalPref(GlobalPref.NATIVE_MKB_MODE) === NativeMkbMode.ON)) {
-            STATES.pointerServerPort = AppInterface.startPointerServer() || 9269;
-            BxLogger.info('startPointerServer', 'Port', STATES.pointerServerPort.toString());
-        }
-
-        // Show wait time in game card
-        getGlobalPref(GlobalPref.UI_GAME_CARD_SHOW_WAIT_TIME) && GameTile.setup();
-
-        EmulatedMkbHandler.setupEvents();
-    }
+    disablePwa();

    // Show a toast when connecting/disconecting controller
-    if (getGlobalPref(GlobalPref.UI_CONTROLLER_SHOW_STATUS)) {
-        window.addEventListener('gamepadconnected', e => showGamepadToast(e.gamepad));
-        window.addEventListener('gamepaddisconnected', e => showGamepadToast(e.gamepad));
+    window.addEventListener('gamepadconnected', e => showGamepadToast(e.gamepad));
+    window.addEventListener('gamepaddisconnected', e => showGamepadToast(e.gamepad));
+
+    // Preload Remote Play
+    if (getPref(PrefKey.REMOTE_PLAY_ENABLED)) {
+        RemotePlay.detect();
+    }
+
+    if (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all') {
+        TouchController.setup();
    }
 }

--- a/src/macros/build.ts
+++ b/src/macros/build.ts
@ -1,41 +1,13 @@
 import stylus from 'stylus';

-export const isFullVersion = () => {
-    return Bun.env.BUILD_VARIANT === 'full';
-};
+// @ts-ignore
+import cssStr from "../assets/css/styles.styl" with { type: "text" };

-export const isLiteVersion = () => {
-    return Bun.env.BUILD_VARIANT === 'lite';
-};
-
-export const renderStylus = async () => {
-    const file = Bun.file('./src/assets/css/styles.styl');
-    const cssStr = await file.text();
-
-    const generatedCss = await (stylus(cssStr, {})
-        .set('filename', 'styles.css')
-        .set('compress', true)
-        .include('src/assets/css/'))
-        .render();
+const generatedCss = await (stylus(cssStr, {})
+	.set('filename', 'styles.css')
+	.include('src/assets/css/'))
+	.render();

+export const renderStylus = () => {
    return generatedCss;
 };
-
-
-export const compressCss = (css: string) => {
-    return (stylus(css, {}).set('compress', true)).render();
-};
-
-export const compressCode = (code: string): string => {
-    return code.split('\n') // Split into lines
-        .map(line => line.startsWith('#') || line.startsWith('@') ? line + '\n' : line.trim()) // Trim spaces, with exceptions for shader files
-        .filter(line => line && !line.startsWith('//')) // Remove empty and commented lines
-        .join(''); // Join into a single line
-};
-
-export const compressCodeFile = async (path: string) => {
-    const file = Bun.file(path);
-    const code = await file.text();
-
-    return compressCode(code);
-};
--- a/src/modules/controller-shortcut.ts
+++ b/src/modules/controller-shortcut.ts
@ -1,55 +0,0 @@
-import { GamepadKey } from "@enums/gamepad";
-import { ShortcutHandler } from "@/utils/shortcut-handler";
-
-
-export class ControllerShortcut {
-    private static buttonsCache: { [key: string]: boolean[] } = {};
-    private static buttonsStatus: { [key: string]: boolean[] } = {};
-
-    static reset(index: number) {
-        ControllerShortcut.buttonsCache[index] = [];
-        ControllerShortcut.buttonsStatus[index] = [];
-    }
-
-    static handle(gamepad: Gamepad): boolean {
-        const controllerSettings = window.BX_STREAM_SETTINGS.controllers[gamepad.id];
-        if (!controllerSettings) {
-            return false;
-        }
-
-        const actions = controllerSettings.shortcuts;
-        if (!actions) {
-            return false;
-        }
-
-        const gamepadIndex = gamepad.index;
-
-        // Move the buttons status from the previous frame to the cache
-        ControllerShortcut.buttonsCache[gamepadIndex] = ControllerShortcut.buttonsStatus[gamepadIndex].slice(0);
-        // Clear the buttons status
-        ControllerShortcut.buttonsStatus[gamepadIndex] = [];
-
-        const pressed: boolean[] = [];
-        let otherButtonPressed = false;
-
-        const entries = gamepad.buttons.entries();
-        let index: GamepadKey;
-        let button: GamepadButton;
-        for ([index, button] of entries) {
-            // Only add the newly pressed button to the array (holding doesn't count)
-            if (button.pressed && index !== GamepadKey.HOME) {
-                otherButtonPressed = true;
-                pressed[index] = true;
-
-                // If this is newly pressed button -> run action
-                if (actions[index] && !ControllerShortcut.buttonsCache[gamepadIndex][index]) {
-                    const idx = index;
-                    setTimeout(() => ShortcutHandler.runAction(actions[idx]!), 0);
-                }
-            }
-        };
-
-        ControllerShortcut.buttonsStatus[gamepadIndex] = pressed;
-        return otherButtonPressed;
-    }
-}
--- a/Show More
+++ b/Show More