diff --git a/package.json b/package.json
index 330d99ff..7c96aa68 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "xml-formatter": "^3.6.6"
     },
     "dependencies": {
-        "arrpc": "https://github.com/Legcord/arrpc.git#f7ab641ad3386d44364e227d97ba0dc847de08d1",
+        "arrpc": "https://github.com/Legcord/arrpc.git#811ed990be17a10ac5c6e992133f4172c6ec8640",
         "electron-context-menu": "^4.0.4",
         "electron-is-dev": "^3.0.1",
         "electron-updater": "^6.6.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 20c95190..7a8b59ce 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       arrpc:
-        specifier: https://github.com/Legcord/arrpc.git#f7ab641ad3386d44364e227d97ba0dc847de08d1
-        version: https://codeload.github.com/Legcord/arrpc/tar.gz/f7ab641ad3386d44364e227d97ba0dc847de08d1
+        specifier: https://github.com/Legcord/arrpc.git#811ed990be17a10ac5c6e992133f4172c6ec8640
+        version: https://codeload.github.com/Legcord/arrpc/tar.gz/811ed990be17a10ac5c6e992133f4172c6ec8640
       electron-context-menu:
         specifier: ^4.0.4
         version: 4.0.4
@@ -1369,8 +1369,8 @@ packages:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
 
-  arrpc@https://codeload.github.com/Legcord/arrpc/tar.gz/f7ab641ad3386d44364e227d97ba0dc847de08d1:
-    resolution: {tarball: https://codeload.github.com/Legcord/arrpc/tar.gz/f7ab641ad3386d44364e227d97ba0dc847de08d1}
+  arrpc@https://codeload.github.com/Legcord/arrpc/tar.gz/811ed990be17a10ac5c6e992133f4172c6ec8640:
+    resolution: {tarball: https://codeload.github.com/Legcord/arrpc/tar.gz/811ed990be17a10ac5c6e992133f4172c6ec8640}
     version: 3.5.0
     hasBin: true
 
@@ -4495,7 +4495,7 @@ snapshots:
 
   array-union@2.1.0: {}
 
-  arrpc@https://codeload.github.com/Legcord/arrpc/tar.gz/f7ab641ad3386d44364e227d97ba0dc847de08d1:
+  arrpc@https://codeload.github.com/Legcord/arrpc/tar.gz/811ed990be17a10ac5c6e992133f4172c6ec8640:
     dependencies:
       koffi: 2.15.0
       ws: 8.18.0
diff --git a/src/shelter/screenshare/index.tsx b/src/shelter/screenshare/index.tsx
index ced781a4..3e44f5e9 100644
--- a/src/shelter/screenshare/index.tsx
+++ b/src/shelter/screenshare/index.tsx
@@ -7,6 +7,7 @@ const {
     flux: {
         stores: { UserStore, MediaEngineStore },
         dispatcher,
+        intercept,
     },
     ui: { openModal },
     plugin: { store },
@@ -72,6 +73,18 @@ export function onLoad() {
             <ScreensharePicker sources={sources} close={close} audioSources={audioSources} />
         ));
     });
+    intercept((dispatch) => {
+        if (dispatch.type === "MEDIA_ENGINE_SET_GO_LIVE_SOURCE") {
+            console.log("Intercepted stream quality change dispatch");
+            console.log(dispatch);
+            dispatch.settings.qualityOptions = {
+                fps: store.fps,
+                resolution: store.resolution,
+                preset: 0,
+            };
+            return dispatch;
+        }
+    });
     dispatcher.subscribe("MEDIA_ENGINE_VIDEO_SOURCE_QUALITY_CHANGED", onStreamQualityChange);
     dispatcher.subscribe("STREAM_DELETE", onStreamEnd);
 }
diff --git a/src/shelter/settings/components/SegmentedControl.tsx b/src/shelter/settings/components/SegmentedControl.tsx
index b5fff3c8..039690ec 100644
--- a/src/shelter/settings/components/SegmentedControl.tsx
+++ b/src/shelter/settings/components/SegmentedControl.tsx
@@ -9,15 +9,21 @@ export const SegmentedControl = (props: {
     return (
         <div class={classes.container}>
             <For each={props.options}>
-                {(opt) => (
-                    <div
-                        class={classes.item}
-                        aria-selected={opt.value === props.value}
-                        onClick={() => props.onChange(String(opt.value))}
-                    >
-                        {opt.label}
-                    </div>
-                )}
+                {(opt) => {
+                    const isSelected = () => String(opt.value) === String(props.value);
+
+                    return (
+                        // biome-ignore lint/a11y/useFocusableInteractive: FIX-ME
+                        <div
+                            class={classes.item}
+                            role="tab"
+                            aria-selected={isSelected() ? "true" : "false"}
+                            onClick={() => props.onChange(String(opt.value))}
+                        >
+                            {opt.label}
+                        </div>
+                    );
+                }}
             </For>
         </div>
     );
diff --git a/src/splash/main.ts b/src/splash/main.ts
index 5bd1e579..ee49b58c 100644
--- a/src/splash/main.ts
+++ b/src/splash/main.ts
@@ -5,6 +5,7 @@ import { getConfig } from "../common/config.js";
 
 export let splashWindow: BrowserWindow;
 export async function createSplashWindow(): Promise<void> {
+    if (getConfig("startMinimized")) return;
     splashWindow = new BrowserWindow({
         width: 300,
         height: 350,