diff --git a/src/ts/process/templates/templates.ts b/src/ts/process/templates/templates.ts
index 3890cde8..ab6922c6 100644
--- a/src/ts/process/templates/templates.ts
+++ b/src/ts/process/templates/templates.ts
@@ -370,7 +370,7 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
         "userPrefix": "",
         "assistantPrefix": "",
         "seperator": "\n",
-        "useName": false
+        "useName": true
       }
     },
     "ainconfig": {
@@ -418,7 +418,7 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
         "type2": "normal"
       },
       {
-        "type": "lorebook",
+        "type": "lorebook"
       },
       {
         "type": "chat",
@@ -427,11 +427,11 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
       },
       {
         "type": "persona",
-        "innerFormat": "[{{slot}}]"
+        "innerFormat": "{{user}} Description: [{{slot}}]"
       },
       {
         "type": "description",
-        "innerFormat": "[{{slot}}]"
+        "innerFormat": "{{char}} Description:[{{slot}}]"
       },
       {
         "type": "chat",
@@ -441,7 +441,7 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
       {
         "type": "plain",
         "text": "### Instruction:",
-        "role": "bot",
+        "role": "system",
         "type2": "normal"
       },
       {
@@ -452,7 +452,7 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
       {
         "type": "plain",
         "text": "",
-        "role": "bot",
+        "role": "system",
         "type2": "globalNote"
       },
       {
@@ -463,7 +463,12 @@ export const prebuiltPresets:{OAI:botPreset,ooba:botPreset,NAI:botPreset,oobaRp:
       }
     ],
     "NAIadventure": false,
-    "NAIappendName": true
+    "NAIappendName": true,
+    "localStopStrings": [
+      "\\n{{user}}:",
+      "\\n### Instruction:",
+      "\\n### Response"
+    ]
   }
 }
 
diff --git a/src/ts/storage/database.ts b/src/ts/storage/database.ts
index 945d5023..bd1c89f1 100644
--- a/src/ts/storage/database.ts
+++ b/src/ts/storage/database.ts
@@ -646,6 +646,7 @@ export interface botPreset{
     promptTemplate?:Proompt[]
     NAIadventure?: boolean
     NAIappendName?: boolean
+    localStopStrings?: string[]
 }
 
 
@@ -869,6 +870,7 @@ export function saveCurrentPreset(){
         promptTemplate: db.promptTemplate ?? null,
         NAIadventure: db.NAIadventure ?? false,
         NAIappendName: db.NAIappendName ?? false,
+        localStopStrings: db.localStopStrings
     }
     db.botPresets = pres
     setDatabase(db)
@@ -933,6 +935,7 @@ export function setPreset(db:Database, newPres: botPreset){
     db.NAIsettings.cfg_scale ??= 1
     db.NAIsettings.mirostat_tau ??= 0
     db.NAIsettings.mirostat_lr ??= 1
+    db.localStopStrings = newPres.localStopStrings
     return db
 }