From da907f4fc29352bdad5a8383917ddf9814bacc28 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Sat, 26 Oct 2024 21:17:46 +0900
Subject: [PATCH] Move DBState to stores

---
 src/App.svelte                                |  4 +-
 src/LiteMain.svelte                           |  2 +-
 src/lib/ChatScreens/AdvancedChatEditor.svelte |  3 +-
 src/lib/ChatScreens/BackgroundDom.svelte      |  5 ++-
 src/lib/ChatScreens/Chat.svelte               |  5 ++-
 src/lib/ChatScreens/ChatScreen.svelte         |  5 ++-
 src/lib/ChatScreens/DefaultChatScreen.svelte  |  5 ++-
 src/lib/ChatScreens/EmotionBox.svelte         |  5 ++-
 src/lib/ChatScreens/ResizeBox.svelte          |  5 ++-
 src/lib/ChatScreens/Suggestion.svelte         |  5 ++-
 src/lib/Mobile/MobileBody.svelte              |  5 ++-
 src/lib/Mobile/MobileCharacters.svelte        |  5 ++-
 src/lib/Mobile/MobileFooter.svelte            |  2 +-
 src/lib/Mobile/MobileHeader.svelte            |  5 ++-
 src/lib/Others/AlertComp.svelte               |  5 ++-
 src/lib/Others/ChatList.svelte                |  5 ++-
 src/lib/Others/GridCatalog.svelte             |  5 ++-
 src/lib/Others/WelcomeRisu.svelte             |  3 +-
 src/lib/Playground/PlaygroundMenu.svelte      |  5 ++-
 .../Pages/AccessibilitySettings.svelte        |  3 +-
 src/lib/Setting/Pages/AdvancedSettings.svelte |  3 +-
 src/lib/Setting/Pages/BotSettings.svelte      |  5 ++-
 .../Setting/Pages/ChatFormatSettings.svelte   |  3 +-
 src/lib/Setting/Pages/DisplaySettings.svelte  |  5 ++-
 .../Pages/GlobalLoreBookSettings.svelte       |  3 +-
 src/lib/Setting/Pages/GlobalRegex.svelte      |  3 +-
 src/lib/Setting/Pages/LanguageSettings.svelte |  3 +-
 .../Pages/Module/ModuleChatMenu.svelte        |  7 ++--
 .../Setting/Pages/Module/ModuleMenu.svelte    |  3 +-
 .../Pages/Module/ModuleSettings.svelte        |  5 ++-
 src/lib/Setting/Pages/OobaSettings.svelte     |  3 +-
 .../Setting/Pages/OpenrouterSettings.svelte   |  3 +-
 src/lib/Setting/Pages/OtherBotSettings.svelte |  3 +-
 src/lib/Setting/Pages/PersonaSettings.svelte  |  3 +-
 src/lib/Setting/Pages/PluginSettings.svelte   |  3 +-
 src/lib/Setting/Pages/PromptSettings.svelte   |  3 +-
 src/lib/Setting/Pages/UserSettings.svelte     |  3 +-
 src/lib/Setting/Settings.svelte               |  2 +-
 src/lib/Setting/botpreset.svelte              |  5 ++-
 src/lib/Setting/listedPersona.svelte          |  3 +-
 src/lib/Setting/lorepreset.svelte             |  3 +-
 src/lib/SideBars/CharConfig.svelte            |  5 ++-
 src/lib/SideBars/DevTool.svelte               |  5 ++-
 src/lib/SideBars/LoreBook/LoreBookList.svelte |  5 ++-
 .../SideBars/LoreBook/LoreBookSetting.svelte  |  5 ++-
 src/lib/SideBars/SideChatList.svelte          |  5 ++-
 src/lib/SideBars/Sidebar.svelte               |  5 ++-
 src/lib/UI/GUI/SideBarArrow.svelte            |  2 +-
 src/lib/UI/GUI/TextAreaResizable.svelte       |  3 +-
 src/lib/UI/MainMenu.svelte                    |  5 ++-
 src/lib/UI/ModelList.svelte                   |  3 +-
 src/lib/UI/PromptDataItem.svelte              |  3 +-
 src/lib/UI/Realm/RealmFrame.svelte            |  5 ++-
 src/lib/UI/Realm/RealmMain.svelte             |  2 +-
 src/lib/UI/Realm/RealmPopUp.svelte            |  3 +-
 src/lib/UI/Realm/RealmUpload.svelte           |  3 +-
 src/lib/UI/Title.svelte                       |  5 ++-
 src/lib/VisualNovel/VisualNovelChat.svelte    |  5 ++-
 src/lib/VisualNovel/VisualNovelMain.svelte    |  3 +-
 src/main.ts                                   | 38 +++----------------
 src/ts/alert.ts                               |  2 +-
 src/ts/characterCards.ts                      |  2 +-
 src/ts/characters.ts                          |  2 +-
 src/ts/globalApi.ts                           |  5 +--
 src/ts/gui/colorscheme.ts                     |  2 +-
 src/ts/hotkey.ts                              |  2 +-
 src/ts/parser.svelte.ts                       |  5 ++-
 src/ts/plugins/embedscript.ts                 |  2 +-
 src/ts/plugins/plugins.ts                     |  2 +-
 src/ts/process/command.ts                     |  2 +-
 src/ts/process/files/multisend.ts             |  2 +-
 src/ts/process/group.ts                       |  2 +-
 src/ts/process/index.svelte.ts                |  5 ++-
 src/ts/process/lorebook.svelte.ts             |  5 ++-
 src/ts/process/lua.ts                         |  2 +-
 src/ts/process/modules.ts                     |  2 +-
 src/ts/process/scripts.ts                     |  2 +-
 src/ts/process/stableDiff.ts                  |  2 +-
 src/ts/process/triggers.ts                    |  2 +-
 src/ts/storage/database.svelte.ts             |  5 +--
 src/ts/{stores.ts => stores.svelte.ts}        |  7 +++-
 src/ts/sync/multiuser.ts                      |  2 +-
 src/ts/translator/translator.ts               |  2 +-
 src/ts/util.ts                                |  2 +-
 84 files changed, 183 insertions(+), 156 deletions(-)
 rename src/ts/{stores.ts => stores.svelte.ts} (93%)

diff --git a/src/App.svelte b/src/App.svelte
index df8aee93..df929112 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { DynamicGUI, settingsOpen, sideBarStore, ShowRealmFrameStore, openPresetList, openPersonaList, MobileGUI, CustomGUISettingMenuStore, loadedStore, alertStore } from './ts/stores';
+    import { DynamicGUI, settingsOpen, sideBarStore, ShowRealmFrameStore, openPresetList, openPersonaList, MobileGUI, CustomGUISettingMenuStore, loadedStore, alertStore } from './ts/stores.svelte';
     import Sidebar from './lib/SideBars/Sidebar.svelte';
-    import { DBState } from './ts/storage/database.svelte';
+    import { DBState } from './ts/stores.svelte';
     import ChatScreen from './lib/ChatScreens/ChatScreen.svelte';
     import AlertComp from './lib/Others/AlertComp.svelte';
     import RealmPopUp from './lib/UI/Realm/RealmPopUp.svelte';
diff --git a/src/LiteMain.svelte b/src/LiteMain.svelte
index bb651596..b9acaa3b 100644
--- a/src/LiteMain.svelte
+++ b/src/LiteMain.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { downloadRisuHub, getRisuHub } from "src/ts/characterCards";
     import LiteCardIcon from "./lib/LiteUI/LiteCardIcon.svelte";
-  import { selectedCharID } from "./ts/stores";
+  import { selectedCharID } from "./ts/stores.svelte";
   import DefaultChatScreen from "./lib/ChatScreens/DefaultChatScreen.svelte";
 </script>
 
diff --git a/src/lib/ChatScreens/AdvancedChatEditor.svelte b/src/lib/ChatScreens/AdvancedChatEditor.svelte
index 4f511f35..ecd1da1a 100644
--- a/src/lib/ChatScreens/AdvancedChatEditor.svelte
+++ b/src/lib/ChatScreens/AdvancedChatEditor.svelte
@@ -1,7 +1,8 @@
 <script>
     import { onMount, createEventDispatcher } from 'svelte';
     import { EditIcon, LanguagesIcon } from "lucide-svelte";
-    import { DBState } from "../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import CodeMirror from 'codemirror';
     import 'codemirror/lib/codemirror.css';
 
diff --git a/src/lib/ChatScreens/BackgroundDom.svelte b/src/lib/ChatScreens/BackgroundDom.svelte
index ed833dbb..1aa8a9e5 100644
--- a/src/lib/ChatScreens/BackgroundDom.svelte
+++ b/src/lib/ChatScreens/BackgroundDom.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { ParseMarkdown, risuChatParser } from "src/ts/parser.svelte";
-    import { DBState, type character, type groupChat } from "src/ts/storage/database.svelte";
-    import { moduleBackgroundEmbedding, ReloadGUIPointer, selectedCharID } from "src/ts/stores";
+    import { type character, type groupChat } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
+    import { moduleBackgroundEmbedding, ReloadGUIPointer, selectedCharID } from "src/ts/stores.svelte";
 
     let backgroundHTML = $derived(DBState.db?.characters?.[$selectedCharID]?.backgroundHTML)
     let currentChar:character|groupChat = $state()
diff --git a/src/lib/ChatScreens/Chat.svelte b/src/lib/ChatScreens/Chat.svelte
index 120c8c71..802ddb22 100644
--- a/src/lib/ChatScreens/Chat.svelte
+++ b/src/lib/ChatScreens/Chat.svelte
@@ -4,8 +4,9 @@
     import AutoresizeArea from "../UI/GUI/TextAreaResizable.svelte";
     import { alertConfirm, alertError, alertRequestData } from "../../ts/alert";
     import { language } from "../../lang";
-    import { DBState, type MessageGenerationInfo } from "../../ts/storage/database.svelte";
-    import { HideIconStore, ReloadGUIPointer, selectedCharID } from "../../ts/stores";
+    import { type MessageGenerationInfo } from "../../ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
+    import { HideIconStore, ReloadGUIPointer, selectedCharID } from "../../ts/stores.svelte";
     import { translateHTML } from "../../ts/translator/translator";
     import { risuChatParser } from "src/ts/process/scripts";
     import { get, type Unsubscriber } from "svelte/store";
diff --git a/src/lib/ChatScreens/ChatScreen.svelte b/src/lib/ChatScreens/ChatScreen.svelte
index 6a117129..5acc9194 100644
--- a/src/lib/ChatScreens/ChatScreen.svelte
+++ b/src/lib/ChatScreens/ChatScreen.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { getCustomBackground, getEmotion } from "../../ts/util";
-    import { DBState } from "../../ts/storage/database.svelte";
-    import { CharEmotion, ShowVN, selectedCharID } from "../../ts/stores";
+    
+    import { DBState } from 'src/ts/stores.svelte';
+    import { CharEmotion, ShowVN, selectedCharID } from "../../ts/stores.svelte";
     import ResizeBox from './ResizeBox.svelte'
     import DefaultChatScreen from "./DefaultChatScreen.svelte";
     import defaultWallpaper from '../../etc/bg.jpg'
diff --git a/src/lib/ChatScreens/DefaultChatScreen.svelte b/src/lib/ChatScreens/DefaultChatScreen.svelte
index dd26a266..8dd5c68e 100644
--- a/src/lib/ChatScreens/DefaultChatScreen.svelte
+++ b/src/lib/ChatScreens/DefaultChatScreen.svelte
@@ -3,9 +3,10 @@
 	import Suggestion from './Suggestion.svelte';
 	import AdvancedChatEditor from './AdvancedChatEditor.svelte';
     import { CameraIcon, DatabaseIcon, DicesIcon, GlobeIcon, ImagePlusIcon, LanguagesIcon, Laugh, MenuIcon, MicOffIcon, PackageIcon, Plus, RefreshCcwIcon, ReplyIcon, Send, StepForwardIcon } from "lucide-svelte";
-    import { selectedCharID, PlaygroundStore, UserIconProtrait, createSimpleCharacter } from "../../ts/stores";
+    import { selectedCharID, PlaygroundStore, UserIconProtrait, createSimpleCharacter } from "../../ts/stores.svelte";
     import Chat from "./Chat.svelte";
-    import { DBState, type Message, type character, type groupChat } from "../../ts/storage/database.svelte";
+    import { type Message, type character, type groupChat } from "../../ts/storage/database.svelte";
+	import { DBState } from 'src/ts/stores.svelte';
     import { getCharImage } from "../../ts/characters";
     import { chatProcessStage, doingChat, sendChat } from "../../ts/process/index.svelte";
     import { findCharacterbyId, messageForm, sleep } from "../../ts/util";
diff --git a/src/lib/ChatScreens/EmotionBox.svelte b/src/lib/ChatScreens/EmotionBox.svelte
index 924dab51..17f8c98a 100644
--- a/src/lib/ChatScreens/EmotionBox.svelte
+++ b/src/lib/ChatScreens/EmotionBox.svelte
@@ -1,6 +1,7 @@
 <script>
-    import { DBState } from '../../ts/storage/database.svelte';
-    import { CharEmotion } from '../../ts/stores';
+    
+    import { DBState } from 'src/ts/stores.svelte';
+    import { CharEmotion } from '../../ts/stores.svelte';
     import { getEmotion } from '../../ts/util';
 </script>
 
diff --git a/src/lib/ChatScreens/ResizeBox.svelte b/src/lib/ChatScreens/ResizeBox.svelte
index 477ec148..4e1e6782 100644
--- a/src/lib/ChatScreens/ResizeBox.svelte
+++ b/src/lib/ChatScreens/ResizeBox.svelte
@@ -1,10 +1,11 @@
 <script>
-    import { CharEmotion, ViewBoxsize } from '../../ts/stores';
+    import { CharEmotion, ViewBoxsize } from '../../ts/stores.svelte';
     import { onMount } from 'svelte';
     import EmotionBox from './EmotionBox.svelte';
     import TransitionImage from './TransitionImage.svelte';
     import { getEmotion } from '../../ts/util';
-    import { DBState } from '../../ts/storage/database.svelte';
+    
+    import { DBState } from 'src/ts/stores.svelte';
 
     let box = $state();
     let isResizing = false;
diff --git a/src/lib/ChatScreens/Suggestion.svelte b/src/lib/ChatScreens/Suggestion.svelte
index 1fd4a5ae..0ef77dff 100644
--- a/src/lib/ChatScreens/Suggestion.svelte
+++ b/src/lib/ChatScreens/Suggestion.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
 	import { requestChatData } from "src/ts/process/request";
     import { doingChat, type OpenAIChat } from "../../ts/process/index.svelte";
-    import { DBState, setDatabase, type character, type Message, type groupChat, type Database } from "../../ts/storage/database.svelte";
-    import { selectedCharID } from "../../ts/stores";
+    import { setDatabase, type character, type Message, type groupChat, type Database } from "../../ts/storage/database.svelte";
+	import { DBState } from 'src/ts/stores.svelte';
+    import { selectedCharID } from "../../ts/stores.svelte";
     import { translate } from "src/ts/translator/translator";
     import { CopyIcon, LanguagesIcon, RefreshCcwIcon } from "lucide-svelte";
     import { alertConfirm } from "src/ts/alert";
diff --git a/src/lib/Mobile/MobileBody.svelte b/src/lib/Mobile/MobileBody.svelte
index 865fd02b..216da149 100644
--- a/src/lib/Mobile/MobileBody.svelte
+++ b/src/lib/Mobile/MobileBody.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { MobileGUIStack, MobileSideBar, selectedCharID } from "src/ts/stores";
+    import { MobileGUIStack, MobileSideBar, selectedCharID } from "src/ts/stores.svelte";
     import Settings from "../Setting/Settings.svelte";
     import RealmMain from "../UI/Realm/RealmMain.svelte";
     import MobileCharacters from "./MobileCharacters.svelte";
@@ -10,7 +10,8 @@
     import SideChatList from "../SideBars/SideChatList.svelte";
     import DevTool from "../SideBars/DevTool.svelte";
     import { isLite } from "src/ts/lite";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
 </script>
 
 {#if $MobileSideBar > 0 && !$isLite}
diff --git a/src/lib/Mobile/MobileCharacters.svelte b/src/lib/Mobile/MobileCharacters.svelte
index 4045f88c..e1c1981a 100644
--- a/src/lib/Mobile/MobileCharacters.svelte
+++ b/src/lib/Mobile/MobileCharacters.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
-    import { type character, DBState, type groupChat } from "src/ts/storage/database.svelte";
+    import { type character, type groupChat } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import BarIcon from "../SideBars/BarIcon.svelte";
     import { addCharacter, changeChar, getCharImage } from "src/ts/characters";
-    import { MobileSearch } from "src/ts/stores";
+    import { MobileSearch } from "src/ts/stores.svelte";
     import { MessageSquareIcon, PlusIcon } from "lucide-svelte";
 
     const agoFormatter = new Intl.RelativeTimeFormat(navigator.languages, { style: 'short' });
diff --git a/src/lib/Mobile/MobileFooter.svelte b/src/lib/Mobile/MobileFooter.svelte
index a20478ee..f46f1766 100644
--- a/src/lib/Mobile/MobileFooter.svelte
+++ b/src/lib/Mobile/MobileFooter.svelte
@@ -2,7 +2,7 @@
 
   import { SettingsIcon, GlobeIcon, HomeIcon, MessageSquare, Volume2Icon, CurlyBraces, ActivityIcon, BookIcon, SmileIcon, UserIcon } from "lucide-svelte";
   import { language } from "src/lang";
-  import { CharConfigSubMenu, MobileGUIStack, MobileSideBar, selectedCharID } from "src/ts/stores";
+  import { CharConfigSubMenu, MobileGUIStack, MobileSideBar, selectedCharID } from "src/ts/stores.svelte";
 
 </script>
 {#if $selectedCharID === -1}
diff --git a/src/lib/Mobile/MobileHeader.svelte b/src/lib/Mobile/MobileHeader.svelte
index 307398e5..e5804840 100644
--- a/src/lib/Mobile/MobileHeader.svelte
+++ b/src/lib/Mobile/MobileHeader.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { ArrowLeft, MenuIcon } from "lucide-svelte";
     import { language } from "src/lang";
-    import { DBState } from "src/ts/storage/database.svelte";
-    import { MobileGUIStack, MobileSearch, selectedCharID, SettingsMenuIndex, MobileSideBar } from "src/ts/stores";
+    
+    import { DBState } from 'src/ts/stores.svelte';
+    import { MobileGUIStack, MobileSearch, selectedCharID, SettingsMenuIndex, MobileSideBar } from "src/ts/stores.svelte";
 
 </script>
 <div class="w-full px-4 h-16 border-b border-b-darkborderc bg-darkbg flex justify-start items-center gap-2">
diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte
index b75b2c89..c4ce651a 100644
--- a/src/lib/Others/AlertComp.svelte
+++ b/src/lib/Others/AlertComp.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { alertGenerationInfoStore } from "../../ts/alert";
-    import { DBState } from '../../ts/storage/database.svelte';
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { getCharImage } from '../../ts/characters';
     import { ParseMarkdown } from '../../ts/parser.svelte';
     import BarIcon from '../SideBars/BarIcon.svelte';
@@ -14,7 +15,7 @@
     import OptionInput from "../UI/GUI/OptionInput.svelte";
     import { language } from 'src/lang';
     import { getFetchData } from 'src/ts/globalApi';
-    import { alertStore, selectedCharID } from "src/ts/stores";
+    import { alertStore, selectedCharID } from "src/ts/stores.svelte";
     import { tokenize } from "src/ts/tokenizer";
     import TextAreaInput from "../UI/GUI/TextAreaInput.svelte";
     import ModuleChatMenu from "../Setting/Pages/Module/ModuleChatMenu.svelte";
diff --git a/src/lib/Others/ChatList.svelte b/src/lib/Others/ChatList.svelte
index af6276fa..86750edb 100644
--- a/src/lib/Others/ChatList.svelte
+++ b/src/lib/Others/ChatList.svelte
@@ -1,8 +1,9 @@
 <script>
     import { alertConfirm, alertError } from "../../ts/alert";
     import { language } from "../../lang";
-    import { DBState } from "../../ts/storage/database.svelte";
-    import { ReloadGUIPointer, selectedCharID } from "../../ts/stores";
+    
+    import { DBState } from 'src/ts/stores.svelte';
+    import { ReloadGUIPointer, selectedCharID } from "../../ts/stores.svelte";
     import { DownloadIcon, EditIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte";
     import { exportChat, importChat } from "../../ts/characters";
     import { findCharacterbyId } from "../../ts/util";
diff --git a/src/lib/Others/GridCatalog.svelte b/src/lib/Others/GridCatalog.svelte
index 2b7b2892..5c8c15a3 100644
--- a/src/lib/Others/GridCatalog.svelte
+++ b/src/lib/Others/GridCatalog.svelte
@@ -1,9 +1,10 @@
 <script lang="ts">
     import { characterFormatUpdate, getCharImage, removeChar } from "../../ts/characters";
-    import { DBState, type Database } from "../../ts/storage/database.svelte";
+    import { type Database } from "../../ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import BarIcon from "../SideBars/BarIcon.svelte";
     import { ArrowLeft, User, Users, Inspect, TrashIcon, Undo2Icon } from "lucide-svelte";
-    import { selectedCharID } from "../../ts/stores";
+    import { selectedCharID } from "../../ts/stores.svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     import Button from "../UI/GUI/Button.svelte";
     import { language } from "src/lang";
diff --git a/src/lib/Others/WelcomeRisu.svelte b/src/lib/Others/WelcomeRisu.svelte
index 96850df5..f55a9c02 100644
--- a/src/lib/Others/WelcomeRisu.svelte
+++ b/src/lib/Others/WelcomeRisu.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { Send } from "lucide-svelte";
     import { changeLanguage, language } from "src/lang";
-    import { DBState, setPreset } from "src/ts/storage/database.svelte";
+    import { setPreset } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import Chat from "../ChatScreens/Chat.svelte";
     import { prebuiltPresets } from "src/ts/process/templates/templates";
     import { updateTextThemeAndCSS } from "src/ts/gui/colorscheme";
diff --git a/src/lib/Playground/PlaygroundMenu.svelte b/src/lib/Playground/PlaygroundMenu.svelte
index 01a0ec8b..ac7756a3 100644
--- a/src/lib/Playground/PlaygroundMenu.svelte
+++ b/src/lib/Playground/PlaygroundMenu.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
     import { ArrowLeft } from "lucide-svelte";
     import { language } from "src/lang";
-    import { PlaygroundStore, SizeStore, selectedCharID } from "src/ts/stores";
+    import { PlaygroundStore, SizeStore, selectedCharID } from "src/ts/stores.svelte";
     import PlaygroundEmbedding from "./PlaygroundEmbedding.svelte";
     import PlaygroundTokenizer from "./PlaygroundTokenizer.svelte";
     import PlaygroundJinja from "./PlaygroundJinja.svelte";
     import PlaygroundSyntax from "./PlaygroundSyntax.svelte";
     import { findCharacterIndexbyId } from "src/ts/util";
     import { characterFormatUpdate, createBlankChar } from "src/ts/characters";
-    import { DBState, type character } from "src/ts/storage/database.svelte";
+    import { type character } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import PlaygroundImageGen from "./PlaygroundImageGen.svelte";
     import PlaygroundParser from "./PlaygroundParser.svelte";
     import ToolConvertion from "./ToolConvertion.svelte";
diff --git a/src/lib/Setting/Pages/AccessibilitySettings.svelte b/src/lib/Setting/Pages/AccessibilitySettings.svelte
index d67f0dca..46a36ece 100644
--- a/src/lib/Setting/Pages/AccessibilitySettings.svelte
+++ b/src/lib/Setting/Pages/AccessibilitySettings.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import { language } from "src/lang";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
 
 </script>
 
diff --git a/src/lib/Setting/Pages/AdvancedSettings.svelte b/src/lib/Setting/Pages/AdvancedSettings.svelte
index 50e310eb..6d379168 100644
--- a/src/lib/Setting/Pages/AdvancedSettings.svelte
+++ b/src/lib/Setting/Pages/AdvancedSettings.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import { language } from "src/lang";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { alertMd } from "src/ts/alert";
     import { getRequestLog, isTauri } from "src/ts/globalApi";
     import NumberInput from "src/lib/UI/GUI/NumberInput.svelte";
diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte
index cefd3e8d..543fa96c 100644
--- a/src/lib/Setting/Pages/BotSettings.svelte
+++ b/src/lib/Setting/Pages/BotSettings.svelte
@@ -3,7 +3,8 @@
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import { language } from "src/lang";
     import Help from "src/lib/Others/Help.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { customProviderStore } from "src/ts/plugins/plugins";
     import { downloadFile, getModelMaxContext, isTauri } from "src/ts/globalApi";
     import { tokenizeAccurate, tokenizerList } from "src/ts/tokenizer";
@@ -24,7 +25,7 @@
     import OpenrouterSettings from "./OpenrouterSettings.svelte";
     import ChatFormatSettings from "./ChatFormatSettings.svelte";
     import PromptSettings from "./PromptSettings.svelte";
-    import { openPresetList } from "src/ts/stores";
+    import { openPresetList } from "src/ts/stores.svelte";
     import { selectSingleFile } from "src/ts/util";
 
     let tokens = $state({
diff --git a/src/lib/Setting/Pages/ChatFormatSettings.svelte b/src/lib/Setting/Pages/ChatFormatSettings.svelte
index 5a696fae..6c8ece50 100644
--- a/src/lib/Setting/Pages/ChatFormatSettings.svelte
+++ b/src/lib/Setting/Pages/ChatFormatSettings.svelte
@@ -2,7 +2,8 @@
     import TextAreaInput from "src/lib/UI/GUI/TextAreaInput.svelte";
     import SelectInput from "src/lib/UI/GUI/SelectInput.svelte";
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { language } from "src/lang";
 </script>
 
diff --git a/src/lib/Setting/Pages/DisplaySettings.svelte b/src/lib/Setting/Pages/DisplaySettings.svelte
index 7c189653..49b3ad4c 100644
--- a/src/lib/Setting/Pages/DisplaySettings.svelte
+++ b/src/lib/Setting/Pages/DisplaySettings.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { language } from "src/lang";
-    import { DBState, saveImage } from "src/ts/storage/database.svelte";
+    import { saveImage } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import { changeFullscreen, selectSingleFile, sleep } from "src/ts/util";
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import Help from "src/lib/Others/Help.svelte";
@@ -16,7 +17,7 @@
   import TextAreaInput from "src/lib/UI/GUI/TextAreaInput.svelte";
   import Arcodion from "src/lib/UI/Arcodion.svelte";
   import Button from "src/lib/UI/GUI/Button.svelte";
-  import { CustomGUISettingMenuStore } from "src/ts/stores";
+  import { CustomGUISettingMenuStore } from "src/ts/stores.svelte";
 
     const onSchemeInputChange = (e:Event) => {
         changeColorScheme((e.target as HTMLInputElement).value)
diff --git a/src/lib/Setting/Pages/GlobalLoreBookSettings.svelte b/src/lib/Setting/Pages/GlobalLoreBookSettings.svelte
index 643fff7c..b1209398 100644
--- a/src/lib/Setting/Pages/GlobalLoreBookSettings.svelte
+++ b/src/lib/Setting/Pages/GlobalLoreBookSettings.svelte
@@ -2,7 +2,8 @@
     import { language } from "src/lang";
     import Help from "src/lib/Others/Help.svelte";
     import LoreBookSetting from "src/lib/SideBars/LoreBook/LoreBookSetting.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     interface Props {
       openLoreList?: boolean;
     }
diff --git a/src/lib/Setting/Pages/GlobalRegex.svelte b/src/lib/Setting/Pages/GlobalRegex.svelte
index cb991290..19fba73a 100644
--- a/src/lib/Setting/Pages/GlobalRegex.svelte
+++ b/src/lib/Setting/Pages/GlobalRegex.svelte
@@ -2,7 +2,8 @@
     import { DownloadIcon, FolderUpIcon, PlusIcon } from "lucide-svelte";
     import { language } from "src/lang";
     import Help from "src/lib/Others/Help.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { exportRegex, importRegex } from "src/ts/process/scripts";
     import RegexList from "src/lib/SideBars/Scripts/RegexList.svelte";
 </script>
diff --git a/src/lib/Setting/Pages/LanguageSettings.svelte b/src/lib/Setting/Pages/LanguageSettings.svelte
index 627dee89..f5c28f13 100644
--- a/src/lib/Setting/Pages/LanguageSettings.svelte
+++ b/src/lib/Setting/Pages/LanguageSettings.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import { changeLanguage, language } from "src/lang";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { sleep } from "src/ts/util";
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
     import SelectInput from "src/lib/UI/GUI/SelectInput.svelte";
diff --git a/src/lib/Setting/Pages/Module/ModuleChatMenu.svelte b/src/lib/Setting/Pages/Module/ModuleChatMenu.svelte
index c98a4c0d..7c6d1242 100644
--- a/src/lib/Setting/Pages/Module/ModuleChatMenu.svelte
+++ b/src/lib/Setting/Pages/Module/ModuleChatMenu.svelte
@@ -4,9 +4,10 @@
     import Button from "src/lib/UI/GUI/Button.svelte";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
     import type { RisuModule } from "src/ts/process/modules";
-    import { DBState } from "src/ts/storage/database.svelte";
-    import { selectedCharID } from "src/ts/stores";
-    import { SettingsMenuIndex, settingsOpen } from "src/ts/stores";
+    
+    import { DBState } from 'src/ts/stores.svelte';
+    import { selectedCharID } from "src/ts/stores.svelte";
+    import { SettingsMenuIndex, settingsOpen } from "src/ts/stores.svelte";
     interface Props {
         close?: any;
         alertMode?: boolean;
diff --git a/src/lib/Setting/Pages/Module/ModuleMenu.svelte b/src/lib/Setting/Pages/Module/ModuleMenu.svelte
index 6e136a94..7af4f12f 100644
--- a/src/lib/Setting/Pages/Module/ModuleMenu.svelte
+++ b/src/lib/Setting/Pages/Module/ModuleMenu.svelte
@@ -12,7 +12,8 @@
     import { getFileSrc, openURL, saveAsset } from "src/ts/globalApi";
     import { exportRegex, importRegex } from "src/ts/process/scripts";
     import { selectMultipleFile } from "src/ts/util";
-    import { DBState } from 'src/ts/storage/database.svelte';
+    
+    import { DBState } from 'src/ts/stores.svelte';
 
     let submenu = $state(0)
     interface Props {
diff --git a/src/lib/Setting/Pages/Module/ModuleSettings.svelte b/src/lib/Setting/Pages/Module/ModuleSettings.svelte
index 1c253d67..4abaa0ed 100644
--- a/src/lib/Setting/Pages/Module/ModuleSettings.svelte
+++ b/src/lib/Setting/Pages/Module/ModuleSettings.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { language } from "src/lang";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import Button from "src/lib/UI/GUI/Button.svelte";
     import ModuleMenu from "src/lib/Setting/Pages/Module/ModuleMenu.svelte";
     import { exportModule, importModule, type RisuModule } from "src/ts/process/modules";
@@ -9,7 +10,7 @@
     import { tooltip } from "src/ts/gui/tooltip";
     import { alertCardExport, alertConfirm, alertError } from "src/ts/alert";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
-    import { ShowRealmFrameStore } from "src/ts/stores";
+    import { ShowRealmFrameStore } from "src/ts/stores.svelte";
     let tempModule:RisuModule = $state({
         name: '',
         description: '',
diff --git a/src/lib/Setting/Pages/OobaSettings.svelte b/src/lib/Setting/Pages/OobaSettings.svelte
index f01875bf..b7903f51 100644
--- a/src/lib/Setting/Pages/OobaSettings.svelte
+++ b/src/lib/Setting/Pages/OobaSettings.svelte
@@ -2,7 +2,8 @@
     import SelectInput from "src/lib/UI/GUI/SelectInput.svelte";
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
     import OptionalInput from "src/lib/UI/GUI/OptionalInput.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import CheckInput from "src/lib/UI/GUI/CheckInput.svelte";
     import { language } from "src/lang";
     import { PlusIcon, TrashIcon } from "lucide-svelte";
diff --git a/src/lib/Setting/Pages/OpenrouterSettings.svelte b/src/lib/Setting/Pages/OpenrouterSettings.svelte
index ea129991..3c1f9898 100644
--- a/src/lib/Setting/Pages/OpenrouterSettings.svelte
+++ b/src/lib/Setting/Pages/OpenrouterSettings.svelte
@@ -2,7 +2,8 @@
     import { language } from "src/lang";
     import Arcodion from "src/lib/UI/Arcodion.svelte";
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import SelectInput from "src/lib/UI/GUI/SelectInput.svelte";
     import OptionInput from "src/lib/UI/GUI/OptionInput.svelte";
     import ChatFormatSettings from "./ChatFormatSettings.svelte";
diff --git a/src/lib/Setting/Pages/OtherBotSettings.svelte b/src/lib/Setting/Pages/OtherBotSettings.svelte
index 6475bb5d..e44b31b9 100644
--- a/src/lib/Setting/Pages/OtherBotSettings.svelte
+++ b/src/lib/Setting/Pages/OtherBotSettings.svelte
@@ -3,7 +3,8 @@
     import { language } from "src/lang";
     import Help from "src/lib/Others/Help.svelte";
     import { selectSingleFile } from "src/ts/util";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { isTauri, saveAsset } from "src/ts/globalApi";
     import NumberInput from "src/lib/UI/GUI/NumberInput.svelte";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
diff --git a/src/lib/Setting/Pages/PersonaSettings.svelte b/src/lib/Setting/Pages/PersonaSettings.svelte
index 63f0109b..f6824319 100644
--- a/src/lib/Setting/Pages/PersonaSettings.svelte
+++ b/src/lib/Setting/Pages/PersonaSettings.svelte
@@ -8,7 +8,8 @@
     import { alertConfirm, alertSelect } from "src/ts/alert";
     import { getCharImage } from "src/ts/characters";
     import { changeUserPersona, exportUserPersona, importUserPersona, saveUserPersona, selectUserImg } from "src/ts/persona";
-    import { DBState, setDatabase } from "src/ts/storage/database.svelte";
+    import { setDatabase } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import { get } from "svelte/store";
 
 </script>
diff --git a/src/lib/Setting/Pages/PluginSettings.svelte b/src/lib/Setting/Pages/PluginSettings.svelte
index 4fbd00bc..24565fc2 100644
--- a/src/lib/Setting/Pages/PluginSettings.svelte
+++ b/src/lib/Setting/Pages/PluginSettings.svelte
@@ -2,7 +2,8 @@
     import { PlusIcon, TrashIcon } from "lucide-svelte";
     import { language } from "src/lang";
     import { alertConfirm } from "src/ts/alert";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { importPlugin } from "src/ts/plugins/plugins";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
     import NumberInput from "src/lib/UI/GUI/NumberInput.svelte";
diff --git a/src/lib/Setting/Pages/PromptSettings.svelte b/src/lib/Setting/Pages/PromptSettings.svelte
index 50178989..18ff35ea 100644
--- a/src/lib/Setting/Pages/PromptSettings.svelte
+++ b/src/lib/Setting/Pages/PromptSettings.svelte
@@ -4,7 +4,8 @@
     import PromptDataItem from "src/lib/UI/PromptDataItem.svelte";
     import { tokenizePreset, type PromptItem } from "src/ts/process/prompt";
     import { templateCheck } from "src/ts/process/templates/templateCheck";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
     import NumberInput from "src/lib/UI/GUI/NumberInput.svelte";
diff --git a/src/lib/Setting/Pages/UserSettings.svelte b/src/lib/Setting/Pages/UserSettings.svelte
index 04de85dc..5a63e56b 100644
--- a/src/lib/Setting/Pages/UserSettings.svelte
+++ b/src/lib/Setting/Pages/UserSettings.svelte
@@ -2,7 +2,8 @@
     import { language } from "src/lang";
     import { hubURL } from "src/ts/characterCards";
     import { loadRisuAccountData, saveRisuAccountData } from "src/ts/drive/accounter";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import { alertConfirm} from "src/ts/alert";
     import { forageStorage, isNodeServer, isTauri, loadInternalBackup } from "src/ts/globalApi";
diff --git a/src/lib/Setting/Settings.svelte b/src/lib/Setting/Settings.svelte
index e05fb540..fdb8b457 100644
--- a/src/lib/Setting/Settings.svelte
+++ b/src/lib/Setting/Settings.svelte
@@ -8,7 +8,7 @@
     import PluginSettings from "./Pages/PluginSettings.svelte";
     import FilesSettings from "./Pages/FilesSettings.svelte";
     import AdvancedSettings from "./Pages/AdvancedSettings.svelte";
-    import { MobileGUI, SettingsMenuIndex, settingsOpen } from "src/ts/stores";
+    import { MobileGUI, SettingsMenuIndex, settingsOpen } from "src/ts/stores.svelte";
     import Botpreset from "./botpreset.svelte";
     import Communities from "./Pages/Communities.svelte";
     import GlobalLoreBookSettings from "./Pages/GlobalLoreBookSettings.svelte";
diff --git a/src/lib/Setting/botpreset.svelte b/src/lib/Setting/botpreset.svelte
index 9df8870a..34f99d1b 100644
--- a/src/lib/Setting/botpreset.svelte
+++ b/src/lib/Setting/botpreset.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
     import { alertCardExport, alertConfirm, alertError } from "../../ts/alert";
     import { language } from "../../lang";
-    import { DBState, changeToPreset, copyPreset, downloadPreset, importPreset } from "../../ts/storage/database.svelte";
+    import { changeToPreset, copyPreset, downloadPreset, importPreset } from "../../ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import { CopyIcon, Share2Icon, PencilIcon, FolderUpIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     import { prebuiltPresets } from "src/ts/process/templates/templates";
-    import { ShowRealmFrameStore } from "src/ts/stores";
+    import { ShowRealmFrameStore } from "src/ts/stores.svelte";
 
     let editMode = $state(false)
     interface Props {
diff --git a/src/lib/Setting/listedPersona.svelte b/src/lib/Setting/listedPersona.svelte
index b90c7156..43e94101 100644
--- a/src/lib/Setting/listedPersona.svelte
+++ b/src/lib/Setting/listedPersona.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
     import { XIcon } from "lucide-svelte";
     import { language } from "../../lang";
-    import { DBState } from "../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { changeUserPersona } from "src/ts/persona";
 
 
diff --git a/src/lib/Setting/lorepreset.svelte b/src/lib/Setting/lorepreset.svelte
index 9b4d92ef..770c5cc9 100644
--- a/src/lib/Setting/lorepreset.svelte
+++ b/src/lib/Setting/lorepreset.svelte
@@ -1,7 +1,8 @@
 <script>
     import { alertConfirm, alertError } from "../../ts/alert";
     import { language } from "../../lang";
-    import { DBState } from "../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { EditIcon, PlusIcon, TrashIcon, XIcon } from "lucide-svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     let editMode = $state(false)
diff --git a/src/lib/SideBars/CharConfig.svelte b/src/lib/SideBars/CharConfig.svelte
index 7d5fcc0c..542a069e 100644
--- a/src/lib/SideBars/CharConfig.svelte
+++ b/src/lib/SideBars/CharConfig.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { language } from "../../lang";
     import { tokenizeAccurate } from "../../ts/tokenizer";
-    import { DBState, saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database.svelte";
-    import { CharConfigSubMenu, MobileGUI, ShowRealmFrameStore, selectedCharID } from "../../ts/stores";
+    import { saveImage as saveAsset, type Database, type character, type groupChat } from "../../ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
+    import { CharConfigSubMenu, MobileGUI, ShowRealmFrameStore, selectedCharID } from "../../ts/stores.svelte";
     import { PlusIcon, SmileIcon, TrashIcon, UserIcon, ActivityIcon, BookIcon, User, CurlyBraces, Volume2Icon, DownloadIcon, FolderUpIcon } from 'lucide-svelte'
     import Check from "../UI/GUI/CheckInput.svelte";
     import { addCharEmotion, addingEmotion, getCharImage, rmCharEmotion, selectCharImg, makeGroupImage, removeChar, changeCharImage } from "../../ts/characters";
diff --git a/src/lib/SideBars/DevTool.svelte b/src/lib/SideBars/DevTool.svelte
index 9335cd8a..d8416c3f 100644
--- a/src/lib/SideBars/DevTool.svelte
+++ b/src/lib/SideBars/DevTool.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { selectedCharID } from "src/ts/stores";
+    import { selectedCharID } from "src/ts/stores.svelte";
     import TextInput from "../UI/GUI/TextInput.svelte";
     import NumberInput from "../UI/GUI/NumberInput.svelte";
     import Button from "../UI/GUI/Button.svelte";
@@ -8,7 +8,8 @@
     import Arcodion from "../UI/Arcodion.svelte";
     import { getCharToken, getChatToken } from "src/ts/tokenizer";
     import { tokenizePreset } from "src/ts/process/prompt";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import TextAreaInput from "../UI/GUI/TextAreaInput.svelte";
     import { FolderUpIcon, PlusIcon, TrashIcon } from "lucide-svelte";
     import { selectSingleFile } from "src/ts/util";
diff --git a/src/lib/SideBars/LoreBook/LoreBookList.svelte b/src/lib/SideBars/LoreBook/LoreBookList.svelte
index a0e5bde4..e3f44314 100644
--- a/src/lib/SideBars/LoreBook/LoreBookList.svelte
+++ b/src/lib/SideBars/LoreBook/LoreBookList.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-    import { DBState, type loreBook } from "src/ts/storage/database.svelte";
+    import { type loreBook } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import LoreBookData from "./LoreBookData.svelte";
-    import { selectedCharID } from "src/ts/stores";
+    import { selectedCharID } from "src/ts/stores.svelte";
     import Sortable from 'sortablejs/modular/sortable.core.esm.js';
     import { onDestroy, onMount } from "svelte";
     import { sleep, sortableOptions } from "src/ts/util";
diff --git a/src/lib/SideBars/LoreBook/LoreBookSetting.svelte b/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
index 3d42a761..6e942df0 100644
--- a/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
+++ b/src/lib/SideBars/LoreBook/LoreBookSetting.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-    import { DBState } from "../../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { language } from "../../../lang";
     import { DownloadIcon, FolderUpIcon, ImportIcon, PlusIcon } from "lucide-svelte";
     import { addLorebook, exportLoreBook, importLoreBook } from "../../../ts/process/lorebook.svelte";
@@ -7,7 +8,7 @@
     import NumberInput from "../../UI/GUI/NumberInput.svelte";
     import LoreBookList from "./LoreBookList.svelte";
     import Help from "src/lib/Others/Help.svelte";
-  import { selectedCharID } from "src/ts/stores";
+  import { selectedCharID } from "src/ts/stores.svelte";
 
     let submenu = $state(0)
     interface Props {
diff --git a/src/lib/SideBars/SideChatList.svelte b/src/lib/SideBars/SideChatList.svelte
index 1de0478f..1cc50ed7 100644
--- a/src/lib/SideBars/SideChatList.svelte
+++ b/src/lib/SideBars/SideChatList.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import type { Chat, character, groupChat } from "src/ts/storage/database.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import TextInput from "../UI/GUI/TextInput.svelte";
     import { DownloadIcon, PencilIcon, FolderUpIcon, MenuIcon, TrashIcon } from "lucide-svelte";
     import { exportChat, importChat } from "src/ts/characters";
@@ -10,7 +11,7 @@
     import { findCharacterbyId, parseKeyValue, sleep, sortableOptions } from "src/ts/util";
     import CheckInput from "../UI/GUI/CheckInput.svelte";
     import { createMultiuserRoom } from "src/ts/sync/multiuser";
-    import { MobileGUI, ReloadGUIPointer, selectedCharID } from "src/ts/stores";
+    import { MobileGUI, ReloadGUIPointer, selectedCharID } from "src/ts/stores.svelte";
     import Sortable from 'sortablejs/modular/sortable.core.esm.js';
     import { onDestroy, onMount } from "svelte";
     import { v4 } from "uuid";
diff --git a/src/lib/SideBars/Sidebar.svelte b/src/lib/SideBars/Sidebar.svelte
index f8b0a2f5..ff23ec01 100644
--- a/src/lib/SideBars/Sidebar.svelte
+++ b/src/lib/SideBars/Sidebar.svelte
@@ -9,8 +9,9 @@
     sideBarStore,
     OpenRealmStore,
     PlaygroundStore
-  } from "../../ts/stores";
-    import { DBState, setDatabase, type folder } from "../../ts/storage/database.svelte";
+  } from "../../ts/stores.svelte";
+    import { setDatabase, type folder } from "../../ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import BarIcon from "./BarIcon.svelte";
     import SidebarIndicator from "./SidebarIndicator.svelte";
     import {
diff --git a/src/lib/UI/GUI/SideBarArrow.svelte b/src/lib/UI/GUI/SideBarArrow.svelte
index c607433e..516bdff4 100644
--- a/src/lib/UI/GUI/SideBarArrow.svelte
+++ b/src/lib/UI/GUI/SideBarArrow.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { ArrowLeft, ArrowRight } from "lucide-svelte";
-    import { DynamicGUI, MobileGUI, sideBarClosing, sideBarStore } from "src/ts/stores";
+    import { DynamicGUI, MobileGUI, sideBarClosing, sideBarStore } from "src/ts/stores.svelte";
 
 </script>
 
diff --git a/src/lib/UI/GUI/TextAreaResizable.svelte b/src/lib/UI/GUI/TextAreaResizable.svelte
index 90072c2e..fa152149 100644
--- a/src/lib/UI/GUI/TextAreaResizable.svelte
+++ b/src/lib/UI/GUI/TextAreaResizable.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { onMount } from 'svelte';
-    import { DBState } from "../../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { longpress } from 'src/ts/gui/longtouch';
 
     let textarea:HTMLElement = $state();
diff --git a/src/lib/UI/MainMenu.svelte b/src/lib/UI/MainMenu.svelte
index 2d612ace..68db68c5 100644
--- a/src/lib/UI/MainMenu.svelte
+++ b/src/lib/UI/MainMenu.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-    import { DBState, appVer, webAppSubVer } from "src/ts/storage/database.svelte";
+    import { appVer, webAppSubVer } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import Hub from "./Realm/RealmMain.svelte";
-    import { OpenRealmStore } from "src/ts/stores";
+    import { OpenRealmStore } from "src/ts/stores.svelte";
     import { ArrowLeft } from "lucide-svelte";
     import { isNodeServer, isTauri, openURL } from "src/ts/globalApi";
     import { language } from "src/lang";
diff --git a/src/lib/UI/ModelList.svelte b/src/lib/UI/ModelList.svelte
index bfebf3ed..af7bf714 100644
--- a/src/lib/UI/ModelList.svelte
+++ b/src/lib/UI/ModelList.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { getHordeModels } from "src/ts/horde/getModels";
     import Arcodion from "./Arcodion.svelte";
     import { language } from "src/lang";
diff --git a/src/lib/UI/PromptDataItem.svelte b/src/lib/UI/PromptDataItem.svelte
index 643168d8..2a270abb 100644
--- a/src/lib/UI/PromptDataItem.svelte
+++ b/src/lib/UI/PromptDataItem.svelte
@@ -8,7 +8,8 @@
     import CheckInput from "./GUI/CheckInput.svelte";
     import { ArrowDown, ArrowUp, XIcon } from "lucide-svelte";
     import TextInput from "./GUI/TextInput.svelte";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     interface Props {
         promptItem: PromptItem;
         onRemove?: () => void;
diff --git a/src/lib/UI/Realm/RealmFrame.svelte b/src/lib/UI/Realm/RealmFrame.svelte
index fddec4fd..f624c8a8 100644
--- a/src/lib/UI/Realm/RealmFrame.svelte
+++ b/src/lib/UI/Realm/RealmFrame.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { alertMd } from "src/ts/alert";
     import { shareRealmCardData } from "src/ts/realm";
-    import { DBState, downloadPreset } from "src/ts/storage/database.svelte";
-    import { selectedCharID, ShowRealmFrameStore } from "src/ts/stores";
+    import { downloadPreset } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
+    import { selectedCharID, ShowRealmFrameStore } from "src/ts/stores.svelte";
     import { sleep } from "src/ts/util";
     import { onDestroy, onMount } from "svelte";
 
diff --git a/src/lib/UI/Realm/RealmMain.svelte b/src/lib/UI/Realm/RealmMain.svelte
index 22ba3ba0..aa5a459b 100644
--- a/src/lib/UI/Realm/RealmMain.svelte
+++ b/src/lib/UI/Realm/RealmMain.svelte
@@ -5,7 +5,7 @@
     import { language } from "src/lang";
     import RisuHubIcon from "./RealmHubIcon.svelte";
     import TextInput from "../GUI/TextInput.svelte";
-    import { MobileGUI, SizeStore } from "src/ts/stores";
+    import { MobileGUI, SizeStore } from "src/ts/stores.svelte";
     import { Capacitor } from "@capacitor/core";
     import RealmPopUp from "./RealmPopUp.svelte";
     import { googleBuild } from "src/ts/globalApi";
diff --git a/src/lib/UI/Realm/RealmPopUp.svelte b/src/lib/UI/Realm/RealmPopUp.svelte
index fa613eee..5d5c1334 100644
--- a/src/lib/UI/Realm/RealmPopUp.svelte
+++ b/src/lib/UI/Realm/RealmPopUp.svelte
@@ -3,7 +3,8 @@
     import { language } from "src/lang";
     import { alertConfirm, alertInput, alertNormal } from "src/ts/alert";
     import { hubURL, type hubType, downloadRisuHub, getRealmInfo } from "src/ts/characterCards";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import RealmLicense from "./RealmLicense.svelte";
     import MultiLangDisplay from "../GUI/MultiLangDisplay.svelte";
     import { tooltip } from "src/ts/gui/tooltip";
diff --git a/src/lib/UI/Realm/RealmUpload.svelte b/src/lib/UI/Realm/RealmUpload.svelte
index de666c3c..e545de68 100644
--- a/src/lib/UI/Realm/RealmUpload.svelte
+++ b/src/lib/UI/Realm/RealmUpload.svelte
@@ -111,7 +111,8 @@
     import { language } from "src/lang";
     import { alertError } from "src/ts/alert";
     import { shareRisuHub2 } from "src/ts/characterCards";
-    import { DBState, type character } from "src/ts/storage/database.svelte";
+    import { type character } from "src/ts/storage/database.svelte";
+    import { DBState } from 'src/ts/stores.svelte';
     import TextInput from "../GUI/TextInput.svelte";
     import Button from "../GUI/Button.svelte";
     import SelectInput from "../GUI/SelectInput.svelte";
diff --git a/src/lib/UI/Title.svelte b/src/lib/UI/Title.svelte
index 75e4adb7..b92f4908 100644
--- a/src/lib/UI/Title.svelte
+++ b/src/lib/UI/Title.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
     import { alertMd } from "src/ts/alert";
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { openURL } from "src/ts/globalApi";
-    import { sideBarStore } from "src/ts/stores";
+    import { sideBarStore } from "src/ts/stores.svelte";
 
     let specialDay = $state('')
     const today = new Date()
diff --git a/src/lib/VisualNovel/VisualNovelChat.svelte b/src/lib/VisualNovel/VisualNovelChat.svelte
index 45fa9937..35b07512 100644
--- a/src/lib/VisualNovel/VisualNovelChat.svelte
+++ b/src/lib/VisualNovel/VisualNovelChat.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
-    import { DBState } from "src/ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import { getFileSrc } from "src/ts/globalApi";
-    import { selectedCharID } from "src/ts/stores";
+    import { selectedCharID } from "src/ts/stores.svelte";
     import { sleep } from "src/ts/util";
     import { onDestroy, onMount } from "svelte";
 
diff --git a/src/lib/VisualNovel/VisualNovelMain.svelte b/src/lib/VisualNovel/VisualNovelMain.svelte
index f55f2576..e323fe9d 100644
--- a/src/lib/VisualNovel/VisualNovelMain.svelte
+++ b/src/lib/VisualNovel/VisualNovelMain.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { getCustomBackground, getEmotion } from "../../ts/util";
-    import { DBState } from "../../ts/storage/database.svelte";
+    
+    import { DBState } from 'src/ts/stores.svelte';
     import BackgroundDom from "../ChatScreens/BackgroundDom.svelte";
     import SideBarArrow from "../UI/GUI/SideBarArrow.svelte";
     import defaultWallpaper from './test.png'
diff --git a/src/main.ts b/src/main.ts
index ae018b3b..fa8471e6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,37 +8,11 @@ import { initHotkey } from "./ts/hotkey";
 import { preLoadCheck } from "./preload";
 import { mount } from "svelte";
 
-const errorHandler = (event: ErrorEvent) => {
-    console.error(event.error)
-    alert(event.error)
-}
-const rejectHandler = (event: PromiseRejectionEvent) => {
-    console.error(event.reason)
-    alert(event.reason)
-}
-
-window.addEventListener('error', errorHandler)
-window.addEventListener('unhandledrejection', rejectHandler)
-
-export const removeDefaultHandler = () => {
-    window.removeEventListener('error', errorHandler)
-    window.removeEventListener('unhandledrejection', rejectHandler)
-}
-
-let app: any;
-
-if(preLoadCheck()){
-    try {    
-        app = mount(App, {
-                  target: document.getElementById("app"),
-                });
-        
-        loadData()
-        initHotkey()
-    } catch (error) {
-        console.error(error, error.stack)
-        alert(error)
-    }
-}
+preLoadCheck()
+let app = mount(App, {
+    target: document.getElementById("app"),
+});
+loadData()
+initHotkey()
 
 export default app;
\ No newline at end of file
diff --git a/src/ts/alert.ts b/src/ts/alert.ts
index d8c07168..08aaa7d5 100644
--- a/src/ts/alert.ts
+++ b/src/ts/alert.ts
@@ -4,7 +4,7 @@ import { language } from "../lang"
 import { isNodeServer, isTauri } from "./globalApi"
 import { Capacitor } from "@capacitor/core"
 import { getDatabase, type MessageGenerationInfo } from "./storage/database.svelte"
-import { alertStore as alertStoreImported } from "./stores"
+import { alertStore as alertStoreImported } from "./stores.svelte"
 
 export interface alertData{
     type: 'error'|'normal'|'none'|'ask'|'wait'|'selectChar'
diff --git a/src/ts/characterCards.ts b/src/ts/characterCards.ts
index 6525e5f8..4d060b76 100644
--- a/src/ts/characterCards.ts
+++ b/src/ts/characterCards.ts
@@ -6,7 +6,7 @@ import { language } from "src/lang"
 import { v4 as uuidv4, v4 } from 'uuid';
 import { characterFormatUpdate } from "./characters"
 import { AppendableBuffer, BlankWriter, checkCharOrder, downloadFile, isNodeServer, isTauri, loadAsset, LocalWriter, openURL, readImage, saveAsset, VirtualWriter } from "./globalApi"
-import { SettingsMenuIndex, ShowRealmFrameStore, selectedCharID, settingsOpen } from "./stores"
+import { SettingsMenuIndex, ShowRealmFrameStore, selectedCharID, settingsOpen } from "./stores.svelte"
 import { convertImage, hasher } from "./parser.svelte"
 import { CCardLib, type CharacterCardV3, type LorebookEntry } from '@risuai/ccardlib'
 import { reencodeImage } from "./process/files/image"
diff --git a/src/ts/characters.ts b/src/ts/characters.ts
index cd5a9543..12807463 100644
--- a/src/ts/characters.ts
+++ b/src/ts/characters.ts
@@ -5,7 +5,7 @@ import { language } from "../lang";
 import { decode as decodeMsgpack } from "msgpackr";
 import { checkNullish, findCharacterbyId, getUserName, selectMultipleFile, selectSingleFile, sleep } from "./util";
 import { v4 as uuidv4 } from 'uuid';
-import { MobileGUIStack, OpenRealmStore, selectedCharID } from "./stores";
+import { MobileGUIStack, OpenRealmStore, selectedCharID } from "./stores.svelte";
 import { checkCharOrder, downloadFile, getFileSrc } from "./globalApi";
 import { reencodeImage } from "./process/files/image";
 import { updateInlayScreen } from "./process/inlayScreen";
diff --git a/src/ts/globalApi.ts b/src/ts/globalApi.ts
index e52cc984..1328cb43 100644
--- a/src/ts/globalApi.ts
+++ b/src/ts/globalApi.ts
@@ -16,7 +16,7 @@ import {open} from '@tauri-apps/plugin-shell'
 import { setDatabase, type Database, defaultSdDataFunc, getDatabase } from "./storage/database.svelte";
 import { getCurrentWebviewWindow } from "@tauri-apps/api/webviewWindow";
 import { checkRisuUpdate } from "./update";
-import { MobileGUI, botMakerMode, selectedCharID, loadedStore } from "./stores";
+import { MobileGUI, botMakerMode, selectedCharID, loadedStore } from "./stores.svelte";
 import { loadPlugins } from "./plugins/plugins";
 import { alertConfirm, alertError, alertNormal, alertNormalWait, alertSelect, alertTOS, alertWait } from "./alert";
 import { checkDriverInit, syncDrive } from "./drive/drive";
@@ -32,12 +32,10 @@ import { saveDbKei } from "./kei/backup";
 import { Capacitor, CapacitorHttp } from '@capacitor/core';
 import * as CapFS from '@capacitor/filesystem'
 import { save } from "@tauri-apps/plugin-dialog";
-import type { RisuModule } from "./process/modules";
 import { listen } from '@tauri-apps/api/event'
 import { registerPlugin } from '@capacitor/core';
 import { language } from "src/lang";
 import { startObserveDom } from "./observer";
-import { removeDefaultHandler } from "src/main";
 import { updateGuisize } from "./gui/guisize";
 import { encodeCapKeySafe } from "./storage/mobileStorage";
 import { updateLorebooks } from "./characters";
@@ -623,7 +621,6 @@ export async function getFetchData(id: string) {
  * Updates the error handling by removing the default handler and adding custom handlers for errors and unhandled promise rejections.
  */
 function updateErrorHandling() {
-  removeDefaultHandler();
   const errorHandler = (event: ErrorEvent) => {
     console.error(event.error);
     alertError(event.error);
diff --git a/src/ts/gui/colorscheme.ts b/src/ts/gui/colorscheme.ts
index 36431fd2..f22b3ef1 100644
--- a/src/ts/gui/colorscheme.ts
+++ b/src/ts/gui/colorscheme.ts
@@ -4,7 +4,7 @@ import { downloadFile } from "../globalApi";
 import { BufferToText, selectSingleFile } from "../util";
 import { alertError } from "../alert";
 import { isLite } from "../lite";
-import { CustomCSSStore, SafeModeStore } from "../stores";
+import { CustomCSSStore, SafeModeStore } from "../stores.svelte";
 
 export interface ColorScheme{
     bgcolor: string;
diff --git a/src/ts/hotkey.ts b/src/ts/hotkey.ts
index 2330020b..d79f3ab6 100644
--- a/src/ts/hotkey.ts
+++ b/src/ts/hotkey.ts
@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
 import { alertSelect, alertToast, doingAlert } from "./alert"
 import { changeToPreset as changeToPreset2, getDatabase  } from "./storage/database.svelte"
-import { MobileGUIStack, MobileSideBar, openPersonaList, openPresetList, SafeModeStore, selectedCharID, settingsOpen } from "./stores"
+import { MobileGUIStack, MobileSideBar, openPersonaList, openPresetList, SafeModeStore, selectedCharID, settingsOpen } from "./stores.svelte"
 import { language } from "src/lang"
 import { updateTextThemeAndCSS } from "./gui/colorscheme"
 
diff --git a/src/ts/parser.svelte.ts b/src/ts/parser.svelte.ts
index 62572d46..553bfb96 100644
--- a/src/ts/parser.svelte.ts
+++ b/src/ts/parser.svelte.ts
@@ -1,11 +1,12 @@
 import DOMPurify from 'isomorphic-dompurify';
 import markdownit from 'markdown-it'
-import { getCurrentCharacter, DBState, type Database, type Message, type character, type customscript, type groupChat, type triggerscript } from './storage/database.svelte';
+import { getCurrentCharacter, type Database, type Message, type character, type customscript, type groupChat, type triggerscript } from './storage/database.svelte';
+import { DBState } from './stores.svelte';
 import { getFileSrc } from './globalApi';
 import { processScriptFull } from './process/scripts';
 import { get } from 'svelte/store';
 import css, { type CssAtRuleAST } from '@adobe/css-tools'
-import { SizeStore, selectedCharID } from './stores';
+import { SizeStore, selectedCharID } from './stores.svelte';
 import { calcString } from './process/infunctions';
 import { findCharacterbyId, getPersonaPrompt, getUserIcon, getUserName, parseKeyValue, sfc32, sleep, uuidtoNumber } from './util';
 import { getInlayImage } from './process/files/image';
diff --git a/src/ts/plugins/embedscript.ts b/src/ts/plugins/embedscript.ts
index 67fd00e0..8b260b8c 100644
--- a/src/ts/plugins/embedscript.ts
+++ b/src/ts/plugins/embedscript.ts
@@ -3,7 +3,7 @@ import type { ScriptMode } from '../process/scripts'
 //@ts-ignore
 import WorkerUrl from './embedworker?worker&url'
 import { getDatabase, type Message } from '../storage/database.svelte'
-import { selectedCharID } from '../stores'
+import { selectedCharID } from '../stores.svelte'
 import { setDatabase } from '../storage/database.svelte'
 
 let worker = new Worker(WorkerUrl, {type: 'module'})
diff --git a/src/ts/plugins/plugins.ts b/src/ts/plugins/plugins.ts
index 1194e45b..aab17e2d 100644
--- a/src/ts/plugins/plugins.ts
+++ b/src/ts/plugins/plugins.ts
@@ -5,7 +5,7 @@ import { getDatabase, setDatabaseLite } from "../storage/database.svelte";
 import { checkNullish, selectSingleFile, sleep } from "../util";
 import type { OpenAIChat } from "../process/index.svelte";
 import { globalFetch } from "../globalApi";
-import { selectedCharID } from "../stores";
+import { selectedCharID } from "../stores.svelte";
 import { addAdditionalCharaJS } from "./embedscript";
 
 export const customProviderStore = writable([] as string[])
diff --git a/src/ts/process/command.ts b/src/ts/process/command.ts
index 3c7fa141..0bac3b9b 100644
--- a/src/ts/process/command.ts
+++ b/src/ts/process/command.ts
@@ -1,6 +1,6 @@
 import { get } from "svelte/store";
 import { getCurrentCharacter, getCurrentChat, getDatabase, setCurrentChat, setDatabase } from "../storage/database.svelte";
-import { selectedCharID } from "../stores";
+import { selectedCharID } from "../stores.svelte";
 import { alertInput, alertMd, alertNormal, alertSelect, alertToast } from "../alert";
 import { sayTTS } from "./tts";
 import { risuChatParser } from "../parser.svelte";
diff --git a/src/ts/process/files/multisend.ts b/src/ts/process/files/multisend.ts
index b7cbe385..66adbf2e 100644
--- a/src/ts/process/files/multisend.ts
+++ b/src/ts/process/files/multisend.ts
@@ -1,5 +1,5 @@
 import { getDatabase, setDatabase } from 'src/ts/storage/database.svelte';
-import { selectedCharID } from 'src/ts/stores';
+import { selectedCharID } from 'src/ts/stores.svelte';
 import { get } from 'svelte/store';
 import { doingChat, sendChat } from '../index.svelte';
 import { downloadFile, isTauri } from 'src/ts/globalApi';
diff --git a/src/ts/process/group.ts b/src/ts/process/group.ts
index 07cfe209..f79616f0 100644
--- a/src/ts/process/group.ts
+++ b/src/ts/process/group.ts
@@ -4,7 +4,7 @@ import { alertConfirm, alertError, alertSelectChar } from "../alert";
 import { language } from "src/lang";
 import { get } from "svelte/store";
 import { getDatabase, setDatabase } from "../storage/database.svelte";
-import { selectedCharID } from "../stores";
+import { selectedCharID } from "../stores.svelte";
 
 export async function addGroupChar(){
     let db = getDatabase()
diff --git a/src/ts/process/index.svelte.ts b/src/ts/process/index.svelte.ts
index 9b49f6ed..74f067ba 100644
--- a/src/ts/process/index.svelte.ts
+++ b/src/ts/process/index.svelte.ts
@@ -1,6 +1,7 @@
 import { get, writable } from "svelte/store";
-import { type character, type MessageGenerationInfo, type Chat, DBState } from "../storage/database.svelte";
-import { CharEmotion, selectedCharID } from "../stores";
+import { type character, type MessageGenerationInfo, type Chat } from "../storage/database.svelte";
+import { DBState } from '../stores.svelte';
+import { CharEmotion, selectedCharID } from "../stores.svelte";
 import { ChatTokenizer, tokenize, tokenizeNum } from "../tokenizer";
 import { language } from "../../lang";
 import { alertError } from "../alert";
diff --git a/src/ts/process/lorebook.svelte.ts b/src/ts/process/lorebook.svelte.ts
index a757dd30..484d5c3d 100644
--- a/src/ts/process/lorebook.svelte.ts
+++ b/src/ts/process/lorebook.svelte.ts
@@ -1,6 +1,7 @@
 import { get } from "svelte/store";
-import {selectedCharID} from '../stores'
-import { DBState, type Message, type loreBook } from "../storage/database.svelte";
+import {selectedCharID} from '../stores.svelte'
+import { type Message, type loreBook } from "../storage/database.svelte";
+import { DBState } from '../stores.svelte';
 import { tokenize } from "../tokenizer";
 import { checkNullish, selectSingleFile } from "../util";
 import { alertError, alertNormal } from "../alert";
diff --git a/src/ts/process/lua.ts b/src/ts/process/lua.ts
index b4c65e64..21265412 100644
--- a/src/ts/process/lua.ts
+++ b/src/ts/process/lua.ts
@@ -2,7 +2,7 @@ import { getChatVar, hasher, setChatVar, type simpleCharacterArgument } from "..
 import { LuaEngine, LuaFactory } from "wasmoon";
 import { getCurrentCharacter, getCurrentChat, getDatabase, setCurrentChat, setDatabase, type Chat, type character, type groupChat } from "../storage/database.svelte";
 import { get } from "svelte/store";
-import { ReloadGUIPointer, selectedCharID } from "../stores";
+import { ReloadGUIPointer, selectedCharID } from "../stores.svelte";
 import { alertError, alertInput, alertNormal } from "../alert";
 import { HypaProcesser } from "./memory/hypamemory";
 import { generateAIImage } from "./stableDiff";
diff --git a/src/ts/process/modules.ts b/src/ts/process/modules.ts
index 04f69be6..c35fd8cf 100644
--- a/src/ts/process/modules.ts
+++ b/src/ts/process/modules.ts
@@ -8,7 +8,7 @@ import { convertExternalLorebook } from "./lorebook.svelte"
 import { decodeRPack, encodeRPack } from "../rpack/rpack_bg"
 import { convertImage } from "../parser.svelte"
 import { Capacitor } from "@capacitor/core"
-import { HideIconStore, moduleBackgroundEmbedding } from "../stores"
+import { HideIconStore, moduleBackgroundEmbedding } from "../stores.svelte"
 
 export interface RisuModule{
     name: string
diff --git a/src/ts/process/scripts.ts b/src/ts/process/scripts.ts
index dcf4b365..725b6fff 100644
--- a/src/ts/process/scripts.ts
+++ b/src/ts/process/scripts.ts
@@ -1,5 +1,5 @@
 import { get } from "svelte/store";
-import { CharEmotion, selectedCharID } from "../stores";
+import { CharEmotion, selectedCharID } from "../stores.svelte";
 import { type character, type customscript, type groupChat, type Database, getDatabase } from "../storage/database.svelte";
 import { downloadFile } from "../globalApi";
 import { alertError, alertNormal } from "../alert";
diff --git a/src/ts/process/stableDiff.ts b/src/ts/process/stableDiff.ts
index 6ce95edc..30170709 100644
--- a/src/ts/process/stableDiff.ts
+++ b/src/ts/process/stableDiff.ts
@@ -3,7 +3,7 @@ import { getDatabase, type character } from "../storage/database.svelte"
 import { requestChatData } from "./request"
 import { alertError } from "../alert"
 import { globalFetch, readImage } from "../globalApi"
-import { CharEmotion } from "../stores"
+import { CharEmotion } from "../stores.svelte"
 import type { OpenAIChat } from "./index.svelte"
 import { processZip } from "./processzip"
 import { keiServerURL } from "../kei/kei"
diff --git a/src/ts/process/triggers.ts b/src/ts/process/triggers.ts
index e0346b50..c956d203 100644
--- a/src/ts/process/triggers.ts
+++ b/src/ts/process/triggers.ts
@@ -3,7 +3,7 @@ import { getCurrentCharacter, getCurrentChat, getDatabase, type Chat, type chara
 import { tokenize } from "../tokenizer";
 import { getModuleTriggers } from "./modules";
 import { get } from "svelte/store";
-import { ReloadGUIPointer, selectedCharID } from "../stores";
+import { ReloadGUIPointer, selectedCharID } from "../stores.svelte";
 import { processMultiCommand } from "./command";
 import { parseKeyValue } from "../util";
 import { alertError, alertInput, alertNormal, alertSelect } from "../alert";
diff --git a/src/ts/storage/database.svelte.ts b/src/ts/storage/database.svelte.ts
index 4a9ba22f..e644d780 100644
--- a/src/ts/storage/database.svelte.ts
+++ b/src/ts/storage/database.svelte.ts
@@ -12,9 +12,6 @@ import { defaultColorScheme, type ColorScheme } from '../gui/colorscheme';
 import type { PromptItem, PromptSettings } from '../process/prompt';
 import type { OobaChatCompletionRequestParams } from '../model/ooba';
 
-export const DBState = $state({
-    db: {} as any as Database
-})
 export let appVer = "137.1.0"
 export let webAppSubVer = '-svelte5-exp'
 
@@ -1508,7 +1505,7 @@ import type { OnnxModelFiles } from '../process/transformers';
 import type { RisuModule } from '../process/modules';
 import type { HypaV2Data } from '../process/memory/hypav2';
 import { decodeRPack, encodeRPack } from '../rpack/rpack_bg';
-import { selectedCharID } from '../stores';
+import { DBState, selectedCharID } from '../stores.svelte';
 
 export async function downloadPreset(id:number, type:'json'|'risupreset'|'return' = 'json'){
     saveCurrentPreset()
diff --git a/src/ts/stores.ts b/src/ts/stores.svelte.ts
similarity index 93%
rename from src/ts/stores.ts
rename to src/ts/stores.svelte.ts
index 19606a62..9ca59842 100644
--- a/src/ts/stores.ts
+++ b/src/ts/stores.svelte.ts
@@ -1,5 +1,5 @@
 import { writable, type Writable } from "svelte/store";
-import type { character, groupChat } from "./storage/database.svelte";
+import type { character, Database, groupChat } from "./storage/database.svelte";
 import type { simpleCharacterArgument } from "./parser.svelte";
 import type { alertData } from "./alert";
 
@@ -84,4 +84,7 @@ export function createSimpleCharacter(char:character|groupChat){
 }
 
 updateSize()
-window.addEventListener("resize", updateSize);
\ No newline at end of file
+window.addEventListener("resize", updateSize);
+export const DBState = $state({
+    db: {} as any as Database
+});
diff --git a/src/ts/sync/multiuser.ts b/src/ts/sync/multiuser.ts
index f7beabbc..bbeb60eb 100644
--- a/src/ts/sync/multiuser.ts
+++ b/src/ts/sync/multiuser.ts
@@ -2,7 +2,7 @@ import { v4 } from 'uuid';
 import { alertError, alertInput, alertNormal, alertStore, alertWait } from '../alert';
 import { get, writable } from 'svelte/store';
 import { setDatabase, type character, saveImage, type Chat, getCurrentChat, setCurrentChat, getDatabase } from '../storage/database.svelte';
-import { selectedCharID } from '../stores';
+import { selectedCharID } from '../stores.svelte';
 import { findCharacterIndexbyId, sleep } from '../util';
 import type { DataConnection, Peer } from 'peerjs';
 import { readImage } from '../globalApi';
diff --git a/src/ts/translator/translator.ts b/src/ts/translator/translator.ts
index a4a5145e..fcce2e2d 100644
--- a/src/ts/translator/translator.ts
+++ b/src/ts/translator/translator.ts
@@ -6,7 +6,7 @@ import { alertError } from "../alert"
 import { requestChatData } from "../process/request"
 import { doingChat, type OpenAIChat } from "../process/index.svelte"
 import { applyMarkdownToNode, parseChatML, type simpleCharacterArgument } from "../parser.svelte"
-import { selectedCharID } from "../stores"
+import { selectedCharID } from "../stores.svelte"
 import { getModuleRegexScripts } from "../process/modules"
 import { getNodetextToSentence, sleep } from "../util"
 import { processScriptFull } from "../process/scripts"
diff --git a/src/ts/util.ts b/src/ts/util.ts
index 9cffe697..25dfdb36 100644
--- a/src/ts/util.ts
+++ b/src/ts/util.ts
@@ -1,7 +1,7 @@
 import { get, writable, type Writable } from "svelte/store"
 import type { Database, Message } from "./storage/database.svelte"
 import { getDatabase } from "./storage/database.svelte"
-import { selectedCharID } from "./stores"
+import { selectedCharID } from "./stores.svelte"
 import {open} from '@tauri-apps/plugin-dialog'
 import { readFile } from "@tauri-apps/plugin-fs"
 import { basename } from "@tauri-apps/api/path"