diff --git a/package.json b/package.json
index b6c3749..ec40769 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ezpplauncher",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "description": "",
   "type": "module",
   "scripts": {
diff --git a/scripts/generate-theme-icons.ts b/scripts/generate-theme-icons.ts
index c1611f7..c9f22f4 100644
--- a/scripts/generate-theme-icons.ts
+++ b/scripts/generate-theme-icons.ts
@@ -1,4 +1,8 @@
-import { THEME_ICON_NAMES, type ThemeIconName, type ThemeIconSet } from '../src/lib/themeIcons';
+import {
+  THEME_ICON_NAMES,
+  type ThemeIconName,
+  type ThemeIconSet,
+} from '../src/lib/theme/themeIcons';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 
@@ -135,7 +139,7 @@ export const THEME_ICON_BODIES: Record<ThemeIconSet, Record<ThemeIconName, Theme
 )};
 `;
 
-const outputPath = fileURLToPath(new URL('../src/lib/themeIconData.ts', import.meta.url));
+const outputPath = fileURLToPath(new URL('../src/lib/theme/themeIconData.ts', import.meta.url));
 writeFileSync(outputPath, output);
 console.log(
   `Generated ${THEME_ICON_NAMES.length} semantic icons for ${Object.keys(collectionPaths).length} sets.`
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 055826e..7a985e4 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1266,7 +1266,7 @@ dependencies = [
 
 [[package]]
 name = "ezpplauncher"
-version = "3.2.7"
+version = "3.3.0"
 dependencies = [
  "aes-gcm",
  "anyhow",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d0a8734..9149165 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ezpplauncher"
-version = "3.2.7"
+version = "3.3.0"
 description = "EZPPLauncher redefined."
 authors = ["HorizonCode"]
 edition = "2024"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 8bd5969..aeaecf2 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "EZPPLauncher",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "identifier": "farm.EZPPFarm.Launcher",
   "mainBinaryName": "ezpplauncher",
   "build": {
@@ -30,7 +30,10 @@
       "csp": {
         "default-src": "'self' tauri: customprotocol: asset:",
         "script-src": "'self' 'unsafe-inline' 'unsafe-eval' asset: http://asset.localhost https://asset.localhost http://127.0.0.1:* https://analytics.ez-pp.farm",
-        "worker-src": ["'self'", "blob:"],
+        "worker-src": [
+          "'self'",
+          "blob:"
+        ],
         "style-src": "'self' 'unsafe-inline' asset: http://asset.localhost https://asset.localhost http://127.0.0.1:*",
         "img-src": "'self' asset: http://asset.localhost https://asset.localhost blob: data: http://127.0.0.1:* https://assets.ppy.sh https://a.ez-pp.farm https://git.ez-pp.farm https://osu.direct https://themes.ez-pp.farm",
         "connect-src": "'self' ipc: http://ipc.localhost asset: http://asset.localhost https://asset.localhost http://127.0.0.1:* https://ez-pp.farm https://api.ez-pp.farm https://c.ez-pp.farm https://analytics.ez-pp.farm https://git.ez-pp.farm https://osu.direct https://osu.ppy.sh https://api.fontsource.org https://cdn.jsdelivr.net https://themes.ez-pp.farm",
diff --git a/src/lib/components/theme/CommunityWorkshopView.svelte b/src/lib/components/theme/CommunityWorkshopView.svelte
index c6a6b41..3c7ca8b 100644
--- a/src/lib/components/theme/CommunityWorkshopView.svelte
+++ b/src/lib/components/theme/CommunityWorkshopView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import DefaultThemePreview from '$assets/default_preview.png';
-  import { activeThemeDownloads, themeDownloadProgress } from '$lib/communityThemeDownloads';
+  import { activeThemeDownloads, themeDownloadProgress } from '$lib/theme/communityThemeDownloads';
   import {
     fetchCommunityTags,
     fetchCommunityThemes,
@@ -31,7 +31,7 @@
     type ThemeReportCategory,
     type ThemeReportQuery,
     type ThemeReportStatus,
-  } from '$lib/communityThemes';
+  } from '$lib/theme/communityThemes';
   import * as AlertDialog from '$lib/components/ui/alert-dialog';
   import Badge from '$lib/components/ui/badge/badge.svelte';
   import { Button } from '$lib/components/ui/button';
@@ -47,9 +47,9 @@
   import * as Tooltip from '$lib/components/ui/tooltip';
   import { active_custom_theme, custom_themes } from '$lib/global';
   import { sendSystemAnnouncement } from '$lib/notifications';
-  import { isThemeTrusted } from '$lib/themeTrust';
-  import { normalizeThemeTags } from '$lib/themeV2';
-  import { reloadThemes, updateInstalledThemeTags, type Theme } from '$lib/themes';
+  import { isThemeTrusted } from '$lib/theme/themeTrust';
+  import { normalizeThemeTags } from '$lib/theme/themeV2';
+  import { reloadThemes, updateInstalledThemeTags, type Theme } from '$lib/theme/themes';
   import { currentUser } from '$lib/userAuthentication';
   import { reduceAnimations } from '$lib/userSettings';
   import WorkshopTooltip from './WorkshopTooltip.svelte';
diff --git a/src/lib/components/theme/ThemeBehaviorInspector.svelte b/src/lib/components/theme/ThemeBehaviorInspector.svelte
index 0272395..c19c160 100644
--- a/src/lib/components/theme/ThemeBehaviorInspector.svelte
+++ b/src/lib/components/theme/ThemeBehaviorInspector.svelte
@@ -6,18 +6,18 @@
   import Input from '$lib/components/ui/input/input.svelte';
   import Label from '$lib/components/ui/label/label.svelte';
   import * as Select from '$lib/components/ui/select';
-  import { isThemeClockVariable, THEME_CLOCK_VARIABLE_NAMES } from '$lib/themeClock';
+  import { isThemeClockVariable, THEME_CLOCK_VARIABLE_NAMES } from '$lib/theme/themeClock';
   import {
     themeBehaviorTargetLabel,
     themeElementLabel,
     themeGroupInteractiveCount,
     themeGroupLabel,
-  } from '$lib/themeLogic';
+  } from '$lib/theme/themeLogic';
   import {
     formatThemeScriptError,
     parseThemeScript,
     themeScriptProgramCanLeaveLauncher,
-  } from '$lib/themeScriptLang';
+  } from '$lib/theme/themeScriptLang';
   import type {
     ThemeV2Behavior,
     ThemeV2BehaviorAction,
@@ -29,7 +29,7 @@
     ThemeV2Group,
     ThemeV2ScriptScreen,
     ThemeV2ScriptValue,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { Link2, Plus, Trash2 } from '@lucide/svelte';
   import { SvelteSet } from 'svelte/reactivity';
 
diff --git a/src/lib/components/theme/ThemeComponentEditor.svelte b/src/lib/components/theme/ThemeComponentEditor.svelte
index 9ce61c6..9f489fe 100644
--- a/src/lib/components/theme/ThemeComponentEditor.svelte
+++ b/src/lib/components/theme/ThemeComponentEditor.svelte
@@ -3,11 +3,11 @@
     analyzeThemeSvelteSource,
     type ThemeSvelteAnalysis,
     type ThemeSvelteDiagnostic,
-  } from '$lib/themeSvelte';
+  } from '$lib/theme/themeSvelte';
   import {
     THEME_SVELTE_COMPONENT_PLACEHOLDER,
     THEME_SVELTE_COMPONENT_SKELETON,
-  } from '$lib/themeSvelteSnippets';
+  } from '$lib/theme/themeSvelteSnippets';
   import { Component, CircleAlert, Maximize2, Minimize2, X } from '@lucide/svelte';
   import type * as Monaco from 'monaco-editor';
   import { onMount } from 'svelte';
diff --git a/src/lib/components/theme/ThemeCssClasses.svelte b/src/lib/components/theme/ThemeCssClasses.svelte
index 7abd392..df639ac 100644
--- a/src/lib/components/theme/ThemeCssClasses.svelte
+++ b/src/lib/components/theme/ThemeCssClasses.svelte
@@ -3,7 +3,7 @@
   import Button from '$lib/components/ui/button/button.svelte';
   import Input from '$lib/components/ui/input/input.svelte';
   import Label from '$lib/components/ui/label/label.svelte';
-  import { themeClassTokens } from '$lib/themeV2';
+  import { themeClassTokens } from '$lib/theme/themeV2';
   import { Code2, RotateCcw } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/theme/ThemeCustomLayer.svelte b/src/lib/components/theme/ThemeCustomLayer.svelte
index 793a40c..0ff10f6 100644
--- a/src/lib/components/theme/ThemeCustomLayer.svelte
+++ b/src/lib/components/theme/ThemeCustomLayer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { compileThemeSvelte } from '$lib/themeSvelte';
-  import { themeAssetUrl, type ThemeV2ScriptValue } from '$lib/themeV2';
+  import { compileThemeSvelte } from '$lib/theme/themeSvelte';
+  import { themeAssetUrl, type ThemeV2ScriptValue } from '$lib/theme/themeV2';
   import { TriangleAlert } from '@lucide/svelte';
   import { mount, unmount } from 'svelte';
 
diff --git a/src/lib/components/theme/ThemeEditorWindow.svelte b/src/lib/components/theme/ThemeEditorWindow.svelte
index e8aa517..f059856 100644
--- a/src/lib/components/theme/ThemeEditorWindow.svelte
+++ b/src/lib/components/theme/ThemeEditorWindow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import Logo from '$assets/logo.png';
-  import { fetchCommunityThemeDetails, publishThemeToWorkshop } from '$lib/communityThemes';
+  import { fetchCommunityThemeDetails, publishThemeToWorkshop } from '$lib/theme/communityThemes';
   import FontPreview from '$lib/components/theme/FontPreview.svelte';
   import ThemeBehaviorInspector from '$lib/components/theme/ThemeBehaviorInspector.svelte';
   import ThemeElementInspector from '$lib/components/theme/ThemeElementInspector.svelte';
@@ -44,31 +44,31 @@
     THEME_CLOCK_VARIABLE_NAMES,
     isThemeClockVariable,
     themeClockValues,
-  } from '$lib/themeClock';
+  } from '$lib/theme/themeClock';
   import {
     BUNDLED_THEME_FONTS,
     bundledThemeFontFamily,
     fontStack,
     type ThemeFontChoice,
-  } from '$lib/themeFonts';
-  import { THEME_ICON_PREVIEW_NAMES, THEME_ICON_SETS } from '$lib/themeIcons';
+  } from '$lib/theme/themeFonts';
+  import { THEME_ICON_PREVIEW_NAMES, THEME_ICON_SETS } from '$lib/theme/themeIcons';
   import {
     themeBehaviorSummary,
     themeBehaviorTargetLabel,
     themeElementLabel,
     themeGroupContainsElement,
     themeGroupInteractiveCount,
-  } from '$lib/themeLogic';
-  import { themeParallax } from '$lib/themeParallax';
-  import { renderThemePreview } from '$lib/themePreview';
-  import { themeScriptInitialVariables, themeScriptVariableNames } from '$lib/themeScript';
+  } from '$lib/theme/themeLogic';
+  import { themeParallax } from '$lib/theme/themeParallax';
+  import { renderThemePreview } from '$lib/theme/themePreview';
+  import { themeScriptInitialVariables, themeScriptVariableNames } from '$lib/theme/themeScript';
   import {
     formatThemeScriptError,
     parseThemeScript,
     themeScriptProgramCanLeaveLauncher,
     themeScriptProgramReferences,
-  } from '$lib/themeScriptLang';
-  import { analyzeThemeSvelteSource } from '$lib/themeSvelte';
+  } from '$lib/theme/themeScriptLang';
+  import { analyzeThemeSvelteSource } from '$lib/theme/themeSvelte';
   import {
     createDefaultThemeV2,
     createThemeV2Behavior,
@@ -96,7 +96,7 @@
     type ThemeV2VideoElement,
     type ThemeV2WidgetElement,
     type ThemeV2WidgetKind,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import {
     exportThemeFolder,
     markThemeSynced,
@@ -105,7 +105,7 @@
     themesDirectory,
     toSafeName,
     updateInstalledThemeWorkshopId,
-  } from '$lib/themes';
+  } from '$lib/theme/themes';
   import type { EZPPUser, EZPPUserInfo } from '$lib/types';
   import { currentUser } from '$lib/userAuthentication';
   import { osuInstallationPath } from '$lib/userSettings';
diff --git a/src/lib/components/theme/ThemeElementInspector.svelte b/src/lib/components/theme/ThemeElementInspector.svelte
index 1f7ac89..d6b57ae 100644
--- a/src/lib/components/theme/ThemeElementInspector.svelte
+++ b/src/lib/components/theme/ThemeElementInspector.svelte
@@ -15,9 +15,9 @@
   import * as Select from '$lib/components/ui/select';
   import Slider from '$lib/components/ui/slider/slider.svelte';
   import Textarea from '$lib/components/ui/textarea/textarea.svelte';
-  import { getThemeDataSampleValue, resolveThemeDataValue, themeGlobalData } from '$lib/themeData';
-  import type { ThemeFontChoice } from '$lib/themeFonts';
-  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
+  import { getThemeDataSampleValue, resolveThemeDataValue, themeGlobalData } from '$lib/theme/themeData';
+  import type { ThemeFontChoice } from '$lib/theme/themeFonts';
+  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/theme/themeIcons';
   import {
     THEME_DATA_FIELDS,
     THEME_PARTICLE_PRESETS,
@@ -29,7 +29,7 @@
     type ThemeV2MaskShape,
     type ThemeV2WidgetKind,
     type ThemeV2WidgetVariant,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { openURL } from '$lib/utils';
   import {
     CircleUser,
diff --git a/src/lib/components/theme/ThemeFilterControls.svelte b/src/lib/components/theme/ThemeFilterControls.svelte
index 5481059..0b0ab99 100644
--- a/src/lib/components/theme/ThemeFilterControls.svelte
+++ b/src/lib/components/theme/ThemeFilterControls.svelte
@@ -2,7 +2,7 @@
   import ThemeSection from '$lib/components/theme/ThemeSection.svelte';
   import Button from '$lib/components/ui/button/button.svelte';
   import Slider from '$lib/components/ui/slider/slider.svelte';
-  import type { ThemeV2Filters } from '$lib/themeV2';
+  import type { ThemeV2Filters } from '$lib/theme/themeV2';
   import { SlidersHorizontal } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/theme/ThemeGroupInspector.svelte b/src/lib/components/theme/ThemeGroupInspector.svelte
index 886f2f4..abd5e40 100644
--- a/src/lib/components/theme/ThemeGroupInspector.svelte
+++ b/src/lib/components/theme/ThemeGroupInspector.svelte
@@ -16,7 +16,7 @@
     type ThemeV2Element,
     type ThemeV2Group,
     type ThemeV2MaskShape,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { Boxes, Layers, RefreshCw, Scan, Ungroup } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/theme/ThemeIcon.svelte b/src/lib/components/theme/ThemeIcon.svelte
index 228fd20..f4d5af6 100644
--- a/src/lib/components/theme/ThemeIcon.svelte
+++ b/src/lib/components/theme/ThemeIcon.svelte
@@ -1,6 +1,10 @@
 <script lang="ts">
-  import { getThemeIconBody } from '$lib/themeIconCatalog';
-  import { DEFAULT_THEME_ICON_SET, type ThemeIconName, type ThemeIconSet } from '$lib/themeIcons';
+  import { getThemeIconBody } from '$lib/theme/themeIconCatalog';
+  import {
+    DEFAULT_THEME_ICON_SET,
+    type ThemeIconName,
+    type ThemeIconSet,
+  } from '$lib/theme/themeIcons';
 
   let {
     name,
diff --git a/src/lib/components/theme/ThemeIconPicker.svelte b/src/lib/components/theme/ThemeIconPicker.svelte
index 3872dfb..b1e84f2 100644
--- a/src/lib/components/theme/ThemeIconPicker.svelte
+++ b/src/lib/components/theme/ThemeIconPicker.svelte
@@ -6,8 +6,8 @@
     getFullIconCatalog,
     type IconPackKey,
     type ThemeIconCatalogItem,
-  } from '$lib/themeIconCatalog';
-  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
+  } from '$lib/theme/themeIconCatalog';
+  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/theme/themeIcons';
   import ThemeIcon from './ThemeIcon.svelte';
   import { Check, ChevronsUpDown, LayoutGrid, List, Search, X } from '@lucide/svelte';
 
diff --git a/src/lib/components/theme/ThemeLinkedLogic.svelte b/src/lib/components/theme/ThemeLinkedLogic.svelte
index f07f6b6..250288e 100644
--- a/src/lib/components/theme/ThemeLinkedLogic.svelte
+++ b/src/lib/components/theme/ThemeLinkedLogic.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
   import ThemeBehaviorInspector from '$lib/components/theme/ThemeBehaviorInspector.svelte';
   import Button from '$lib/components/ui/button/button.svelte';
-  import { themeEditorSectionOpen } from '$lib/themeEditorUiState';
-  import { themeBehaviorSummary, themeGroupInteractiveCount } from '$lib/themeLogic';
+  import { themeEditorSectionOpen } from '$lib/theme/themeEditorUiState';
+  import { themeBehaviorSummary, themeGroupInteractiveCount } from '$lib/theme/themeLogic';
   import type {
     ThemeV2Behavior,
     ThemeV2BehaviorTarget,
     ThemeV2Element,
     ThemeV2Group,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { AlertTriangle, ChevronDown, Plus, Zap } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/theme/ThemeReportDialog.svelte b/src/lib/components/theme/ThemeReportDialog.svelte
index 65ac41a..1f4bdb1 100644
--- a/src/lib/components/theme/ThemeReportDialog.svelte
+++ b/src/lib/components/theme/ThemeReportDialog.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-  import {
-    reportCommunityTheme,
-    type CommunityTheme,
-    type ThemeReportCategory,
-  } from '$lib/communityThemes';
   import { Button } from '$lib/components/ui/button';
   import * as Dialog from '$lib/components/ui/dialog';
   import { Label } from '$lib/components/ui/label';
   import * as Select from '$lib/components/ui/select';
   import Textarea from '$lib/components/ui/textarea/textarea.svelte';
+  import {
+    reportCommunityTheme,
+    type CommunityTheme,
+    type ThemeReportCategory,
+  } from '$lib/theme/communityThemes';
   import { Flag, LoaderCircle, X } from '@lucide/svelte';
   import { sileo } from 'sileo';
 
diff --git a/src/lib/components/theme/ThemeScriptEditor.svelte b/src/lib/components/theme/ThemeScriptEditor.svelte
index 2c9f9ff..d3ef3fd 100644
--- a/src/lib/components/theme/ThemeScriptEditor.svelte
+++ b/src/lib/components/theme/ThemeScriptEditor.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { isThemeClockVariable, THEME_CLOCK_VARIABLE_NAMES } from '$lib/themeClock';
-  import { parseThemeScript } from '$lib/themeScriptLang';
-  import type { ThemeV2Element, ThemeV2Group, ThemeV2ScriptScreen } from '$lib/themeV2';
+  import { isThemeClockVariable, THEME_CLOCK_VARIABLE_NAMES } from '$lib/theme/themeClock';
+  import { parseThemeScript } from '$lib/theme/themeScriptLang';
+  import type { ThemeV2Element, ThemeV2Group, ThemeV2ScriptScreen } from '$lib/theme/themeV2';
   import { Braces, CircleAlert, Maximize2, Minimize2, X } from '@lucide/svelte';
   import type * as Monaco from 'monaco-editor';
   import { onMount } from 'svelte';
diff --git a/src/lib/components/theme/ThemeSection.svelte b/src/lib/components/theme/ThemeSection.svelte
index 7c7a51f..836fe02 100644
--- a/src/lib/components/theme/ThemeSection.svelte
+++ b/src/lib/components/theme/ThemeSection.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { themeEditorSectionOpen } from '$lib/themeEditorUiState';
+  import { themeEditorSectionOpen } from '$lib/theme/themeEditorUiState';
   import { ChevronDown } from '@lucide/svelte';
   import { untrack } from 'svelte';
   import type { Component, Snippet } from 'svelte';
diff --git a/src/lib/components/theme/ThemeStage.svelte b/src/lib/components/theme/ThemeStage.svelte
index 5dbb94f..c6a38e2 100644
--- a/src/lib/components/theme/ThemeStage.svelte
+++ b/src/lib/components/theme/ThemeStage.svelte
@@ -5,9 +5,9 @@
   import ThemeV2Elements from '$lib/components/theme/ThemeV2Elements.svelte';
   import * as Avatar from '$lib/components/ui/avatar';
   import { currentUserInfo } from '$lib/data';
-  import { scopeThemeCss } from '$lib/themeCssScope';
-  import { fontStack, monoFontStack } from '$lib/themeFonts';
-  import { DEFAULT_THEME_ICON_SET } from '$lib/themeIcons';
+  import { scopeThemeCss } from '$lib/theme/themeCssScope';
+  import { fontStack, monoFontStack } from '$lib/theme/themeFonts';
+  import { DEFAULT_THEME_ICON_SET } from '$lib/theme/themeIcons';
   import {
     normalizeChrome,
     readableTextColor,
@@ -18,7 +18,7 @@
     type ThemeV2Group,
     type ThemeV2ScriptValue,
     type ThemeV2WidgetKind,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { currentUser } from '$lib/userAuthentication';
   import { countryCodeToEmoji } from '$lib/utils';
   import { Clock, Trophy } from '@lucide/svelte';
diff --git a/src/lib/components/theme/ThemeTextStyleControls.svelte b/src/lib/components/theme/ThemeTextStyleControls.svelte
index 33e30ea..1300f5f 100644
--- a/src/lib/components/theme/ThemeTextStyleControls.svelte
+++ b/src/lib/components/theme/ThemeTextStyleControls.svelte
@@ -4,7 +4,11 @@
   import Input from '$lib/components/ui/input/input.svelte';
   import Label from '$lib/components/ui/label/label.svelte';
   import * as Select from '$lib/components/ui/select';
-  import type { ThemeV2TextDecoration, ThemeV2TextStyle, ThemeV2TextTransform } from '$lib/themeV2';
+  import type {
+    ThemeV2TextDecoration,
+    ThemeV2TextStyle,
+    ThemeV2TextTransform,
+  } from '$lib/theme/themeV2';
   import { Bold, Italic, RotateCcw, Strikethrough, Type, Underline } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/theme/ThemeTransformControls.svelte b/src/lib/components/theme/ThemeTransformControls.svelte
index 9006b5e..7a8959b 100644
--- a/src/lib/components/theme/ThemeTransformControls.svelte
+++ b/src/lib/components/theme/ThemeTransformControls.svelte
@@ -4,7 +4,7 @@
   import Input from '$lib/components/ui/input/input.svelte';
   import Label from '$lib/components/ui/label/label.svelte';
   import Slider from '$lib/components/ui/slider/slider.svelte';
-  import type { ThemeV2Transform } from '$lib/themeV2';
+  import type { ThemeV2Transform } from '$lib/theme/themeV2';
   import { FlipHorizontal2, FlipVertical2, RotateCcw, RotateCw } from '@lucide/svelte';
 
   type TransformTarget = ThemeV2Transform & { offsetX?: number; offsetY?: number };
diff --git a/src/lib/components/theme/ThemeV2Background.svelte b/src/lib/components/theme/ThemeV2Background.svelte
index 7e58006..041755f 100644
--- a/src/lib/components/theme/ThemeV2Background.svelte
+++ b/src/lib/components/theme/ThemeV2Background.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import { custom_theme_volume } from '$lib/global';
-  import { playThemeMedia, themeMediaSource, themeVideoLifecycle } from '$lib/themeMedia';
-  import { themeParallax } from '$lib/themeParallax';
-  import type { ThemeV2Definition } from '$lib/themeV2';
-  import { themeAssetUrl } from '$lib/themeV2';
+  import { playThemeMedia, themeMediaSource, themeVideoLifecycle } from '$lib/theme/themeMedia';
+  import { themeParallax } from '$lib/theme/themeParallax';
+  import type { ThemeV2Definition } from '$lib/theme/themeV2';
+  import { themeAssetUrl } from '$lib/theme/themeV2';
   import { reduceAnimations } from '$lib/userSettings';
   import { trackMediaContainer } from '$lib/utils';
   import { onDestroy } from 'svelte';
diff --git a/src/lib/components/theme/ThemeV2Elements.svelte b/src/lib/components/theme/ThemeV2Elements.svelte
index 62327bc..552b8a6 100644
--- a/src/lib/components/theme/ThemeV2Elements.svelte
+++ b/src/lib/components/theme/ThemeV2Elements.svelte
@@ -6,9 +6,9 @@
   import DownloadButton from '$lib/components/ui/download-button/DownloadButton.svelte';
   import { currentUserInfo } from '$lib/data';
   import { launching as launchingStore } from '$lib/global';
-  import { getThemeDataSampleValue, resolveThemeDataValue, themeGlobalData } from '$lib/themeData';
-  import { fontStack } from '$lib/themeFonts';
-  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
+  import { getThemeDataSampleValue, resolveThemeDataValue, themeGlobalData } from '$lib/theme/themeData';
+  import { fontStack } from '$lib/theme/themeFonts';
+  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/theme/themeIcons';
   import {
     themeArcGeometry,
     themeClockDate,
@@ -16,9 +16,9 @@
     themeCountdownText,
     themeParticleSeeds,
     themeSvgGradientVector,
-  } from '$lib/themeLayers';
-  import { themeMediaSource, themeVideoLifecycle } from '$lib/themeMedia';
-  import { interpolateThemeText } from '$lib/themeTextVariables';
+  } from '$lib/theme/themeLayers';
+  import { themeMediaSource, themeVideoLifecycle } from '$lib/theme/themeMedia';
+  import { interpolateThemeText } from '$lib/theme/themeTextVariables';
   import {
     themeAssetUrl,
     themeClassNames,
@@ -42,7 +42,7 @@
     type ThemeV2Group,
     type ThemeV2Point,
     type ThemeV2ScriptValue,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import { currentUser } from '$lib/userAuthentication';
   import { countryCodeToEmoji, formatRelativeTime, openURL } from '$lib/utils';
   import { Boxes, ChevronRight, Clock, Move, RotateCw, Trophy } from '@lucide/svelte';
diff --git a/src/lib/components/theme/ThemeVariableDefaults.svelte b/src/lib/components/theme/ThemeVariableDefaults.svelte
index 08e8f61..856de5b 100644
--- a/src/lib/components/theme/ThemeVariableDefaults.svelte
+++ b/src/lib/components/theme/ThemeVariableDefaults.svelte
@@ -2,7 +2,7 @@
   import ThemeSection from '$lib/components/theme/ThemeSection.svelte';
   import Button from '$lib/components/ui/button/button.svelte';
   import Input from '$lib/components/ui/input/input.svelte';
-  import type { ThemeV2ScriptValue } from '$lib/themeV2';
+  import type { ThemeV2ScriptValue } from '$lib/theme/themeV2';
   import { Braces, RotateCcw } from '@lucide/svelte';
 
   let {
diff --git a/src/lib/components/ui/download-button/DownloadButton.svelte b/src/lib/components/ui/download-button/DownloadButton.svelte
index edd736e..9e89ba6 100644
--- a/src/lib/components/ui/download-button/DownloadButton.svelte
+++ b/src/lib/components/ui/download-button/DownloadButton.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import ThemeIcon from '$lib/components/theme/ThemeIcon.svelte';
-  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/themeIcons';
+  import { DEFAULT_THEME_ICON_SET, type ThemeIconSet } from '$lib/theme/themeIcons';
 
   const prop: {
     downloading: boolean;
diff --git a/src/lib/components/ui/titlebar/titlebar.svelte b/src/lib/components/ui/titlebar/titlebar.svelte
index 41a7ccd..63b66ea 100644
--- a/src/lib/components/ui/titlebar/titlebar.svelte
+++ b/src/lib/components/ui/titlebar/titlebar.svelte
@@ -7,7 +7,7 @@
     custom_theme_volume,
     platform,
   } from '$lib/global';
-  import { DEFAULT_THEME_ICON_SET } from '$lib/themeIcons';
+  import { DEFAULT_THEME_ICON_SET } from '$lib/theme/themeIcons';
   import { reduceAnimations } from '$lib/userSettings';
   import Minimize from '@lucide/svelte/icons/minus';
   import Close from '@lucide/svelte/icons/x';
diff --git a/src/lib/global.ts b/src/lib/global.ts
index dbb54cb..38c0495 100644
--- a/src/lib/global.ts
+++ b/src/lib/global.ts
@@ -1,6 +1,6 @@
 import { browser } from '$app/environment';
 import { ezppfarm } from './api/ezpp';
-import type { Theme } from './themes';
+import type { Theme } from './theme/themes';
 import type { Release } from './types';
 import { setGlobalVolume } from './utils';
 import type { Component } from 'svelte';
diff --git a/src/lib/notifications.ts b/src/lib/notifications.ts
index 640774f..8c75867 100644
--- a/src/lib/notifications.ts
+++ b/src/lib/notifications.ts
@@ -1,4 +1,4 @@
-import { getAuthHeaders, getThemesServiceUrl } from './communityThemes';
+import { getAuthHeaders, getThemesServiceUrl } from './theme/communityThemes';
 
 export type NotificationType =
   | 'theme_hidden'
diff --git a/src/lib/communityThemeDownloads.ts b/src/lib/theme/communityThemeDownloads.ts
similarity index 100%
rename from src/lib/communityThemeDownloads.ts
rename to src/lib/theme/communityThemeDownloads.ts
diff --git a/src/lib/communityThemes.ts b/src/lib/theme/communityThemes.ts
similarity index 99%
rename from src/lib/communityThemes.ts
rename to src/lib/theme/communityThemes.ts
index 1e264bb..413b5b4 100644
--- a/src/lib/communityThemes.ts
+++ b/src/lib/theme/communityThemes.ts
@@ -1,4 +1,4 @@
-import { config } from './config';
+import { config } from '../config';
 import { normalizeThemeVersion } from './themeV2';
 import {
   markThemeSynced,
diff --git a/src/lib/themeClock.ts b/src/lib/theme/themeClock.ts
similarity index 100%
rename from src/lib/themeClock.ts
rename to src/lib/theme/themeClock.ts
diff --git a/src/lib/themeCssScope.ts b/src/lib/theme/themeCssScope.ts
similarity index 100%
rename from src/lib/themeCssScope.ts
rename to src/lib/theme/themeCssScope.ts
diff --git a/src/lib/themeData.ts b/src/lib/theme/themeData.ts
similarity index 98%
rename from src/lib/themeData.ts
rename to src/lib/theme/themeData.ts
index c06a1c3..7cf4c6c 100644
--- a/src/lib/themeData.ts
+++ b/src/lib/theme/themeData.ts
@@ -1,8 +1,8 @@
-import { currentUserInfo } from './data';
-import { launcherVersion, onlineFriends, osuBuild, osuStream, serverPing } from './global';
+import { currentUserInfo } from '../data';
+import { launcherVersion, onlineFriends, osuBuild, osuStream, serverPing } from '../global';
+import { currentUser } from '../userAuthentication';
 import { themeClockValues } from './themeClock';
 import type { ThemeV2DataField, ThemeV2DataMode } from './themeV2';
-import { currentUser } from './userAuthentication';
 import { derived } from 'svelte/store';
 
 export type ThemeDataStats = {
diff --git a/src/lib/themeEditorUiState.ts b/src/lib/theme/themeEditorUiState.ts
similarity index 100%
rename from src/lib/themeEditorUiState.ts
rename to src/lib/theme/themeEditorUiState.ts
diff --git a/src/lib/themeFonts.ts b/src/lib/theme/themeFonts.ts
similarity index 100%
rename from src/lib/themeFonts.ts
rename to src/lib/theme/themeFonts.ts
diff --git a/src/lib/themeIconCatalog.ts b/src/lib/theme/themeIconCatalog.ts
similarity index 100%
rename from src/lib/themeIconCatalog.ts
rename to src/lib/theme/themeIconCatalog.ts
diff --git a/src/lib/themeIconData.ts b/src/lib/theme/themeIconData.ts
similarity index 100%
rename from src/lib/themeIconData.ts
rename to src/lib/theme/themeIconData.ts
diff --git a/src/lib/themeIcons.ts b/src/lib/theme/themeIcons.ts
similarity index 100%
rename from src/lib/themeIcons.ts
rename to src/lib/theme/themeIcons.ts
diff --git a/src/lib/themeLayers.ts b/src/lib/theme/themeLayers.ts
similarity index 100%
rename from src/lib/themeLayers.ts
rename to src/lib/theme/themeLayers.ts
diff --git a/src/lib/themeLogic.ts b/src/lib/theme/themeLogic.ts
similarity index 100%
rename from src/lib/themeLogic.ts
rename to src/lib/theme/themeLogic.ts
diff --git a/src/lib/themeMedia.ts b/src/lib/theme/themeMedia.ts
similarity index 99%
rename from src/lib/themeMedia.ts
rename to src/lib/theme/themeMedia.ts
index e348151..669cecc 100644
--- a/src/lib/themeMedia.ts
+++ b/src/lib/theme/themeMedia.ts
@@ -13,7 +13,7 @@
  * theme videos and videos picked in the editor (served as /preview/ URLs) are
  * transcoded to a cached H.264 copy by the Rust backend before playback.
  */
-import { custom_theme_volume } from './global';
+import { custom_theme_volume } from '../global';
 import { invoke } from '@tauri-apps/api/core';
 import { listen } from '@tauri-apps/api/event';
 import { get, writable } from 'svelte/store';
diff --git a/src/lib/themeParallax.ts b/src/lib/theme/themeParallax.ts
similarity index 100%
rename from src/lib/themeParallax.ts
rename to src/lib/theme/themeParallax.ts
diff --git a/src/lib/themePreview.ts b/src/lib/theme/themePreview.ts
similarity index 100%
rename from src/lib/themePreview.ts
rename to src/lib/theme/themePreview.ts
diff --git a/src/lib/themeScript.ts b/src/lib/theme/themeScript.ts
similarity index 100%
rename from src/lib/themeScript.ts
rename to src/lib/theme/themeScript.ts
diff --git a/src/lib/themeScriptLang.ts b/src/lib/theme/themeScriptLang.ts
similarity index 100%
rename from src/lib/themeScriptLang.ts
rename to src/lib/theme/themeScriptLang.ts
diff --git a/src/lib/themeSvelte.ts b/src/lib/theme/themeSvelte.ts
similarity index 100%
rename from src/lib/themeSvelte.ts
rename to src/lib/theme/themeSvelte.ts
diff --git a/src/lib/themeSvelteDefaults.ts b/src/lib/theme/themeSvelteDefaults.ts
similarity index 100%
rename from src/lib/themeSvelteDefaults.ts
rename to src/lib/theme/themeSvelteDefaults.ts
diff --git a/src/lib/themeSvelteSnippets.ts b/src/lib/theme/themeSvelteSnippets.ts
similarity index 100%
rename from src/lib/themeSvelteSnippets.ts
rename to src/lib/theme/themeSvelteSnippets.ts
diff --git a/src/lib/themeTextVariables.ts b/src/lib/theme/themeTextVariables.ts
similarity index 100%
rename from src/lib/themeTextVariables.ts
rename to src/lib/theme/themeTextVariables.ts
diff --git a/src/lib/themeTrust.ts b/src/lib/theme/themeTrust.ts
similarity index 97%
rename from src/lib/themeTrust.ts
rename to src/lib/theme/themeTrust.ts
index bf13a3e..007b666 100644
--- a/src/lib/themeTrust.ts
+++ b/src/lib/theme/themeTrust.ts
@@ -1,4 +1,4 @@
-import type { Theme } from '$lib/themes';
+import type { Theme } from '$lib/theme/themes';
 
 /**
  * API 1.0 themes are executable bundles: loading one imports its entry script
diff --git a/src/lib/themeV2.ts b/src/lib/theme/themeV2.ts
similarity index 100%
rename from src/lib/themeV2.ts
rename to src/lib/theme/themeV2.ts
diff --git a/src/lib/themes.ts b/src/lib/theme/themes.ts
similarity index 99%
rename from src/lib/themes.ts
rename to src/lib/theme/themes.ts
index e4ae796..a68101a 100644
--- a/src/lib/themes.ts
+++ b/src/lib/theme/themes.ts
@@ -1,7 +1,7 @@
-import { active_custom_theme, custom_theme_audio_playing, custom_themes } from './global';
+import { active_custom_theme, custom_theme_audio_playing, custom_themes } from '../global';
+import { disableMediaControls, setGlobalVolume } from '../utils';
 import { clearThemeMediaCache, playThemeMedia } from './themeMedia';
 import { isThemeV2, normalizeThemeV2, type ThemeV2Asset, type ThemeV2Definition } from './themeV2';
-import { disableMediaControls, setGlobalVolume } from './utils';
 import { betterFetch } from '@better-fetch/fetch';
 import { convertFileSrc, invoke } from '@tauri-apps/api/core';
 import { listen } from '@tauri-apps/api/event';
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index d59342f..8d4f2bb 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -1,5 +1,5 @@
 import { custom_theme_audio_playing } from './global';
-import { playThemeMedia } from './themeMedia';
+import { playThemeMedia } from './theme/themeMedia';
 import { invoke } from '@tauri-apps/api/core';
 import { type ClassValue, clsx } from 'clsx';
 import * as crypto from 'crypto-js';
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 959ecbc..5066524 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -42,11 +42,10 @@
     themeMediaStatus,
     themeMediaSuspended,
     themeMediaSuspension,
-  } from '$lib/themeMedia';
-  import { themeParallax } from '$lib/themeParallax';
-  import { isThemeTrusted } from '$lib/themeTrust';
-  import { themeV2Css } from '$lib/themeV2';
-  import { getThemes, loadTheme } from '$lib/themes';
+  } from '$lib/theme/themeMedia';
+  import { themeParallax } from '$lib/theme/themeParallax';
+  import { isThemeTrusted } from '$lib/theme/themeTrust';
+  import { getThemes, loadTheme } from '$lib/theme/themes';
   import { currentUser } from '$lib/userAuthentication';
   import {
     cursorSmoothening,
diff --git a/src/screens/Launch.svelte b/src/screens/Launch.svelte
index 28028da..7918ff8 100644
--- a/src/screens/Launch.svelte
+++ b/src/screens/Launch.svelte
@@ -2,12 +2,6 @@
   import DefaultThemePreview from '$assets/default_preview.png';
   import Logo from '$assets/logo.png';
   import { ezppfarm } from '$lib/api/ezpp';
-  import {
-    downloadAndInstallCommunityTheme,
-    fetchCommunityThemeDetails,
-    fetchCommunityThemes,
-    type CommunityTheme,
-  } from '$lib/communityThemes';
   import NotificationHub from '$lib/components/notifications/NotificationHub.svelte';
   import ThemeIcon from '$lib/components/theme/ThemeIcon.svelte';
   import ThemeReportDialog from '$lib/components/theme/ThemeReportDialog.svelte';
@@ -97,8 +91,14 @@
     stopOpenTabletDriver,
   } from '$lib/osuUtil';
   import * as presence from '$lib/presence';
-  import { DEFAULT_THEME_ICON_SET } from '$lib/themeIcons';
-  import { themeMediaSuspended } from '$lib/themeMedia';
+  import {
+    downloadAndInstallCommunityTheme,
+    fetchCommunityThemeDetails,
+    fetchCommunityThemes,
+    type CommunityTheme,
+  } from '$lib/theme/communityThemes';
+  import { DEFAULT_THEME_ICON_SET } from '$lib/theme/themeIcons';
+  import { themeMediaSuspended } from '$lib/theme/themeMedia';
   import {
     loadThemeScript,
     setThemeScriptHandlers,
@@ -106,8 +106,8 @@
     stopThemeScript,
     themeScriptState,
     triggerThemeScriptElement,
-  } from '$lib/themeScript';
-  import { isThemeTrusted, themeCodeKind, trustTheme } from '$lib/themeTrust';
+  } from '$lib/theme/themeScript';
+  import { isThemeTrusted, themeCodeKind, trustTheme } from '$lib/theme/themeTrust';
   import {
     normalizeChrome,
     normalizeThemeVersion,
@@ -117,7 +117,7 @@
     type ThemeV2Chrome,
     type ThemeV2Definition,
     type ThemeV2ScriptScreen,
-  } from '$lib/themeV2';
+  } from '$lib/theme/themeV2';
   import {
     checkThemeFromFile,
     deleteTheme,
@@ -133,7 +133,7 @@
     type Theme,
     type ThemeBackup,
     type ThemeInfo,
-  } from '$lib/themes';
+  } from '$lib/theme/themes';
   import { EZPPActionStatus, type LaunchView } from '$lib/types';
   import { currentUser } from '$lib/userAuthentication';
   import {