diff --git a/examples/server/public/index.html b/examples/server/public/index.html
index 94284d659..a653f3958 100644
--- a/examples/server/public/index.html
+++ b/examples/server/public/index.html
@@ -32,11 +32,11 @@
 
     const params = signal({
       n_predict: 358,
-      temperature: 0.7,
+      temperature: 1.0, // adapt to optimized min-p requierements
       repeat_last_n: 256, // 0 = disable penalty, -1 = context size
       repeat_penalty: 1.18, // 1.0 = disabled
-      top_k: 1, // <= 0 to use vocab size
-      top_p: 0.5, // 1.0 = disabled
+      top_k: 0, // <= 0 to use vocab size
+      top_p: 1.0, // 1.0 = disabled
       min_p: 0.05, // 0 = disabled
       tfs_z: 1.0, // 1.0 = disabled
       typical_p: 1.0, // 1.0 = disabled
@@ -658,12 +658,14 @@ async function updateSystemLanguage(event) {
                 </optgroup>
                 <optgroup label="More Prompt-Styles">
                   <option value="airoboros180">Airoboros L2</option>
+                  <option value="bakllava">BakLLaVA-1</option>
                   <option value="codeCherryPop">Code Cherry Pop</option>
                   <option value="deepseekCoder">Deepseek Coder</option>
                   <option value="dolphinMistral">Dolphin Mistral</option>
                   <option value="evolvedSeeker">evolvedSeeker 1.3B</option>
                   <option value="goliath120b">Goliath 120B</option>
                   <option value="jordan">Jordan</option>
+                  <option value="bllava">LLaVA</option>
                   <option value="leoHessianai">Leo Hessianai</option>
                   <option value="leoMistral">Leo Mistral</option>
                   <option value="marx">Marx</option>
@@ -773,21 +775,21 @@ async function updateSystemLanguage(event) {
 
           <fieldset class="two">
             ${IntField({ label: "Prediction", max: 2048, min: -1, step: 16, name: "n_predict", value: params.value.n_predict, })}
-            ${FloatField({ label: "Temperature", max: 1.5, min: 0.0, name: "temperature", step: 0.01, value: params.value.temperature })}
-            ${IntField({ label: "Top-K", max: 100, min: -1, step: 1, name: "top_k", value: params.value.top_k })}
-            ${FloatField({ label: "Repetition Penalty", max: 2.0, min: 0.0, name: "repeat_penalty", step: 0.01, value: params.value.repeat_penalty })}
             ${FloatField({ label: "Min-P sampling", max: 1.0, min: 0.0, name: "min_p", step: 0.01, value: params.value.min_p })}
+            ${FloatField({ label: "Repetition Penalty", max: 2.0, min: 0.0, name: "repeat_penalty", step: 0.01, value: params.value.repeat_penalty })}
+            ${FloatField({ label: "Temperature", max: 1.5, min: 0.0, name: "temperature", step: 0.01, value: params.value.temperature })}
           </fieldset>
 
           <details>
             <summary><span class="summary-title">Further Options</span></summary>
             <fieldset class="two">
-              ${FloatField({ label: "Top-P", max: 1.0, min: 0.0, name: "top_p", step: 0.01, value: params.value.top_p })}
+              ${IntField({ label: "Top-K", max: 100, min: -1, step: 1, name: "top_k", value: params.value.top_k })}
               ${IntField({ label: "Penalize Last N", max: 2048, min: 0, step: 16, name: "repeat_last_n", value: params.value.repeat_last_n })}
-              ${FloatField({ label: "TFS-Z", max: 1.0, min: 0.0, name: "tfs_z", step: 0.01, value: params.value.tfs_z })}
+              ${FloatField({ label: "Top-P", max: 1.0, min: 0.0, name: "top_p", step: 0.01, value: params.value.top_p })}
               ${FloatField({ label: "Presence Penalty", max: 1.0, min: 0.0, name: "presence_penalty", step: 0.01, value: params.value.presence_penalty })}
-              ${FloatField({ label: "Typical-P", max: 1.0, min: 0.0, name: "typical_p", step: 0.01, value: params.value.typical_p })}
+              ${FloatField({ label: "TFS-Z", max: 1.0, min: 0.0, name: "tfs_z", step: 0.01, value: params.value.tfs_z })}
               ${FloatField({ label: "Frequency Penalty", max: 1.0, min: 0.0, name: "frequency_penalty", step: 0.01, value: params.value.frequency_penalty })}
+              ${FloatField({ label: "Typical-P", max: 1.0, min: 0.0, name: "typical_p", step: 0.01, value: params.value.typical_p })}
             </fieldset>
 
             <hr style="height: 1px; background-color: #ececf1; border: none;" />
diff --git a/examples/server/public/promptFormats.js b/examples/server/public/promptFormats.js
index b8072358e..a9b23812c 100644
--- a/examples/server/public/promptFormats.js
+++ b/examples/server/public/promptFormats.js
@@ -12,6 +12,12 @@ export const promptFormats = {
   char: "Response",
   user: "Instruction"
 },
+"bakllava": {
+  template: "{{history}}{{char}}:",
+  historyTemplate: "{{name}}: {{message}}\n",
+  char: "ASSISTANT",
+  user: "USER"
+},
 "chatml": {
   template: "<|im_start|>system\n{{prompt}}<|im_end|>\n{{history}}\n<|im_start|>{{char}}",
   historyTemplate: "<|im_start|>{{user}}\n{{message}}<|im_end|>",
@@ -54,6 +60,18 @@ export const promptFormats = {
   char: "ASSISTANT",
   user: "USER"
 },
+"llama2": {
+  template: "<s>[INST] <<SYS>>\n{{prompt}}\n<</SYS>>\n\n{{history}} [/INST] {{char}} </s><s>[INST] ",
+  historyTemplate: "{{name}}: {{message}} [/INST]",
+  char: "llama",
+  user: "user"
+},
+"llava": {
+  template: "{{history}}{{char}}:",
+  historyTemplate: "{{name}}: {{message}}\n",
+  char: "ASSISTANT",
+  user: "USER"
+},
 "leoHessianai": {
   template: "<|im_start|>system\n{{prompt}}<|im_end|>\n{{history}}\n<|im_start|>{{char}}",
   historyTemplate: "<|im_start|>{{user}}\n{{message}}<|im_end|>",
@@ -66,12 +84,6 @@ export const promptFormats = {
   char: "ASSISTANT",
   user: "USER"
 },
-"llama2": {
-  template: "<s>[INST] <<SYS>>\n{{prompt}}\n<</SYS>>\n\n{{history}} [/INST] {{char}} </s><s>[INST] ",
-  historyTemplate: "{{name}}: {{message}} [/INST]",
-  char: "llama",
-  user: "user"
-},
 "marx": {
   template: "{{history}}\n{{char}}:",
   historyTemplate: "{{name}}: {{message}}",
diff --git a/start-dia-server.desktop b/start-dia-server.desktop
deleted file mode 100644
index 188de6ed3..000000000
--- a/start-dia-server.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-   [Desktop Entry]
-   Name="llama.cpp Server"
-   Exec=./sh-server-dialog.sh
-   Icon=./icon.png
-   Terminal=true
-   Type=Application
diff --git a/sh-server-dialog.sh b/start-server-dialog.sh
similarity index 100%
rename from sh-server-dialog.sh
rename to start-server-dialog.sh
diff --git a/sh-server-zenity.sh b/start-server-zenity.sh
similarity index 100%
rename from sh-server-zenity.sh
rename to start-server-zenity.sh
diff --git a/start-zen-server.desktop b/start-zen-server.desktop
deleted file mode 100644
index 418513403..000000000
--- a/start-zen-server.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-   [Desktop Entry]
-   Name="llama.cpp Server"
-   Exec=./sh-server-zenity.sh
-   Icon=./icon.png
-   Terminal=false
-   Type=Application