diff --git a/kcpp_adapters/Alpaca.json b/kcpp_adapters/Alpaca.json
new file mode 100644
index 000000000..d5d25c421
--- /dev/null
+++ b/kcpp_adapters/Alpaca.json
@@ -0,0 +1,8 @@
+{
+  "system_start": "",
+  "system_end": "\n\n",
+  "user_start": "### Instruction:\n",
+  "user_end": "\n\n",
+  "assistant_start": "### Response:\n",
+  "assistant_end": "</s>\n\n"
+}
diff --git a/kcpp_adapters/ChatML.json b/kcpp_adapters/ChatML.json
index b20d82507..7de664c84 100644
--- a/kcpp_adapters/ChatML.json
+++ b/kcpp_adapters/ChatML.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<|im_start|>system\n",
-"system_end":"<|im_end|>",
-"user_start":"<|im_start|>user\n",
-"user_end":"<|im_end|>",
-"assistant_start":"<|im_start|>assistant\n",
-"assistant_end":"<|im_end|>"
-}
\ No newline at end of file
+  "system_start": "<|im_start|>system\n",
+  "system_end": "<|im_end|>\n",
+  "user_start": "<|im_start|>user\n",
+  "user_end": "<|im_end|>\n",
+  "assistant_start": "<|im_start|>assistant\n",
+  "assistant_end": "<|im_end|>\n"
+}
diff --git a/kcpp_adapters/Command-R.json b/kcpp_adapters/Command-R.json
index 0314921d9..dcc56e2fc 100644
--- a/kcpp_adapters/Command-R.json
+++ b/kcpp_adapters/Command-R.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<|START_OF_TURN_TOKEN|><|SYSTEM_TOKEN|>",
-"system_end":"<|END_OF_TURN_TOKEN|>",
-"user_start":"<|START_OF_TURN_TOKEN|><|USER_TOKEN|>",
-"user_end":"<|END_OF_TURN_TOKEN|>",
-"assistant_start":"<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>",
-"assistant_end":"<|END_OF_TURN_TOKEN|>"
-}
\ No newline at end of file
+  "system_start": "<|START_OF_TURN_TOKEN|><|SYSTEM_TOKEN|>",
+  "system_end": "<|END_OF_TURN_TOKEN|>",
+  "user_start": "<|START_OF_TURN_TOKEN|><|USER_TOKEN|>",
+  "user_end": "<|END_OF_TURN_TOKEN|>",
+  "assistant_start": "<|START_OF_TURN_TOKEN|><|CHATBOT_TOKEN|>",
+  "assistant_end": "<|END_OF_TURN_TOKEN|>"
+}
diff --git a/kcpp_adapters/Gemma-2.json b/kcpp_adapters/Gemma-2.json
index 6cff4cfb8..81e032b59 100644
--- a/kcpp_adapters/Gemma-2.json
+++ b/kcpp_adapters/Gemma-2.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<start_of_turn>system\n",
-"system_end":"<end_of_turn>",
-"user_start":"<start_of_turn>user\n",
-"user_end":"<end_of_turn>",
-"assistant_start":"<start_of_turn>model\n",
-"assistant_end":"<end_of_turn>"
-}
\ No newline at end of file
+  "system_start": "<start_of_turn>system\n",
+  "system_end": "<end_of_turn>\n",
+  "user_start": "<start_of_turn>user\n",
+  "user_end": "<end_of_turn>\n",
+  "assistant_start": "<start_of_turn>model\n",
+  "assistant_end": "<end_of_turn>\n"
+}
diff --git a/kcpp_adapters/Llama-2-Chat.json b/kcpp_adapters/Llama-2-Chat.json
index 15f1c9fd2..ddd17d87b 100644
--- a/kcpp_adapters/Llama-2-Chat.json
+++ b/kcpp_adapters/Llama-2-Chat.json
@@ -1,8 +1,8 @@
 {
-"system_start":"",
-"system_end":"",
-"user_start":"[INST] ",
-"user_end":"",
-"assistant_start":" [/INST]",
-"assistant_end":""
-}
\ No newline at end of file
+  "system_start": "",
+  "system_end": "",
+  "user_start": "<s>[INST] ",
+  "user_end": "",
+  "assistant_start": " [/INST] ",
+  "assistant_end": " </s>\n"
+}
diff --git a/kcpp_adapters/Llama-3.json b/kcpp_adapters/Llama-3.json
index f6fa65cda..477a3dd0f 100644
--- a/kcpp_adapters/Llama-3.json
+++ b/kcpp_adapters/Llama-3.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<|start_header_id|>system<|end_header_id|>\n\n",
-"system_end":"<|eot_id|>",
-"user_start":"<|eot_id|><|start_header_id|>user<|end_header_id|>\n\n",
-"user_end":"<|eot_id|>",
-"assistant_start":"<|start_header_id|>assistant<|end_header_id|>\n\n",
-"assistant_end":"<|eot_id|>"
-}
\ No newline at end of file
+  "system_start": "<|start_header_id|>system<|end_header_id|>\n\n",
+  "system_end": "<|eot_id|>",
+  "user_start": "<|start_header_id|>user<|end_header_id|>\n\n",
+  "user_end": "<|eot_id|>",
+  "assistant_start": "<|start_header_id|>assistant<|end_header_id|>\n\n",
+  "assistant_end": "<|eot_id|>"
+}
diff --git a/kcpp_adapters/Metharme.json b/kcpp_adapters/Metharme.json
index e0eb2bc46..ff33e3a06 100644
--- a/kcpp_adapters/Metharme.json
+++ b/kcpp_adapters/Metharme.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<|system|>",
-"system_end":"",
-"user_start":"<|user|>",
-"user_end":"",
-"assistant_start":"<|model>",
-"assistant_end":""
-}
\ No newline at end of file
+  "system_start": "<|system|>",
+  "system_end": "",
+  "user_start": "<|user|>",
+  "user_end": "",
+  "assistant_start": "<|model>",
+  "assistant_end": ""
+}
diff --git a/kcpp_adapters/Mistral.json b/kcpp_adapters/Mistral.json
index 8d39b9c8a..b221c6141 100644
--- a/kcpp_adapters/Mistral.json
+++ b/kcpp_adapters/Mistral.json
@@ -1,8 +1,8 @@
 {
-"system_start":"",
-"system_end":"",
-"user_start":"[INST] ",
-"user_end":" [/INST]\n",
-"assistant_start":"",
-"assistant_end":"\n"
-}
\ No newline at end of file
+  "system_start": "",
+  "system_end": "",
+  "user_start": "[INST] ",
+  "user_end": "",
+  "assistant_start": " [/INST]",
+  "assistant_end": "</s> "
+}
diff --git a/kcpp_adapters/Phi-3.json b/kcpp_adapters/Phi-3.json
index 39a61c13b..5d4734afd 100644
--- a/kcpp_adapters/Phi-3.json
+++ b/kcpp_adapters/Phi-3.json
@@ -1,8 +1,8 @@
 {
-"system_start":"<|system|>",
-"system_end":"<|end|>",
-"user_start":"<|user|>",
-"user_end":"<|end|>",
-"assistant_start":"<|assistant|>",
-"assistant_end":"<|end|>"
-}
\ No newline at end of file
+  "system_start": "<|system|>\n",
+  "system_end": "<|end|>\n",
+  "user_start": "<|user|>\n",
+  "user_end": "<|end|>\n",
+  "assistant_start": "<|assistant|>\n",
+  "assistant_end": "<|end|>\n"
+}
diff --git a/kcpp_adapters/Vicuna.json b/kcpp_adapters/Vicuna.json
index 2d43c4688..8ab9644ae 100644
--- a/kcpp_adapters/Vicuna.json
+++ b/kcpp_adapters/Vicuna.json
@@ -1,8 +1,8 @@
 {
-"system_start":"\nSYSTEM: ",
-"system_end":"",
-"user_start":"\nUSER: ",
-"user_end":"",
-"assistant_start":"\nASSISTANT: ",
-"assistant_end":""
-}
\ No newline at end of file
+  "system_start": "",
+  "system_end": "\n\n",
+  "user_start": "USER: ",
+  "user_end": "\n",
+  "assistant_start": "ASSISTANT: ",
+  "assistant_end": "</s>\n"
+}