diff --git a/src/components/TableRowAssetIcon.tsx b/src/components/TableRowAssetIcon.tsx
index f160299..df63aee 100644
--- a/src/components/TableRowAssetIcon.tsx
+++ b/src/components/TableRowAssetIcon.tsx
@@ -1,11 +1,11 @@
 import { getAssetByName, getAssetId } from '@revenge-mod/assets'
-import components from '@revenge-mod/discord/design/components'
+import { Components } from '@revenge-mod/discord/design'
 
 import type { DiscordModules } from '@revenge-mod/discord/types'
 
 export default function TableRowAssetIcon(props: TableRowAssetIconProps) {
     return (
-        <components.TableRow.Icon
+        <Components.TableRow.Icon
             source={props.name ? getAssetId(getAssetByName(props.name)!)! : props.id!}
             {...props}
         />
diff --git a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
index 57a75a4..c5fe93b 100644
--- a/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
+++ b/src/plugins/developer-settings/definitions/EvaluateJavaScriptSetting.tsx
@@ -1,7 +1,7 @@
 import { React } from '@revenge-mod/react'
 
 import { AlertActionCreators } from '@revenge-mod/discord/actions'
-import components from '@revenge-mod/discord/design/components'
+import { Components } from '@revenge-mod/discord/design'
 
 import { nodeUtil } from '@revenge-mod/externals/browserify'
 
@@ -35,7 +35,7 @@ const {
     TableSwitchRow,
     Text,
     TextArea,
-} = components
+} = Components
 
 function EvaluateJavaScriptAlert() {
     const code = React.useRef('')
diff --git a/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx b/src/plugins/developer-settings/screens/RevengeDeveloperSettingScreen.tsx
index 4f831d5..d9118ca 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/modules/settings'
-import components from '@revenge-mod/discord/design/components'
+import { Components } from '@revenge-mod/discord/design'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings/renderer'
 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/index.ts b/src/plugins/settings/index.ts
index c78ebca..1b5b0be 100644
--- a/src/plugins/settings/index.ts
+++ b/src/plugins/settings/index.ts
@@ -1,8 +1,8 @@
 import { PluginFlags } from '@revenge-mod/plugins'
 import { InternalPluginFlags, registerPlugin } from '@revenge-mod/plugins/_'
 
-import { waitForModules } from '@revenge-mod/modules/finders'
 import { byName, byProps } from '@revenge-mod/modules/finders/filters'
+import { waitForModules } from '@revenge-mod/modules/finders/wait'
 
 import { _data, _subs } from '@revenge-mod/discord/_/modules/settings'
 import { type SettingsItem, onceSettingsModulesLoaded } from '@revenge-mod/discord/modules/settings'
diff --git a/src/plugins/settings/register.ts b/src/plugins/settings/register.ts
index 4d5e907..80ea7da 100644
--- a/src/plugins/settings/register.ts
+++ b/src/plugins/settings/register.ts
@@ -4,7 +4,6 @@ import { MobileSetting } from './constants'
 
 import HermesVersionSetting from './definitions/HermesVersionSetting'
 import ReactNativeVersionSetting from './definitions/ReactNativeVersionSetting'
-import RevengePluginsSetting from './definitions/RevengePluginsSetting'
 // import RevengeThemesSetting from './definitions/RevengeThemesSetting'
 // import RevengeFontsSetting from './definitions/RevengeFontsSetting'
 import ReactVersionSetting from './definitions/ReactVersionSetting'
@@ -13,6 +12,7 @@ import RevengeCustomPageSetting from './definitions/RevengeCustomPageSetting'
 import RevengeDiscordServerSetting from './definitions/RevengeDiscordServerSetting'
 import RevengeGitHubOrganizationSetting from './definitions/RevengeGitHubOrganizationSetting'
 import RevengeNotImplementedSetting from './definitions/RevengeNotImplementedSetting'
+import RevengePluginsSetting from './definitions/RevengePluginsSetting'
 import RevengeSetting from './definitions/RevengeSetting'
 import RevengeVersionSetting from './definitions/RevengeVersionSetting'
 
diff --git a/src/plugins/settings/screens/RevengeCustomPageScreen.tsx b/src/plugins/settings/screens/RevengeCustomPageScreen.tsx
index 38e2c5a..7c5cff2 100644
--- a/src/plugins/settings/screens/RevengeCustomPageScreen.tsx
+++ b/src/plugins/settings/screens/RevengeCustomPageScreen.tsx
@@ -1,7 +1,7 @@
 import { React } from '@revenge-mod/react'
 
-import type { ReactNavigationParamList } from '@revenge-mod/externals/react-navigation'
 import type { StackScreenProps } from '@react-navigation/stack'
+import type { ReactNavigationParamList } from '@revenge-mod/externals/react-navigation'
 
 import type { MobileSetting, UserSettingsSections } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx b/src/plugins/settings/screens/RevengeFontsSettingScreen.tsx
index 76ac917..25675f1 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/modules/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings/renderer'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
index 76ac917..25675f1 100644
--- a/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
+++ b/src/plugins/settings/screens/RevengePluginsSettingScreen.tsx
@@ -1,4 +1,4 @@
-import { SettingListRenderer } from '@revenge-mod/discord/modules/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings/renderer'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/settings/screens/RevengeSettingScreen.tsx b/src/plugins/settings/screens/RevengeSettingScreen.tsx
index 92fb4df..9d52944 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/modules/settings'
-import components from '@revenge-mod/discord/design/components'
+import { Components } from '@revenge-mod/discord/design'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings/renderer'
 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 04692b0..6d38027 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/modules/settings'
+import { SettingListRenderer } from '@revenge-mod/discord/modules/settings/renderer'
 
 import { MobileSetting } from '../constants'
 
diff --git a/src/plugins/staff-settings/index.ts b/src/plugins/staff-settings/index.ts
index 4a2649d..e599a87 100644
--- a/src/plugins/staff-settings/index.ts
+++ b/src/plugins/staff-settings/index.ts
@@ -1,5 +1,5 @@
-import { waitForModules } from '@revenge-mod/modules/finders'
 import { byProps } from '@revenge-mod/modules/finders/filters'
+import { waitForModules } from '@revenge-mod/modules/finders/wait'
 
 import { after } from '@revenge-mod/patcher'