diff --git a/src/lib/Setting/Pages/BotSettings.svelte b/src/lib/Setting/Pages/BotSettings.svelte
index c7f5188f..c1a532bc 100644
--- a/src/lib/Setting/Pages/BotSettings.svelte
+++ b/src/lib/Setting/Pages/BotSettings.svelte
@@ -25,6 +25,7 @@
   import Arcodion from "src/lib/UI/Arcodion.svelte";
   import { startsWith } from "lodash";
   import OpenrouterSettings from "./OpenrouterSettings.svelte";
+  import ChatFormatSettings from "./ChatFormatSettings.svelte";
 
     let tokens = {
         mainPrompt: 0,
@@ -436,23 +437,7 @@
         </div>
     {/if}
     <div class="flex flex-col p-3 rounded-md border-selected border mt-4">
-        <span class="text-textcolor">Chat Formating</span>
-        <SelectInput bind:value={$DataBase.instructChatTemplate}>
-            <OptionInput value="chatml">ChatML</OptionInput>
-            <OptionInput value="llama3">Llama3</OptionInput>
-            <OptionInput value="gpt2">GPT2</OptionInput>
-            <OptionInput value="gemma">Gemma</OptionInput>
-            <OptionInput value="mistral">Mistral</OptionInput>
-            <OptionInput value="llama2">Llama2</OptionInput>
-            <OptionInput value="vicuna">Vicuna</OptionInput>
-            <OptionInput value="alpaca">Alpaca</OptionInput>
-            <OptionInput value="jinja">Custom (Jinja)</OptionInput>
-        </SelectInput>
-
-        {#if $DataBase.instructChatTemplate === 'jinja'}
-            <span class="text-textcolor">Jinja Template</span>
-            <TextAreaInput fullwidth autocomplete="off" height={"24"} bind:value={$DataBase.JinjaTemplate} />
-        {/if}
+        <ChatFormatSettings />
     </div>
 
     <span class="text-textcolor mt-2">{language.autoSuggest} <Help key="autoSuggest"/></span>
diff --git a/src/lib/Setting/Pages/ChatFormatSettings.svelte b/src/lib/Setting/Pages/ChatFormatSettings.svelte
new file mode 100644
index 00000000..4b83f172
--- /dev/null
+++ b/src/lib/Setting/Pages/ChatFormatSettings.svelte
@@ -0,0 +1,24 @@
+<script lang="ts">
+    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 { DataBase } from "src/ts/storage/database";
+</script>
+
+<span class="text-textcolor">Chat Formating</span>
+<SelectInput bind:value={$DataBase.instructChatTemplate}>
+    <OptionInput value="chatml">ChatML</OptionInput>
+    <OptionInput value="llama3">Llama3</OptionInput>
+    <OptionInput value="gpt2">GPT2</OptionInput>
+    <OptionInput value="gemma">Gemma</OptionInput>
+    <OptionInput value="mistral">Mistral</OptionInput>
+    <OptionInput value="llama2">Llama2</OptionInput>
+    <OptionInput value="vicuna">Vicuna</OptionInput>
+    <OptionInput value="alpaca">Alpaca</OptionInput>
+    <OptionInput value="jinja">Custom (Jinja)</OptionInput>
+</SelectInput>
+
+{#if $DataBase.instructChatTemplate === 'jinja'}
+    <span class="text-textcolor">Jinja Template</span>
+    <TextAreaInput fullwidth autocomplete="off" height={"24"} bind:value={$DataBase.JinjaTemplate} />
+{/if}
\ No newline at end of file
diff --git a/src/lib/Setting/Pages/OobaSettings.svelte b/src/lib/Setting/Pages/OobaSettings.svelte
index 9e357461..71d0bc1e 100644
--- a/src/lib/Setting/Pages/OobaSettings.svelte
+++ b/src/lib/Setting/Pages/OobaSettings.svelte
@@ -1,40 +1,20 @@
 <script lang="ts">
-    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 OptionalInput from "src/lib/UI/GUI/OptionalInput.svelte";
     import { DataBase } from "src/ts/storage/database";
-  import CheckInput from "src/lib/UI/GUI/CheckInput.svelte";
-  import { language } from "src/lang";
-  import { PlusIcon, TrashIcon } from "lucide-svelte";
-  import TextInput from "src/lib/UI/GUI/TextInput.svelte";
-  import Arcodion from "src/lib/UI/Arcodion.svelte";
-    let openOobaSettings = false
-    const toggleOobaSettings = () => {
-        openOobaSettings = !openOobaSettings
-    }
+    import CheckInput from "src/lib/UI/GUI/CheckInput.svelte";
+    import { language } from "src/lang";
+    import { PlusIcon, TrashIcon } from "lucide-svelte";
+    import TextInput from "src/lib/UI/GUI/TextInput.svelte";
+    import Arcodion from "src/lib/UI/Arcodion.svelte";
+    import ChatFormatSettings from "./ChatFormatSettings.svelte";
     export let instructionMode = false
 </script>
 
 <Arcodion name="Ooba Settings" styled>
     {#if instructionMode}
-        <span class="text-textcolor">Chat Formating</span>
-        <SelectInput bind:value={$DataBase.instructChatTemplate}>
-            <OptionInput value="chatml">ChatML</OptionInput>
-            <OptionInput value="llama3">Llama3</OptionInput>
-            <OptionInput value="gpt2">GPT2</OptionInput>
-            <OptionInput value="gemma">Gemma</OptionInput>
-            <OptionInput value="mistral">Mistral</OptionInput>
-            <OptionInput value="llama2">Llama2</OptionInput>
-            <OptionInput value="vicuna">Vicuna</OptionInput>
-            <OptionInput value="alpaca">Alpaca</OptionInput>
-            <OptionInput value="jinja">Custom (Jinja)</OptionInput>
-        </SelectInput>
-
-        {#if $DataBase.instructChatTemplate === 'jinja'}
-            <span class="text-textcolor">Jinja Template</span>
-            <TextAreaInput fullwidth autocomplete="off" height={"24"} bind:value={$DataBase.JinjaTemplate} />
-        {/if}
+        <ChatFormatSettings />
     {:else}
         <span class="text-textcolor">Ooba Mode</span>
         <SelectInput className="mt-2 mb-4" bind:value={$DataBase.reverseProxyOobaArgs.mode}>