add patch caching

make that actually work lol
add * option for route in itempatches
2026-06-13 20:25:04 +03:00 · 2022-12-31 23:27:04 -05:00 · 2022-12-31 22:52:37 -05:00 · 2022-12-31 22:46:39 -05:00 · 2022-12-31 22:00:38 -05:00 · 2022-12-31 21:53:39 -05:00
58 changed files with 971 additions and 1458 deletions
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+[A clear and concise description of what the bug is.]
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+[A clear and concise description of what you expected to happen.]
+
+**Screenshots**
+[If applicable, add screenshots to help explain your problem.]
+
+**Version information**
+ - SteamOS Version: ``[Run ``uname -a`` and place the output here. Leave the single quotations outside.]``
+ - Selected Update Channel: [Stable, Beta or Preview.]
+
+**Logs**
+[Please reboot your deck (if possible) when attempting to recreate the issue, then run
+``cd ~ && journalctl -b0  -u plugin_loader.service > backendlog.txt``. This will save the log file to ``~`` aka ``/home/deck``. Please upload the file here in place of this textblock.]
+
+**Additional context**
+Have you modified the read-only filesystem at any point?  
+[Yes or No.]
@@ -1,74 +0,0 @@
-name: Bug report
-description: File a bug/issue
-title: "[BUG] <title>"
-labels: [bug]
-body:
-  - type: checkboxes
-    id: low-effort-checks
-    attributes:
-      label: Please confirm
-      description: Issues without all checks may be ignored/closed.
-      options:
-        - label: I have searched existing issues
-        - label: This issue is not a duplicate of an existing one
-        - label: I have checked the [common issues section in the readme file](https://github.com/SteamDeckHomebrew/decky-loader#-common-issues)
-        - label: I have attached logs to this bug report (failure to include logs will mean your issue will not be responded too).
-
-  - type: textarea
-    attributes:
-      label: Bug Report Description
-      description: A clear and concise description of what the bug is and if possible, the steps you used to get to the bug. If appropriate, include screenshots or videos.
-      placeholder: |
-        When I try to use ...
-
-        Steps to reproduce the behavior:
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Expected Behaviour
-      description: A brief description of the expected behavior.
-      placeholder: It should be ...
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: SteamOS version
-#      description: Can be found with `uname -a`
-#      placeholder: "Linux steamdeck 5.13.0-valve36-1-neptune #1 SMP PREEMPT Mon, 19 Dec 2022 23:39:41 +0000 x86_64 GNU/Linux"
-      placeholder: "SteamOS 3.4.3 Stable"
-    validations:
-      required: true
-
-  - type: dropdown
-    attributes:
-      label: Selected Update Channel
-      description: Which branch of Decky are you on?
-      multiple: false
-      options:
-         - Stable
-         - Prerelease
-    validations:
-      required: true
-
-  - type: input
-    attributes:
-      label: Have you modified the read-only filesystem at any point?
-      description: Describe how here, if you haven't done anything you can leave this blank
-      placeholder: Yes, I've installed neofetch via pacman.
-    validations:
-      required: false
-
-  - type: textarea
-    attributes:
-      label: Logs
-      description: Please reboot your deck (if possible) when attempting to recreate the issue, then run ``cd ~ && journalctl -b0  -u plugin_loader.service > deckylog.txt``. This will save the log file to ``~`` aka ``/home/deck``. Please upload the file here
-      placeholder: deckylog.txt
-    validations:
-      required: true
@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Steam Deck Homebrew Discord Server
-    url: https://discord.gg/ZU74G2NJzk
-    about: Please ask and answer questions here.
@@ -1,35 +0,0 @@
-name: Feature request
-description: Request a new feature (NOT A PLUGIN)
-title: "[Request] <title>"
-labels: [feature request]
-body:
-  - type: checkboxes
-    id: low-effort-checks
-    attributes:
-      label: Please confirm
-      description: Issues without all checks may be ignored/closed.
-      options:
-        - label: I have searched existing issues
-        - label: This issue is not a duplicate of an existing one
-        - label: This is not a request for a plugin
-
-  - type: textarea
-    attributes:
-      label: Feature Request Description
-      description: A clear and concise description of what the new feature. 
-      placeholder: |
-        Decky plugins should be sortable in the quick access menu
-    validations:
-      required: true
-
-  - type: textarea
-    attributes:
-      label: Further Description
-      description: A further explanation of the feature. If appropriate, include screenshots or videos.
-      placeholder: |
-        This would help make the UI clearer and easier to use as there is less clutter in the QAM.
-        It would also make it faster to access plugins that are used more.
-
-        This could be implemented by adding ...
-    validations:
-      required: false
@@ -69,7 +69,7 @@ jobs:
      run: pnpm run build

    - name: Build Python Backend 🛠️
-      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/legacy:/legacy --add-data ./plugin:/plugin ./backend/*.py
+      run: pyinstaller --noconfirm --onefile --name "PluginLoader" --add-data ./backend/static:/static --add-data ./backend/legacy:/legacy ./backend/*.py
        
    - name: Upload package artifact ⬆️
      if: ${{ !env.ACT }}
@@ -130,7 +130,9 @@ jobs:
            OUT=$(semver bump ${{github.event.inputs.bump}} "$OUT")
            printf "OUT: ${OUT}\n"
          else
-            printf "no type selected, not bumping for release.\n"
+            printf "no type selected, defaulting to patch.\n"
+            OUT=$(semver bump patch "$OUT")
+            printf "OUT: ${OUT}\n"
          fi
        elif [[ ! "$VERSION" =~ "-pre" ]]; then
          printf "previous tag is a release, bumping by selected type.\n"
@@ -157,7 +159,7 @@ jobs:
      uses: softprops/action-gh-release@v1
      if: ${{ github.event_name == 'workflow_dispatch' && !env.ACT  }}
      with:
-        name: Release ${{ steps.ready_tag.outputs.tag_name }}
+        name: Prerelease ${{ steps.ready_tag.outputs.tag_name }}
        tag_name: ${{ steps.ready_tag.outputs.tag_name }}
        files: ./dist/PluginLoader
        prerelease: false
@@ -1,47 +0,0 @@
-name: Push Updated Plugin Stub to Template
-
-on: push
-
-jobs:
-  copy-stub:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@8230315d06ad95c617244d2f265d237a1682d445
-      with:
-        ref: ${{ github.sha }}
-        fetch-depth: 0
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Checkout
-      uses: actions/checkout@v2
-      
-    - name: Is stub changed
-      id: changed-stub
-      run: |
-        STUB_CHANGED="false"
-        PATHS=(plugin plugin/decky_plugin.pyi)
-        SHA=${{ github.sha }}
-        SHA_PREV=$(git rev-list --parents -n 1 $SHA)
-        FILES=$(git diff $SHA_PREV..$SHA --name-only -- ${PATHS[@]} | jq -Rsc 'split("\n")[:-1] | join (",")')
-        if [[ "$FILES" == *"plugin/decky_plugin.pyi"* ]]; then
-          $STUB_CHANGED="true"
-          echo "Stub has changed, pushing updated stub"
-        else
-          echo "Stub has not changed, exiting."
-          echo "has_changed=$STUB_CHANGED" >> $GITHUB_OUTPUT
-          exit 0
-        fi
-        echo "has_changed=$STUB_CHANGED" >> $GITHUB_OUTPUT
-
-    - name: Push updated stub
-      if: steps.changed-stub.outputs.has_changed == true
-      uses: dmnemec/copy_file_to_another_repo_action@bbebd3da22e4a37d04dca5f782edd5201cb97083
-      env:
-        API_TOKEN_GITHUB: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        source_file: 'plugin/decky_plugin.pyi'
-        destination_repo: 'SteamDeckHomebrew/decky-plugin-template'
-        user_email: '11465594+TrainDoctor@users.noreply.github.com'
-        user_name: 'TrainDoctor'
-        commit_message: 'Updated template with latest plugin stub changes'
@@ -1,17 +0,0 @@
-name: Lint
-
-on:
-  push:
-
-jobs:
-  lint:
-    name: Run linters
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2 # Check out the repository first.
-      - name: Run prettier (JavaScript & TypeScript)
-        run: |
-          pushd frontend
-          npm install
-          npm run lint
@@ -1,9 +1,7 @@
 <h1 align="center">
-  <a name="logo" href="https://deckbrew.xyz/"><img src="https://deckbrew.xyz/static/icon-45ca1f5aea376a9ad37e92db906f283e.png" alt="Deckbrew logo" width="200"></a>
+  <a name="logo" href="https://deckbrew.xyz/"><img src="https://deckbrew.xyz/logo.png" alt="Deckbrew logo" width="200"></a>
  <br>
  Decky Loader
-  <br>
-  <a name="logo" href="https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/decky_installer.desktop"><img src="./docs/images/download_button.png"  alt="Download decky" width="350"></a>
 </h1>

 <p align="center">
@@ -11,7 +9,7 @@
  <a href="https://github.com/SteamDeckHomebrew/decky-loader/stargazers"><img src="https://img.shields.io/github/stars/SteamDeckHomebrew/decky-loader" /></a>
  <a href="https://github.com/SteamDeckHomebrew/decky-loader/commits/main"><img src="https://img.shields.io/github/last-commit/SteamDeckHomebrew/decky-loader.svg" /></a>
  <a href="https://github.com/SteamDeckHomebrew/decky-loader/blob/main/LICENSE"><img src="https://img.shields.io/github/license/SteamDeckHomebrew/decky-loader" /></a>
-  <a href="https://deckbrew.xyz/discord"><img src="https://img.shields.io/discord/960281551428522045?color=%235865F2&label=discord" /></a>
+  <a href="https://discord.gg/ZU74G2NJzk"><img src="https://img.shields.io/discord/960281551428522045?color=%235865F2&label=discord" /></a>
  <br>
  <br>
  <img src="https://media.discordapp.net/attachments/966017112244125756/1012466063893610506/main.jpg" alt="Decky screenshot" width="80%">
@@ -36,10 +34,13 @@ For more information about Decky Loader as well as documentation and development
 - Crankshaft is incompatible with Decky Loader. If you are using Crankshaft, please uninstall it before installing Decky Loader.
 - Syncthing may use port 8080 on Steam Deck, which Decky Loader needs to function. If you are using Syncthing as a service, please change its port to something else.
 - If you are using any software that uses port 1337 or 8080, please change its port to something else or uninstall it.
- If you run the installer and it just opens a file in a text editor: click the (...) button in the top right of dolphin (the file manager) then 'configure' and 'configure dolphin'. Click on the 'confirmations' tab and set 'when opening an executable file' to 'run script'.

 ## 💾 Installation
- This installation can be done without an admin/sudo password set.
+
+1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Settings menu.
+1. Navigate to the System menu and scroll to the System Settings. Toggle "Enable Developer Mode" so it is enabled.
+1. Navigate to the Developer menu and scroll to Miscellaneous. Toggle "CEF Remote Debugging" so it is enabled.
+1. Select "Restart Now" to apply your changes.
 1. Prepare a mouse and keyboard if possible.
   - Keyboards and mice can be connected to the Steam Deck via USB-C or Bluetooth.
   - Many Bluetooth keyboard and mouse apps are available for iOS and Android.
@@ -47,27 +48,24 @@ For more information about Decky Loader as well as documentation and development
   - If you have no other options, use the right trackpad as a mouse and press <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16>+<img src="./docs/images/light/x.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/x.svg#gh-light-mode-only" height=16> to open the on-screen keyboard as needed.
 1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Power menu.
 1. Select "Switch to Desktop".
-1. Navigate to this Github page on a browser of your choice.
-1. Press the 'Download' button at the top of the page.
-1. Run the downloaded file by clicking on it in Dolphin (the file manager).
-1. Either type your admin password or allow Decky to temporarily set your password to `Decky!`
-1. Choose the version of Decky Loader you want to install.
+1. Open the Konsole app and enter the command `passwd`. You can skip this step if you have already created a sudo password using this command. ([YouTube Guide](https://www.youtube.com/watch?v=1vOMYGj22rQ))
+1. You will be prompted to create a password. Your text will not be visible. After you press enter, you will need to type your password again to confirm.
+1. Choose the version of Decky Loader you want to install and paste the following command into the Konsole app.
   - **Latest Release**  
     Intended for most users. This is the latest stable version of Decky Loader.  
+     `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_release.sh | sh`
   - **Latest Pre-Release**  
-     Intended for plugin developers. Pre-releases are unlikely to be fully stable but contain the latest changes. For more information on plugin development, please consult [the wiki page](https://deckbrew.xyz/en/loader-dev/development).
+     Intended for plugin developers. Pre-releases are unlikely to be fully stable but contain the latest changes. For more information on plugin development, please consult [the wiki page](https://deckbrew.xyz/en/loader-dev/development).  
+     `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/install_prerelease.sh | sh`
 1. Open the Return to Gaming Mode shortcut on your desktop.

- There is also a fast install for those who can use Konsole. Run `curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/install_release.sh | sh` and type your password when prompted.
-
 ### 👋 Uninstallation

-We are sorry to see you go! If you are considering uninstalling because you are having issues, please consider [opening an issue](https://github.com/SteamDeckHomebrew/decky-loader/issues) or [joining our Discord](https://deckbrew.xyz/discord) so we can help you and other users.
+We are sorry to see you go! If you are considering uninstalling because you are having issues, please consider [opening an issue](https://github.com/SteamDeckHomebrew/decky-loader/issues) or [joining our Discord](https://discord.gg/ZU74G2NJzk) so we can help you and other users.

 1. Press the <img src="./docs/images/light/steam.svg#gh-dark-mode-only" height=16><img src="./docs/images/dark/steam.svg#gh-light-mode-only" height=16> button and open the Power menu.
 1. Select "Switch to Desktop".
-1. Run the installer file again, and select `uninstall decky loader` 
- There is also a fast uninstall for those who can use Konsole. Run `curl -L https://github.com/SteamDeckHomebrew/decky-installer/releases/latest/download/uninstall.sh | sh` and type your password when prompted.
+1. Open the Konsole app and run `curl -L https://github.com/SteamDeckHomebrew/decky-loader/raw/main/dist/uninstall.sh | sh`.

 ## 🚀 Getting Started

@@ -84,16 +82,15 @@ Now that you have Decky Loader installed, you can start using plugins. Each plug

 ### 🛠️ Plugin Development

-There is no complete plugin development documentation yet. However a good starting point is the [plugin template repository](https://github.com/SteamDeckHomebrew/decky-plugin-template). Consider [joining our Discord](https://deckbrew.xyz/discord) if you have any questions.
+There is no complete plugin development documentation yet. However a good starting point is the [plugin template repository](https://github.com/SteamDeckHomebrew/decky-plugin-template). Consider [joining our Discord](https://discord.gg/ZU74G2NJzk) if you have any questions.

 ### 🤝 Contributing

-Please consult [the wiki page regarding development](https://wiki.deckbrew.xyz/en/loader-dev/development) for more information on installing development versions of Decky Loader. You can also install the Steam Deck UI on a Windows or Linux computer for testing by following [this YouTube guide](https://youtu.be/1IAbZte8e7E?t=112).
+Please consult [the wiki page regarding development](https://deckbrew.xyz/en/loader-dev/development) for more information on installing development versions of Decky Loader. You can also install the Steam Deck UI on a Windows or Linux computer for testing by following [this YouTube guide](https://youtu.be/1IAbZte8e7E?t=112).

 1. Clone the repository using the latest commit to main before starting your PR.
 1. In your clone of the repository, run these commands.
   ```bash
-   cd frontend
   pnpm i
   pnpm run build
   ```
@@ -26,10 +26,10 @@ cd ..

 if [[ "$type" == "release" ]]; then
    printf "release!\n"
-    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts --container-architecture linux/amd64
+    act workflow_dispatch -e act/release.json --artifact-server-path act/artifacts
 elif [[ "$type" == "prerelease" ]]; then
    printf "prerelease!\n"
-    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts --container-architecture linux/amd64
+    act workflow_dispatch -e act/prerelease.json --artifact-server-path act/artifacts
 else
    printf "Release type unspecified/badly specified.\n"
    printf "Options: 'release' or 'prerelease'\n"
@@ -1,7 +1,5 @@
 # Full imports
 import json
-# import pprint
-# from pprint import pformat

 # Partial imports
 from aiohttp import ClientSession, web
@@ -42,7 +40,7 @@ class PluginBrowser:
            return False
        zip_file = ZipFile(zip)
        zip_file.extractall(self.plugin_path)
-        plugin_dir = path.join(self.plugin_path, self.find_plugin_folder(name))
+        plugin_dir = self.find_plugin_folder(name)
        code_chown = call(["chown", "-R", get_user()+":"+get_user_group(), plugin_dir])
        code_chmod = call(["chmod", "-R", "555", plugin_dir])
        if code_chown != 0 or code_chmod != 0:
@@ -92,7 +90,6 @@ class PluginBrowser:

        return rv

-    """Return the filename (only) for the specified plugin"""
    def find_plugin_folder(self, name):
        for folder in listdir(self.plugin_path):
            try:
@@ -100,7 +97,7 @@ class PluginBrowser:
                    plugin = json.load(f)

                if plugin['name'] == name:
-                    return folder
+                    return str(path.join(self.plugin_path, folder))
            except:
                logger.debug(f"skipping {folder}")

@@ -108,28 +105,20 @@ class PluginBrowser:
        if self.loader.watcher:
            self.loader.watcher.disabled = True
        tab = await get_gamepadui_tab()
-        plugin_dir = path.join(self.plugin_path, self.find_plugin_folder(name))
        try:
            logger.info("uninstalling " + name)
-            logger.info(" at dir " + plugin_dir)
-            logger.debug("calling frontend unload for %s" % str(name))
-            res = await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')")
-            logger.debug("result of unload from UI: %s", res)
-            # plugins_snapshot = self.plugins.copy()
-            # snapshot_string = pformat(plugins_snapshot)
-            # logger.debug("current plugins: %s", snapshot_string)
+            logger.info(" at dir " + self.find_plugin_folder(name))
+            logger.debug("unloading %s" % str(name))
+            await tab.evaluate_js(f"DeckyPluginLoader.unloadPlugin('{name}')")
            if self.plugins[name]:
-                logger.debug("Plugin %s was found", name)
                self.plugins[name].stop()
-                logger.debug("Plugin %s was stopped", name)
                del self.plugins[name]
-                logger.debug("Plugin %s was removed from the dictionary", name)
            logger.debug("removing files %s" % str(name))
-            rmtree(plugin_dir)
+            rmtree(self.find_plugin_folder(name))
        except FileNotFoundError:
            logger.warning(f"Plugin {name} not installed, skipping uninstallation")
        except Exception as e:
-            logger.error(f"Plugin {name} in {plugin_dir} was not uninstalled")
+            logger.error(f"Plugin {name} in {self.find_plugin_folder(name)} was not uninstalled")
            logger.error(f"Error at %s", exc_info=e)
        if self.loader.watcher:
            self.loader.watcher.disabled = False
@@ -162,8 +151,7 @@ class PluginBrowser:
                logger.debug("Unzipping...")
                ret = self._unzip_to_plugin_dir(res_zip, name, hash)
                if ret:
-                    plugin_folder = self.find_plugin_folder(name)
-                    plugin_dir = path.join(self.plugin_path, plugin_folder)
+                    plugin_dir = self.find_plugin_folder(name)
                    ret = await self._download_remote_binaries_for_plugin_with_name(plugin_dir)
                    if ret:
                        logger.info(f"Installed {name} (Version: {version})")
@@ -171,7 +159,7 @@ class PluginBrowser:
                            self.loader.plugins[name].stop()
                            self.loader.plugins.pop(name, None)
                        await sleep(1)
-                        self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_folder)
+                        self.loader.import_plugin(path.join(plugin_dir, "main.py"), plugin_dir)
                    else:
                        logger.fatal(f"Failed Downloading Remote Binaries")
                else:
@@ -5,7 +5,6 @@ import ssl
 import subprocess
 import uuid
 import os
-import sys
 from subprocess import check_output
 from time import sleep
 from hashlib import sha256
@@ -20,6 +19,8 @@ REMOTE_DEBUGGER_UNIT = "steam-web-debug-portforward.service"
 # global vars
 csrf_token = str(uuid.uuid4())
 ssl_ctx = ssl.create_default_context(cafile=certifi.where())
+user = None
+group = None

 assets_regex = re.compile("^/plugins/.*/assets/.*")
 frontend_regex = re.compile("^/frontend/.*")
@@ -36,97 +37,65 @@ async def csrf_middleware(request, handler):
        return await handler(request)
    return Response(text='Forbidden', status='403')

-# Deprecated
+# Get the user by checking for the first logged in user. As this is run
+# by systemd at startup the process is likely to start before the user
+# logs in, so we will wait here until they are available. Note that
+# other methods such as getenv wont work as there was no $SUDO_USER to
+# start the systemd service.
 def set_user():
-    pass
+    global user
+    cmd = "who | awk '{print $1}' | sort | head -1"
+    while user == None:
+        name = check_output(cmd, shell=True).decode().strip()
+        if name not in [None, '']:
+            user = name
+        sleep(0.1)

-# Get the user id hosting the plugin loader
-def get_user_id() -> int:
-    proc_path = os.path.realpath(sys.argv[0])
-    pws = sorted(pwd.getpwall(), reverse=True, key=lambda pw: len(pw.pw_dir))
-    for pw in pws:
-        if proc_path.startswith(os.path.realpath(pw.pw_dir)):
-            return pw.pw_uid
-    raise PermissionError("The plugin loader does not seem to be hosted by any known user.")
-
-# Get the user hosting the plugin loader
+# Get the global user. get_user must be called first.
 def get_user() -> str:
-    return pwd.getpwuid(get_user_id()).pw_name
+    global user
+    if user == None:
+        raise ValueError("helpers.get_user method called before user variable was set. Run helpers.set_user first.")
+    return user

-# Get the effective user id of the running process
-def get_effective_user_id() -> int:
-    return os.geteuid()
-
-# Get the effective user of the running process
-def get_effective_user() -> str:
-    return pwd.getpwuid(get_effective_user_id()).pw_name
-
-# Get the effective user group id of the running process
-def get_effective_user_group_id() -> int:
-    return os.getegid()
-
-# Get the effective user group of the running process
-def get_effective_user_group() -> str:
-    return grp.getgrgid(get_effective_user_group_id()).gr_name
-
-# Get the user owner of the given file path.
+#Get the user owner of the given file path.
 def get_user_owner(file_path) -> str:
-    return pwd.getpwuid(os.stat(file_path).st_uid).pw_name
+    return pwd.getpwuid(os.stat(file_path).st_uid)[0]

-# Get the user group of the given file path.
+#Get the user group of the given file path.
 def get_user_group(file_path) -> str:
-    return grp.getgrgid(os.stat(file_path).st_gid).gr_name
+    return grp.getgrgid(os.stat(file_path).st_gid)[0]

-# Deprecated
+# Set the global user group. get_user must be called first
 def set_user_group() -> str:
-    return get_user_group()
+    global group
+    global user
+    if user == None:
+        raise ValueError("helpers.set_user_dir method called before user variable was set. Run helpers.set_user first.")
+    if group == None:
+        group = check_output(["id", "-g", "-n", user]).decode().strip()

-# Get the group id of the user hosting the plugin loader
-def get_user_group_id() -> int:
-    return pwd.getpwuid(get_user_id()).pw_gid
-
-# Get the group of the user hosting the plugin loader
+# Get the group of the global user. set_user_group must be called first.
 def get_user_group() -> str:
-    return grp.getgrgid(get_user_group_id()).gr_name
+    global group
+    if group == None:
+        raise ValueError("helpers.get_user_group method called before group variable was set. Run helpers.set_user_group first.")
+    return group

 # Get the default home path unless a user is specified
 def get_home_path(username = None) -> str:
    if username == None:
-        username = get_user()
-    return pwd.getpwnam(username).pw_dir
+        raise ValueError("Username not defined, no home path can be found.")
+    else:
+        return str("/home/"+username)

-# Get the default homebrew path unless a home_path is specified
+# Get the default homebrew path unless a user is specified
 def get_homebrew_path(home_path = None) -> str:
    if home_path == None:
-        home_path = get_home_path()
-    return os.path.join(home_path, "homebrew")
-
-# Recursively create path and chown as user
-def mkdir_as_user(path):
-    path = os.path.realpath(path)
-    os.makedirs(path, exist_ok=True)
-    chown_path = get_home_path()
-    parts = os.path.relpath(path, chown_path).split(os.sep)
-    uid = get_user_id()
-    gid = get_user_group_id()
-    for p in parts:
-        chown_path = os.path.join(chown_path, p)
-        os.chown(chown_path, uid, gid)
-
-# Fetches the version of loader
-def get_loader_version() -> str:
-    try:
-        with open(os.path.join(os.getcwd(), ".loader.version"), "r", encoding="utf-8") as version_file:
-            return version_file.readline().strip()
-    except:
-        return "unknown"
-
-# returns the appropriate system python paths
-def get_system_pythonpaths() -> list[str]:
-    # run as normal normal user to also include user python paths
-    proc = subprocess.run(["python3", "-c", "import sys; print(':'.join(x for x in sys.path if x))"],
-                          user=get_user_id(), env={}, capture_output=True)
-    return proc.stdout.decode().strip().split(":")
+        raise ValueError("Home path not defined, homebrew dir cannot be determined.")
+    else:
+        return str(home_path+"/homebrew")
+    # return str(home_path+"/homebrew")

 # Download Remote Binaries to local Plugin
 async def download_remote_binary_to_path(url, binHash, path) -> bool:
@@ -394,12 +394,9 @@ async def get_tab_lambda(test) -> Tab:
        raise ValueError(f"Tab not found by lambda")
    return tab

-def tab_is_gamepadui(t: Tab) -> bool:
-    return "https://steamloopback.host/routes/" in t.url and (t.title == "Steam Shared Context presented by Valve™" or t.title == "Steam" or t.title == "SP")
-
 async def get_gamepadui_tab() -> Tab:
    tabs = await get_tabs()
-    tab = next((i for i in tabs if tab_is_gamepadui(i)), None)
+    tab = next((i for i in tabs if ("https://steamloopback.host/routes/" in i.url and (i.title == "Steam" or i.title == "SP"))), None)
    if not tab:
        raise ValueError(f"GamepadUI Tab not found")
    return tab
@@ -408,11 +405,3 @@ async def inject_to_tab(tab_name, js, run_async=False):
    tab = await get_tab(tab_name)

    return await tab.evaluate_js(js, run_async)
-
-async def close_old_tabs():
-    tabs = await get_tabs()
-    for t in tabs:
-        if not t.title or (t.title != "Steam Shared Context presented by Valve™" and t.title != "Steam" and t.title != "SP"):
-            logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
-            await t.close()
-            await sleep(0.5)
@@ -6,9 +6,14 @@ from pathlib import Path
 from traceback import print_exc

 from aiohttp import web
-from os.path import exists
+from genericpath import exists
 from watchdog.events import RegexMatchingEventHandler
-from watchdog.observers import Observer
+from watchdog.utils import UnsupportedLibc
+
+try:
+    from watchdog.observers.inotify import InotifyObserver as Observer
+except UnsupportedLibc:
+    from watchdog.observers.fsevents import FSEventsObserver as Observer

 from injector import get_tab, get_gamepadui_tab
 from plugin import PluginWrapper
@@ -19,19 +19,27 @@ from aiohttp_jinja2 import setup as jinja_setup
 # local modules
 from browser import PluginBrowser
 from helpers import (REMOTE_DEBUGGER_UNIT, csrf_middleware, get_csrf_token,
-                     get_home_path, get_homebrew_path, get_user, get_user_group,
+                     get_home_path, get_homebrew_path, get_user,
+                     get_user_group, set_user, set_user_group,
                     stop_systemd_unit, start_systemd_unit)
-from injector import get_gamepadui_tab, Tab, get_tabs, close_old_tabs
+from injector import get_gamepadui_tab, Tab, get_tabs
 from loader import Loader
 from settings import SettingsManager
 from updater import Updater
 from utilities import Utilities

+# Ensure USER and GROUP vars are set first.
+# TODO: This isn't the best way to do this but supports the current
+# implementation. All the config load and environment setting eventually be
+# moved into init or a config/loader method.
+set_user()
+set_user_group()
 USER = get_user()
 GROUP = get_user_group()
-HOMEBREW_PATH = get_homebrew_path()
+HOME_PATH = "/home/"+USER
+HOMEBREW_PATH = HOME_PATH+"/homebrew"
 CONFIG = {
-    "plugin_path": getenv("PLUGIN_PATH", path.join(HOMEBREW_PATH, "plugins")),
+    "plugin_path": getenv("PLUGIN_PATH", HOMEBREW_PATH+"/plugins"),
    "chown_plugin_path": getenv("CHOWN_PLUGIN_PATH", "1") == "1",
    "server_host": getenv("SERVER_HOST", "127.0.0.1"),
    "server_port": int(getenv("SERVER_PORT", "1337")),
@@ -48,15 +56,12 @@ basicConfig(

 logger = getLogger("Main")

-def chown_plugin_dir():
+async def chown_plugin_dir():
    code_chown = call(["chown", "-R", USER+":"+GROUP, CONFIG["plugin_path"]])
    code_chmod = call(["chmod", "-R", "555", CONFIG["plugin_path"]])
    if code_chown != 0 or code_chmod != 0:
        logger.error(f"chown/chmod exited with a non-zero exit code (chown: {code_chown}, chmod: {code_chmod})")

-if CONFIG["chown_plugin_path"] == True:
-    chown_plugin_dir()
-
 class PluginManager:
    def __init__(self, loop) -> None:
        self.loop = loop
@@ -82,6 +87,8 @@ class PluginManager:
                self.loop.create_task(start_systemd_unit(REMOTE_DEBUGGER_UNIT))
            else:
                self.loop.create_task(stop_systemd_unit(REMOTE_DEBUGGER_UNIT))
+            if CONFIG["chown_plugin_path"] == True:
+                chown_plugin_dir()
            self.loop.create_task(self.loader_reinjector())
            self.loop.create_task(self.load_plugins())

@@ -163,7 +170,12 @@ class PluginManager:
        try:
            if first:
                if await tab.has_global_var("deckyHasLoaded", False):
-                    await close_old_tabs()
+                    tabs = await get_tabs()
+                    for t in tabs:
+                        if not t.title or (t.title != "Steam" and t.title != "SP"):
+                            logger.debug("Closing tab: " + getattr(t, "title", "Untitled"))
+                            await t.close()
+                            await sleep(0.5)
            await tab.evaluate_js("try{if (window.deckyHasLoaded){setTimeout(() => location.reload(), 100)}else{window.deckyHasLoaded = true;(async()=>{try{while(!window.SP_REACT){await new Promise(r => setTimeout(r, 10))};await import('http://localhost:1337/frontend/index.js')}catch(e){console.error(e)};})();}}catch(e){console.error(e)}", False, False, False)
        except:
            logger.info("Failed to inject JavaScript into tab\n" + format_exc())
@@ -7,12 +7,10 @@ from importlib.util import module_from_spec, spec_from_file_location
 from json import dumps, load, loads
 from logging import getLogger
 from traceback import format_exc
-from os import path, setgid, setuid, environ
+from os import path, setgid, setuid
 from signal import SIGINT, signal
-from sys import exit, path as syspath
+from sys import exit
 from time import time
-import helpers
-from updater import Updater

 multiprocessing.set_start_method("fork")

@@ -21,7 +19,6 @@ BUFFER_LIMIT = 2 ** 20  # 1 MiB
 class PluginWrapper:
    def __init__(self, file, plugin_directory, plugin_path) -> None:
        self.file = file
-        self.plugin_path = plugin_path
        self.plugin_directory = plugin_directory
        self.reader = None
        self.writer = None
@@ -59,38 +56,13 @@ class PluginWrapper:
            set_event_loop(new_event_loop())
            if self.passive:
                return
-            setgid(0 if "root" in self.flags else helpers.get_user_group_id())
-            setuid(0 if "root" in self.flags else helpers.get_user_id())
-            # export a bunch of environment variables to help plugin developers
-            environ["HOME"] = helpers.get_home_path("root" if "root" in self.flags else helpers.get_user())
-            environ["USER"] = "root" if "root" in self.flags else helpers.get_user()
-            environ["DECKY_VERSION"] = helpers.get_loader_version()
-            environ["DECKY_USER"] = helpers.get_user()
-            environ["DECKY_USER_HOME"] = helpers.get_home_path()
-            environ["DECKY_HOME"] = helpers.get_homebrew_path()
-            environ["DECKY_PLUGIN_SETTINGS_DIR"] = path.join(environ["DECKY_HOME"], "settings", self.plugin_directory)
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_SETTINGS_DIR"])
-            environ["DECKY_PLUGIN_RUNTIME_DIR"] = path.join(environ["DECKY_HOME"], "data", self.plugin_directory)
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_RUNTIME_DIR"])
-            environ["DECKY_PLUGIN_LOG_DIR"] = path.join(environ["DECKY_HOME"], "logs", self.plugin_directory)
-            helpers.mkdir_as_user(environ["DECKY_PLUGIN_LOG_DIR"])
-            environ["DECKY_PLUGIN_DIR"] = path.join(self.plugin_path, self.plugin_directory)
-            environ["DECKY_PLUGIN_NAME"] = self.name
-            environ["DECKY_PLUGIN_VERSION"] = self.version
-            environ["DECKY_PLUGIN_AUTHOR"] = self.author
-            # append the loader's plugin path to the recognized python paths
-            syspath.append(path.realpath(path.join(path.dirname(__file__), "plugin")))
-            # append the plugin's `py_modules` to the recognized python paths
-            syspath.append(path.join(environ["DECKY_PLUGIN_DIR"], "py_modules"))
-            # append the system and user python paths
-            syspath.extend(helpers.get_system_pythonpaths())
+            setgid(0 if "root" in self.flags else 1000)
+            setuid(0 if "root" in self.flags else 1000)
            spec = spec_from_file_location("_", self.file)
            module = module_from_spec(spec)
            spec.loader.exec_module(module)
            self.Plugin = module.Plugin

-            if hasattr(self.Plugin, "_migration"):
-                get_event_loop().run_until_complete(self.Plugin._migration(self.Plugin))
            if hasattr(self.Plugin, "_main"):
                get_event_loop().create_task(self.Plugin._main(self.Plugin))
            get_event_loop().create_task(self._setup_socket())
@@ -101,12 +73,9 @@ class PluginWrapper:

    async def _unload(self):
        try:
-            self.log.info("Attempting to unload with plugin " + self.name + "'s \"_unload\" function.\n")
+            self.log.info("Attempting to unload " + self.name + "\n")
            if hasattr(self.Plugin, "_unload"):
                await self.Plugin._unload(self.Plugin)
-                self.log.info("Unloaded " + self.name + "\n")
-            else:
-                self.log.info("Could not find \"_unload\" in " + self.name + "'s main.py" + "\n")
        except:
            self.log.error("Failed to unload " + self.name + "!\n" + format_exc())
            exit(0)
@@ -130,7 +99,6 @@ class PluginWrapper:
                    break
            data = loads(line.decode("utf-8"))
            if "stop" in data:
-                self.log.info("Calling Loader unload function.")
                await self._unload()
                get_event_loop().stop()
                while get_event_loop().is_running():
@@ -2,14 +2,14 @@ from json import dump, load
 from os import mkdir, path, listdir, rename
 from shutil import chown

-from helpers import get_home_path, get_homebrew_path, get_user, get_user_group, get_user_owner
+from helpers import get_home_path, get_homebrew_path, get_user, set_user, get_user_owner


 class SettingsManager:
    def __init__(self, name, settings_directory = None) -> None:
+        set_user()
        USER = get_user()
-        GROUP = get_user_group()
-        wrong_dir = get_homebrew_path()
+        wrong_dir = get_homebrew_path(get_home_path(USER))
        if settings_directory == None:
            settings_directory = path.join(wrong_dir, "settings")

@@ -18,7 +18,7 @@ class SettingsManager:
        #Create the folder with the correct permission
        if not path.exists(settings_directory):
            mkdir(settings_directory)
-            chown(settings_directory, USER, GROUP)
+            chown(settings_directory, USER, USER)

        #Copy all old settings file in the root directory to the correct folder
        for file in listdir(wrong_dir):
@@ -30,7 +30,7 @@ class SettingsManager:

        #If the owner of the settings directory is not the user, then set it as the user:
        if get_user_owner(settings_directory) != USER:
-            chown(settings_directory, USER, GROUP)
+            chown(settings_directory, USER, USER)

        self.settings = {}

@@ -30,7 +30,12 @@ class Updater:
        }
        self.remoteVer = None
        self.allRemoteVers = None
-        self.localVer = helpers.get_loader_version()
+        try:
+            logger.info(getcwd())
+            with open(path.join(getcwd(), ".loader.version"), "r", encoding="utf-8") as version_file:
+                self.localVer = version_file.readline().replace("\n", "")
+        except:
+            self.localVer = False

        try:
            self.currentBranch = self.get_branch(self.context.settings)
@@ -65,7 +70,7 @@ class Updater:
        logger.debug("current branch: %i" % ver)
        if ver == -1:
            logger.info("Current branch is not set, determining branch from version...")
-            if self.localVer.startswith("v") and "-pre" in self.localVer:
+            if self.localVer.startswith("v") and self.localVer.find("-pre"):
                logger.info("Current version determined to be pre-release")
                return 1
            else:
@@ -91,12 +96,15 @@ class Updater:
        return str(url)

    async def get_version(self):
-        return {
-            "current": self.localVer,
-            "remote": self.remoteVer,
-            "all": self.allRemoteVers,
-            "updatable": self.localVer != "unknown"
-        }
+        if self.localVer:
+            return {
+                "current": self.localVer,
+                "remote": self.remoteVer,
+                "all": self.allRemoteVers,
+                "updatable": self.localVer != None
+            }
+        else:
+            return {"current": "unknown", "remote": self.remoteVer, "all": self.allRemoteVers, "updatable": False}

    async def check_for_updates(self):
        logger.debug("checking for updates")
@@ -108,10 +116,10 @@ class Updater:
        logger.debug("determining release type to find, branch is %i" % selectedBranch)
        if selectedBranch == 0:
            logger.debug("release type: release")
-            self.remoteVer = next(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and not ver["tag_name"].find("-pre") > 0 and ver["tag_name"], remoteVersions), None)
+            self.remoteVer = next(filter(lambda ver: ver["tag_name"].startswith("v") and not ver["prerelease"] and ver["tag_name"], remoteVersions), None)
        elif selectedBranch == 1:
            logger.debug("release type: pre-release")
-            self.remoteVer = next(filter(lambda ver:ver["tag_name"].startswith("v"), remoteVersions), None)
+            self.remoteVer = next(filter(lambda ver: ver["prerelease"] and ver["tag_name"].startswith("v") and ver["tag_name"].find("-pre"), remoteVersions), None)
        else:
            logger.error("release type: NOT FOUND")
            raise ValueError("no valid branch found")
@@ -153,7 +161,7 @@ class Updater:
                logger.error(f"Error at %s", exc_info=e)
            with open(path.join(getcwd(), "plugin_loader.service"), "r", encoding="utf-8") as service_file:
                service_data = service_file.read()
-            service_data = service_data.replace("${HOMEBREW_FOLDER}", helpers.get_homebrew_path())
+            service_data = service_data.replace("${HOMEBREW_FOLDER}", "/home/"+helpers.get_user()+"/homebrew")
            with open(path.join(getcwd(), "plugin_loader.service"), "w", encoding="utf-8") as service_file:
                    service_file.write(service_data)
                    
@@ -7,7 +7,7 @@ from asyncio import sleep, start_server, gather, open_connection
 from aiohttp import ClientSession, web

 from logging import getLogger
-from injector import inject_to_tab, get_gamepadui_tab, close_old_tabs
+from injector import inject_to_tab, get_gamepadui_tab
 import helpers
 import subprocess

@@ -233,7 +233,7 @@ class Utilities:
            self.rdt_proxy_server.close()
            self.rdt_proxy_task.cancel()

-    async def _enable_rdt(self):
+    async def enable_rdt(self):
        # TODO un-hardcode port
        try:
            self.stop_rdt_proxy()
@@ -243,26 +243,14 @@ class Utilities:
                self.logger.info("Connecting to React DevTools at " + ip)
                async with ClientSession() as web:
                    res = await web.request("GET", "http://" + ip + ":8097", ssl=helpers.get_ssl_context())
-                    script = """
-                    if (!window.deckyHasConnectedRDT) {
-                        window.deckyHasConnectedRDT = true;
-                        // This fixes the overlay when hovering over an element in RDT
-                        Object.defineProperty(window, '__REACT_DEVTOOLS_TARGET_WINDOW__', {
-                            enumerable: true,
-                            configurable: true,
-                            get: function() {
-                                return (GamepadNavTree?.m_context?.m_controller || FocusNavController)?.m_ActiveContext?.ActiveWindow || window;
-                            }
-                        });
-                    """ + await res.text() + "\n}"
                if res.status != 200:
                    self.logger.error("Failed to connect to React DevTools at " + ip)
                    return False
                self.start_rdt_proxy(ip, 8097)
+                script = "if(!window.deckyHasConnectedRDT){window.deckyHasConnectedRDT=true;\n" + await res.text() + "\n}"
                self.logger.info("Connected to React DevTools, loading script")
                tab = await get_gamepadui_tab()
                # RDT needs to load before React itself to work.
-                await close_old_tabs()
                result = await tab.reload_and_evaluate(script)
                self.logger.info(result)
                        
@@ -270,13 +258,9 @@ class Utilities:
            self.logger.error("Failed to connect to React DevTools")
            self.logger.error(format_exc())

-    async def enable_rdt(self):
-        self.context.loop.create_task(self._enable_rdt())
-
    async def disable_rdt(self):
        self.logger.info("Disabling React DevTools")
        tab = await get_gamepadui_tab()
        self.rdt_script_id = None
-        await close_old_tabs()
-        await tab.evaluate_js("location.reload();", False, True, False)
+        await tab.evaluate_js("SteamClient.User.StartRestart();", False, True, False)
        self.logger.info("React DevTools disabled")
@@ -11,12 +11,10 @@ HOMEBREW_FOLDER="${USER_DIR}/homebrew"
 rm -rf "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/plugins"
-touch "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"

 # Download latest release and install it
 RELEASE=$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases' | jq -r "first(.[] | select(.prerelease == "true"))")
-VERSION=$(jq -r '.tag_name' <<< ${RELEASE} )
-DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoader"))' <<< ${RELEASE})
+read VERSION DOWNLOADURL < <(echo $(jq -r '.tag_name, .assets[].browser_download_url' <<< ${RELEASE}))

 printf "Installing version %s...\n" "${VERSION}"
 curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader
@@ -11,12 +11,10 @@ HOMEBREW_FOLDER="${USER_DIR}/homebrew"
 rm -rf "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/services"
 sudo -u $SUDO_USER mkdir -p "${HOMEBREW_FOLDER}/plugins"
-touch "${USER_DIR}/.steam/steam/.cef-enable-remote-debugging"

 # Download latest release and install it
 RELEASE=$(curl -s 'https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases' | jq -r "first(.[] | select(.prerelease == "false"))")
-VERSION=$(jq -r '.tag_name' <<< ${RELEASE} )
-DOWNLOADURL=$(jq -r '.assets[].browser_download_url | select(endswith("PluginLoader"))' <<< ${RELEASE})
+read VERSION DOWNLOADURL < <(echo $(jq -r '.tag_name, .assets[].browser_download_url' <<< ${RELEASE}))

 printf "Installing version %s...\n" "${VERSION}"
 curl -L $DOWNLOADURL --output ${HOMEBREW_FOLDER}/services/PluginLoader
@@ -1,2 +0,0 @@
-declare module '*.png';
-declare module '*.jpg';
@@ -12,7 +12,6 @@
  },
  "devDependencies": {
    "@rollup/plugin-commonjs": "^21.1.0",
-    "@rollup/plugin-image": "^3.0.1",
    "@rollup/plugin-json": "^4.1.0",
    "@rollup/plugin-node-resolve": "^13.3.0",
    "@rollup/plugin-replace": "^4.0.0",
@@ -42,7 +41,7 @@
    }
  },
  "dependencies": {
-    "decky-frontend-lib": "^3.19.1",
+    "decky-frontend-lib": "^3.18.4",
    "react-file-icon": "^1.2.0",
    "react-icons": "^4.4.0",
    "react-markdown": "^8.0.3",
@@ -2,7 +2,6 @@ lockfileVersion: 5.4

 specifiers:
  '@rollup/plugin-commonjs': ^21.1.0
-  '@rollup/plugin-image': ^3.0.1
  '@rollup/plugin-json': ^4.1.0
  '@rollup/plugin-node-resolve': ^13.3.0
  '@rollup/plugin-replace': ^4.0.0
@@ -11,7 +10,7 @@ specifiers:
  '@types/react-file-icon': ^1.0.1
  '@types/react-router': 5.1.18
  '@types/webpack': ^5.28.0
-  decky-frontend-lib: ^3.19.1
+  decky-frontend-lib: ^3.18.4
  husky: ^8.0.1
  import-sort-style-module: ^6.0.0
  inquirer: ^8.2.4
@@ -31,7 +30,7 @@ specifiers:
  typescript: ^4.7.4

 dependencies:
-  decky-frontend-lib: 3.19.1
+  decky-frontend-lib: 3.18.4
  react-file-icon: 1.2.0_wcqkhtmu7mswc6yz4uyexck3ty
  react-icons: 4.4.0_react@16.14.0
  react-markdown: 8.0.3_vshvapmxg47tngu7tvrsqpq55u
@@ -39,7 +38,6 @@ dependencies:

 devDependencies:
  '@rollup/plugin-commonjs': 21.1.0_rollup@2.76.0
-  '@rollup/plugin-image': 3.0.1_rollup@2.76.0
  '@rollup/plugin-json': 4.1.0_rollup@2.76.0
  '@rollup/plugin-node-resolve': 13.3.0_rollup@2.76.0
  '@rollup/plugin-replace': 4.0.0_rollup@2.76.0
@@ -341,20 +339,6 @@ packages:
      rollup: 2.76.0
    dev: true

-  /@rollup/plugin-image/3.0.1_rollup@2.76.0:
-    resolution: {integrity: sha512-F50Sko4Xcc576x7HG9f3MvJKKnBfSmqfVFWJkJgyIEkI8YxZxux28lDbuy0+GsAK6BFl9Gn+TRXOUgHHJbFh3w==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2_rollup@2.76.0
-      mini-svg-data-uri: 1.4.4
-      rollup: 2.76.0
-    dev: true
-
  /@rollup/plugin-inject/4.0.4_rollup@2.76.0:
    resolution: {integrity: sha512-4pbcU4J/nS+zuHk+c+OL3WtmEQhqxlZ9uqfjQMQDOHOPld7PsCd8k5LWs8h5wjwJN7MgnAn768F2sDxEP4eNFQ==}
    peerDependencies:
@@ -438,21 +422,6 @@ packages:
      picomatch: 2.3.1
    dev: true

-  /@rollup/pluginutils/5.0.2_rollup@2.76.0:
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-      rollup: 2.76.0
-    dev: true
-
  /@types/debug/4.1.7:
    resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
    dependencies:
@@ -975,8 +944,8 @@ packages:
    dependencies:
      ms: 2.1.2

-  /decky-frontend-lib/3.19.1:
-    resolution: {integrity: sha512-hU4+EFs74MGzUCv8l1AO2+EBj9RRbnpU19Crm4u+3lbLu6d63U2GsUeQ9ssmNRcOMY1OuVZkRoZBE58soOBJ3A==}
+  /decky-frontend-lib/3.18.4:
+    resolution: {integrity: sha512-i3TAe3RJtT1TK0rJgW9Ek5jxMWZRCYLDvqHDylGVieUvuyI7c8X+cogz30pP4cqeGOaA1d/MxBEbhlpD3JhVvg==}
    dev: false

  /decode-named-character-reference/1.0.2:
@@ -1967,11 +1936,6 @@ packages:
    engines: {node: '>=6'}
    dev: true

-  /mini-svg-data-uri/1.4.4:
-    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
-    hasBin: true
-    dev: true
-
  /minimatch/3.1.2:
    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
    dependencies:
@@ -1,5 +1,4 @@
 import commonjs from '@rollup/plugin-commonjs';
-import image from '@rollup/plugin-image';
 import json from '@rollup/plugin-json';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
@@ -30,7 +29,6 @@ export default defineConfig({
      preventAssignment: false,
      'process.env.NODE_ENV': JSON.stringify('production'),
    }),
-    image(),
  ],
  preserveEntrySignatures: false,
  output: {
@@ -14,13 +14,13 @@ export class DeckyGlobalComponentsState {
    return { components: this._components };
  }

-  addComponent(path: string, component: FC) {
-    this._components.set(path, component);
+  addComponent(name: string, component: FC) {
+    this._components.set(name, component);
    this.notifyUpdate();
  }

-  removeComponent(path: string) {
-    this._components.delete(path);
+  removeComponent(name: string) {
+    this._components.delete(name);
    this.notifyUpdate();
  }

@@ -30,8 +30,8 @@ export class DeckyGlobalComponentsState {
 }

 interface DeckyGlobalComponentsContext extends PublicDeckyGlobalComponentsState {
-  addComponent(path: string, component: FC): void;
-  removeComponent(path: string): void;
+  addComponent(name: string, component: FC): void;
+  removeComponent(name: string): void;
 }

 const DeckyGlobalComponentsContext = createContext<DeckyGlobalComponentsContext>(null as any);
@@ -1,37 +0,0 @@
-export default function DeckyIcon() {
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 456" width="512" height="456">
-      <g>
-        <path
-          style={{ fill: 'none' }}
-          d="M154.33,72.51v49.79c11.78-0.17,23.48,2,34.42,6.39c10.93,4.39,20.89,10.91,29.28,19.18
-          c8.39,8.27,15.06,18.13,19.61,29c4.55,10.87,6.89,22.54,6.89,34.32c0,11.78-2.34,23.45-6.89,34.32
-          c-4.55,10.87-11.21,20.73-19.61,29c-8.39,8.27-18.35,14.79-29.28,19.18c-10.94,4.39-22.63,6.56-34.42,6.39v49.77
-          c36.78,0,72.05-14.61,98.05-40.62c26-26.01,40.61-61.28,40.61-98.05c0-36.78-14.61-72.05-40.61-98.05
-          C226.38,87.12,191.11,72.51,154.33,72.51z"
-        />
-
-        <ellipse
-          transform="matrix(0.982 -0.1891 0.1891 0.982 -37.1795 32.9988)"
-          style={{ fill: 'none' }}
-          cx="154.33"
-          cy="211.33"
-          rx="69.33"
-          ry="69.33"
-        />
-        <path style={{ fill: 'none' }} d="M430,97h-52v187h52c7.18,0,13-5.82,13-13V110C443,102.82,437.18,97,430,97z" />
-        <path
-          style={{ fill: 'currentColor' }}
-          d="M432,27h-54V0H0v361c0,52.47,42.53,95,95,95h188c52.47,0,95-42.53,95-95v-7h54c44.18,0,80-35.82,80-80V107
-          C512,62.82,476.18,27,432,27z M85,211.33c0-38.29,31.04-69.33,69.33-69.33c38.29,0,69.33,31.04,69.33,69.33
-          c0,38.29-31.04,69.33-69.33,69.33C116.04,280.67,85,249.62,85,211.33z M252.39,309.23c-26.01,26-61.28,40.62-98.05,40.62v-49.77
-          c11.78,0.17,23.48-2,34.42-6.39c10.93-4.39,20.89-10.91,29.28-19.18c8.39-8.27,15.06-18.13,19.61-29
-          c4.55-10.87,6.89-22.53,6.89-34.32c0-11.78-2.34-23.45-6.89-34.32c-4.55-10.87-11.21-20.73-19.61-29
-          c-8.39-8.27-18.35-14.79-29.28-19.18c-10.94-4.39-22.63-6.56-34.42-6.39V72.51c36.78,0,72.05,14.61,98.05,40.61
-          c26,26.01,40.61,61.28,40.61,98.05C293,247.96,278.39,283.23,252.39,309.23z M443,271c0,7.18-5.82,13-13,13h-52V97h52
-          c7.18,0,13,5.82,13,13V271z"
-        />
-      </g>
-    </svg>
-  );
-}
@@ -0,0 +1,147 @@
+import { CustomMainMenuItem, ItemPatch, OverlayPatch } from 'decky-frontend-lib';
+import { FC, ReactNode, createContext, useContext, useEffect, useState } from 'react';
+
+interface PublicDeckyMenuState {
+  items: Set<CustomMainMenuItem>;
+  itemPatches: Map<string, Set<ItemPatch>>;
+  overlayPatches: Set<OverlayPatch>;
+  overlayComponents: Set<ReactNode>;
+}
+
+export class DeckyMenuState {
+  private _items = new Set<CustomMainMenuItem>();
+  private _itemPatches = new Map<string, Set<ItemPatch>>();
+  private _overlayPatches = new Set<OverlayPatch>();
+  private _overlayComponents = new Set<ReactNode>();
+
+  public eventBus = new EventTarget();
+
+  publicState(): PublicDeckyMenuState {
+    return {
+      items: this._items,
+      itemPatches: this._itemPatches,
+      overlayPatches: this._overlayPatches,
+      overlayComponents: this._overlayComponents,
+    };
+  }
+
+  addItem(item: CustomMainMenuItem) {
+    this._items.add(item);
+    this.notifyUpdate();
+    return item;
+  }
+
+  addPatch(path: string, patch: ItemPatch) {
+    let patchList = this._itemPatches.get(path);
+    if (!patchList) {
+      patchList = new Set();
+      this._itemPatches.set(path, patchList);
+    }
+    patchList.add(patch);
+    this.notifyUpdate();
+    return patch;
+  }
+
+  addOverlayPatch(patch: OverlayPatch) {
+    this._overlayPatches.add(patch);
+    this.notifyUpdate();
+    return patch;
+  }
+
+  addOverlayComponent(component: ReactNode) {
+    this._overlayComponents.add(component);
+    this.notifyUpdate();
+    return component;
+  }
+
+  removePatch(path: string, patch: ItemPatch) {
+    const patchList = this._itemPatches.get(path);
+    patchList?.delete(patch);
+    if (patchList?.size == 0) {
+      this._itemPatches.delete(path);
+    }
+    this.notifyUpdate();
+  }
+
+  removeItem(item: CustomMainMenuItem) {
+    this._items.delete(item);
+    this.notifyUpdate();
+    return item;
+  }
+
+  removeOverlayPatch(patch: OverlayPatch) {
+    this._overlayPatches.delete(patch);
+    this.notifyUpdate();
+  }
+
+  removeOverlayComponent(component: ReactNode) {
+    this._overlayComponents.delete(component);
+    this.notifyUpdate();
+  }
+
+  private notifyUpdate() {
+    this.eventBus.dispatchEvent(new Event('update'));
+  }
+}
+
+interface DeckyMenuStateContext extends PublicDeckyMenuState {
+  addItem: DeckyMenuState['addItem'];
+  addPatch: DeckyMenuState['addPatch'];
+  addOverlayPatch: DeckyMenuState['addOverlayPatch'];
+  addOverlayComponent: DeckyMenuState['addOverlayComponent'];
+  removePatch: DeckyMenuState['removePatch'];
+  removeOverlayPatch: DeckyMenuState['removeOverlayPatch'];
+  removeOverlayComponent: DeckyMenuState['removeOverlayComponent'];
+  removeItem: DeckyMenuState['removeItem'];
+}
+
+const DeckyMenuStateContext = createContext<DeckyMenuStateContext>(null as any);
+
+export const useDeckyMenuState = () => useContext(DeckyMenuStateContext);
+
+interface Props {
+  deckyMenuState: DeckyMenuState;
+}
+
+export const DeckyMenuStateContextProvider: FC<Props> = ({ children, deckyMenuState }) => {
+  const [publicDeckyMenuState, setPublicDeckyMenuState] = useState<PublicDeckyMenuState>({
+    ...deckyMenuState.publicState(),
+  });
+
+  useEffect(() => {
+    function onUpdate() {
+      setPublicDeckyMenuState({ ...deckyMenuState.publicState() });
+    }
+
+    deckyMenuState.eventBus.addEventListener('update', onUpdate);
+
+    return () => deckyMenuState.eventBus.removeEventListener('update', onUpdate);
+  }, []);
+
+  const addItem = deckyMenuState.addItem.bind(deckyMenuState);
+  const addPatch = deckyMenuState.addPatch.bind(deckyMenuState);
+  const addOverlayPatch = deckyMenuState.addOverlayPatch.bind(deckyMenuState);
+  const addOverlayComponent = deckyMenuState.addOverlayComponent.bind(deckyMenuState);
+  const removePatch = deckyMenuState.removePatch.bind(deckyMenuState);
+  const removeOverlayPatch = deckyMenuState.removeOverlayPatch.bind(deckyMenuState);
+  const removeOverlayComponent = deckyMenuState.removeOverlayComponent.bind(deckyMenuState);
+  const removeItem = deckyMenuState.removeItem.bind(deckyMenuState);
+
+  return (
+    <DeckyMenuStateContext.Provider
+      value={{
+        ...publicDeckyMenuState,
+        addItem,
+        addPatch,
+        addOverlayPatch,
+        addOverlayComponent,
+        removePatch,
+        removeOverlayPatch,
+        removeOverlayComponent,
+        removeItem,
+      }}
+    >
+      {children}
+    </DeckyMenuStateContext.Provider>
+  );
+};
@@ -1,4 +1,4 @@
-import { Focusable, Navigation } from 'decky-frontend-lib';
+import { Focusable, Router } from 'decky-frontend-lib';
 import { FunctionComponent, useRef } from 'react';
 import ReactMarkdown, { Options as ReactMarkdownOptions } from 'react-markdown';
 import remarkGfm from 'remark-gfm';
@@ -22,7 +22,7 @@ const Markdown: FunctionComponent<MarkdownProps> = (props) => {
                onActivate={() => {}}
                onOKButton={() => {
                  props.onDismiss?.();
-                  Navigation.NavigateToExternalWeb(aRef.current!.href);
+                  Router.NavigateToExternalWeb(aRef.current!.href);
                }}
                style={{ display: 'inline' }}
              >
@@ -4,11 +4,15 @@ const QuickAccessVisibleState = createContext<boolean>(true);

 export const useQuickAccessVisible = () => useContext(QuickAccessVisibleState);

-export const QuickAccessVisibleStateProvider: FC<{ initial: boolean; tab: any }> = ({ children, initial, tab }) => {
+export const QuickAccessVisibleStateProvider: FC<{ initial: boolean; setter: ((val: boolean) => {}[]) | never[] }> = ({
+  children,
+  initial,
+  setter,
+}) => {
  const [visible, setVisible] = useState<boolean>(initial);
  const [prev, setPrev] = useState<boolean>(initial);
-  // HACK but i can't think of a better way to do this
-  tab.qAMVisibilitySetter = setVisible;
+  // hack to use an array as a "pointer" to pass the setter up the tree
+  setter[0] = setVisible;
  if (initial != prev) {
    setPrev(initial);
    setVisible(initial);
@@ -1,7 +1,6 @@
 import { DialogButton, Focusable, Router, staticClasses } from 'decky-frontend-lib';
 import { CSSProperties, VFC } from 'react';
-import { BsGearFill } from 'react-icons/bs';
-import { FaArrowLeft, FaStore } from 'react-icons/fa';
+import { FaArrowLeft, FaCog, FaStore } from 'react-icons/fa';

 import { useDeckyState } from './DeckyState';

@@ -27,6 +26,12 @@ const TitleView: VFC = () => {
  if (activePlugin === null) {
    return (
      <Focusable style={titleStyles} className={staticClasses.Title}>
+        <DialogButton
+          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
+          onClick={onSettingsClick}
+        >
+          <FaCog style={{ marginTop: '-4px', display: 'block' }} />
+        </DialogButton>
        <div style={{ marginRight: 'auto', flex: 0.9 }}>Decky</div>
        <DialogButton
          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
@@ -34,12 +39,6 @@ const TitleView: VFC = () => {
        >
          <FaStore style={{ marginTop: '-4px', display: 'block' }} />
        </DialogButton>
-        <DialogButton
-          style={{ height: '28px', width: '40px', minWidth: 0, padding: '10px 12px' }}
-          onClick={onSettingsClick}
-        >
-          <BsGearFill style={{ marginTop: '-4px', display: 'block' }} />
-        </DialogButton>
      </Focusable>
    );
  }
@@ -1,4 +1,4 @@
-import { ConfirmModal, Navigation, QuickAccessTab } from 'decky-frontend-lib';
+import { ConfirmModal, Navigation, QuickAccessTab, Spinner, staticClasses } from 'decky-frontend-lib';
 import { FC, useState } from 'react';

 interface PluginInstallModalProps {
@@ -26,14 +26,15 @@ const PluginInstallModal: FC<PluginInstallModalProps> = ({ artifact, version, ha
      onCancel={async () => {
        await onCancel();
      }}
-      strTitle={`Install ${artifact}`}
-      strOKButtonText={loading ? 'Installing' : 'Install'}
    >
-      {hash == 'False' ? (
-        <h3 style={{ color: 'red' }}>!!!!NO HASH PROVIDED!!!!</h3>
-      ) : (
-        `Are you sure you want to install ${artifact} ${version}?`
-      )}
+      <div className={staticClasses.Title} style={{ flexDirection: 'column' }}>
+        {hash == 'False' ? <h3 style={{ color: 'red' }}>!!!!NO HASH PROVIDED!!!!</h3> : null}
+        <div style={{ flexDirection: 'row' }}>
+          {loading && <Spinner style={{ width: '20px' }} />} {loading ? 'Installing' : 'Install'} {artifact}
+          {version ? ' version ' + version : null}
+          {!loading && '?'}
+        </div>
+      </div>
    </ConfirmModal>
  );
 };
@@ -4,6 +4,13 @@ import Logger from '../../../../logger';

 const logger = new Logger('LibraryPatch');

+declare global {
+  interface Window {
+    SteamClient: any;
+    appDetailsStore: any;
+  }
+}
+
 let patch: Patch;

 function rePatch() {
@@ -13,9 +20,7 @@ function rePatch() {
      const details = window.appDetailsStore.GetAppDetails(appid);
      logger.debug('game details', details);
      // strShortcutStartDir
-      const file = await window.DeckyPluginLoader.openFilePicker(
-        details?.strShortcutStartDir.replaceAll('"', '') || '/',
-      );
+      const file = await window.DeckyPluginLoader.openFilePicker(details.strShortcutStartDir.replaceAll('"', ''));
      logger.debug('user selected', file);
      window.SteamClient.Apps.SetShortcutExe(appid, JSON.stringify(file.path));
      const pathArr = file.path.split('/');
@@ -1,9 +1,7 @@
 import { SidebarNavigation } from 'decky-frontend-lib';
 import { lazy } from 'react';
-import { FaCode, FaPlug } from 'react-icons/fa';

 import { useSetting } from '../../utils/hooks/useSetting';
-import DeckyIcon from '../DeckyIcon';
 import WithSuspense from '../WithSuspense';
 import GeneralSettings from './pages/general';
 import PluginList from './pages/plugin_list';
@@ -15,18 +13,19 @@ export default function SettingsPage() {

  const pages = [
    {
-      title: 'Decky',
+      title: 'General',
      content: <GeneralSettings isDeveloper={isDeveloper} setIsDeveloper={setIsDeveloper} />,
      route: '/decky/settings/general',
-      icon: <DeckyIcon />,
    },
    {
      title: 'Plugins',
      content: <PluginList />,
      route: '/decky/settings/plugins',
-      icon: <FaPlug />,
    },
-    {
+  ];
+
+  if (isDeveloper)
+    pages.push({
      title: 'Developer',
      content: (
        <WithSuspense>
@@ -34,10 +33,7 @@ export default function SettingsPage() {
        </WithSuspense>
      ),
      route: '/decky/settings/developer',
-      icon: <FaCode />,
-      visible: isDeveloper,
-    },
-  ];
+    });

-  return <SidebarNavigation pages={pages} />;
+  return <SidebarNavigation title="Decky Settings" showTitle pages={pages} />;
 }
@@ -1,10 +1,9 @@
-import { DialogBody, Field, TextField, Toggle } from 'decky-frontend-lib';
+import { Field, Focusable, TextField, Toggle } from 'decky-frontend-lib';
 import { useRef } from 'react';
 import { FaReact, FaSteamSymbol } from 'react-icons/fa';

 import { setShouldConnectToReactDevTools, setShowValveInternal } from '../../../../developer';
 import { useSetting } from '../../../../utils/hooks/useSetting';
-import RemoteDebuggingSettings from '../general/RemoteDebugging';

 export default function DeveloperSettings() {
  const [enableValveInternal, setEnableValveInternal] = useSetting<boolean>('developer.valve_internal', false);
@@ -13,8 +12,7 @@ export default function DeveloperSettings() {
  const textRef = useRef<HTMLDivElement>(null);

  return (
-    <DialogBody>
-      <RemoteDebuggingSettings />
+    <>
      <Field
        label="Enable Valve Internal"
        description={
@@ -32,33 +30,55 @@ export default function DeveloperSettings() {
            setShowValveInternal(toggleValue);
          }}
        />
-      </Field>
-      <Field
-        label="Enable React DevTools"
-        description={
-          <>
-            <span style={{ whiteSpace: 'pre-line' }}>
-              Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set the
-              IP address before enabling.
-            </span>
-            <br />
-            <br />
-            <div ref={textRef}>
-              <TextField label={'IP'} value={reactDevtoolsIP} onChange={(e) => setReactDevtoolsIP(e?.target.value)} />
-            </div>
-          </>
+      </Field>{' '}
+      <Focusable
+        onTouchEnd={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
+        }
+        onClick={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
+        }
+        onOKButton={
+          reactDevtoolsIP == ''
+            ? () => {
+                (textRef.current?.childNodes[0] as HTMLInputElement)?.focus();
+              }
+            : undefined
        }
-        icon={<FaReact style={{ display: 'block' }} />}
      >
-        <Toggle
-          value={reactDevtoolsEnabled}
-          // disabled={reactDevtoolsIP == ''}
-          onChange={(toggleValue) => {
-            setReactDevtoolsEnabled(toggleValue);
-            setShouldConnectToReactDevTools(toggleValue);
-          }}
-        />
-      </Field>
-    </DialogBody>
+        <Field
+          label="Enable React DevTools"
+          description={
+            <>
+              <span style={{ whiteSpace: 'pre-line' }}>
+                Enables connection to a computer running React DevTools. Changing this setting will reload Steam. Set
+                the IP address before enabling.
+              </span>
+              <div ref={textRef}>
+                <TextField label={'IP'} value={reactDevtoolsIP} onChange={(e) => setReactDevtoolsIP(e?.target.value)} />
+              </div>
+            </>
+          }
+          icon={<FaReact style={{ display: 'block' }} />}
+        >
+          <Toggle
+            value={reactDevtoolsEnabled}
+            disabled={reactDevtoolsIP == ''}
+            onChange={(toggleValue) => {
+              setReactDevtoolsEnabled(toggleValue);
+              setShouldConnectToReactDevTools(toggleValue);
+            }}
+          />
+        </Field>
+      </Focusable>
+    </>
  );
 }
@@ -19,7 +19,7 @@ const BranchSelect: FunctionComponent<{}> = () => {
  return (
    // Returns numerical values from 0 to 2 (with current branch setup as of 8/28/22)
    // 0 being stable, 1 being pre-release and 2 being nightly
-    <Field label="Decky Update Channel" childrenContainerWidth={'fixed'}>
+    <Field label="Update Channel">
      <Dropdown
        rgOptions={Object.values(UpdateBranch)
          .filter((branch) => typeof branch == 'string')
@@ -1,5 +1,5 @@
 import { Field, Toggle } from 'decky-frontend-lib';
-import { FaChrome } from 'react-icons/fa';
+import { FaBug } from 'react-icons/fa';

 import { useSetting } from '../../../../utils/hooks/useSetting';

@@ -11,10 +11,10 @@ export default function RemoteDebuggingSettings() {
      label="Allow Remote CEF Debugging"
      description={
        <span style={{ whiteSpace: 'pre-line' }}>
-          Allows unauthenticated access to the CEF debugger to anyone in your network.
+          Allow unauthenticated access to the CEF debugger to anyone in your network
        </span>
      }
-      icon={<FaChrome style={{ display: 'block' }} />}
+      icon={<FaBug style={{ display: 'block' }} />}
    >
      <Toggle
        value={allowRemoteDebugging || false}
@@ -16,7 +16,7 @@ const StoreSelect: FunctionComponent<{}> = () => {
  // 0 being Default, 1 being Testing and 2 being Custom
  return (
    <>
-      <Field label="Plugin Store Channel" childrenContainerWidth={'fixed'}>
+      <Field label="Store Channel">
        <Dropdown
          rgOptions={Object.values(Store)
            .filter((store) => typeof store == 'string')
@@ -6,15 +6,15 @@ import {
  Focusable,
  ProgressBarWithInfo,
  Spinner,
-  findSP,
  showModal,
 } from 'decky-frontend-lib';
 import { useCallback } from 'react';
 import { Suspense, lazy } from 'react';
 import { useEffect, useState } from 'react';
-import { FaExclamation } from 'react-icons/fa';
+import { FaArrowDown } from 'react-icons/fa';

 import { VerInfo, callUpdaterMethod, finishUpdate } from '../../../../updater';
+import { findSP } from '../../../../utils/windows';
 import { useDeckyState } from '../../../DeckyState';
 import InlinePatchNotes from '../../../patchnotes/InlinePatchNotes';
 import WithSuspense from '../../../WithSuspense';
@@ -95,21 +95,21 @@ export default function UpdaterSettings() {
      <Field
        onOptionsActionDescription={versionInfo?.all ? 'Patch Notes' : undefined}
        onOptionsButton={versionInfo?.all ? showPatchNotes : undefined}
-        label="Decky Updates"
+        label="Updates"
        description={
-          checkingForUpdates || versionInfo?.remote?.tag_name != versionInfo?.current || !versionInfo?.remote ? (
-            ''
-          ) : (
-            <span>Up to date: running {versionInfo?.current}</span>
+          versionInfo && (
+            <span style={{ whiteSpace: 'pre-line' }}>{`Current version: ${versionInfo.current}\n${
+              versionInfo.updatable ? `Latest version: ${versionInfo.remote?.tag_name}` : ''
+            }`}</span>
          )
        }
        icon={
-          versionInfo?.remote &&
-          versionInfo?.remote?.tag_name != versionInfo?.current && (
-            <FaExclamation color="var(--gpColor-Yellow)" style={{ display: 'block' }} />
+          !versionInfo ? (
+            <Spinner style={{ width: '1em', height: 20, display: 'block' }} />
+          ) : (
+            <FaArrowDown style={{ display: 'block' }} />
          )
        }
-        childrenContainerWidth={'fixed'}
      >
        {updateProgress == -1 && !isLoaderUpdating ? (
          <DialogButton
@@ -144,7 +144,7 @@ export default function UpdaterSettings() {
          />
        )}
      </Field>
-      {versionInfo?.remote && versionInfo?.remote?.tag_name != versionInfo?.current && (
+      {versionInfo?.remote && (
        <InlinePatchNotes
          title={versionInfo?.remote.name}
          date={new Intl.RelativeTimeFormat('en-US', {
@@ -1,17 +1,10 @@
-import {
-  DialogBody,
-  DialogButton,
-  DialogControlsSection,
-  DialogControlsSectionHeader,
-  Field,
-  TextField,
-  Toggle,
-} from 'decky-frontend-lib';
+import { DialogButton, Field, TextField, Toggle } from 'decky-frontend-lib';
 import { useState } from 'react';
+import { FaShapes, FaTools } from 'react-icons/fa';

 import { installFromURL } from '../../../../store';
-import { useDeckyState } from '../../../DeckyState';
 import BranchSelect from './BranchSelect';
+import RemoteDebuggingSettings from './RemoteDebugging';
 import StoreSelect from './StoreSelect';
 import UpdaterSettings from './Updater';

@@ -23,44 +16,34 @@ export default function GeneralSettings({
  setIsDeveloper: (val: boolean) => void;
 }) {
  const [pluginURL, setPluginURL] = useState('');
-  const { versionInfo } = useDeckyState();

  return (
-    <DialogBody>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Updates</DialogControlsSectionHeader>
-        <UpdaterSettings />
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Beta Participation</DialogControlsSectionHeader>
-        <BranchSelect />
-        <StoreSelect />
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>Other</DialogControlsSectionHeader>
-        <Field label="Enable Developer Mode">
-          <Toggle
-            value={isDeveloper}
-            onChange={(toggleValue) => {
-              setIsDeveloper(toggleValue);
-            }}
-          />
-        </Field>
-        <Field
-          label="Install plugin from URL"
-          description={<TextField label={'URL'} value={pluginURL} onChange={(e) => setPluginURL(e?.target.value)} />}
-        >
-          <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
-            Install
-          </DialogButton>
-        </Field>
-      </DialogControlsSection>
-      <DialogControlsSection>
-        <DialogControlsSectionHeader>About</DialogControlsSectionHeader>
-        <Field label="Decky Version" focusable={true}>
-          <div style={{ color: 'var(--gpSystemLighterGrey)' }}>{versionInfo?.current}</div>
-        </Field>
-      </DialogControlsSection>
-    </DialogBody>
+    <div>
+      <UpdaterSettings />
+      <BranchSelect />
+      <StoreSelect />
+      <RemoteDebuggingSettings />
+      <Field
+        label="Developer mode"
+        description={<span style={{ whiteSpace: 'pre-line' }}>Enables Decky's developer settings.</span>}
+        icon={<FaTools style={{ display: 'block' }} />}
+      >
+        <Toggle
+          value={isDeveloper}
+          onChange={(toggleValue) => {
+            setIsDeveloper(toggleValue);
+          }}
+        />
+      </Field>
+      <Field
+        label="Manual plugin install"
+        description={<TextField label={'URL'} value={pluginURL} onChange={(e) => setPluginURL(e?.target.value)} />}
+        icon={<FaShapes style={{ display: 'block' }} />}
+      >
+        <DialogButton disabled={pluginURL.length == 0} onClick={() => installFromURL(pluginURL)}>
+          Install
+        </DialogButton>
+      </Field>
+    </div>
  );
 }
@@ -1,12 +1,4 @@
-import {
-  DialogBody,
-  DialogButton,
-  DialogControlsSection,
-  Focusable,
-  Menu,
-  MenuItem,
-  showContextMenu,
-} from 'decky-frontend-lib';
+import { DialogButton, Focusable, Menu, MenuItem, showContextMenu } from 'decky-frontend-lib';
 import { useEffect } from 'react';
 import { FaDownload, FaEllipsisH } from 'react-icons/fa';

@@ -29,52 +21,46 @@ export default function PluginList() {
  }

  return (
-    <DialogBody>
-      <DialogControlsSection>
-        <ul style={{ listStyleType: 'none', padding: '0' }}>
-          {plugins.map(({ name, version }) => {
-            const update = updates?.get(name);
-            return (
-              <li style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingBottom: '10px' }}>
-                <span>
-                  {name} <span style={{ opacity: '50%' }}>{'(' + version + ')'}</span>
-                </span>
-                <Focusable style={{ marginLeft: 'auto', boxShadow: 'none', display: 'flex', justifyContent: 'right' }}>
-                  {update && (
-                    <DialogButton
-                      style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
-                      onClick={() => requestPluginInstall(name, update)}
-                    >
-                      <div style={{ display: 'flex', flexDirection: 'row' }}>
-                        Update to {update.name}
-                        <FaDownload style={{ paddingLeft: '2rem' }} />
-                      </div>
-                    </DialogButton>
-                  )}
-                  <DialogButton
-                    style={{ height: '40px', width: '40px', padding: '10px 12px', minWidth: '40px' }}
-                    onClick={(e: MouseEvent) =>
-                      showContextMenu(
-                        <Menu label="Plugin Actions">
-                          <MenuItem onSelected={() => window.DeckyPluginLoader.importPlugin(name, version)}>
-                            Reload
-                          </MenuItem>
-                          <MenuItem onSelected={() => window.DeckyPluginLoader.uninstallPlugin(name)}>
-                            Uninstall
-                          </MenuItem>
-                        </Menu>,
-                        e.currentTarget ?? window,
-                      )
-                    }
-                  >
-                    <FaEllipsisH />
-                  </DialogButton>
-                </Focusable>
-              </li>
-            );
-          })}
-        </ul>
-      </DialogControlsSection>
-    </DialogBody>
+    <ul style={{ listStyleType: 'none' }}>
+      {plugins.map(({ name, version }) => {
+        const update = updates?.get(name);
+        return (
+          <li style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingBottom: '10px' }}>
+            <span>
+              {name} {version}
+            </span>
+            <Focusable style={{ marginLeft: 'auto', boxShadow: 'none', display: 'flex', justifyContent: 'right' }}>
+              {update && (
+                <DialogButton
+                  style={{ height: '40px', minWidth: '60px', marginRight: '10px' }}
+                  onClick={() => requestPluginInstall(name, update)}
+                >
+                  <div style={{ display: 'flex', flexDirection: 'row' }}>
+                    Update to {update.name}
+                    <FaDownload style={{ paddingLeft: '2rem' }} />
+                  </div>
+                </DialogButton>
+              )}
+              <DialogButton
+                style={{ height: '40px', width: '40px', padding: '10px 12px', minWidth: '40px' }}
+                onClick={(e: MouseEvent) =>
+                  showContextMenu(
+                    <Menu label="Plugin Actions">
+                      <MenuItem onSelected={() => window.DeckyPluginLoader.importPlugin(name, version)}>
+                        Reload
+                      </MenuItem>
+                      <MenuItem onSelected={() => window.DeckyPluginLoader.uninstallPlugin(name)}>Uninstall</MenuItem>
+                    </Menu>,
+                    e.currentTarget ?? window,
+                  )
+                }
+              >
+                <FaEllipsisH />
+              </DialogButton>
+            </Focusable>
+          </li>
+        );
+      })}
+    </ul>
  );
 }
@@ -1,12 +1,15 @@
 import {
-  ButtonItem,
+  DialogButton,
  Dropdown,
  Focusable,
-  PanelSectionRow,
+  Navigation,
+  QuickAccessTab,
  SingleDropdownOption,
  SuspensefulImage,
+  joinClassNames,
+  staticClasses,
 } from 'decky-frontend-lib';
-import { FC, useState } from 'react';
+import { FC, useRef, useState } from 'react';

 import { StorePlugin, StorePluginVersion, requestPluginInstall } from '../../store';

@@ -16,162 +19,168 @@ interface PluginCardProps {

 const PluginCard: FC<PluginCardProps> = ({ plugin }) => {
  const [selectedOption, setSelectedOption] = useState<number>(0);
-  const root: boolean = plugin.tags.some((tag) => tag === 'root');
-
+  const buttonRef = useRef<HTMLDivElement>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
  return (
    <div
-      className="deckyStoreCard"
      style={{
-        marginLeft: '20px',
-        marginRight: '20px',
-        marginBottom: '20px',
-        display: 'flex',
-        alignItems: 'center',
+        padding: '30px',
+        paddingTop: '10px',
+        paddingBottom: '10px',
      }}
    >
-      <div
-        className="deckyStoreCardImageContainer"
-        style={{
-          width: '320px',
-          height: '200px',
-          position: 'relative',
+      {/* TODO: abstract this messy focus hackiness into a custom component in lib */}
+      <Focusable
+        className="deckyStoreCard"
+        ref={containerRef}
+        onActivate={(_: CustomEvent) => {
+          buttonRef.current!.focus();
+        }}
+        onCancel={(_: CustomEvent) => {
+          if (containerRef.current!.querySelectorAll('* :focus').length === 0) {
+            Navigation.NavigateBack();
+            setTimeout(() => Navigation.OpenQuickAccessMenu(QuickAccessTab.Decky), 1000);
+          } else {
+            containerRef.current!.focus();
+          }
        }}
-      >
-        <SuspensefulImage
-          className="deckyStoreCardImage"
-          suspenseHeight="200px"
-          suspenseWidth="320px"
-          style={{
-            width: '320px',
-            height: '200px',
-            objectFit: 'cover',
-          }}
-          src={plugin.image_url}
-        />
-      </div>
-      <div
-        className="deckyStoreCardInfo"
        style={{
-          width: 'calc(100% - 320px)', // The calc is here so that the info section doesn't expand into the image
          display: 'flex',
          flexDirection: 'column',
-          height: '100%',
-          marginLeft: '1em',
-          justifyContent: 'center',
+          background: '#ACB2C924',
+          height: 'unset',
+          marginBottom: 'unset',
+          // boxShadow: var(--gpShadow-Medium);
+          scrollSnapAlign: 'start',
+          boxSizing: 'border-box',
        }}
      >
-        <span
-          className="deckyStoreCardTitle"
-          style={{
-            fontSize: '1.25em',
-            fontWeight: 'bold',
-            whiteSpace: 'nowrap',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-            width: '90%',
-          }}
-        >
-          {plugin.name}
-        </span>
-        <span
-          className="deckyStoreCardAuthor"
-          style={{
-            marginRight: 'auto',
-            fontSize: '1em',
-          }}
-        >
-          {plugin.author}
-        </span>
-        <span
-          className="deckyStoreCardDescription"
-          style={{
-            fontSize: '13px',
-            color: '#969696',
-            WebkitLineClamp: root ? '2' : '3',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            display: '-webkit-box',
-          }}
-        >
-          {plugin.description ? (
-            plugin.description
-          ) : (
-            <span>
-              <i style={{ color: '#666' }}>No description provided.</i>
-            </span>
-          )}
-        </span>
-        {root && (
-          <span
-            className="deckyStoreCardDescription deckyStoreCardDescriptionRoot"
-            style={{
-              fontSize: '13px',
-              color: '#fee75c',
-            }}
+        <div className="deckyStoreCardHeader" style={{ display: 'flex', alignItems: 'center' }}>
+          <div
+            style={{ fontSize: '18pt', padding: '10px' }}
+            className={joinClassNames(staticClasses.Text)}
+            // onClick={() => Router.NavigateToExternalWeb('https://github.com/' + plugin.artifact)}
          >
-            <i>This plugin has full access to your Steam Deck.</i>{' '}
-            <a
-              className="deckyStoreCardDescriptionRootLink"
-              href="https://deckbrew.xyz/root"
-              target="_blank"
+            {plugin.name}
+          </div>
+        </div>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'row',
+          }}
+          className="deckyStoreCardBody"
+        >
+          <SuspensefulImage
+            className="deckyStoreCardImage"
+            suspenseWidth="256px"
+            style={{
+              width: 'auto',
+              height: '160px',
+            }}
+            src={plugin.image_url}
+          />
+          <div
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+            }}
+            className="deckyStoreCardInfo"
+          >
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
+              style={{ marginTop: '0px', marginLeft: '16px' }}
+            >
+              <span style={{ paddingLeft: '0px' }}>Author: {plugin.author}</span>
+            </p>
+            <p
+              className={joinClassNames(staticClasses.PanelSectionRow)}
              style={{
-                color: '#fee75c',
-                textDecoration: 'none',
+                marginLeft: '16px',
+                marginTop: '0px',
+                marginBottom: '0px',
+                marginRight: '16px',
              }}
            >
-              deckbrew.xyz/root
-            </a>
-          </span>
-        )}
+              <span style={{ paddingLeft: '0px' }}>{plugin.description}</span>
+            </p>
+            <p
+              className={joinClassNames('deckyStoreCardTagsContainer', staticClasses.PanelSectionRow)}
+              style={{
+                padding: '0 16px',
+                display: 'flex',
+                flexWrap: 'wrap',
+                gap: '5px 10px',
+              }}
+            >
+              <span style={{ padding: '5px 0' }}>Tags:</span>
+              {plugin.tags.map((tag: string) => (
+                <span
+                  className="deckyStoreCardTag"
+                  style={{
+                    padding: '5px',
+                    borderRadius: '5px',
+                    background: tag == 'root' ? '#842029' : '#ACB2C947',
+                  }}
+                >
+                  {tag == 'root' ? 'Requires root' : tag}
+                </span>
+              ))}
+            </p>
+          </div>
+        </div>
        <div
-          className="deckyStoreCardButtonRow"
+          className="deckyStoreCardActionsContainer"
          style={{
-            marginTop: '1em',
            width: '100%',
-            overflow: 'hidden',
+            alignSelf: 'flex-end',
+            display: 'flex',
+            flexDirection: 'row',
          }}
        >
-          <PanelSectionRow>
-            <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-              <div
-                className="deckyStoreCardInstallContainer"
-                style={{
-                  paddingTop: '0px',
-                  paddingBottom: '0px',
-                  width: '40%',
-                }}
+          <Focusable
+            className="deckyStoreCardActions"
+            style={{
+              display: 'flex',
+              flexDirection: 'row',
+              width: '100%',
+            }}
+          >
+            <div
+              className="deckyStoreCardInstallButtonContainer"
+              style={{
+                flex: '1',
+              }}
+            >
+              <DialogButton
+                className="deckyStoreCardInstallButton"
+                ref={buttonRef}
+                onClick={() => requestPluginInstall(plugin.name, plugin.versions[selectedOption])}
              >
-                <ButtonItem
-                  bottomSeparator="none"
-                  layout="below"
-                  onClick={() => requestPluginInstall(plugin.name, plugin.versions[selectedOption])}
-                >
-                  <span className="deckyStoreCardInstallText">Install</span>
-                </ButtonItem>
-              </div>
-              <div
-                className="deckyStoreCardVersionContainer"
-                style={{
-                  marginLeft: '5%',
-                  width: '30%',
-                }}
-              >
-                <Dropdown
-                  rgOptions={
-                    plugin.versions.map((version: StorePluginVersion, index) => ({
-                      data: index,
-                      label: version.name,
-                    })) as SingleDropdownOption[]
-                  }
-                  menuLabel="Plugin Version"
-                  selectedOption={selectedOption}
-                  onChange={({ data }) => setSelectedOption(data)}
-                />
-              </div>
-            </Focusable>
-          </PanelSectionRow>
+                Install
+              </DialogButton>
+            </div>
+            <div
+              className="deckyStoreCardVersionDropdownContainer"
+              style={{
+                flex: '0.2',
+              }}
+            >
+              <Dropdown
+                rgOptions={
+                  plugin.versions.map((version: StorePluginVersion, index) => ({
+                    data: index,
+                    label: version.name,
+                  })) as SingleDropdownOption[]
+                }
+                strDefaultLabel={'Select a version'}
+                selectedOption={selectedOption}
+                onChange={({ data }) => setSelectedOption(data)}
+              />
+            </div>
+          </Focusable>
        </div>
-      </div>
+      </Focusable>
    </div>
  );
 };
@@ -1,29 +1,14 @@
-import {
-  Dropdown,
-  DropdownOption,
-  Focusable,
-  PanelSectionRow,
-  SteamSpinner,
-  Tabs,
-  TextField,
-  findModule,
-} from 'decky-frontend-lib';
-import { FC, useEffect, useMemo, useState } from 'react';
+import { SteamSpinner } from 'decky-frontend-lib';
+import { FC, useEffect, useState } from 'react';

-import logo from '../../../assets/plugin_store.png';
 import Logger from '../../logger';
 import { StorePlugin, getPluginList } from '../../store';
 import PluginCard from './PluginCard';

-const logger = new Logger('Store');
+const logger = new Logger('FilePicker');

 const StorePage: FC<{}> = () => {
-  const [currentTabRoute, setCurrentTabRoute] = useState<string>('browse');
  const [data, setData] = useState<StorePlugin[] | null>(null);
-  const { TabCount } = findModule((m) => {
-    if (m?.TabCount && m?.TabTitle) return true;
-    return false;
-  });

  useEffect(() => {
    (async () => {
@@ -34,12 +19,19 @@ const StorePage: FC<{}> = () => {
  }, []);

  return (
-    <>
+    <div
+      style={{
+        marginTop: '40px',
+        height: 'calc( 100% - 40px )',
+        overflowY: 'scroll',
+      }}
+    >
      <div
        style={{
-          marginTop: '40px',
-          height: 'calc( 100% - 40px )',
-          background: '#0005',
+          display: 'flex',
+          flexWrap: 'nowrap',
+          flexDirection: 'column',
+          height: '100%',
        }}
      >
        {!data ? (
@@ -47,193 +39,13 @@ const StorePage: FC<{}> = () => {
            <SteamSpinner />
          </div>
        ) : (
-          <Tabs
-            activeTab={currentTabRoute}
-            onShowTab={(tabId: string) => {
-              setCurrentTabRoute(tabId);
-            }}
-            tabs={[
-              {
-                title: 'Browse',
-                content: <BrowseTab children={{ data: data }} />,
-                id: 'browse',
-                renderTabAddon: () => <span className={TabCount}>{data.length}</span>,
-              },
-              {
-                title: 'About',
-                content: <AboutTab />,
-                id: 'about',
-              },
-            ]}
-          />
+          <div>
+            {data.map((plugin: StorePlugin) => (
+              <PluginCard plugin={plugin} />
+            ))}
+          </div>
        )}
      </div>
-    </>
-  );
-};
-
-const BrowseTab: FC<{ children: { data: StorePlugin[] } }> = (data) => {
-  const sortOptions = useMemo(
-    (): DropdownOption[] => [
-      { data: 1, label: 'Alphabetical (A to Z)' },
-      { data: 2, label: 'Alphabetical (Z to A)' },
-    ],
-    [],
-  );
-
-  // const filterOptions = useMemo((): DropdownOption[] => [{ data: 1, label: 'All' }], []);
-
-  const [selectedSort, setSort] = useState<number>(sortOptions[0].data);
-  // const [selectedFilter, setFilter] = useState<number>(filterOptions[0].data);
-  const [searchFieldValue, setSearchValue] = useState<string>('');
-
-  return (
-    <>
-      <style>{`
-              .deckyStoreCardInstallContainer > .Panel {
-                padding: 0;
-              }
-            `}</style>
-      {/* This should be used once filtering is added
-
-      <PanelSectionRow>
-        <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              width: '47.5%',
-            }}
-          >
-            <span className="DialogLabel">Sort</span>
-            <Dropdown
-              menuLabel="Sort"
-              rgOptions={sortOptions}
-              strDefaultLabel="Last Updated (Newest)"
-              selectedOption={selectedSort}
-              onChange={(e) => setSort(e.data)}
-            />
-          </div>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              width: '47.5%',
-              marginLeft: 'auto',
-            }}
-          >
-            <span className="DialogLabel">Filter</span>
-            <Dropdown
-              menuLabel="Filter"
-              rgOptions={filterOptions}
-              strDefaultLabel="All"
-              selectedOption={selectedFilter}
-              onChange={(e) => setFilter(e.data)}
-            />
-          </div>
-        </Focusable>
-      </PanelSectionRow>
-      <div style={{ justifyContent: 'center', display: 'flex' }}>
-        <Focusable style={{ display: 'flex', alignItems: 'center', width: '96%' }}>
-          <div style={{ width: '100%' }}>
-            <TextField label="Search" value={searchFieldValue} onChange={(e) => setSearchValue(e.target.value)} />
-          </div>
-        </Focusable>
-      </div>
-      */}
-      <PanelSectionRow>
-        <Focusable style={{ display: 'flex', maxWidth: '100%' }}>
-          <div
-            style={{
-              display: 'flex',
-              flexDirection: 'column',
-              minWidth: '100%',
-              maxWidth: '100%',
-            }}
-          >
-            <span className="DialogLabel">Sort</span>
-            <Dropdown
-              menuLabel="Sort"
-              rgOptions={sortOptions}
-              strDefaultLabel="Last Updated (Newest)"
-              selectedOption={selectedSort}
-              onChange={(e) => setSort(e.data)}
-            />
-          </div>
-        </Focusable>
-      </PanelSectionRow>
-      <div style={{ justifyContent: 'center', display: 'flex' }}>
-        <Focusable style={{ display: 'flex', alignItems: 'center', width: '96%' }}>
-          <div style={{ width: '100%' }}>
-            <TextField label="Search" value={searchFieldValue} onChange={(e) => setSearchValue(e.target.value)} />
-          </div>
-        </Focusable>
-      </div>
-      <div>
-        {data.children.data
-          .filter((plugin: StorePlugin) => {
-            return (
-              plugin.name.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.description.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.author.toLowerCase().includes(searchFieldValue.toLowerCase()) ||
-              plugin.tags.some((tag: string) => tag.toLowerCase().includes(searchFieldValue.toLowerCase()))
-            );
-          })
-          .sort((a, b) => {
-            if (selectedSort % 2 === 1) return a.name.localeCompare(b.name);
-            else return b.name.localeCompare(a.name);
-          })
-          .map((plugin: StorePlugin) => (
-            <PluginCard plugin={plugin} />
-          ))}
-      </div>
-    </>
-  );
-};
-
-const AboutTab: FC<{}> = () => {
-  return (
-    <div
-      style={{
-        display: 'flex',
-        flexDirection: 'column',
-      }}
-    >
-      <style>{`
-              .deckyStoreAboutHeader {
-                font-size: 24px;
-                font-weight: 600;
-                margin-top: 20px;
-              }
-            `}</style>
-      <img
-        src={logo}
-        style={{
-          width: '256px',
-          height: 'auto',
-          alignSelf: 'center',
-        }}
-      />
-      <span className="deckyStoreAboutHeader">Testing</span>
-      <span>
-        Please consider testing new plugins to help the Decky Loader team!{' '}
-        <a
-          href="https://deckbrew.xyz/testing"
-          target="_blank"
-          style={{
-            textDecoration: 'none',
-          }}
-        >
-          deckbrew.xyz/testing
-        </a>
-      </span>
-      <span className="deckyStoreAboutHeader">Contributing</span>
-      <span>
-        If you would like to contribute to the Decky Plugin Store, check the SteamDeckHomebrew/decky-plugin-template
-        repository on GitHub. Information on development and distribution is available in the README.
-      </span>
-      <span className="deckyStoreAboutHeader">Source Code</span>
-      <span>All plugin source code is available on SteamDeckHomebrew/decky-plugin-database repository on GitHub.</span>
    </div>
  );
 };
@@ -1,5 +1,3 @@
-import { Navigation, Router, sleep } from 'decky-frontend-lib';
-
 import PluginLoader from './plugin-loader';
 import { DeckyUpdater } from './updater';

@@ -16,23 +14,6 @@ declare global {
  }
 }

-(async () => {
-  try {
-    if (!Router.NavigateToAppProperties || !Router.NavigateToLibraryTab || !Router.NavigateToInvites) {
-      while (!Navigation.NavigateToAppProperties) await sleep(100);
-      const shims = {
-        NavigateToAppProperties: Navigation.NavigateToAppProperties,
-        NavigateToInvites: Navigation.NavigateToInvites,
-        NavigateToLibraryTab: Navigation.NavigateToLibraryTab,
-      };
-      (Router as unknown as any).deckyShim = true;
-      Object.assign(Router, shims);
-    }
-  } catch (e) {
-    console.error('[DECKY]: Error initializing Navigation interface shims', e);
-  }
-})();
-
 (async () => {
  window.deckyAuthToken = await fetch('http://127.0.0.1:1337/auth/token').then((r) => r.text());

@@ -0,0 +1,235 @@
+import {
+  CustomMainMenuItem,
+  ItemPatch,
+  MainMenuItem,
+  OverlayPatch,
+  afterPatch,
+  findInReactTree,
+  sleep,
+} from 'decky-frontend-lib';
+import { FC } from 'react';
+import { ReactNode, cloneElement, createElement } from 'react';
+
+import { DeckyMenuState, DeckyMenuStateContextProvider, useDeckyMenuState } from './components/DeckyMenuState';
+import Logger from './logger';
+
+declare global {
+  interface Window {
+    __MENU_HOOK_INSTANCE: any;
+  }
+}
+
+class MenuHook extends Logger {
+  private menuRenderer?: any;
+  private originalRenderer?: any;
+  private menuState: DeckyMenuState = new DeckyMenuState();
+
+  constructor() {
+    super('MenuHook');
+
+    this.log('Initialized');
+    window.__MENU_HOOK_INSTANCE?.deinit?.();
+    window.__MENU_HOOK_INSTANCE = this;
+  }
+
+  init() {
+    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
+    let outerMenuRoot: any;
+    const findMenuRoot = (currentNode: any, iters: number): any => {
+      if (iters >= 60) {
+        // currently 54
+        return null;
+      }
+      if (currentNode?.memoizedProps?.navID == 'MainNavMenuContainer') {
+        this.log(`Menu root was found in ${iters} recursion cycles`);
+        return currentNode;
+      }
+      if (currentNode.child) {
+        let node = findMenuRoot(currentNode.child, iters + 1);
+        if (node !== null) return node;
+      }
+      if (currentNode.sibling) {
+        let node = findMenuRoot(currentNode.sibling, iters + 1);
+        if (node !== null) return node;
+      }
+      return null;
+    };
+
+    (async () => {
+      outerMenuRoot = findMenuRoot(tree, 0);
+      while (!outerMenuRoot) {
+        this.error(
+          'Failed to find Menu root node, reattempting in 5 seconds. A developer may need to increase the recursion limit.',
+        );
+        await sleep(5000);
+        outerMenuRoot = findMenuRoot(tree, 0);
+      }
+      this.log('found outermenuroot', outerMenuRoot);
+      const menuRenderer = outerMenuRoot.return;
+      this.menuRenderer = menuRenderer;
+      this.originalRenderer = menuRenderer.type;
+      let toReplace = new Map<string, ReactNode>();
+      let alreadyPatched = new Map<string, { total: number; node: ReactNode }>();
+
+      let patchedInnerMenu: any;
+      let overlayComponentManager: any;
+
+      const DeckyOverlayComponentManager = () => {
+        const { overlayComponents } = useDeckyMenuState();
+
+        return <>{overlayComponents.values()}</>;
+      };
+
+      const DeckyInnerMenuWrapper = (props: { innerProps: any }) => {
+        const { overlayPatches } = useDeckyMenuState();
+
+        const rendererRet = this.originalRenderer(props.innerProps);
+
+        // Find the first array of children, this contains [mainmenu, overlay]
+        const childArray = findInReactTree(rendererRet, (x) => x?.[0]?.type);
+
+        // Insert the overlay components manager
+        if (!overlayComponentManager) {
+          overlayComponentManager = <DeckyOverlayComponentManager />;
+        }
+
+        childArray.push(overlayComponentManager);
+
+        // This must be cached in patchedInnerMenu to prevent re-renders
+        if (patchedInnerMenu) {
+          childArray[0].type = patchedInnerMenu;
+        } else {
+          afterPatch(childArray[0], 'type', (_, ret) => {
+            const { itemPatches, items } = useDeckyMenuState();
+
+            const itemList = ret.props.children;
+
+            // Add custom menu items
+            if (items.size > 0) {
+              const button = findInReactTree(ret.props.children, (x) =>
+                x?.type?.toString()?.includes('exactRouteMatch:'),
+              );
+
+              const MenuItemComponent: FC<MainMenuItem> = button.type;
+
+              items.forEach((item) => {
+                let realIndex = 0; // there are some non-item things in the array
+                let count = 0;
+                itemList.forEach((i: any) => {
+                  if (count == item.index) return;
+                  if (i?.type == MenuItemComponent) count++;
+                  realIndex++;
+                });
+                itemList.splice(realIndex, 0, createElement(MenuItemComponent, item));
+              });
+            }
+
+            // Apply and revert patches
+            itemList.forEach((item: { props: MainMenuItem }, index: number) => {
+              if (!item?.props?.route) return;
+              const replaced = toReplace.get(item?.props?.route as string);
+              if (replaced) {
+                itemList[index] = replaced;
+                toReplace.delete(item?.props.route as string);
+              }
+              if (item?.props?.route && (itemPatches.has(item.props.route as string) || itemPatches.has('*'))) {
+                if (
+                  item?.props?.route && 
+                  alreadyPatched.has(item.props.route) &&
+                  alreadyPatched.get(item.props.route)?.total ==
+                    (itemPatches.get(item.props.route)?.size || 0) + (itemPatches.get('*')?.size || 0)
+                ) {
+                  const patched = alreadyPatched.get(item.props.route);
+                  this.debug('found already patched', patched);
+                  itemList[index] = patched?.node;
+                  return;
+                }
+                toReplace.set(item?.props?.route as string, itemList[index]);
+                itemPatches.get(item.props.route as string)?.forEach((patch) => {
+                  const oType = itemList[index].type;
+                  itemList[index] = patch({
+                    ...cloneElement(itemList[index]),
+                    type: (props: any) => createElement(oType, props),
+                  });
+                });
+                itemPatches.get('*')?.forEach((patch) => {
+                  const oType = itemList[index].type;
+                  itemList[index] = patch({
+                    ...cloneElement(itemList[index]),
+                    type: (props: any) => createElement(oType, props),
+                  });
+                });
+                alreadyPatched.set(item.props.route, {
+                  total: (itemPatches.get(item.props.route)?.size || 0) + (itemPatches.get('*')?.size || 0),
+                  node: itemList[index],
+                });
+              }
+            });
+
+            return ret;
+          });
+          patchedInnerMenu = childArray[0].type;
+        }
+
+        // Apply patches to the overlay
+        if (childArray[1]) {
+          overlayPatches.forEach((patch) => (childArray[1] = patch(childArray[1])));
+        }
+
+        return rendererRet;
+      };
+
+      const DeckyOuterMenuWrapper = (props: any) => {
+        return (
+          <DeckyMenuStateContextProvider deckyMenuState={this.menuState}>
+            <DeckyInnerMenuWrapper innerProps={props} />
+          </DeckyMenuStateContextProvider>
+        );
+      };
+      menuRenderer.type = DeckyOuterMenuWrapper;
+      if (menuRenderer.alternate) {
+        menuRenderer.alternate.type = menuRenderer.type;
+      }
+      this.log('Finished initial injection');
+    })();
+  }
+
+  deinit() {
+    this.menuRenderer.type = this.originalRenderer;
+    this.menuRenderer.alternate.type = this.menuRenderer.type;
+  }
+
+  addItem(item: CustomMainMenuItem) {
+    return this.menuState.addItem(item);
+  }
+
+  addPatch(path: string, patch: ItemPatch) {
+    return this.menuState.addPatch(path, patch);
+  }
+
+  addOverlayPatch(patch: OverlayPatch) {
+    return this.menuState.addOverlayPatch(patch);
+  }
+
+  addOverlayComponent(component: ReactNode) {
+    return this.menuState.addOverlayComponent(component);
+  }
+
+  removePatch(path: string, patch: ItemPatch) {
+    return this.menuState.removePatch(path, patch);
+  }
+
+  removeItem(item: CustomMainMenuItem) {
+    return this.menuState.removeItem(item);
+  }
+
+  removeOverlayPatch(patch: OverlayPatch) {
+    return this.menuState.removeOverlayPatch(patch);
+  }
+
+  removeOverlayComponent(component: ReactNode) {
+    return this.menuState.removeOverlayComponent(component);
+  }
+}
+
+export default MenuHook;
@@ -1,4 +1,4 @@
-import { ConfirmModal, ModalRoot, Patch, QuickAccessTab, Router, showModal, sleep } from 'decky-frontend-lib';
+import { ConfirmModal, ModalRoot, QuickAccessTab, Router, showModal, sleep, staticClasses } from 'decky-frontend-lib';
 import { FC, lazy } from 'react';
 import { FaCog, FaExclamationCircle, FaPlug } from 'react-icons/fa';

@@ -10,6 +10,7 @@ import NotificationBadge from './components/NotificationBadge';
 import PluginView from './components/PluginView';
 import WithSuspense from './components/WithSuspense';
 import Logger from './logger';
+import MenuHook from './menu-hook';
 import { Plugin } from './plugin';
 import RouterHook from './router-hook';
 import { deinitSteamFixes, initSteamFixes } from './steamfixes';
@@ -28,6 +29,7 @@ const FilePicker = lazy(() => import('./components/modals/filepicker'));
 class PluginLoader extends Logger {
  private plugins: Plugin[] = [];
  private tabsHook: TabsHook | OldTabsHook = document.title == 'SP' ? new OldTabsHook() : new TabsHook();
+  private menuHook: MenuHook = new MenuHook();
  // private windowHook: WindowHook = new WindowHook();
  private routerHook: RouterHook = new RouterHook();
  public toaster: Toaster = new Toaster();
@@ -37,11 +39,10 @@ class PluginLoader extends Logger {
  // stores a list of plugin names which requested to be reloaded
  private pluginReloadQueue: { name: string; version?: string }[] = [];

-  private focusWorkaroundPatch?: Patch;
-
  constructor() {
    super(PluginLoader.name);
    this.tabsHook.init();
+    this.menuHook.init();
    this.log('Initialized');

    const TabBadge = () => {
@@ -146,10 +147,10 @@ class PluginLoader extends Logger {
        onCancel={() => {
          // do nothing
        }}
-        strTitle={`Uninstall ${name}`}
-        strOKButtonText={'Uninstall'}
      >
-        Are you sure you want to uninstall {name}?
+        <div className={staticClasses.Title} style={{ flexDirection: 'column' }}>
+          Uninstall {name}?
+        </div>
      </ConfirmModal>,
    );
  }
@@ -176,11 +177,9 @@ class PluginLoader extends Logger {
    this.routerHook.removeRoute('/decky/settings');
    deinitSteamFixes();
    deinitFilepickerPatches();
-    this.focusWorkaroundPatch?.unpatch();
  }

  public unloadPlugin(name: string) {
-    console.log('Plugin List: ', this.plugins);
    const plugin = this.plugins.find((plugin) => plugin.name === name || plugin.name === name.replace('$LEGACY_', ''));
    plugin?.onDismount?.();
    this.plugins = this.plugins.filter((p) => p !== plugin);
@@ -314,6 +313,7 @@ class PluginLoader extends Logger {

  createPluginAPI(pluginName: string) {
    return {
+      menuHook: this.menuHook,
      routerHook: this.routerHook,
      toaster: this.toaster,
      callServerMethod: this.callServerMethod,
@@ -336,7 +336,6 @@ class PluginLoader extends Logger {
      fetchNoCors(url: string, request: any = {}) {
        let args = { method: 'POST', headers: {} };
        const req = { ...args, ...request, url, data: request.body };
-        req?.body && delete req.body;
        return this.callServerMethod('http_request', req);
      },
      executeInTab(tab: string, runAsync: boolean, code: string) {
@@ -120,12 +120,16 @@ class RouterHook extends Logger {
      return <>{renderedComponents}</>;
    };

+    let globalComponents: any;
+
    this.wrapperPatch = afterPatch(this.gamepadWrapper, 'render', (_: any, ret: any) => {
      if (ret?.props?.children?.props?.children?.length == 5 || ret?.props?.children?.props?.children?.length == 4) {
        const idx = ret?.props?.children?.props?.children?.length == 4 ? 1 : 2;
-        const potentialSettingsRootString =
-          ret.props.children.props.children[idx]?.props?.children?.[0]?.type?.type?.toString() || '';
-        if (potentialSettingsRootString?.includes('Settings.Root()')) {
+        if (
+          ret.props.children.props.children[idx]?.props?.children?.[0]?.type?.type
+            ?.toString()
+            ?.includes('GamepadUI.Settings.Root()')
+        ) {
          if (!this.router) {
            this.router = ret.props.children.props.children[idx]?.props?.children?.[0]?.type;
            this.routerPatch = afterPatch(this.router, 'type', (_: any, ret: any) => {
@@ -141,11 +145,17 @@ class RouterHook extends Logger {
            this.memoizedRouter = memo(this.router.type);
            this.memoizedRouter.isDeckyRouter = true;
          }
-          ret.props.children.props.children.push(
-            <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
-              <DeckyGlobalComponentsWrapper />
-            </DeckyGlobalComponentsStateContextProvider>,
-          );
+
+          if (!globalComponents) {
+            globalComponents = (
+              <DeckyGlobalComponentsStateContextProvider deckyGlobalComponentsState={this.globalComponentsState}>
+                <DeckyGlobalComponentsWrapper />
+              </DeckyGlobalComponentsStateContextProvider>
+            );
+          }
+
+          ret.props.children.props.children.push(globalComponents);
+
          ret.props.children.props.children[idx].props.children[0].type = this.memoizedRouter;
        }
      }
@@ -7,6 +7,6 @@ export function deinitSteamFixes() {
 }

 export async function initSteamFixes() {
-  fixes.push(await reloadFix());
+  fixes.push(reloadFix());
  fixes.push(await restartFix());
 }
@@ -1,17 +1,10 @@
-import { getFocusNavController, sleep } from 'decky-frontend-lib';
-
 import Logger from '../logger';

 const logger = new Logger('ReloadSteamFix');

-declare global {
-  var GamepadNavTree: any;
-}
-
-export default async function reloadFix() {
+export default function reloadFix() {
  // Hack to unbreak the ui when reloading it
-  await sleep(4000);
-  if (getFocusNavController()?.m_rgAllContexts?.length == 0) {
+  if (window.FocusNavController?.m_rgAllContexts?.length == 0) {
    SteamClient.URL.ExecuteSteamURL('steam://open/settings');
    logger.log('Applied UI reload fix.');
  }
@@ -4,6 +4,13 @@ import Logger from '../logger';

 const logger = new Logger('RestartSteamFix');

+declare global {
+  interface Window {
+    SteamClient: any;
+    appDetailsStore: any;
+  }
+}
+
 let patch: Patch;

 function rePatch() {
@@ -35,7 +35,7 @@ class TabsHook extends Logger {
    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
    let qAMRoot: any;
    const findQAMRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 65) {
+      if (iters >= 55) {
        // currently 45
        return null;
      }
@@ -128,23 +128,22 @@ class TabsHook extends Logger {
    let deckyTabAmount = existingTabs.reduce((prev: any, cur: any) => (cur.decky ? prev + 1 : prev), 0);
    if (deckyTabAmount == this.tabs.length) {
      for (let tab of existingTabs) {
-        if (tab?.decky && tab?.qAMVisibilitySetter) tab?.qAMVisibilitySetter(visible);
+        if (tab?.decky) tab.panel.props.setter[0](visible);
      }
      return;
    }
    for (const { title, icon, content, id } of this.tabs) {
-      const tab: any = {
+      existingTabs.push({
        key: id,
        title,
        tab: icon,
        decky: true,
-      };
-      tab.panel = (
-        <QuickAccessVisibleStateProvider initial={visible} tab={tab}>
-          {content}
-        </QuickAccessVisibleStateProvider>
-      );
-      existingTabs.push(tab);
+        panel: (
+          <QuickAccessVisibleStateProvider initial={visible} setter={[]}>
+            {content}
+          </QuickAccessVisibleStateProvider>
+        ),
+      });
    }
  }
 }
@@ -40,15 +40,11 @@ class Toaster extends Logger {
    let instance: any;
    const tree = (document.getElementById('root') as any)._reactRootContainer._internalRoot.current;
    const findToasterRoot = (currentNode: any, iters: number): any => {
-      if (iters >= 65) {
-        // currently 65
+      if (iters >= 50) {
+        // currently 40
        return null;
      }
-      if (
-        currentNode?.memoizedProps?.className?.startsWith?.('gamepadtoasts_GamepadToastPlaceholder') ||
-        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder') ||
-        currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPopup')
-      ) {
+      if (currentNode?.memoizedProps?.className?.startsWith?.('toastmanager_ToastPlaceholder')) {
        this.log(`Toaster root was found in ${iters} recursion cycles`);
        return currentNode;
      }
@@ -0,0 +1,7 @@
+export function findSP(): Window {
+  // old (SP as host)
+  if (document.title == 'SP') return window;
+  // new (SP as popup)
+  return FocusNavController.m_ActiveContext.m_rgGamepadNavigationTrees.find((x: any) => x.m_ID == 'root_1_').Root
+    .Element.ownerDocument.defaultView;
+}
@@ -1,7 +1,7 @@
 {
  "compilerOptions": {
    "module": "ESNext",
-    "target": "ES2021",
+    "target": "ES2020",
    "jsx": "react",
    "jsxFactory": "window.SP_REACT.createElement",
    "jsxFragmentFactory": "window.SP_REACT.Fragment",
@@ -18,6 +18,6 @@
    "allowSyntheticDefaultImports": true,
    "skipLibCheck": true
  },
-  "include": ["src", "index.d.ts"],
+  "include": ["src"],
  "exclude": ["node_modules"]
 }
@@ -1,201 +0,0 @@
-"""
-This module exposes various constants and helpers useful for decky plugins.
-
-* Plugin's settings and configurations should be stored under `DECKY_PLUGIN_SETTINGS_DIR`.
-* Plugin's runtime data should be stored under `DECKY_PLUGIN_RUNTIME_DIR`.
-* Plugin's persistent log files should be stored under `DECKY_PLUGIN_LOG_DIR`.
-
-Avoid writing outside of `DECKY_HOME`, storing under the suggested paths is strongly recommended.
-
-Some basic migration helpers are available: `migrate_any`, `migrate_settings`, `migrate_runtime`, `migrate_logs`.
-
-A logging facility `logger` is available which writes to the recommended location.
-"""
-
-__version__ = '0.1.0'
-
-import os
-import subprocess
-import logging
-
-"""
-Constants
-"""
-
-HOME: str = os.getenv("HOME", default="")
-"""
-The home directory of the effective user running the process.
-Environment variable: `HOME`.
-If `root` was specified in the plugin's flags it will be `/root` otherwise the user whose home decky resides in.
-e.g.: `/home/deck`
-"""
-
-USER: str = os.getenv("USER", default="")
-"""
-The effective username running the process.
-Environment variable: `USER`.
-It would be `root` if `root` was specified in the plugin's flags otherwise the user whose home decky resides in.
-e.g.: `deck`
-"""
-
-DECKY_VERSION: str = os.getenv("DECKY_VERSION", default="")
-"""
-The version of the decky loader.
-Environment variable: `DECKY_VERSION`.
-e.g.: `v2.5.0-pre1`
-"""
-
-DECKY_USER: str = os.getenv("DECKY_USER", default="")
-"""
-The user whose home decky resides in.
-Environment variable: `DECKY_USER`.
-e.g.: `deck`
-"""
-
-DECKY_USER_HOME: str = os.getenv("DECKY_USER_HOME", default="")
-"""
-The home of the user where decky resides in.
-Environment variable: `DECKY_USER_HOME`.
-e.g.: `/home/deck`
-"""
-
-DECKY_HOME: str = os.getenv("DECKY_HOME", default="")
-"""
-The root of the decky folder.
-Environment variable: `DECKY_HOME`.
-e.g.: `/home/deck/homebrew`
-"""
-
-DECKY_PLUGIN_SETTINGS_DIR: str = os.getenv(
-    "DECKY_PLUGIN_SETTINGS_DIR", default="")
-"""
-The recommended path in which to store configuration files (created automatically).
-Environment variable: `DECKY_PLUGIN_SETTINGS_DIR`.
-e.g.: `/home/deck/homebrew/settings/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_RUNTIME_DIR: str = os.getenv(
-    "DECKY_PLUGIN_RUNTIME_DIR", default="")
-"""
-The recommended path in which to store runtime data (created automatically).
-Environment variable: `DECKY_PLUGIN_RUNTIME_DIR`.
-e.g.: `/home/deck/homebrew/data/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_LOG_DIR: str = os.getenv("DECKY_PLUGIN_LOG_DIR", default="")
-"""
-The recommended path in which to store persistent logs (created automatically).
-Environment variable: `DECKY_PLUGIN_LOG_DIR`.
-e.g.: `/home/deck/homebrew/logs/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_DIR: str = os.getenv("DECKY_PLUGIN_DIR", default="")
-"""
-The root of the plugin's directory.
-Environment variable: `DECKY_PLUGIN_DIR`.
-e.g.: `/home/deck/homebrew/plugins/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_NAME: str = os.getenv("DECKY_PLUGIN_NAME", default="")
-"""
-The name of the plugin as specified in the 'plugin.json'.
-Environment variable: `DECKY_PLUGIN_NAME`.
-e.g.: `Example Plugin`
-"""
-
-DECKY_PLUGIN_VERSION: str = os.getenv("DECKY_PLUGIN_VERSION", default="")
-"""
-The version of the plugin as specified in the 'package.json'.
-Environment variable: `DECKY_PLUGIN_VERSION`.
-e.g.: `0.0.1`
-"""
-
-DECKY_PLUGIN_AUTHOR: str = os.getenv("DECKY_PLUGIN_AUTHOR", default="")
-"""
-The author of the plugin as specified in the 'plugin.json'.
-Environment variable: `DECKY_PLUGIN_AUTHOR`.
-e.g.: `John Doe`
-"""
-
-DECKY_PLUGIN_LOG: str = os.path.join(DECKY_PLUGIN_LOG_DIR, "plugin.log")
-"""
-The path to the plugin's main logfile.
-Environment variable: `DECKY_PLUGIN_LOG`.
-e.g.: `/home/deck/homebrew/logs/decky-plugin-template/plugin.log`
-"""
-
-"""
-Migration helpers
-"""
-
-
-def migrate_any(target_dir: str, *files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories to a new location and remove old locations.
-    Specified files will be migrated to `target_dir`.
-    Specified directories will have their contents recursively migrated to `target_dir`.
-
-    Returns the mapping of old -> new location.
-    """
-    file_map: dict[str, str] = {}
-    for f in files_or_directories:
-        if not os.path.exists(f):
-            file_map[f] = ""
-            continue
-        if os.path.isdir(f):
-            src_dir = f
-            src_file = "."
-            file_map[f] = target_dir
-        else:
-            src_dir = os.path.dirname(f)
-            src_file = os.path.basename(f)
-            file_map[f] = os.path.join(target_dir, src_file)
-        subprocess.run(["sh", "-c", "mkdir -p \"$3\"; tar -cf - -C \"$1\" \"$2\" | tar -xf - -C \"$3\" && rm -rf \"$4\"",
-                       "_", src_dir, src_file, target_dir, f])
-    return file_map
-
-
-def migrate_settings(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin settings to the recommended location and remove old locations.
-    Specified files will be migrated to `DECKY_PLUGIN_SETTINGS_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_SETTINGS_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-    return migrate_any(DECKY_PLUGIN_SETTINGS_DIR, *files_or_directories)
-
-
-def migrate_runtime(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin runtime data to the recommended location and remove old locations
-    Specified files will be migrated to `DECKY_PLUGIN_RUNTIME_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_RUNTIME_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-    return migrate_any(DECKY_PLUGIN_RUNTIME_DIR, *files_or_directories)
-
-
-def migrate_logs(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin logs to the recommended location and remove old locations.
-    Specified files will be migrated to `DECKY_PLUGIN_LOG_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_LOG_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-    return migrate_any(DECKY_PLUGIN_LOG_DIR, *files_or_directories)
-
-
-"""
-Logging
-"""
-
-logging.basicConfig(filename=DECKY_PLUGIN_LOG,
-                    format='[%(asctime)s][%(levelname)s]: %(message)s',
-                    force=True)
-logger: logging.Logger = logging.getLogger()
-"""The main plugin logger writing to `DECKY_PLUGIN_LOG`."""
-
-logger.setLevel(logging.INFO)
@@ -1,173 +0,0 @@
-"""
-This module exposes various constants and helpers useful for decky plugins.
-
-* Plugin's settings and configurations should be stored under `DECKY_PLUGIN_SETTINGS_DIR`.
-* Plugin's runtime data should be stored under `DECKY_PLUGIN_RUNTIME_DIR`.
-* Plugin's persistent log files should be stored under `DECKY_PLUGIN_LOG_DIR`.
-
-Avoid writing outside of `DECKY_HOME`, storing under the suggested paths is strongly recommended.
-
-Some basic migration helpers are available: `migrate_any`, `migrate_settings`, `migrate_runtime`, `migrate_logs`.
-
-A logging facility `logger` is available which writes to the recommended location.
-"""
-
-__version__ = '0.1.0'
-
-import logging
-
-"""
-Constants
-"""
-
-HOME: str
-"""
-The home directory of the effective user running the process.
-Environment variable: `HOME`.
-If `root` was specified in the plugin's flags it will be `/root` otherwise the user whose home decky resides in.
-e.g.: `/home/deck`
-"""
-
-USER: str
-"""
-The effective username running the process.
-Environment variable: `USER`.
-It would be `root` if `root` was specified in the plugin's flags otherwise the user whose home decky resides in.
-e.g.: `deck`
-"""
-
-DECKY_VERSION: str
-"""
-The version of the decky loader.
-Environment variable: `DECKY_VERSION`.
-e.g.: `v2.5.0-pre1`
-"""
-
-DECKY_USER: str
-"""
-The user whose home decky resides in.
-Environment variable: `DECKY_USER`.
-e.g.: `deck`
-"""
-
-DECKY_USER_HOME: str
-"""
-The home of the user where decky resides in.
-Environment variable: `DECKY_USER_HOME`.
-e.g.: `/home/deck`
-"""
-
-DECKY_HOME: str
-"""
-The root of the decky folder.
-Environment variable: `DECKY_HOME`.
-e.g.: `/home/deck/homebrew`
-"""
-
-DECKY_PLUGIN_SETTINGS_DIR: str
-"""
-The recommended path in which to store configuration files (created automatically).
-Environment variable: `DECKY_PLUGIN_SETTINGS_DIR`.
-e.g.: `/home/deck/homebrew/settings/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_RUNTIME_DIR: str
-"""
-The recommended path in which to store runtime data (created automatically).
-Environment variable: `DECKY_PLUGIN_RUNTIME_DIR`.
-e.g.: `/home/deck/homebrew/data/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_LOG_DIR: str
-"""
-The recommended path in which to store persistent logs (created automatically).
-Environment variable: `DECKY_PLUGIN_LOG_DIR`.
-e.g.: `/home/deck/homebrew/logs/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_DIR: str
-"""
-The root of the plugin's directory.
-Environment variable: `DECKY_PLUGIN_DIR`.
-e.g.: `/home/deck/homebrew/plugins/decky-plugin-template`
-"""
-
-DECKY_PLUGIN_NAME: str
-"""
-The name of the plugin as specified in the 'plugin.json'.
-Environment variable: `DECKY_PLUGIN_NAME`.
-e.g.: `Example Plugin`
-"""
-
-DECKY_PLUGIN_VERSION: str
-"""
-The version of the plugin as specified in the 'package.json'.
-Environment variable: `DECKY_PLUGIN_VERSION`.
-e.g.: `0.0.1`
-"""
-
-DECKY_PLUGIN_AUTHOR: str
-"""
-The author of the plugin as specified in the 'plugin.json'.
-Environment variable: `DECKY_PLUGIN_AUTHOR`.
-e.g.: `John Doe`
-"""
-
-DECKY_PLUGIN_LOG: str
-"""
-The path to the plugin's main logfile.
-Environment variable: `DECKY_PLUGIN_LOG`.
-e.g.: `/home/deck/homebrew/logs/decky-plugin-template/plugin.log`
-"""
-
-"""
-Migration helpers
-"""
-
-
-def migrate_any(target_dir: str, *files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories to a new location and remove old locations.
-    Specified files will be migrated to `target_dir`.
-    Specified directories will have their contents recursively migrated to `target_dir`.
-
-    Returns the mapping of old -> new location.
-    """
-
-
-def migrate_settings(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin settings to the recommended location and remove old locations.
-    Specified files will be migrated to `DECKY_PLUGIN_SETTINGS_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_SETTINGS_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-
-
-def migrate_runtime(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin runtime data to the recommended location and remove old locations
-    Specified files will be migrated to `DECKY_PLUGIN_RUNTIME_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_RUNTIME_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-
-
-def migrate_logs(*files_or_directories: str) -> dict[str, str]:
-    """
-    Migrate files and directories relating to plugin logs to the recommended location and remove old locations.
-    Specified files will be migrated to `DECKY_PLUGIN_LOG_DIR`.
-    Specified directories will have their contents recursively migrated to `DECKY_PLUGIN_LOG_DIR`.
-
-    Returns the mapping of old -> new location.
-    """
-
-
-"""
-Logging
-"""
-
-logger: logging.Logger
-"""The main plugin logger writing to `DECKY_PLUGIN_LOG`."""
@@ -2,4 +2,4 @@ aiohttp==3.8.1
 aiohttp-jinja2==1.5.0
 aiohttp_cors==0.7.0
 watchdog==2.1.7
-certifi==2022.12.7
+certifi==2022.6.15
Author	SHA1	Message	Date
AAGaming	0e5d991c8d	add patch caching	2022-12-31 23:27:04 -05:00
AAGaming	0fe3282828	make that actually work lol	2022-12-31 22:52:37 -05:00
AAGaming	335d38e12b	add * option for route in itempatches	2022-12-31 22:46:39 -05:00
AAGaming	d762860eac	missed this	2022-12-31 22:00:38 -05:00
AAGaming	fdbc508fa8	Main menu and overlay patching API	2022-12-31 21:53:39 -05:00
AAGaming	81fbd0f83f	Fix reloading UI on updates and restarting steam	2022-12-29 23:46:47 -05:00