diff --git a/src/core/ui/settings/pages/Developer/index.tsx b/src/core/ui/settings/pages/Developer/index.tsx
index 5d700ff..6f66a81 100644
--- a/src/core/ui/settings/pages/Developer/index.tsx
+++ b/src/core/ui/settings/pages/Developer/index.tsx
@@ -21,7 +21,7 @@ const { showSimpleActionSheet } = lazyDestructure(() => findByProps("showSimpleA
 const { openAlert } = lazyDestructure(() => findByProps("openAlert", "dismissAlert"));
 const { AlertModal, AlertActionButton } = lazyDestructure(() => findByProps("AlertModal", "AlertActions"));
 
-const RDT_EMBED_LINK = "https://github.com/revenge-mod/react-devtools-core/releases/latest/download/rdtc.js";
+const RDT_EMBED_LINK = "";
 
 const useStyles = createStyles({
     leadingText: {
diff --git a/src/core/ui/settings/pages/Themes/index.tsx b/src/core/ui/settings/pages/Themes/index.tsx
index 5595edb..e7e38da 100644
--- a/src/core/ui/settings/pages/Themes/index.tsx
+++ b/src/core/ui/settings/pages/Themes/index.tsx
@@ -2,80 +2,141 @@ import { formatString, Strings } from "@core/i18n";
 import AddonPage from "@core/ui/components/AddonPage";
 import ThemeCard from "@core/ui/settings/pages/Themes/ThemeCard";
 import { useProxy } from "@core/vendetta/storage";
-import { getCurrentTheme, installTheme, themes, VdThemeInfo } from "@lib/addons/themes";
+import {
+  getCurrentTheme,
+  installTheme,
+  themes,
+  VdThemeInfo,
+} from "@lib/addons/themes";
 import { colorsPref } from "@lib/addons/themes/colors/preferences";
 import { updateBunnyColor } from "@lib/addons/themes/colors/updater";
 import { Author } from "@lib/addons/types";
 import { findAssetId } from "@lib/api/assets";
 import { settings } from "@lib/api/settings";
 import { useObservable } from "@lib/api/storage";
-import { ActionSheet, BottomSheetTitleHeader, Button, TableRadioGroup, TableRadioRow, TableRowIcon } from "@metro/common/components";
+import {
+  ActionSheet,
+  BottomSheetTitleHeader,
+  Button,
+  TableRowGroup,
+  TableSwitchRow,
+  TableRowIcon,
+} from "@metro/common/components";
 import { View } from "react-native";
 
+/**
+ * Theme options have been changed from radio groups to individual switches
+ * for better UX. Each option can now be toggled independently.
+ */
+
 export default function Themes() {
-    useProxy(settings);
-    useProxy(themes);
+  useProxy(settings);
+  useProxy(themes);
 
-    return (
-        <AddonPage<VdThemeInfo>
-            title={Strings.THEMES}
-            searchKeywords={[
-                "data.name",
-                "data.description",
-                p => p.data.authors?.map((a: Author) => a.name).join(", ") ?? ""
-            ]}
-            sortOptions={{
-                "Name (A-Z)": (a, b) => a.data.name.localeCompare(b.data.name),
-                "Name (Z-A)": (a, b) => b.data.name.localeCompare(a.data.name)
-            }}
-            installAction={{
-                label: "Install a theme",
-                fetchFn: installTheme
-            }}
-            items={Object.values(themes)}
-            safeModeHint={{
-                message: formatString("SAFE_MODE_NOTICE_THEMES", { enabled: Boolean(settings.safeMode?.currentThemeId) }),
-                footer: settings.safeMode?.currentThemeId && <Button
-                    size="small"
-                    text={Strings.DISABLE_THEME}
-                    onPress={() => delete settings.safeMode?.currentThemeId}
-                    style={{ marginTop: 8 }}
+  return (
+    <AddonPage<VdThemeInfo>
+      title={Strings.THEMES}
+      searchKeywords={[
+        "data.name",
+        "data.description",
+        (p) => p.data.authors?.map((a: Author) => a.name).join(", ") ?? "",
+      ]}
+      sortOptions={{
+        "Name (A-Z)": (a, b) => a.data.name.localeCompare(b.data.name),
+        "Name (Z-A)": (a, b) => b.data.name.localeCompare(a.data.name),
+      }}
+      installAction={{
+        label: "Install a theme",
+        fetchFn: installTheme,
+      }}
+      items={Object.values(themes)}
+      safeModeHint={{
+        message: formatString("SAFE_MODE_NOTICE_THEMES", {
+          enabled: Boolean(settings.safeMode?.currentThemeId),
+        }),
+        footer: settings.safeMode?.currentThemeId && (
+          <Button
+            size="small"
+            text={Strings.DISABLE_THEME}
+            onPress={() => delete settings.safeMode?.currentThemeId}
+            style={{ marginTop: 8 }}
+          />
+        ),
+      }}
+      CardComponent={ThemeCard}
+      OptionsActionSheetComponent={() => {
+        useObservable([colorsPref]);
+
+        return (
+          <ActionSheet>
+            <BottomSheetTitleHeader title="Options" />
+            <View style={{ paddingVertical: 20, gap: 12 }}>
+              {/* Changed from TableRadioGroup to individual TableSwitchRow components
+                  for better UX - users can now toggle options individually */}
+              <TableRowGroup title="Override Theme Type">
+                <TableSwitchRow
+                  label="Auto"
+                  icon={<TableRowIcon source={findAssetId("RobotIcon")} />}
+                  value={!colorsPref.type}
+                  onValueChange={(enabled: boolean) => {
+                    if (enabled) {
+                      colorsPref.type = undefined;
+                    } else {
+                      colorsPref.type = "dark";
+                    }
+                    getCurrentTheme()?.data &&
+                      updateBunnyColor(getCurrentTheme()!.data!, {
+                        update: true,
+                      });
+                  }}
                 />
-            }}
-            CardComponent={ThemeCard}
-            OptionsActionSheetComponent={() => {
-                useObservable([colorsPref]);
-
-                return <ActionSheet>
-                    <BottomSheetTitleHeader title="Options" />
-                    <View style={{ paddingVertical: 20, gap: 12 }}>
-                        <TableRadioGroup
-                            title="Override Theme Type"
-                            value={colorsPref.type ?? "auto"}
-                            hasIcons={true}
-                            onChange={type => {
-                                colorsPref.type = type !== "auto" ? type as "dark" | "light" : undefined;
-                                getCurrentTheme()?.data && updateBunnyColor(getCurrentTheme()!.data!, { update: true });
-                            }}
-                        >
-                            <TableRadioRow icon={<TableRowIcon source={findAssetId("RobotIcon")} />} label="Auto" value="auto" />
-                            <TableRadioRow icon={<TableRowIcon source={findAssetId("ThemeDarkIcon")} />} label="Dark" value="dark" />
-                            <TableRadioRow icon={<TableRowIcon source={findAssetId("ThemeLightIcon")} />} label="Light" value="light" />
-                        </TableRadioGroup>
-                        <TableRadioGroup
-                            title="Chat Background"
-                            value={colorsPref.customBackground ?? "shown"}
-                            hasIcons={true}
-                            onChange={type => {
-                                colorsPref.customBackground = type !== "shown" ? type as "hidden" : null;
-                            }}
-                        >
-                            <TableRadioRow icon={<TableRowIcon source={findAssetId("ImageIcon")} />} label="Show" value={"shown"} />
-                            <TableRadioRow icon={<TableRowIcon source={findAssetId("DenyIcon")} />} label="Hide" value={"hidden"} />
-                        </TableRadioGroup>
-                    </View>
-                </ActionSheet>;
-            }}
-        />
-    );
+                <TableSwitchRow
+                  label="Dark"
+                  icon={<TableRowIcon source={findAssetId("ThemeDarkIcon")} />}
+                  value={colorsPref.type === "dark"}
+                  onValueChange={(enabled: boolean) => {
+                    colorsPref.type = enabled ? "dark" : undefined;
+                    getCurrentTheme()?.data &&
+                      updateBunnyColor(getCurrentTheme()!.data!, {
+                        update: true,
+                      });
+                  }}
+                />
+                <TableSwitchRow
+                  label="Light"
+                  icon={<TableRowIcon source={findAssetId("ThemeLightIcon")} />}
+                  value={colorsPref.type === "light"}
+                  onValueChange={(enabled: boolean) => {
+                    colorsPref.type = enabled ? "light" : undefined;
+                    getCurrentTheme()?.data &&
+                      updateBunnyColor(getCurrentTheme()!.data!, {
+                        update: true,
+                      });
+                  }}
+                />
+              </TableRowGroup>
+              <TableRowGroup title="Chat Background">
+                <TableSwitchRow
+                  label="Show Background"
+                  icon={<TableRowIcon source={findAssetId("ImageIcon")} />}
+                  value={!colorsPref.customBackground}
+                  onValueChange={(enabled: boolean) => {
+                    colorsPref.customBackground = enabled ? null : "hidden";
+                  }}
+                />
+                <TableSwitchRow
+                  label="Hide Background"
+                  icon={<TableRowIcon source={findAssetId("DenyIcon")} />}
+                  value={colorsPref.customBackground === "hidden"}
+                  onValueChange={(enabled: boolean) => {
+                    colorsPref.customBackground = enabled ? "hidden" : null;
+                  }}
+                />
+              </TableRowGroup>
+            </View>
+          </ActionSheet>
+        );
+      }}
+    />
+  );
 }