From 81fec97f5491b3f8b01db658d8bfc5c4665e68eb Mon Sep 17 00:00:00 2001
From: cloak1505 <nanashi-san@outlook.com>
Date: Fri, 25 Apr 2025 09:22:10 -0500
Subject: [PATCH 1/4] Repair Lightning 1.1's system prompt

---
 default/content/presets/context/Lightning 1.1.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default/content/presets/context/Lightning 1.1.json b/default/content/presets/context/Lightning 1.1.json
index 24878e009..e5c283e00 100644
--- a/default/content/presets/context/Lightning 1.1.json	
+++ b/default/content/presets/context/Lightning 1.1.json	
@@ -1,5 +1,5 @@
 {
-    "story_string": "{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s description:{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality:{{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{user}}'s persona: {{persona}}\n{{/if}}",
+    "story_string": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\nTake the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace.\n\n{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s description:{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality:{{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{user}}'s persona: {{persona}}\n{{/if}}",
     "example_separator": "Example of an interaction:",
     "chat_start": "This is the history of the roleplay:",
     "use_stop_strings": false,

From 2151ae7aaa4a4f8781cd72e11755cd0b01f01992 Mon Sep 17 00:00:00 2001
From: cloak1505 <nanashi-san@outlook.com>
Date: Fri, 25 Apr 2025 09:40:49 -0500
Subject: [PATCH 2/4] Normalize instruct "names_behavior" to "force" for those
 that don't require "none" or "always

---
 default/content/presets/instruct/ChatML.json            | 2 +-
 default/content/presets/instruct/Command R.json         | 2 +-
 default/content/presets/instruct/Gemma 2.json           | 2 +-
 default/content/presets/instruct/Llama 3 Instruct.json  | 2 +-
 default/content/presets/instruct/Llama 4 Instruct.json  | 2 +-
 default/content/presets/instruct/Mistral V1.json        | 2 +-
 default/content/presets/instruct/Mistral V2 & V3.json   | 2 +-
 default/content/presets/instruct/Mistral V3-Tekken.json | 2 +-
 default/content/presets/instruct/Mistral V7.json        | 2 +-
 default/content/presets/instruct/Phi.json               | 2 +-
 default/content/presets/instruct/Pygmalion.json         | 2 +-
 default/content/presets/instruct/Tulu.json              | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/default/content/presets/instruct/ChatML.json b/default/content/presets/instruct/ChatML.json
index 199b3915b..ee543433a 100644
--- a/default/content/presets/instruct/ChatML.json
+++ b/default/content/presets/instruct/ChatML.json
@@ -6,7 +6,7 @@
     "stop_sequence": "<|im_end|>",
     "wrap": true,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Command R.json b/default/content/presets/instruct/Command R.json
index f34159081..762c0df8d 100644
--- a/default/content/presets/instruct/Command R.json	
+++ b/default/content/presets/instruct/Command R.json	
@@ -8,7 +8,7 @@
     "stop_sequence": "<|END_OF_TURN_TOKEN|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|END_OF_TURN_TOKEN|>",
diff --git a/default/content/presets/instruct/Gemma 2.json b/default/content/presets/instruct/Gemma 2.json
index 7a21a2316..d5585a2c8 100644
--- a/default/content/presets/instruct/Gemma 2.json	
+++ b/default/content/presets/instruct/Gemma 2.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "<end_of_turn>",
     "wrap": true,
     "macro": true,
-    "names_behavior": "none",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Llama 3 Instruct.json b/default/content/presets/instruct/Llama 3 Instruct.json
index 317a4c698..8bc2e0ace 100644
--- a/default/content/presets/instruct/Llama 3 Instruct.json	
+++ b/default/content/presets/instruct/Llama 3 Instruct.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "<|eot_id|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Llama 4 Instruct.json b/default/content/presets/instruct/Llama 4 Instruct.json
index 28115c6ce..13c712af2 100644
--- a/default/content/presets/instruct/Llama 4 Instruct.json	
+++ b/default/content/presets/instruct/Llama 4 Instruct.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "<|eot|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Mistral V1.json b/default/content/presets/instruct/Mistral V1.json
index c47dbdc77..679ae01db 100644
--- a/default/content/presets/instruct/Mistral V1.json	
+++ b/default/content/presets/instruct/Mistral V1.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Mistral V2 & V3.json b/default/content/presets/instruct/Mistral V2 & V3.json
index 7619a1aa5..da072c92b 100644
--- a/default/content/presets/instruct/Mistral V2 & V3.json	
+++ b/default/content/presets/instruct/Mistral V2 & V3.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Mistral V3-Tekken.json b/default/content/presets/instruct/Mistral V3-Tekken.json
index 217007d73..ee0207748 100644
--- a/default/content/presets/instruct/Mistral V3-Tekken.json	
+++ b/default/content/presets/instruct/Mistral V3-Tekken.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Mistral V7.json b/default/content/presets/instruct/Mistral V7.json
index b6b81ae02..4568365a9 100644
--- a/default/content/presets/instruct/Mistral V7.json	
+++ b/default/content/presets/instruct/Mistral V7.json	
@@ -6,7 +6,7 @@
     "stop_sequence": "</s>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Phi.json b/default/content/presets/instruct/Phi.json
index 2762cdbd2..617be7ae6 100644
--- a/default/content/presets/instruct/Phi.json
+++ b/default/content/presets/instruct/Phi.json
@@ -8,7 +8,7 @@
     "stop_sequence": "<|end|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|end|>\n",
diff --git a/default/content/presets/instruct/Pygmalion.json b/default/content/presets/instruct/Pygmalion.json
index 3827585bf..96cd55312 100644
--- a/default/content/presets/instruct/Pygmalion.json
+++ b/default/content/presets/instruct/Pygmalion.json
@@ -6,7 +6,7 @@
     "stop_sequence": "<|user|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "system_sequence_prefix": "<|system|>",
     "system_sequence_suffix": "",
diff --git a/default/content/presets/instruct/Tulu.json b/default/content/presets/instruct/Tulu.json
index 14072f563..3cfe4f87a 100644
--- a/default/content/presets/instruct/Tulu.json
+++ b/default/content/presets/instruct/Tulu.json
@@ -8,7 +8,7 @@
     "stop_sequence": "<|end_of_text|>",
     "wrap": false,
     "macro": true,
-    "names_behavior": "always",
+    "names_behavior": "force",
     "activation_regex": "",
     "skip_examples": false,
     "output_suffix": "<|end_of_text|>\n",

From 82c86c9ce631bb1aa08d6a0f57e36569f47d42ff Mon Sep 17 00:00:00 2001
From: cloak1505 <170299980+cloak1505@users.noreply.github.com>
Date: Fri, 25 Apr 2025 14:57:42 -0500
Subject: [PATCH 3/4] Clean Lightning 1.1

---
 default/content/presets/context/Lightning 1.1.json   | 6 +++---
 default/content/presets/instruct/Lightning 1.1.json  | 8 ++++----
 default/content/presets/sysprompt/Lightning 1.1.json | 4 ++++
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 default/content/presets/sysprompt/Lightning 1.1.json

diff --git a/default/content/presets/context/Lightning 1.1.json b/default/content/presets/context/Lightning 1.1.json
index e5c283e00..8aff8abc1 100644
--- a/default/content/presets/context/Lightning 1.1.json	
+++ b/default/content/presets/context/Lightning 1.1.json	
@@ -1,7 +1,7 @@
 {
-    "story_string": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\nTake the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace.\n\n{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s description:{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality:{{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{user}}'s persona: {{persona}}\n{{/if}}",
-    "example_separator": "Example of an interaction:",
-    "chat_start": "This is the history of the roleplay:",
+    "story_string": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\n### Instruction:\n{{system}}\n{{#if wiBefore}}{{wiBefore}}\n{{/if}}{{#if description}}{{char}}'s description:{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality:{{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if wiAfter}}{{wiAfter}}\n{{/if}}{{#if persona}}{{user}}'s persona: {{persona}}\n{{/if}}\n\n",
+    "example_separator": "Example of an interaction:\n",
+    "chat_start": "This is the history of the roleplay:\n",
     "use_stop_strings": false,
     "allow_jailbreak": false,
     "always_force_name2": true,
diff --git a/default/content/presets/instruct/Lightning 1.1.json b/default/content/presets/instruct/Lightning 1.1.json
index 3ce4d6a90..6f1439629 100644
--- a/default/content/presets/instruct/Lightning 1.1.json	
+++ b/default/content/presets/instruct/Lightning 1.1.json	
@@ -1,7 +1,7 @@
 {
     "input_sequence": "### Instruction:",
-    "output_sequence": "### Response: (length = unlimited)",
-    "last_output_sequence": "",
+    "output_sequence": "### Response:",
+    "last_output_sequence": "### Response: (length = unlimited)",
     "system_sequence": "",
     "stop_sequence": "",
     "wrap": true,
@@ -12,8 +12,8 @@
     "system_sequence_suffix": "",
     "first_output_sequence": "",
     "skip_examples": false,
-    "output_suffix": "",
-    "input_suffix": "",
+    "output_suffix": "\n\n",
+    "input_suffix": "\n\n",
     "system_suffix": "",
     "user_alignment_message": "",
     "system_same_as_user": true,
diff --git a/default/content/presets/sysprompt/Lightning 1.1.json b/default/content/presets/sysprompt/Lightning 1.1.json
new file mode 100644
index 000000000..b122f0a12
--- /dev/null
+++ b/default/content/presets/sysprompt/Lightning 1.1.json	
@@ -0,0 +1,4 @@
+{
+    "name": "Lightning 1.1",
+    "content": "Take the role of {{char}} in a play that leaves a lasting impression on {{user}}. Write {{char}}'s next reply.\nNever skip or gloss over {{char}}’s actions. Progress the scene at a naturally slow pace."
+}

From 321efa354aa9c21c846b992d22d9f2be26715122 Mon Sep 17 00:00:00 2001
From: cloak1505 <170299980+cloak1505@users.noreply.github.com>
Date: Fri, 25 Apr 2025 15:35:44 -0500
Subject: [PATCH 4/4] Update index.json

---
 default/content/index.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/default/content/index.json b/default/content/index.json
index 449c55289..3557ea8e0 100644
--- a/default/content/index.json
+++ b/default/content/index.json
@@ -755,6 +755,10 @@
         "filename": "presets/sysprompt/Neutral - Chat.json",
         "type": "sysprompt"
     },
+    {
+        "filename": "presets/sysprompt/Lightning 1.1.json",
+        "type": "sysprompt"
+    },
     {
         "filename": "presets/instruct/Mistral V1.json",
         "type": "instruct"