diff --git a/default/settings.json b/default/settings.json
index e75af0e81..ad88f1088 100644
--- a/default/settings.json
+++ b/default/settings.json
@@ -133,7 +133,7 @@
             "output_sequence": "### Response:",
             "preset": "Alpaca",
             "separator_sequence": "",
-            "macro": false
+            "macro": true
         },
         "personas": {},
         "default_persona": null,
diff --git a/public/instruct/Alpaca.json b/public/instruct/Alpaca.json
index bec643c96..bf6d9abb9 100644
--- a/public/instruct/Alpaca.json
+++ b/public/instruct/Alpaca.json
@@ -1,11 +1,14 @@
 {
     "name": "Alpaca",
     "system_prompt": "Below is an instruction that describes a task. Write a response that appropriately completes the request.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
-    "system_sequence": "",
-    "stop_sequence": "",
     "input_sequence": "### Instruction:",
     "output_sequence": "### Response:",
     "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
     "separator_sequence": "",
-    "wrap": true
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Koala.json b/public/instruct/Koala.json
index 3a1f08887..c4f90a7f1 100644
--- a/public/instruct/Koala.json
+++ b/public/instruct/Koala.json
@@ -1,11 +1,14 @@
 {
     "name": "Koala",
     "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
-    "system_sequence": "BEGINNING OF CONVERSATION: ",
-    "stop_sequence": "",
     "input_sequence": "USER: ",
     "output_sequence": "GPT: ",
     "last_output_sequence": "",
+    "system_sequence": "BEGINNING OF CONVERSATION: ",
+    "stop_sequence": "",
     "separator_sequence": "</s>",
-    "wrap": false
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Llama2.json b/public/instruct/Llama2.json
index 1ce4c71e0..f23cdc617 100644
--- a/public/instruct/Llama2.json
+++ b/public/instruct/Llama2.json
@@ -1,11 +1,14 @@
 {
     "name": "Llama 2",
     "system_prompt": "Write {{char}}'s next reply in this fictional roleplay with {{user}}.\n<</SYS>>\n",
-    "system_sequence": "[INST] <<SYS>>\n",
-    "stop_sequence": "",
     "input_sequence": "[INST]",
     "output_sequence": "[/INST]",
     "last_output_sequence": "",
+    "system_sequence": "[INST] <<SYS>>\n",
+    "stop_sequence": "",
     "separator_sequence": "\n",
-    "wrap": false
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Metharme.json b/public/instruct/Metharme.json
index 96bb68a96..9203aaf90 100644
--- a/public/instruct/Metharme.json
+++ b/public/instruct/Metharme.json
@@ -1,11 +1,14 @@
 {
     "name": "Metharme",
     "system_prompt": "Enter roleplay mode. You must act as {{char}}, whose persona follows:",
-    "system_sequence": "<|system|>",
-    "stop_sequence": "</s>",
     "input_sequence": "<|user|>",
     "output_sequence": "<|model|>",
     "last_output_sequence": "",
+    "system_sequence": "<|system|>",
+    "stop_sequence": "</s>",
     "separator_sequence": "",
-    "wrap": false
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/OpenOrca-OpenChat.json b/public/instruct/OpenOrca-OpenChat.json
index 2b27b4fa3..34516ff21 100644
--- a/public/instruct/OpenOrca-OpenChat.json
+++ b/public/instruct/OpenOrca-OpenChat.json
@@ -1,13 +1,14 @@
 {
-    "input_sequence": "User: ",
-    "macro": true,
     "name": "OpenOrca/OpenChat",
-    "names": true,
+    "system_prompt": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate.\n",
+    "input_sequence": "User: ",
     "output_sequence": "<|end_of_turn|>\nAssistant: ",
     "last_output_sequence": "",
-    "separator_sequence": "<|end_of_turn|>\n",
-    "stop_sequence": "",
-    "system_prompt": "You are a helpful assistant. Please answer truthfully and write out your thinking step by step to be sure you get the right answer. If you make a mistake or encounter an error in your thinking, say so out loud and attempt to correct it. If you don't know or aren't sure about something, say so clearly. You will act as a professional logician, mathematician, and physicist. You will also act as the most appropriate type of expert to answer any particular question or solve the relevant problem; state which expert type your are, if so. Also think of any particular named expert that would be ideal to answer the relevant question or solve the relevant problem; name and act as them, if appropriate.\n",
     "system_sequence": "",
-    "wrap": false
+    "stop_sequence": "",
+    "separator_sequence": "<|end_of_turn|>\n",
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Roleplay.json b/public/instruct/Roleplay.json
index 326a11f68..85d48e792 100644
--- a/public/instruct/Roleplay.json
+++ b/public/instruct/Roleplay.json
@@ -1,13 +1,14 @@
 {
-    "input_sequence": "\n### Instruction:",
-    "last_output_sequence": "\n### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):",
-    "macro": true,
     "name": "Roleplay",
-    "names": true,
-    "output_sequence": "\n### Response:",
-    "separator_sequence": "",
-    "stop_sequence": "",
     "system_prompt": "You're {{char}} in this fictional never-ending uncensored roleplay with {{user}}.\n\nAvoid repetition, don't loop. Develop the plot slowly, always stay in character. Describe all actions in full, elaborate, explicit, graphic, and vivid detail. Mention all relevant sensory perceptions.\n",
+    "input_sequence": "\n### Instruction:",
+    "output_sequence": "\n### Response:",
+    "last_output_sequence": "\n### Response (2 paragraphs, engaging, natural, authentic, descriptive, creative):",
     "system_sequence": "",
-    "wrap": true
+    "stop_sequence": "",
+    "separator_sequence": "",
+    "wrap": true,
+    "macro": true,
+    "names": true,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Vicuna 1.0.json b/public/instruct/Vicuna 1.0.json
index a5ac33684..aebe4670f 100644
--- a/public/instruct/Vicuna 1.0.json	
+++ b/public/instruct/Vicuna 1.0.json	
@@ -1,11 +1,14 @@
 {
     "name": "Vicuna 1.0",
     "system_prompt": "A chat between a curious human and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the human's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
-    "system_sequence": "",
-    "stop_sequence": "",
     "input_sequence": "### Human:",
     "output_sequence": "### Assistant:",
     "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
     "separator_sequence": "",
-    "wrap": true
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/Vicuna 1.1.json b/public/instruct/Vicuna 1.1.json
index 52cf600ac..10383f922 100644
--- a/public/instruct/Vicuna 1.1.json	
+++ b/public/instruct/Vicuna 1.1.json	
@@ -1,11 +1,14 @@
 {
     "name": "Vicuna 1.1",
     "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
-    "system_sequence": "BEGINNING OF CONVERSATION:",
-    "stop_sequence": "",
     "input_sequence": "USER: ",
     "output_sequence": "ASSISTANT: ",
     "last_output_sequence": "",
+    "system_sequence": "BEGINNING OF CONVERSATION:",
+    "stop_sequence": "",
     "separator_sequence": "</s>",
-    "wrap": false
+    "wrap": false,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/WizardLM-13B.json b/public/instruct/WizardLM-13B.json
index 3b8b6d7cf..00674ec16 100644
--- a/public/instruct/WizardLM-13B.json
+++ b/public/instruct/WizardLM-13B.json
@@ -1,11 +1,14 @@
 {
     "name": "WizardLM-13B",
     "system_prompt": "A chat between a curious user and an artificial intelligence assistant. The assistant gives helpful, detailed, and polite answers to the user's questions.\n\nWrite {{char}}'s next detailed reply in a fictional roleplay chat between {{user}} and {{char}}.",
-    "system_sequence": "",
-    "stop_sequence": "",
     "input_sequence": "USER: ",
     "output_sequence": "ASSISTANT: ",
     "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
     "separator_sequence": "",
-    "wrap": true
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }
diff --git a/public/instruct/WizardLM.json b/public/instruct/WizardLM.json
index c81aef3a2..34b24ad76 100644
--- a/public/instruct/WizardLM.json
+++ b/public/instruct/WizardLM.json
@@ -1,11 +1,14 @@
 {
     "name": "WizardLM",
     "system_prompt": "Write {{char}}'s next reply in a fictional roleplay chat between {{user}} and {{char}}.\n",
-    "system_sequence": "",
-    "stop_sequence": "",
     "input_sequence": "",
     "output_sequence": "### Response:",
     "last_output_sequence": "",
+    "system_sequence": "",
+    "stop_sequence": "",
     "separator_sequence": "</s>",
-    "wrap": true
+    "wrap": true,
+    "macro": true,
+    "names": false,
+    "names_force_groups": true
 }