From fbdea3c9dabc353c6922774c86b6a90fde331331 Mon Sep 17 00:00:00 2001
From: PalmDevs <git@palmdevs.me>
Date: Thu, 8 May 2025 19:00:49 +0700
Subject: [PATCH] fix(plugins): refactor plugins to work with new APIs

---
 .../{AssetIcon.tsx => TableRowAssetIcon.tsx}      |  8 ++++----
 .../definitions/EvaluateJavaScriptSetting.tsx     | 15 ++++++++-------
 .../definitions/ReactDevToolsConnectSetting.tsx   |  6 +++---
 .../ReactDevToolsDisconnectSetting.tsx            |  6 +++---
 .../definitions/ReactDevToolsVersionSetting.tsx   |  6 +++---
 .../definitions/RevengeDeveloperSetting.tsx       |  6 +++---
 src/plugins/developer-settings/index.ts           |  8 +++++---
 src/plugins/developer-settings/register.ts        |  2 +-
 .../screens/RevengeDeveloperSettingScreen.tsx     | 10 +++++-----
 .../settings/definitions/HermesVersionSetting.tsx |  6 +++---
 .../definitions/ReactNativeVersionSetting.tsx     |  6 +++---
 .../settings/definitions/ReactVersionSetting.tsx  |  6 +++---
 .../settings/definitions/ReloadAppSetting.tsx     |  6 +++---
 .../definitions/RevengeDiscordServerSetting.tsx   |  6 +++---
 .../settings/definitions/RevengeFontsSetting.tsx  |  6 +++---
 .../RevengeGitHubOrganizationSetting.tsx          |  6 +++---
 .../definitions/RevengeNotImplementedSetting.tsx  |  6 +++---
 .../definitions/RevengePluginsSetting.tsx         |  6 +++---
 .../settings/definitions/RevengeSetting.tsx       |  6 +++---
 .../settings/definitions/RevengeThemesSetting.tsx |  6 +++---
 .../definitions/RevengeVersionSetting.tsx         |  6 +++---
 src/plugins/settings/index.ts                     |  4 ++--
 src/plugins/settings/register.ts                  |  2 +-
 .../screens/RevengeFontsSettingScreen.tsx         |  2 +-
 .../screens/RevengePluginsSettingScreen.tsx       |  4 ++--
 .../settings/screens/RevengeSettingScreen.tsx     | 12 ++++++------
 .../screens/RevengeThemesSettingScreen.tsx        |  2 +-
 27 files changed, 84 insertions(+), 81 deletions(-)
 rename src/components/{AssetIcon.tsx => TableRowAssetIcon.tsx} (61%)

diff --git a/src/components/AssetIcon.tsx b/src/components/TableRowAssetIcon.tsx
similarity index 61%
rename from src/components/AssetIcon.tsx
rename to src/components/TableRowAssetIcon.tsx
index 75457b3..f160299 100644
--- a/src/components/AssetIcon.tsx
+++ b/src/components/TableRowAssetIcon.tsx
@@ -1,18 +1,18 @@
 import { getAssetByName, getAssetId } from '@revenge-mod/assets'
-import { Components } from '@revenge-mod/discord/ui'
+import components from '@revenge-mod/discord/design/components'
 
 import type { DiscordModules } from '@revenge-mod/discord/types'
 
-export default function AssetIcon(props: AssetIconProps) {
+export default function TableRowAssetIcon(props: TableRowAssetIconProps) {
     return (
-        <Components.TableRow.Icon
+        <components.TableRow.Icon
             source={props.name ? getAssetId(getAssetByName(props.name)!)! : props.id!}
             {...props}
         />
     )
 }
 
-export type AssetIconProps = Omit<DiscordModules.Components.TableRowIconProps, 'source'> &
+export type TableRowAssetIconProps = Omit<DiscordModules.Components.TableRowIconProps, 'source'> &
     (
         | {
               name: string
diff --git a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
index a0948d9..57a75a4 100644
--- a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
+++ b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
@@ -1,22 +1,23 @@
 import { React } from '@revenge-mod/react'
 
 import { AlertActionCreators } from '@revenge-mod/discord/actions'
-import { nodeUtils } from '@revenge-mod/discord/polyfills'
-import { Components } from '@revenge-mod/discord/ui'
+import components from '@revenge-mod/discord/design/components'
+
+import { nodeUtil } from '@revenge-mod/externals/browserify'
 
 import { getErrorStack } from '@revenge-mod/utils/errors'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { pluginApi } from '..'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ALERT_KEY = 'evaluate-javascript'
 
 const EvaluateJavaScriptSetting: SettingsItem = {
     parent: null,
-    IconComponent: () => <AssetIcon name="FileIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="FileIcon" />,
     title: () => 'Evaluate JavaScript',
     useDescription: () => 'Runs a JavaScript code snippet.',
     onPress: () => AlertActionCreators.openAlert(ALERT_KEY, <EvaluateJavaScriptAlert />),
@@ -34,7 +35,7 @@ const {
     TableSwitchRow,
     Text,
     TextArea,
-} = Components
+} = components
 
 function EvaluateJavaScriptAlert() {
     const code = React.useRef('')
@@ -111,7 +112,7 @@ function EvaluateJavaScriptAlert() {
                                 const res = globalThis.eval?.(code.current)
 
                                 alert(
-                                    nodeUtils.inspect(awaitResult && res instanceof Promise ? await res : res, {
+                                    nodeUtil.inspect(awaitResult && res instanceof Promise ? await res : res, {
                                         depth: inspectDepth,
                                         showHidden,
                                     }),
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
index 1359dac..334c515 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsConnectSetting.tsx
@@ -1,15 +1,15 @@
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 import { DevToolsContext, connectToDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ReactDevToolsConnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
-    IconComponent: () => <AssetIcon name="LinkIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="LinkIcon" />,
     title: () => 'Connect to React DevTools',
     usePredicate: () => {
         const dtOpen = useIsDevToolsOpen()
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
index 400f866..294ceda 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsDisconnectSetting.tsx
@@ -1,15 +1,15 @@
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 import { disconnectFromDevTools, useIsDevToolsOpen } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ReactDevToolsDisconnectSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
-    IconComponent: () => <AssetIcon name="DenyIcon" variant="danger" />,
+    IconComponent: () => <TableRowAssetIcon name="DenyIcon" variant="danger" />,
     variant: 'danger',
     title: () => 'Disconnect from React DevTools',
     usePredicate: useIsDevToolsOpen,
diff --git a/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
index 790850a..46b3b9e 100644
--- a/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
+++ b/src/plugins/developer-settings/definitions/ReactDevToolsVersionSetting.tsx
@@ -1,15 +1,15 @@
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 import { DevToolsContext } from '../devtools'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ReactDevToolsVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE_DEVELOPER,
-    IconComponent: () => <AssetIcon name="ScienceIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="ScienceIcon" />,
     title: () => 'React DevTools',
     useDescription: () => __REACT_DEVTOOLS__!.version,
     usePredicate: () => DevToolsContext.available,
diff --git a/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
index 2d067c9..706fc6f 100644
--- a/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
+++ b/src/plugins/developer-settings/definitions/RevengeDeveloperSetting.tsx
@@ -1,13 +1,13 @@
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeDeveloperSetting: SettingsItem = {
     parent: null,
     type: 'route',
-    IconComponent: () => <AssetIcon name="WrenchIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="WrenchIcon" />,
     title: () => 'Developer',
     screen: {
         route: UserSettingsSections[MobileSetting.REVENGE_DEVELOPER],
diff --git a/src/plugins/developer-settings/index.ts b/src/plugins/developer-settings/index.ts
index 36767f6..7ff1e66 100644
--- a/src/plugins/developer-settings/index.ts
+++ b/src/plugins/developer-settings/index.ts
@@ -1,8 +1,10 @@
-import { type PluginApi, PluginFlags } from '@revenge-mod/plugins'
+import { PluginFlags } from '@revenge-mod/plugins'
 import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 
-import { _data } from '@revenge-mod/discord/_/settings'
-import { onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
+import { _data } from '@revenge-mod/discord/_/modules/settings'
+import { onceSettingsModulesLoaded } from '@revenge-mod/discord/modules/settings'
+
+import type { PluginApi } from '@revenge-mod/plugins/types'
 
 registerPlugin(
     {
diff --git a/src/plugins/developer-settings/register.ts b/src/plugins/developer-settings/register.ts
index d11bf26..872b431 100644
--- a/src/plugins/developer-settings/register.ts
+++ b/src/plugins/developer-settings/register.ts
@@ -1,4 +1,4 @@
-import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/settings'
+import { addSettingsItemToSection, registerSettingsItems } from '@revenge-mod/discord/modules/settings'
 
 import { MobileSetting } from './constants'
 
diff --git a/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
index 08be805..4f831d5 100644
--- a/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
+++ b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
@@ -1,5 +1,5 @@
-import { SettingListRenderer } from '@revenge-mod/discord/settings'
-import { Components } from '@revenge-mod/discord/ui'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
+import components from '@revenge-mod/discord/design/components'
 import { React, ReactNative } from '@revenge-mod/react'
 
 import { MobileSetting } from '../constants'
@@ -8,7 +8,7 @@ import { DevToolsContext } from '../devtools'
 // TODO(plugins/settings): debug bridge
 export default function RevengeDeveloperSettingScreen() {
     return (
-        <Components.Stack spacing={0} style={{ flexGrow: 1 }}>
+        <components.Stack spacing={0} style={{ flexGrow: 1 }}>
             {globalThis.__REACT_DEVTOOLS__ && <ReactDevToolsAddressSetting />}
             <SettingListRenderer.SettingsList
                 sections={[
@@ -28,14 +28,14 @@ export default function RevengeDeveloperSettingScreen() {
                     },
                 ]}
             />
-        </Components.Stack>
+        </components.Stack>
     )
 }
 
 export function ReactDevToolsAddressSetting() {
     return (
         <ReactNative.View style={{ paddingHorizontal: 16, paddingTop: 16 }}>
-            <Components.TextInput
+            <components.TextInput
                 editable={!DevToolsContext.open}
                 isDisabled={DevToolsContext.open}
                 leadingText="ws://"
diff --git a/src/plugins/settings/definitions/HermesVersionSetting.tsx b/src/plugins/settings/definitions/HermesVersionSetting.tsx
index 123bf1f..9ddab71 100644
--- a/src/plugins/settings/definitions/HermesVersionSetting.tsx
+++ b/src/plugins/settings/definitions/HermesVersionSetting.tsx
@@ -1,17 +1,17 @@
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 // @ts-expect-error
 const props = HermesInternal.getRuntimeProperties()
 
 const HermesVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="TranscriptOutlineIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="TranscriptOutlineIcon" />,
     title: () => 'Hermes',
     useDescription: () => `${props['Bytecode Version']} (${props.Build})`,
     type: 'static',
diff --git a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
index 4b59345..277ff64 100644
--- a/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
+++ b/src/plugins/settings/definitions/ReactNativeVersionSetting.tsx
@@ -1,17 +1,17 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const { major, minor, patch, prerelease } = ReactNative.Platform.constants.reactNativeVersion
 const version = `${major}.${minor}.${patch}${prerelease ? `-${prerelease}` : ''}`
 
 const ReactNativeVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="ScienceIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="ScienceIcon" />,
     title: () => 'React Native',
     useDescription: () => version,
     type: 'static',
diff --git a/src/plugins/settings/definitions/ReactVersionSetting.tsx b/src/plugins/settings/definitions/ReactVersionSetting.tsx
index 5c06402..5c814ee 100644
--- a/src/plugins/settings/definitions/ReactVersionSetting.tsx
+++ b/src/plugins/settings/definitions/ReactVersionSetting.tsx
@@ -2,13 +2,13 @@ import { React } from '@revenge-mod/react'
 
 import { MobileSetting } from '../constants'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ReactVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="ScienceIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="ScienceIcon" />,
     title: () => 'React',
     useDescription: () => React.version,
     type: 'static',
diff --git a/src/plugins/settings/definitions/ReloadAppSetting.tsx b/src/plugins/settings/definitions/ReloadAppSetting.tsx
index 076b46e..9960038 100644
--- a/src/plugins/settings/definitions/ReloadAppSetting.tsx
+++ b/src/plugins/settings/definitions/ReloadAppSetting.tsx
@@ -1,15 +1,15 @@
 import { BundleUpdaterManager } from '@revenge-mod/discord/native'
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const ReloadAppSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="RetryIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="RetryIcon" />,
     title: () => 'Reload App',
     onPress: () => BundleUpdaterManager.reload(),
     type: 'pressable',
diff --git a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
index ef822a9..aef249d 100644
--- a/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeDiscordServerSetting.tsx
@@ -1,15 +1,15 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 import { DiscordServerURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeDiscordServerSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="Discord" />,
+    IconComponent: () => <TableRowAssetIcon name="Discord" />,
     title: () => 'Discord Server',
     onPress: () => ReactNative.Linking.openURL(DiscordServerURL),
     type: 'pressable',
diff --git a/src/plugins/settings/definitions/RevengeFontsSetting.tsx b/src/plugins/settings/definitions/RevengeFontsSetting.tsx
index 4aff0bc..918c69c 100644
--- a/src/plugins/settings/definitions/RevengeFontsSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeFontsSetting.tsx
@@ -1,13 +1,13 @@
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeFontsSetting: SettingsItem = {
     parent: null,
     type: 'route',
-    IconComponent: () => <AssetIcon name="TextIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="TextIcon" />,
     title: () => 'Fonts',
     screen: {
         route: UserSettingsSections[MobileSetting.REVENGE_PLUGINS],
diff --git a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
index 1fe8cd0..6066220 100644
--- a/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeGitHubOrganizationSetting.tsx
@@ -1,15 +1,15 @@
 import { React, ReactNative } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 import { GitHubOrganizationURL } from '~/constants'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeGitHubOrganizationSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon name="img_account_sync_github_white" />,
+    IconComponent: () => <TableRowAssetIcon name="img_account_sync_github_white" />,
     title: () => 'GitHub',
     onPress: () => ReactNative.Linking.openURL(GitHubOrganizationURL),
     type: 'pressable',
diff --git a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
index 619e6e2..7b10eee 100644
--- a/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeNotImplementedSetting.tsx
@@ -1,12 +1,12 @@
 import { React } from '@revenge-mod/react'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeNotImplementedSetting: SettingsItem = {
     parent: null,
-    IconComponent: () => <AssetIcon name="CircleXIcon-primary" variant="danger" />,
+    IconComponent: () => <TableRowAssetIcon name="CircleXIcon-primary" variant="danger" />,
     title: () => 'Not Implemented',
     useDescription: () => 'This feature is not implemented yet. Check back later!',
     variant: 'danger',
diff --git a/src/plugins/settings/definitions/RevengePluginsSetting.tsx b/src/plugins/settings/definitions/RevengePluginsSetting.tsx
index a98f6ab..5c5f58e 100644
--- a/src/plugins/settings/definitions/RevengePluginsSetting.tsx
+++ b/src/plugins/settings/definitions/RevengePluginsSetting.tsx
@@ -1,15 +1,15 @@
 import { getEnabledPluginsCount } from '@revenge-mod/plugins/_'
 
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengePluginsSetting: SettingsItem = {
     parent: null,
     type: 'route',
-    IconComponent: () => <AssetIcon name="PuzzlePieceIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="PuzzlePieceIcon" />,
     title: () => 'Plugins',
     useTrailing: () => `${getEnabledPluginsCount()} enabled`,
     screen: {
diff --git a/src/plugins/settings/definitions/RevengeSetting.tsx b/src/plugins/settings/definitions/RevengeSetting.tsx
index 918a532..1a037a9 100644
--- a/src/plugins/settings/definitions/RevengeSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeSetting.tsx
@@ -1,14 +1,14 @@
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeSetting: SettingsItem = {
     parent: null,
     type: 'route',
-    IconComponent: () => <AssetIcon id={RevengeIcon} />,
+    IconComponent: () => <TableRowAssetIcon id={RevengeIcon} />,
     title: () => 'Revenge',
     useTrailing: () => `${__BUILD_VERSION__}-${__BUILD_COMMIT__}-${__BUILD_BRANCH__}`,
     screen: {
diff --git a/src/plugins/settings/definitions/RevengeThemesSetting.tsx b/src/plugins/settings/definitions/RevengeThemesSetting.tsx
index 1341ee9..ba5cf1f 100644
--- a/src/plugins/settings/definitions/RevengeThemesSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeThemesSetting.tsx
@@ -1,13 +1,13 @@
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 
 import { MobileSetting, UserSettingsSections } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeThemesSetting: SettingsItem = {
     parent: null,
     type: 'route',
-    IconComponent: () => <AssetIcon name="PaintPaletteIcon" />,
+    IconComponent: () => <TableRowAssetIcon name="PaintPaletteIcon" />,
     title: () => 'Themes',
     screen: {
         route: UserSettingsSections[MobileSetting.REVENGE_THEMES],
diff --git a/src/plugins/settings/definitions/RevengeVersionSetting.tsx b/src/plugins/settings/definitions/RevengeVersionSetting.tsx
index 0e67451..4574ab2 100644
--- a/src/plugins/settings/definitions/RevengeVersionSetting.tsx
+++ b/src/plugins/settings/definitions/RevengeVersionSetting.tsx
@@ -1,13 +1,13 @@
-import AssetIcon from '~/components/AssetIcon'
+import TableRowAssetIcon from '~/components/TableRowAssetIcon'
 import RevengeIcon from '~assets/RevengeIcon'
 
 import { MobileSetting } from '../constants'
 
-import type { SettingsItem } from '@revenge-mod/discord/settings'
+import type { SettingsItem } from '@revenge-mod/discord/modules/settings'
 
 const RevengeVersionSetting: SettingsItem = {
     parent: MobileSetting.REVENGE,
-    IconComponent: () => <AssetIcon id={RevengeIcon} />,
+    IconComponent: () => <TableRowAssetIcon id={RevengeIcon} />,
     title: () => 'Revenge',
     useDescription: () => `${__BUILD_VERSION__}-${__BUILD_COMMIT__}-${__BUILD_BRANCH__} (${__BUILD_ENV__})`,
     type: 'static',
diff --git a/src/plugins/settings/index.ts b/src/plugins/settings/index.ts
index 58bc040..c78ebca 100644
--- a/src/plugins/settings/index.ts
+++ b/src/plugins/settings/index.ts
@@ -4,8 +4,8 @@ import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 import { waitForModules } from '@revenge-mod/modules/finders'
 import { byName, byProps } from '@revenge-mod/modules/finders/filters'
 
-import { _data, _subs } from '@revenge-mod/discord/_/settings'
-import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/settings'
+import { _data, _subs } from '@revenge-mod/discord/_/modules/settings'
+import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/modules/settings'
 
 import { after } from '@revenge-mod/patcher'
 
diff --git a/src/plugins/settings/register.ts b/src/plugins/settings/register.ts
index 4e1c249..ed99870 100644
--- a/src/plugins/settings/register.ts
+++ b/src/plugins/settings/register.ts
@@ -1,4 +1,4 @@
-import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/settings'
+import { registerSettingsItems, registerSettingsSection } from '@revenge-mod/discord/modules/settings'
 
 import { MobileSetting } from './constants'
 
diff --git a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
index 2d24ac4..76ac917 100644
--- a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
index 9bd53ef..76ac917 100644
--- a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
@@ -1,8 +1,8 @@
-import { SettingListRenderer } from '@revenge-mod/discord/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
 
 import { MobileSetting } from '../constants'
 
-export default function RevengePluginsSettingScreen() {
+export default function RevengeFontsSettingScreen() {
     return (
         <SettingListRenderer.SettingsList
             sections={[
diff --git a/src/plugins/settings/screens/RevengeSettingScreen.tsx b/src/plugins/settings/screens/RevengeSettingScreen.tsx
index 77a938b..92fb4df 100644
--- a/src/plugins/settings/screens/RevengeSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeSettingScreen.tsx
@@ -1,5 +1,5 @@
-import { SettingListRenderer } from '@revenge-mod/discord/settings'
-import { Components } from '../../../../lib/discord/src/ui/common'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
+import components from '@revenge-mod/discord/design/components'
 import { MobileSetting } from '../constants'
 
 export default function RevengeSettingScreen() {
@@ -15,12 +15,12 @@ export default function RevengeSettingScreen() {
                     ],
                     subLabel: (
                         <>
-                            <Components.Text variant="text-xs/medium">
+                            <components.Text variant="text-xs/medium">
                                 You are using the next version of Revenge!
-                            </Components.Text>
-                            <Components.Text variant="text-xs/semibold" color="text-danger">
+                            </components.Text>
+                            <components.Text variant="text-xs/semibold" color="text-danger">
                                 This version is experimental and may be unstable.
-                            </Components.Text>
+                            </components.Text>
                         </>
                     ),
                 },
diff --git a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
index e85c9ee..04692b0 100644
--- a/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengeThemesSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
 
 import { MobileSetting } from '../constants'