diff --git a/src/core/ui/components/AddonPage.tsx b/src/core/ui/components/AddonPage.tsx
index 6f09fe5..85ca8dc 100644
--- a/src/core/ui/components/AddonPage.tsx
+++ b/src/core/ui/components/AddonPage.tsx
@@ -1,8 +1,8 @@
 import { Strings } from "@core/i18n";
 import { CardWrapper } from "@core/ui/components/AddonCard";
 import { findAssetId } from "@lib/api/assets";
-import { useProxy } from "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { HTTP_REGEX_MULTI } from "@lib/utils/constants";
 import { findByProps } from "@metro";
 import { clipboard } from "@metro/common";
diff --git a/src/core/ui/settings/hooks/useFS.ts b/src/core/ui/hooks/useFS.ts
similarity index 100%
rename from src/core/ui/settings/hooks/useFS.ts
rename to src/core/ui/hooks/useFS.ts
diff --git a/src/core/ui/settings/index.ts b/src/core/ui/settings/index.ts
index 55c5642..1d1b3e5 100644
--- a/src/core/ui/settings/index.ts
+++ b/src/core/ui/settings/index.ts
@@ -2,8 +2,8 @@ import PyoncordIcon from "@assets/icons/pyoncord.png";
 import { Strings } from "@core/i18n";
 import { findAssetId } from "@lib/api/assets";
 import { isFontSupported, isThemeSupported } from "@lib/api/native/loader";
-import { useProxy } from "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { registerSection } from "@ui/settings";
 import { version } from "bunny-build-info";
 
diff --git a/src/core/ui/settings/pages/Developer/index.tsx b/src/core/ui/settings/pages/Developer/index.tsx
index 7681b2e..9150969 100644
--- a/src/core/ui/settings/pages/Developer/index.tsx
+++ b/src/core/ui/settings/pages/Developer/index.tsx
@@ -1,11 +1,11 @@
 import { Strings } from "@core/i18n";
-import { CheckState, useFileExists } from "@core/ui/settings/hooks/useFS";
+import { CheckState, useFileExists } from "@core/ui/hooks/useFS";
 import AssetBrowser from "@core/ui/settings/pages/Developer/AssetBrowser";
 import { findAssetId } from "@lib/api/assets";
-import { getReactDevToolsProp, getReactDevToolsVersion, isLoaderConfigSupported, isReactDevToolsPreloaded, isVendettaLoader } from "@lib/api/native/loader";
-import { useProxy } from "@lib/api/storage";
 import { connectToDebugger } from "@lib/api/debug";
+import { getReactDevToolsProp, getReactDevToolsVersion, isLoaderConfigSupported, isReactDevToolsPreloaded, isVendettaLoader } from "@lib/api/native/loader";
 import { loaderConfig, settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { lazyDestructure } from "@lib/utils/lazy";
 import { NavigationNative } from "@metro/common";
 import { Button, LegacyFormText, Stack, TableRow, TableRowGroup, TableSwitchRow, TextInput } from "@metro/common/components";
diff --git a/src/core/ui/settings/pages/Fonts/FontCard.tsx b/src/core/ui/settings/pages/Fonts/FontCard.tsx
index 5b9d8bb..f84c27c 100644
--- a/src/core/ui/settings/pages/Fonts/FontCard.tsx
+++ b/src/core/ui/settings/pages/Fonts/FontCard.tsx
@@ -4,14 +4,14 @@ import { findAssetId } from "@lib/api/assets";
 import { BundleUpdaterManager } from "@lib/api/native/modules";
 import { useProxy } from "@lib/api/storage";
 import { FontDefinition, fonts, selectFont } from "@lib/fonts";
-import { showConfirmationAlert } from "@ui/alerts";
-import { TextStyleSheet } from "@ui/styles";
 import { lazyDestructure } from "@lib/utils/lazy";
 import { ButtonColors } from "@lib/utils/types";
 import { findByProps } from "@metro";
 import { NavigationNative, tokens } from "@metro/common";
 import { Button, Card, IconButton, Stack, Text } from "@metro/common/components";
 import * as Skia from "@shopify/react-native-skia";
+import { showConfirmationAlert } from "@ui/alerts";
+import { TextStyleSheet } from "@ui/styles";
 import { useMemo } from "react";
 import { View } from "react-native";
 
diff --git a/src/core/ui/settings/pages/Fonts/index.tsx b/src/core/ui/settings/pages/Fonts/index.tsx
index a1eb018..3e788b5 100644
--- a/src/core/ui/settings/pages/Fonts/index.tsx
+++ b/src/core/ui/settings/pages/Fonts/index.tsx
@@ -1,9 +1,9 @@
 import { Strings } from "@core/i18n";
 import AddonPage from "@core/ui/components/AddonPage";
 import FontEditor from "@core/ui/settings/pages/Fonts/FontEditor";
+import { settings } from "@lib/api/settings";
 import { useProxy } from "@lib/api/storage";
 import { FontDefinition, fonts, installFont } from "@lib/fonts";
-import { settings } from "@lib/api/settings";
 import { NavigationNative } from "@metro/common";
 
 import FontCard from "./FontCard";
diff --git a/src/core/ui/settings/pages/General/About.tsx b/src/core/ui/settings/pages/General/About.tsx
index 6848290..6cb9efc 100644
--- a/src/core/ui/settings/pages/General/About.tsx
+++ b/src/core/ui/settings/pages/General/About.tsx
@@ -1,8 +1,8 @@
 import { Strings } from "@core/i18n";
 import Version from "@core/ui/settings/pages/General/Version";
-import { useProxy } from "@lib/api/storage";
 import { getDebugInfo } from "@lib/api/debug";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { Stack, TableRowGroup } from "@metro/common/components";
 import { Platform, ScrollView } from "react-native";
 
diff --git a/src/core/ui/settings/pages/General/index.tsx b/src/core/ui/settings/pages/General/index.tsx
index 7485bb4..094ba14 100644
--- a/src/core/ui/settings/pages/General/index.tsx
+++ b/src/core/ui/settings/pages/General/index.tsx
@@ -2,9 +2,9 @@ import { Strings } from "@core/i18n";
 import { PyoncordIcon } from "@core/ui/settings";
 import About from "@core/ui/settings/pages/General/About";
 import { findAssetId } from "@lib/api/assets";
-import { useProxy } from "@lib/api/storage";
 import { getDebugInfo, toggleSafeMode } from "@lib/api/debug";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { DISCORD_SERVER, GITHUB } from "@lib/utils/constants";
 import { NavigationNative, url } from "@metro/common";
 import { Stack, TableRow, TableRowGroup, TableSwitchRow } from "@metro/common/components";
diff --git a/src/core/ui/settings/pages/Plugins/PluginCard.tsx b/src/core/ui/settings/pages/Plugins/PluginCard.tsx
index 2062a68..5cc1d6b 100644
--- a/src/core/ui/settings/pages/Plugins/PluginCard.tsx
+++ b/src/core/ui/settings/pages/Plugins/PluginCard.tsx
@@ -2,11 +2,11 @@ import { CardWrapper } from "@core/ui/components/AddonCard";
 import { VdPluginManager, VendettaPlugin } from "@core/vendetta/plugins";
 import { findAssetId } from "@lib/api/assets";
 import { useProxy } from "@lib/api/storage";
-import { showSheet } from "@ui/sheets";
 import { lazyDestructure } from "@lib/utils/lazy";
 import { findByProps } from "@metro";
 import { NavigationNative } from "@metro/common";
 import { Card, IconButton, Stack, TableSwitch, Text } from "@metro/common/components";
+import { showSheet } from "@ui/sheets";
 import { createContext, memo, useContext } from "react";
 import { Image, View } from "react-native";
 
diff --git a/src/core/ui/settings/pages/Plugins/index.tsx b/src/core/ui/settings/pages/Plugins/index.tsx
index c4afdfb..b0b08b4 100644
--- a/src/core/ui/settings/pages/Plugins/index.tsx
+++ b/src/core/ui/settings/pages/Plugins/index.tsx
@@ -2,8 +2,8 @@ import { Strings } from "@core/i18n";
 import AddonPage from "@core/ui/components/AddonPage";
 import PluginCard from "@core/ui/settings/pages/Plugins/PluginCard";
 import { VdPluginManager, VendettaPlugin } from "@core/vendetta/plugins";
-import { useProxy } from "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { Author } from "@lib/utils/types";
 
 export default function Plugins() {
diff --git a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
index e742408..235cbeb 100644
--- a/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
+++ b/src/core/ui/settings/pages/Plugins/sheets/PluginInfoActionSheet.tsx
@@ -2,12 +2,12 @@ import { formatString, Strings } from "@core/i18n";
 import { VdPluginManager, VendettaPlugin } from "@core/vendetta/plugins";
 import { findAssetId } from "@lib/api/assets";
 import { purgeStorage, useProxy } from "@lib/api/storage";
-import { showConfirmationAlert } from "@ui/alerts";
-import { hideSheet } from "@ui/sheets";
-import { showToast } from "@ui/toasts";
 import { ButtonColors } from "@lib/utils/types";
 import { clipboard } from "@metro/common";
 import { ActionSheet, ActionSheetRow, Button, TableRow, Text } from "@metro/common/components";
+import { showConfirmationAlert } from "@ui/alerts";
+import { hideSheet } from "@ui/sheets";
+import { showToast } from "@ui/toasts";
 import { ScrollView, View } from "react-native";
 
 interface InfoProps {
diff --git a/src/core/ui/settings/pages/Plugins/usePluginCardStyles.ts b/src/core/ui/settings/pages/Plugins/usePluginCardStyles.ts
index 90982f4..2750221 100644
--- a/src/core/ui/settings/pages/Plugins/usePluginCardStyles.ts
+++ b/src/core/ui/settings/pages/Plugins/usePluginCardStyles.ts
@@ -1,5 +1,5 @@
-import { createStyles } from "@ui/styles";
 import { tokens } from "@metro/common";
+import { createStyles } from "@ui/styles";
 
 export const usePluginCardStyles = createStyles({
     smallIcon: {
diff --git a/src/core/ui/settings/pages/Themes/ThemeCard.tsx b/src/core/ui/settings/pages/Themes/ThemeCard.tsx
index 42fef99..a1c93d4 100644
--- a/src/core/ui/settings/pages/Themes/ThemeCard.tsx
+++ b/src/core/ui/settings/pages/Themes/ThemeCard.tsx
@@ -1,8 +1,8 @@
 import { formatString, Strings } from "@core/i18n";
 import AddonCard, { CardWrapper } from "@core/ui/components/AddonCard";
 import { findAssetId } from "@lib/api/assets";
-import { useProxy } from "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { applyTheme, fetchTheme, removeTheme, selectTheme, Theme, themes } from "@lib/themes";
 import { ButtonColors } from "@lib/utils/types";
 import { clipboard } from "@metro/common";
diff --git a/src/core/ui/settings/pages/Themes/index.tsx b/src/core/ui/settings/pages/Themes/index.tsx
index 5b90edf..6c2ef95 100644
--- a/src/core/ui/settings/pages/Themes/index.tsx
+++ b/src/core/ui/settings/pages/Themes/index.tsx
@@ -1,8 +1,8 @@
 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 "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { useProxy } from "@lib/api/storage";
 import { installTheme, Theme, themes } from "@lib/themes";
 import { Author } from "@lib/utils/types";
 import { Button } from "@metro/common/components";
diff --git a/src/core/vendetta/api.tsx b/src/core/vendetta/api.tsx
index d23c77b..2485089 100644
--- a/src/core/vendetta/api.tsx
+++ b/src/core/vendetta/api.tsx
@@ -1,11 +1,11 @@
 import * as assets from "@lib/api/assets";
 import * as commands from "@lib/api/commands";
+import * as debug from "@lib/api/debug";
 import { getVendettaLoaderIdentity, isPyonLoader } from "@lib/api/native/loader";
 import patcher from "@lib/api/patcher";
+import { loaderConfig, settings } from "@lib/api/settings";
 import * as storage from "@lib/api/storage";
 import { createStorage } from "@lib/api/storage";
-import * as debug from "@lib/api/debug";
-import { loaderConfig, settings } from "@lib/api/settings";
 import * as themes from "@lib/themes";
 import * as utils from "@lib/utils";
 import { cyrb64Hash } from "@lib/utils/cyrb64";
diff --git a/src/core/vendetta/plugins.ts b/src/core/vendetta/plugins.ts
index 4b48736..41c27a7 100644
--- a/src/core/vendetta/plugins.ts
+++ b/src/core/vendetta/plugins.ts
@@ -1,5 +1,5 @@
-import { awaitStorage, createMMKVBackend, createStorage, purgeStorage, wrapSync } from "@lib/api/storage";
 import { settings } from "@lib/api/settings";
+import { awaitStorage, createMMKVBackend, createStorage, purgeStorage, wrapSync } from "@lib/api/storage";
 import { safeFetch } from "@lib/utils";
 import { BUNNY_PROXY_PREFIX, VD_PROXY_PREFIX } from "@lib/utils/constants";
 import { DiscordLogger, logger } from "@lib/utils/logger";
diff --git a/src/index.ts b/src/index.ts
index ca44b85..be6cbb3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,11 +4,11 @@ import initSettings from "@core/ui/settings";
 import { initVendettaObject } from "@core/vendetta/api";
 import { VdPluginManager } from "@core/vendetta/plugins";
 import { patchCommands } from "@lib/api/commands";
+import { patchLogHook } from "@lib/api/debug";
 import { injectFluxInterceptor } from "@lib/api/flux";
 import { removeFile, writeFile } from "@lib/api/native/fs";
 import { isPyonLoader, isThemeSupported } from "@lib/api/native/loader";
 import { FileManager } from "@lib/api/native/modules";
-import { patchLogHook } from "@lib/api/debug";
 import { updateFonts } from "@lib/fonts";
 import { checkAndRegisterUpdates, initPlugins } from "@lib/plugins";
 import { initThemes, patchChatBackground } from "@lib/themes";
diff --git a/src/lib/ui/safeMode.tsx b/src/lib/ui/safeMode.tsx
index 25f4f88..c9903c9 100644
--- a/src/lib/ui/safeMode.tsx
+++ b/src/lib/ui/safeMode.tsx
@@ -1,7 +1,7 @@
 import { Strings } from "@core/i18n";
+import { toggleSafeMode } from "@lib/api/debug";
 import { DeviceManager } from "@lib/api/native/modules";
 import { after } from "@lib/api/patcher";
-import { toggleSafeMode } from "@lib/api/debug";
 import { settings } from "@lib/api/settings";
 import { lazyDestructure } from "@lib/utils/lazy";
 import { ButtonColors } from "@lib/utils/types";