From 76b22a7b237123fcd4dce22d72eccffd10ddaed1 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sun, 1 Feb 2026 22:16:13 +0800
Subject: [PATCH] updated lite

---
 embd_res/klite.embd | 795 ++++++++++++++++++++++----------------------
 1 file changed, 402 insertions(+), 393 deletions(-)
diff --git a/embd_res/klite.embd b/embd_res/klite.embd
index d8955d56c..df88ae1f9 100644
--- a/embd_res/klite.embd
+++ b/embd_res/klite.embd
@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 <head>
 	<script id="init-config">
-	const LITEVER = 310;
+	const LITEVER = 312;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = urlParams.get('local'); //this will be replaced automatically in embedded kcpp
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -1357,7 +1357,7 @@ Current version indicated by LITEVER below.
 		padding-top: 4px;
 		margin-left: 4px;
 		margin-bottom: 2px;
-		/* disabled because it's a lot of hassle with light colorschemes */'
+		/* disabled because it's a lot of hassle with light colorschemes */
 		/* text-shadow: 1px 1px 1px var(--theme_color_bg_muted); */
 	}
 	.unstarted_block
@@ -2255,7 +2255,7 @@ Current version indicated by LITEVER below.
 		display: inline-block;
 		padding: 0 0 0 10px;
 		vertical-align: top;
-		max-width: 92%;
+		max-width: 75%;
 	}
 
 	.chat_received_withd_msg p {
@@ -2267,7 +2267,7 @@ Current version indicated by LITEVER below.
 	}
 
 	.chat_received_withd_msg {
-		width: 75%;
+		width: 100%;
 		background: var(--theme_color_ai_msg_bg) none repeat scroll 0 0;
 		border-radius: 0 15px 15px 15px;
 		color: var(--theme_color_ai_msg_fg);
@@ -4457,8 +4457,9 @@ Current version indicated by LITEVER below.
 		darkmode: true,
 		colortheme: 0, // 0=newtheme, 1=oldtheme, 2=fruity, 3=black
 		render_streaming_markdown: true,
+		show_nametags: true,
 		enable_tool_use: false,
-		tools_auto_exec: true,
+		tools_auto_exec: false,
 		corsproxy_mcp: false,
 		kcpp_mcp_bridge: true,
 		cached_mcp_tools: {}, //key is url, value is tools array
@@ -4485,6 +4486,7 @@ Current version indicated by LITEVER below.
 		start_thinking_tag: "<think>",
 		stop_thinking_tag: "</think>",
 		hide_think_stream: false,
+		handle_mismatched_think: true,
 		think_injected: 0, //0=normal, 1=force
 		strip_thinking_mode: 1, //0=no stripping, 1=strip except recent, 2=strip all
 		websearch_enabled: false,
@@ -7448,6 +7450,7 @@ Current version indicated by LITEVER below.
 			return `<pre>${cpybtn}<code>${code}</code></pre>`;
 		};
 		const convertMarkdownTableToHtml = (t) => {
+			t = t.trim();
 			let hsep = /^[\s]*\|(?:[\s]*[-:]+[-:|\s]*)+\|[\s]*$/gm;
 			let l = /^[\s]*\|(.*)\|[\s]*$/gm;
 			let r = t.split(/\r?\n|\r/);
@@ -7672,7 +7675,7 @@ Current version indicated by LITEVER below.
 			.replace(/~~(\w.*?)~~/gm, "<del>$1</del>")
 			.replace(/\^\^(\w.*?)\^\^/gm, "<ins>$1</ins>")
 			.replace(/\{\{(\w.*?)\}\}/gm, "<mark>$1</mark>")
-			.replace(/^((?:(?:\|[^|\r\n]+)*\|[^|\r\n]*[^\s|\r\n][^|\r\n]*(?:\|[^|\r\n]+)*\| {0,2}(?:\r?\n|\r|$))+)/gm,
+			.replace(/^((?: {0,3}(?:\|[^|\r\n]+)*\|[^|\r\n]*[^\s|\r\n][^|\r\n]*(?:\|[^|\r\n]+)*\| {0,2}(?:\r?\n|\r|$))+)/gm,
 				(matchedTable) => convertMarkdownTableToHtml(matchedTable))
 			.replace(/&lt;sub&gt;(.+?)&lt;\/sub&gt;/g, "<sub>$1</sub>")
 			.replace(/&lt;sup&gt;(.+?)&lt;\/sup&gt;/g, "<sup>$1</sup>");
@@ -15308,6 +15311,7 @@ Current version indicated by LITEVER below.
 		document.getElementById("allow_continue_user_turn").checked = localsettings.allow_continue_user_turn;
 		document.getElementById("proxy_disable_stream").checked = localsettings.proxy_disable_stream;
 		document.getElementById("render_streaming_markdown").checked = localsettings.render_streaming_markdown;
+		document.getElementById("show_nametags").checked = localsettings.show_nametags;
 		document.getElementById("min_p").value = localsettings.min_p;
 		document.getElementById("dynatemp_range").value = localsettings.dynatemp_range;
 		document.getElementById("dynatemp_exponent").value = localsettings.dynatemp_exponent;
@@ -15635,32 +15639,32 @@ Current version indicated by LITEVER below.
 			document.getElementById("tfs_s").value = found.tfs;
 			document.getElementById("min_p").value = found.min_p;
 			document.getElementById("presence_penalty").value = found.presence_penalty;
-			document.getElementById("sampler_seed").value = found.sampler_seed ? found.sampler_seed : defaultsettings.sampler_seed;
+			document.getElementById("sampler_seed").value = found.sampler_seed == null? defaultsettings.sampler_seed : found.sampler_seed;
 			document.getElementById("rep_pen_range").value = found.rep_pen_range;
 			document.getElementById("rep_pen_slope").value = found.rep_pen_slope;
 			document.getElementById("smoothing_factor").value = found.smoothing_factor;
 			document.getElementById("smoothing_curve").value = found.smoothing_curve;
 			document.getElementById("sampler_order").value = found.sampler_order.toString();
 			document.getElementById("nsigma").value = found.nsigma;
-			document.getElementById("dry_multiplier").value = found.dry_multiplier ? found.dry_multiplier : defaultsettings.dry_multiplier;
-			document.getElementById("dry_base").value = found.dry_base ? found.dry_base : defaultsettings.dry_base;
-			document.getElementById("dry_allowed_length").value = found.dry_allowed_length ? found.dry_allowed_length : defaultsettings.dry_allowed_length;
-			document.getElementById("dry_penalty_last_n").value = found.dry_penalty_last_n ? found.dry_penalty_last_n : defaultsettings.dry_penalty_last_n;
+			document.getElementById("dry_multiplier").value = found.dry_multiplier == null? defaultsettings.dry_multiplier : found.dry_multiplier;
+			document.getElementById("dry_base").value = found.dry_base == null? defaultsettings.dry_base : found.dry_base;
+			document.getElementById("dry_allowed_length").value = found.dry_allowed_length == null? defaultsettings.dry_allowed_length : found.dry_allowed_length;
+			document.getElementById("dry_penalty_last_n").value = found.dry_penalty_last_n == null? defaultsettings.dry_penalty_last_n : found.dry_penalty_last_n;
 			pendingsequencebreakers = found.dry_sequence_breakers || defaultsettings.dry_sequence_breakers;
-			document.getElementById("xtc_threshold").value = found.xtc_threshold ? found.xtc_threshold : defaultsettings.xtc_threshold;
-			document.getElementById("xtc_probability").value = found.xtc_probability ? found.xtc_probability : defaultsettings.xtc_probability;
-			document.getElementById("adaptivep_target").value = found.adaptivep_target ? found.adaptivep_target : defaultsettings.adaptivep_target;
-			document.getElementById("adaptivep_decay").value = found.adaptivep_decay ? found.adaptivep_decay : defaultsettings.adaptivep_decay;
-			document.getElementById("miro_type").value = found.miro_type ? found.miro_type : defaultsettings.miro_type;
-			document.getElementById("miro_tau").value = found.miro_tau ? found.miro_tau : defaultsettings.miro_tau;
-			document.getElementById("miro_eta").value = found.miro_eta ? found.miro_eta : defaultsettings.miro_eta;
-			pendinggrammar = found.grammar ? found.grammar : defaultsettings.grammar;
+			document.getElementById("xtc_threshold").value = found.xtc_threshold == null ? defaultsettings.xtc_threshold : found.xtc_threshold;
+			document.getElementById("xtc_probability").value = found.xtc_probability == null? defaultsettings.xtc_probability : found.xtc_probability;
+			document.getElementById("adaptivep_target").value = found.adaptivep_target == null? defaultsettings.adaptivep_target : found.adaptivep_target;
+			document.getElementById("adaptivep_decay").value = found.adaptivep_decay == null? defaultsettings.adaptivep_decay : found.adaptivep_decay;
+			document.getElementById("miro_type").value = found.miro_type == null? defaultsettings.miro_type : found.miro_type;
+			document.getElementById("miro_tau").value = found.miro_tau == null? defaultsettings.miro_tau : found.miro_tau;
+			document.getElementById("miro_eta").value = found.miro_eta == null? defaultsettings.miro_eta : found.miro_eta;
+			pendinggrammar = found.grammar == null? defaultsettings.grammar : found.grammar;
 			document.getElementById("dynatemp_range").value = found.dynatemp_range;
 			document.getElementById("dynatemp_exponent").value = found.dynatemp_exponent;
 			document.getElementById("dynatemp_overview").innerText = (document.getElementById("dynatemp_range").value!=0?"ON":"OFF");
-			document.getElementById("second_ep_qty").value = found.second_ep_qty || defaultsettings.second_ep_qty;
-			document.getElementById("second_ep_model").value = found.second_ep_model || defaultsettings.second_ep_model;
-			document.getElementById("second_ep_url").value = found.second_ep_url || defaultsettings.second_ep_url;
+			document.getElementById("second_ep_qty").value = found.second_ep_qty == null? defaultsettings.second_ep_qty : found.second_ep_qty;
+			document.getElementById("second_ep_model").value = found.second_ep_model == null? defaultsettings.second_ep_model : found.second_ep_model;
+			document.getElementById("second_ep_url").value = found.second_ep_url == null? defaultsettings.second_ep_url : found.second_ep_url;
 			document.getElementById("second_ep_overview").innerText = (document.getElementById("second_ep_qty").value>0 && document.getElementById("second_ep_url").value!=""?"ON":"OFF");
 		} else {
 			document.getElementById("presetsdesc").innerText = "";
@@ -16176,6 +16180,7 @@ Current version indicated by LITEVER below.
 		localsettings.allow_continue_user_turn = (document.getElementById("allow_continue_user_turn").checked ? true : false);
 		localsettings.proxy_disable_stream = (document.getElementById("proxy_disable_stream").checked ? true : false);
 		localsettings.render_streaming_markdown = (document.getElementById("render_streaming_markdown").checked ? true : false);
+		localsettings.show_nametags = (document.getElementById("show_nametags").checked ? true : false);
 		if(document.getElementById("opmode").value==1)
 		{
 			localsettings.gui_type_story = document.getElementById("gui_type").value;
@@ -16325,6 +16330,7 @@ Current version indicated by LITEVER below.
 			localsettings.stop_thinking_tag = defaultsettings.stop_thinking_tag;
 		}
 		localsettings.hide_think_stream = (document.getElementById("hide_think_stream").checked?true:false);
+		localsettings.handle_mismatched_think = (document.getElementById("handle_mismatched_think").checked?true:false);
 
 		localsettings.tts_mode = document.getElementById("ttsselect").value;
 		localsettings.xtts_voice = document.getElementById("xtts_voices").value;
@@ -17519,6 +17525,18 @@ Current version indicated by LITEVER below.
 					});
 					inputtxt = inputtxt.replace(pat, "%ExpandBtn%");
 				}
+				else
+				{
+					if(localsettings.handle_mismatched_think && !inputtxt.includes(localsettings.start_thinking_tag) && inputtxt.includes(localsettings.stop_thinking_tag))
+					{
+						let chunks = inputtxt.split(localsettings.stop_thinking_tag);
+						if(chunks.length==2) //exactly 2 parts
+						{
+							matches.push(chunks[0]);
+							inputtxt = `%ExpandBtn%${chunks[1]}`;
+						}
+					}
+				}
 			}
 			else //just hide
 			{
@@ -24124,286 +24142,6 @@ Current version indicated by LITEVER below.
 		}
 		populate_corpo_leftpanel_topper();
 
-		if (gametext_arr.length == 0 && synchro_pending_stream=="" && pending_response_id=="") {
-
-			if (perfdata == null) {
-				if(document.getElementById("connectstatus").innerHTML == "Offline Mode")
-				{
-					document.getElementById("gametext").innerHTML = "Welcome to <span class=\"color_kobotext\">KoboldAI Lite</span>!<br>You are in <span class=\"color_red\">Offline Mode</span>.<br>You will still be able to load and edit stories, but not generate new text."
-				}else{
-					document.getElementById("gametext").innerHTML = "Welcome to <span class=\"color_kobotext\">KoboldAI Lite</span>!<br><span class=\"color_orange\">Attempting to Connect...</span>"
-				}
-			} else {
-				let whorun = "";
-
-				if (custom_kobold_endpoint != "") {
-					whorun = "<br>You're using the custom KoboldAI endpoint at <span class=\"color_orange\">"+custom_kobold_endpoint+"</span>";
-				}
-				else if(custom_oai_key!="")
-				{
-					whorun = "<br>You're using the OpenAI API";
-				}
-				else if(custom_claude_key!="")
-				{
-					whorun = "<br>You're using the Claude API";
-				}
-				else if(custom_gemini_key!="")
-				{
-					whorun = "<br>You're using the Gemini API";
-				}
-				else if(custom_cohere_key!="")
-				{
-					whorun = "<br>You're using the Cohere API";
-				}
-				else {
-					whorun = `<br>Horde <a class="color_blueurl mainnav" href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" onclick="get_and_show_workers()">Volunteer(s)</a> are running <span class="color_orange">${selected_models.reduce((s, a) => s + a.count, 0)} threads</span> for selected models with a total queue length of <span class="color_orange">${selected_models.reduce((s, a) => s + a.queued, 0)}</span> tokens`;
-				}
-				let nowmode = (localsettings.opmode==1?"Story Mode":(localsettings.opmode==2?"Adventure Mode":(localsettings.opmode==3?"Chat Mode":"Instruct Mode")));
-				let selmodelstr = "";
-				const maxmodelnames = 7;
-				if(selected_models.length>maxmodelnames)
-				{
-					let shortenedarr = selected_models.slice(0, maxmodelnames-1);
-					selmodelstr = shortenedarr.reduce((s, a) => s + (s == "" ? "" : ", ") + a.name, "") + " and " + (selected_models.length-(maxmodelnames-1)) + " others";
-				}else{
-					selmodelstr = selected_models.reduce((s, a) => s + (s == "" ? "" : ", ") + a.name, "");
-				}
-
-				document.getElementById("gametext").innerHTML = `Welcome to <span class="color_kobotext">KoboldAI Lite</span>!`+
-				`<br>You are using the models <span class="color_lightgreen">${selmodelstr}</span>${(selected_workers.length == 0 ? `` : ` (Pinned to ${selected_workers.length} worker IDs)`)}.`+
-				`${whorun}.`+
-				(multiplayer_active?(!multiplayer_pinged?`<br><br><span class="color_orange">[ Trying to join Multiplayer... ]</span>`:`<br><br><span class="color_green">[ Multiplayer is <b>Active</b>! This session is shared with other server participants.]<br>[ You can leave via exit button in top right corner. ]</span>`):(is_using_kcpp_with_multiplayer()?`<br><br>[ <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="join_multiplayer()"><span class="color_lightgreen">Multiplayer Available</span> - Click Here To Join</a> ]`:``))+
-				`<br><br><span class="color_orange bolded">${nowmode} Selected</span> - Enter a prompt below to begin!`+
-				`<br>Or, <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="document.getElementById('loadfileinput').click()">load a <b>JSON File</b> or a <b>Character Card</b> here.</a>`+
-				`<br>Or, <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="display_scenarios()">select a <b>Quick Start Scenario</b> here.</a>`+
-				`<br>${(welcome!=""?`<br><em>${escape_html(welcome)}</em>`:``)}`;
-			}
-
-			//kick out of edit mode
-			if (document.getElementById("allowediting").checked) {
-				document.getElementById("allowediting").checked = inEditMode = false;
-				toggle_editable();
-			}
-
-		}
-		else {
-
-			let fulltxt = "";
-			if (inEditMode) {
-				fulltxt = concat_gametext(false, "", "%SpnStg%", "%SpnEtg%",true);
-			} else {
-				fulltxt = concat_gametext(false, "", "", "",true);
-				fulltxt = apply_display_only_regex(fulltxt);
-				fulltxt = replace_placeholders(fulltxt,true);
-			}
-
-			let alreadyShowedStreaming = false; //sometimes, streaming is injected inline to preserve indentation
-
-			if(localsettings.opmode==4 && !inEditMode)
-			{
-				//accept all newline formats for backwards compatibility
-				fulltxt = replaceAll(fulltxt, "\n\n"+get_instruct_starttag(true)+"\n\n", `%SpcStg%`);
-				fulltxt = replaceAll(fulltxt, "\n\n"+get_instruct_endtag(true)+"\n\n", `%SpcEtg%`);
-				fulltxt = replaceAll(fulltxt, "\n"+get_instruct_starttag(true)+"\n", `%SpcStg%`);
-				fulltxt = replaceAll(fulltxt, "\n"+get_instruct_endtag(true)+"\n", `%SpcEtg%`);
-				fulltxt = replaceAll(fulltxt, get_instruct_starttag(false), `%SpcStg%`);
-				fulltxt = replaceAll(fulltxt, get_instruct_endtag(false), `%SpcEtg%`);
-				fulltxt = replaceAll(fulltxt, get_instruct_starttag(true), `%SpcStg%`);
-				fulltxt = replaceAll(fulltxt, get_instruct_endtag(true), `%SpcEtg%`);
-				if (localsettings.separate_end_tags) {
-					if (get_instruct_endtag_end(true)) {
-						fulltxt = replaceAll(fulltxt, get_instruct_endtag_end(false), ``);
-						fulltxt = replaceAll(fulltxt, get_instruct_endtag_end(true), ``);
-					}
-					if (get_instruct_starttag_end(true)) {
-						fulltxt = replaceAll(fulltxt, get_instruct_starttag_end(false), ``);
-						fulltxt = replaceAll(fulltxt, get_instruct_starttag_end(true), ``);
-					}
-				}
-
-				let instruct_turns = repack_instruct_turns(fulltxt, `%SpcStg%`,`%SpcEtg%`, true);
-				repact_instruct_turns_beautify_render(instruct_turns);
-				fulltxt = "";
-				for(let i=0;i<instruct_turns.length;++i)
-				{
-					let curr = instruct_turns[i];
-					let currmsg = curr.msg;
-
-					//in some special cases, add streaming text inline
-					let allow_cont_prev_turn = (localsettings.opmode==4 || (localsettings.opmode==3 && localsettings.allow_continue_chat));
-					if(i>0 && (i==instruct_turns.length-1) && curr.myturn==false && currmsg && allow_cont_prev_turn)
-					{
-						let codeblockcount = (currmsg.match(/```/g) || []).length; //only allow continue if not in codeblock
-						if(codeblockcount==0 || codeblockcount%2==0)
-						{
-							//inject into previous turn, only for instruct OR continuechat
-							let pend = escape_html(pending_context_preinjection) + format_streaming_text(escape_html(synchro_pending_stream));
-							if(pend)
-							{
-								currmsg += `<span class="color_pendingtext pending_text">${pend}</span>`;
-								alreadyShowedStreaming = true;
-							}
-						}
-					}
-
-					//apply stylization to time tags
-					if(localsettings.inject_timestamps && localsettings.instruct_has_markdown)
-					{
-						currmsg = currmsg.replace(/(\[\d{1,2}\/\d{1,2}\/\d{4}, \d{1,2}:\d{2} [AP]M\])/g, "$1\n");
-					}
-					if(localsettings.inject_chatnames_instruct && localsettings.instruct_has_markdown)
-					{
-						let m_name = localsettings.chatname + ": ";
-						currmsg = replaceAll(currmsg, m_name, `<b>` + escape_html(m_name) + `</b>`);
-						let m_opps = localsettings.chatopponent.split("||$||");
-						for(let i=0;i<m_opps.length;++i)
-						{
-							if(m_opps[i] && m_opps[i].trim()!="")
-							{
-								let m_opp = m_opps[i] + ": ";
-								currmsg = replaceAll(currmsg, m_opp, `<b>` + escape_html(m_opp) + `</b>`);
-							}
-						}
-					}
-
-					if(localsettings.instruct_has_markdown && (localsettings.render_streaming_markdown||synchro_pending_stream==""||(i+1)<instruct_turns.length))
-					{
-						//if a list has a starttag on the same line, add a newline before it
-						currmsg = currmsg.replace(/(\n[-*] .+?)(%SpcStg%)/g, "$1\n$2");
-						let codeblockcount = (currmsg.match(/```/g) || []).length;
-						if(codeblockcount>0 && codeblockcount%2!=0 )
-						{
-							currmsg += "```"; //force end code block
-						}
-						currmsg = simpleMarkdown(currmsg,localsettings.instruct_has_latex);
-					}
-
-					if(curr.myturn)
-					{
-						fulltxt += `<hr style="margin-top: 12px; margin-bottom: 12px;"><span class="color_kobotext"><span class="humansquare" onclick="classic_click_turn(this,${i})"></span>${currmsg}</span>`;
-					}
-					else
-					{
-						if (i == 0) {
-							fulltxt += `${currmsg}`;
-						} else {
-							fulltxt += `<hr style="margin-top: 12px; margin-bottom: 12px;"><span><span class="nikosquare" onclick="classic_click_turn(this,${i})"></span>${currmsg}</span>`;
-						}
-					}
-				}
-
-			} else {
-				fulltxt = replaceAll(fulltxt, get_instruct_starttag(true), `%SclStg%`+escape_html(get_instruct_starttag(true))+`%SpnEtg%`);
-				fulltxt = replaceAll(fulltxt, get_instruct_endtag(true), `%SclStg%`+escape_html(get_instruct_endtag(true))+`%SpnEtg%`);
-				if (localsettings.separate_end_tags) {
-					if (get_instruct_starttag_end(true) != "") {
-						fulltxt = replaceAll(fulltxt, get_instruct_starttag_end(true), `%SclStg%` + escape_html(get_instruct_starttag_end(true)) + `%SpnEtg%`);
-					}
-					if (get_instruct_endtag_end(true) != "") {
-						fulltxt = replaceAll(fulltxt, get_instruct_endtag_end(true), `%SclStg%` + escape_html(get_instruct_endtag_end(true)) + `%SpnEtg%`);
-					}
-				}
-				//failsafe to handle removing newline tags
-				fulltxt = replaceAll(fulltxt, instructstartplaceholder.trim(), `%SclStg%`+instructstartplaceholder.trim()+`%SpnEtg%`);
-				fulltxt = replaceAll(fulltxt, instructendplaceholder.trim(), `%SclStg%`+instructendplaceholder.trim()+`%SpnEtg%`);
-				fulltxt = replaceAll(fulltxt, instructstartplaceholder_end.trim(), `%SclStg%`+instructstartplaceholder_end.trim()+`%SpnEtg%`);
-				fulltxt = replaceAll(fulltxt, instructendplaceholder_end.trim(), `%SclStg%`+instructendplaceholder_end.trim()+`%SpnEtg%`);
-
-				if(get_instruct_systag(true)!="")
-				{
-					fulltxt = replaceAll(fulltxt, get_instruct_systag(true), `%SclStg%`+escape_html(get_instruct_systag(true))+`%SpnEtg%`);
-					if(get_instruct_systag_end(true)!="")
-					{
-						fulltxt = replaceAll(fulltxt, get_instruct_systag_end(true), `%SclStg%`+escape_html(get_instruct_systag_end(true))+`%SpnEtg%`);
-					}
-				}
-				fulltxt = replaceAll(fulltxt, instructsysplaceholder.trim(), `%SclStg%`+instructsysplaceholder.trim()+`%SpnEtg%`);
-				fulltxt = replaceAll(fulltxt, instructsysplaceholder_end.trim(), `%SclStg%`+instructsysplaceholder_end.trim()+`%SpnEtg%`);
-			}
-
-			//this is a hacky fix to handle instruct tags that use arrow brackets only
-			fulltxt = replaceAll(fulltxt, `%SpnStg%`, `<span class="txtchunk">`);
-			fulltxt = replaceAll(fulltxt, `%SclStg%`,`<span class="color_muted">`);
-			fulltxt = replaceAll(fulltxt, `%SpnEtg%`, `</span>`);
-
-			if(localsettings.opmode==3)
-			{
-				if(!document.getElementById("allowediting").checked && !fulltxt.startsWith("\n"))
-				{
-					fulltxt = "\n" + fulltxt;
-				}
-
-				//for chat mode, highlight our name in blue and opponent in red
-				let m_name = "\n" + localsettings.chatname + ": ";
-
-				//match anything that is NOT us, ie. opponents
-				var regex = new RegExp("\n(?!" + localsettings.chatname + ").+?\: ", "gi");
-				let colormap = {}, colidx = 0;
-				fulltxt = fulltxt.replace(regex, function (m) {
-					let oname = escape_html(m);
-					let onametrim = oname.trim();
-					if(colormap[onametrim]==null)
-					{
-						colormap[onametrim] = get_unique_color(colidx);
-						++colidx;
-					}
-					return `<span class="`+colormap[onametrim]+`">` + oname + `</span>`;
-				});
-				fulltxt = replaceAll(fulltxt,m_name, `<span class="color_blue">` + escape_html(m_name) + `</span>`);
-			}
-
-			//for adventure mode, highlight our actions in the theme's text highlight color
-			if (localsettings.opmode == 2) {
-				fulltxt = fulltxt.replace(/\n\n\> .+?\n/g, function (m) {
-					return `<span class="color_adventure_action">` + m + `</span>`;
-				});
-			}
-
-			//streaming display for all other cases
-			if(!alreadyShowedStreaming && synchro_pending_stream!="" && waiting_for_summarycall==0)
-			{
-				let pend = escape_html(pending_context_preinjection) + format_streaming_text(escape_html(synchro_pending_stream));
-				fulltxt += `<span class="color_pendingtext pending_text">${pend}</span>`;
-			}
-
-			if(!inEditMode)
-			{
-				let floatimg = (localsettings.opmode!=4);
-
-				//handle images
-				fulltxt = render_all_media_html(fulltxt,floatimg,false);
-			}
-			else
-			{
-				fulltxt = stash_image_placeholders(fulltxt,true);
-			}
-
-
-			fulltxt = fulltxt.replace(/(\r\n|\r|\n)/g, '<br>');
-
-			//if ends with a single <br> and nothing else, trim it
-			if (fulltxt.endsWith("<br>") && !fulltxt.endsWith("<br><br>")) {
-				fulltxt = fulltxt.slice(0, -4);
-			}
-
-			//console.log("FT:" + fulltxt);
-			if(fulltxt == "" && gametext_arr.length == 0 && synchro_pending_stream=="" && pending_response_id!="")
-			{
-				fulltxt = "Generating...";
-			}
-			if(inEditMode)
-			{
-				//fix to prevent layout thrashing due to forced reflow in chrome when deleting text, break into multiple spans with nothing else in between
-				let multigroups = splitIntoGroups(fulltxt, 150);
-				for(let i=0;i<multigroups.length;++i)
-				{
-					multigroups[i] = "<span>"+multigroups[i]+"</span>";
-				}
-				fulltxt = multigroups.join('');
-			}
-			document.getElementById("gametext").innerHTML = fulltxt;
-		}
-
 		if(localflag && is_using_kcpp_with_admin())
 		{
 			document.getElementById("topbtn_admin").classList.remove("hidden");
@@ -24528,7 +24266,7 @@ Current version indicated by LITEVER below.
 		}
 
 		// Render onto enhanced chat interface if selected.
-		let isAestheticUiStyle = is_aesthetic_ui();
+		let isAestheticUiStyle = is_aesthetic_ui(); //coverts both aesthetic and messenger
 		let isCorpoUiStyle = is_corpo_ui();
 
 		document.getElementById("corpo_welcome").classList.add("hidden");
@@ -24557,12 +24295,10 @@ Current version indicated by LITEVER below.
 			let textToRender = "";
 			let prepToGen = (gametext_arr.length == 0 && synchro_pending_stream == "" && pending_response_id != "");
 			if (gametext_arr.length == 0 && (prepToGen || pending_response_id == "")) {
-				let intro = document.getElementById("gametext").innerHTML;
+				let intro = render_regular_welcome();
 				document.getElementById("chat_msg_body").innerHTML = `<span class='unstarted_block'>${intro}</span>`;
 			} else {
 				textToRender = concat_gametext(false, "", "", "", true);
-				textToRender = apply_display_only_regex(textToRender);
-				textToRender = replace_placeholders(textToRender,true);
 				if((localsettings.opmode==3 && localsettings.gui_type_chat==1) ||
 				(localsettings.opmode==4 && localsettings.gui_type_instruct==1))
 				{
@@ -24621,10 +24357,11 @@ Current version indicated by LITEVER below.
 			document.getElementById("enhancedchatinterface").classList.remove("hidden");
 			document.getElementById("normalinterface").classList.add("hidden");
 			document.getElementById("corpointerface").classList.add("hidden");
-		} else {
+		} else { //classic ui
 			document.getElementById("enhancedchatinterface").classList.add("hidden");
 			document.getElementById("corpointerface").classList.add("hidden");
 			document.getElementById("normalinterface").classList.remove("hidden");
+			document.getElementById("gametext").innerHTML = render_classic_ui(inEditMode);
 		}
 
 		if (inEditMode && isCorpoUiStyle) {
@@ -24785,6 +24522,272 @@ Current version indicated by LITEVER below.
 		}
 	}
 
+	function render_classic_ui(inEditMode) //classic ui is also used for all edit modes
+	{
+		if (gametext_arr.length == 0 && synchro_pending_stream=="" && pending_response_id=="")
+		{
+			let fulltxt = render_regular_welcome();
+			return fulltxt;
+		}
+		else
+		{
+			let alreadyShowedStreaming = false; //sometimes, streaming is injected inline to preserve indentation
+			let fulltxt = "";
+
+			if (inEditMode) //edit mode only
+			{
+				fulltxt = concat_gametext(false, "", "%SpnStg%", "%SpnEtg%",true);
+				fulltxt = replaceAll(fulltxt, get_instruct_starttag(true), `%SclStg%`+escape_html(get_instruct_starttag(true))+`%SpnEtg%`);
+				fulltxt = replaceAll(fulltxt, get_instruct_endtag(true), `%SclStg%`+escape_html(get_instruct_endtag(true))+`%SpnEtg%`);
+				if (localsettings.separate_end_tags) {
+					if (get_instruct_starttag_end(true) != "") {
+						fulltxt = replaceAll(fulltxt, get_instruct_starttag_end(true), `%SclStg%` + escape_html(get_instruct_starttag_end(true)) + `%SpnEtg%`);
+					}
+					if (get_instruct_endtag_end(true) != "") {
+						fulltxt = replaceAll(fulltxt, get_instruct_endtag_end(true), `%SclStg%` + escape_html(get_instruct_endtag_end(true)) + `%SpnEtg%`);
+					}
+				}
+				//failsafe to handle removing newline tags
+				fulltxt = replaceAll(fulltxt, instructstartplaceholder.trim(), `%SclStg%`+instructstartplaceholder.trim()+`%SpnEtg%`);
+				fulltxt = replaceAll(fulltxt, instructendplaceholder.trim(), `%SclStg%`+instructendplaceholder.trim()+`%SpnEtg%`);
+				fulltxt = replaceAll(fulltxt, instructstartplaceholder_end.trim(), `%SclStg%`+instructstartplaceholder_end.trim()+`%SpnEtg%`);
+				fulltxt = replaceAll(fulltxt, instructendplaceholder_end.trim(), `%SclStg%`+instructendplaceholder_end.trim()+`%SpnEtg%`);
+
+				if(get_instruct_systag(true)!="")
+				{
+					fulltxt = replaceAll(fulltxt, get_instruct_systag(true), `%SclStg%`+escape_html(get_instruct_systag(true))+`%SpnEtg%`);
+					if(get_instruct_systag_end(true)!="")
+					{
+						fulltxt = replaceAll(fulltxt, get_instruct_systag_end(true), `%SclStg%`+escape_html(get_instruct_systag_end(true))+`%SpnEtg%`);
+					}
+				}
+				fulltxt = replaceAll(fulltxt, instructsysplaceholder.trim(), `%SclStg%`+instructsysplaceholder.trim()+`%SpnEtg%`);
+				fulltxt = replaceAll(fulltxt, instructsysplaceholder_end.trim(), `%SclStg%`+instructsysplaceholder_end.trim()+`%SpnEtg%`);
+
+				//this is a hacky fix to handle instruct tags that use arrow brackets only
+				fulltxt = replaceAll(fulltxt, `%SpnStg%`, `<span class="txtchunk">`);
+				fulltxt = replaceAll(fulltxt, `%SclStg%`,`<span class="color_muted">`);
+				fulltxt = replaceAll(fulltxt, `%SpnEtg%`, `</span>`);
+			}
+			else //non edit mode
+			{
+				if(localsettings.opmode==4) //instruct mode only, non edit
+				{
+					fulltxt = concat_gametext(false, "", "", "",true);
+
+					//accept all newline formats for backwards compatibility
+					fulltxt = replaceAll(fulltxt, "\n\n"+get_instruct_starttag(false)+"\n\n", get_instruct_starttag(false));
+					fulltxt = replaceAll(fulltxt, "\n\n"+get_instruct_endtag(false)+"\n\n", get_instruct_endtag(false));
+					fulltxt = replaceAll(fulltxt, "\n"+get_instruct_starttag(false)+"\n", get_instruct_starttag(false));
+					fulltxt = replaceAll(fulltxt, "\n"+get_instruct_endtag(false)+"\n", get_instruct_endtag(false));
+
+					let chatunits = [];
+					fulltxt = replace_instruct_placeholders(fulltxt);
+					chatunits = repack_instruct_history(fulltxt, true);
+					repact_instruct_turns_beautify_render(chatunits);
+
+					fulltxt = "";
+					let countmap = new Map();
+					for(let i=0;i<chatunits.length;++i)
+					{
+						let curr = chatunits[i];
+
+						//in some special cases, add streaming text inline
+						let allow_cont_prev_turn = (localsettings.opmode==4 || (localsettings.opmode==3 && localsettings.allow_continue_chat));
+						if(i>0 && (i==chatunits.length-1) && curr.myturn==false && curr.msg && allow_cont_prev_turn)
+						{
+							let codeblockcount = (curr.msg.match(/```/g) || []).length; //only allow continue if not in codeblock
+							if(codeblockcount==0 || codeblockcount%2==0)
+							{
+								//inject into previous turn, only for instruct OR continuechat
+								let pend = escape_html(pending_context_preinjection) + format_streaming_text(escape_html(synchro_pending_stream));
+								if(pend)
+								{
+									curr.msg += `<span class="color_pendingtext pending_text">${pend}</span>`;
+									alreadyShowedStreaming = true;
+								}
+							}
+						}
+
+						if(curr.msg && curr.msg!="")
+						{
+							curr = repack_postprocess_turn(curr, countmap, false); //change whole object
+						}
+						let currmsg = curr.msg;
+
+						let namepart = (curr.name?`<span style="font-weight: bolder;">${escape_html(curr.name)} </span><br>`:"");
+						if(localsettings.inject_chatnames_instruct && localsettings.show_nametags)
+						{
+							currmsg = namepart + currmsg;
+						}
+
+						if(curr.myturn)
+						{
+							fulltxt += `<hr style="margin-top: 12px; margin-bottom: 12px;"><span class="color_kobotext"><span class="humansquare" onclick="classic_click_turn(this,${i})"></span>${currmsg}</span>`;
+						}
+						else
+						{
+							if (i == 0) {
+								fulltxt += `${currmsg}`;
+							} else {
+								fulltxt += `<hr style="margin-top: 12px; margin-bottom: 12px;"><span><span class="nikosquare" onclick="classic_click_turn(this,${i})"></span>${currmsg}</span>`;
+							}
+						}
+					}
+
+				}
+				else //all other modes besides instruct, non-edit
+				{
+					fulltxt = concat_gametext(false, "", "", "",true);
+					fulltxt = apply_display_only_regex(fulltxt);
+					fulltxt = replace_placeholders(fulltxt,true);
+
+					if(localsettings.opmode==3)
+					{
+						if(!inEditMode && !fulltxt.startsWith("\n"))
+						{
+							fulltxt = "\n" + fulltxt;
+						}
+
+						//for chat mode, highlight our name in blue and opponent in red
+						let m_name = "\n" + localsettings.chatname + ": ";
+
+						//match anything that is NOT us, ie. opponents
+						var regex = new RegExp("\n(?!" + localsettings.chatname + ").+?\: ", "gi");
+						let colormap = {}, colidx = 0;
+						fulltxt = fulltxt.replace(regex, function (m) {
+							let oname = escape_html(m);
+							let onametrim = oname.trim();
+							if(colormap[onametrim]==null)
+							{
+								colormap[onametrim] = get_unique_color(colidx);
+								++colidx;
+							}
+							return `<span class="`+colormap[onametrim]+`">` + oname + `</span>`;
+						});
+						fulltxt = replaceAll(fulltxt,m_name, `<span class="color_blue">` + escape_html(m_name) + `</span>`);
+					}
+
+					//for adventure mode, highlight our actions in the theme's text highlight color
+					if (localsettings.opmode == 2) {
+						fulltxt = fulltxt.replace(/\n\n\> .+?\n/g, function (m) {
+							return `<span class="color_adventure_action">` + m + `</span>`;
+						});
+					}
+				}
+			}
+
+			//streaming display for all other cases
+			if(!alreadyShowedStreaming && synchro_pending_stream!="" && waiting_for_summarycall==0)
+			{
+				let pend = escape_html(pending_context_preinjection) + format_streaming_text(escape_html(synchro_pending_stream));
+				fulltxt += `<span class="color_pendingtext pending_text">${pend}</span>`;
+			}
+
+			if(!inEditMode)
+			{
+				let floatimg = (localsettings.opmode!=4);
+
+				//handle images
+				fulltxt = render_all_media_html(fulltxt,floatimg,false);
+			}
+			else
+			{
+				fulltxt = stash_image_placeholders(fulltxt,true);
+			}
+
+
+			fulltxt = fulltxt.replace(/(\r\n|\r|\n)/g, '<br>');
+
+			//if ends with a single <br> and nothing else, trim it
+			if (fulltxt.endsWith("<br>") && !fulltxt.endsWith("<br><br>")) {
+				fulltxt = fulltxt.slice(0, -4);
+			}
+
+			//console.log("FT:" + fulltxt);
+			if(fulltxt == "" && gametext_arr.length == 0 && synchro_pending_stream=="" && pending_response_id!="")
+			{
+				fulltxt = "Generating...";
+			}
+			if(inEditMode)
+			{
+				//fix to prevent layout thrashing due to forced reflow in chrome when deleting text, break into multiple spans with nothing else in between
+				let multigroups = splitIntoGroups(fulltxt, 150);
+				for(let i=0;i<multigroups.length;++i)
+				{
+					multigroups[i] = "<span>"+multigroups[i]+"</span>";
+				}
+				fulltxt = multigroups.join('');
+			}
+			return fulltxt;
+		}
+
+	}
+
+	function render_regular_welcome()
+	{
+		let outputhtml = "";
+		if (perfdata == null) {
+			if(document.getElementById("connectstatus").innerHTML == "Offline Mode")
+			{
+				outputhtml = "Welcome to <span class=\"color_kobotext\">KoboldAI Lite</span>!<br>You are in <span class=\"color_red\">Offline Mode</span>.<br>You will still be able to load and edit stories, but not generate new text."
+			}else{
+				outputhtml = "Welcome to <span class=\"color_kobotext\">KoboldAI Lite</span>!<br><span class=\"color_orange\">Attempting to Connect...</span>"
+			}
+		} else {
+			let whorun = "";
+
+			if (custom_kobold_endpoint != "") {
+				whorun = "<br>You're using the custom KoboldAI endpoint at <span class=\"color_orange\">"+custom_kobold_endpoint+"</span>";
+			}
+			else if(custom_oai_key!="")
+			{
+				whorun = "<br>You're using the OpenAI API";
+			}
+			else if(custom_claude_key!="")
+			{
+				whorun = "<br>You're using the Claude API";
+			}
+			else if(custom_gemini_key!="")
+			{
+				whorun = "<br>You're using the Gemini API";
+			}
+			else if(custom_cohere_key!="")
+			{
+				whorun = "<br>You're using the Cohere API";
+			}
+			else {
+				whorun = `<br>Horde <a class="color_blueurl mainnav" href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" onclick="get_and_show_workers()">Volunteer(s)</a> are running <span class="color_orange">${selected_models.reduce((s, a) => s + a.count, 0)} threads</span> for selected models with a total queue length of <span class="color_orange">${selected_models.reduce((s, a) => s + a.queued, 0)}</span> tokens`;
+			}
+			let nowmode = (localsettings.opmode==1?"Story Mode":(localsettings.opmode==2?"Adventure Mode":(localsettings.opmode==3?"Chat Mode":"Instruct Mode")));
+			let selmodelstr = "";
+			const maxmodelnames = 7;
+			if(selected_models.length>maxmodelnames)
+			{
+				let shortenedarr = selected_models.slice(0, maxmodelnames-1);
+				selmodelstr = shortenedarr.reduce((s, a) => s + (s == "" ? "" : ", ") + a.name, "") + " and " + (selected_models.length-(maxmodelnames-1)) + " others";
+			}else{
+				selmodelstr = selected_models.reduce((s, a) => s + (s == "" ? "" : ", ") + a.name, "");
+			}
+
+			outputhtml = `Welcome to <span class="color_kobotext">KoboldAI Lite</span>!`+
+			`<br>You are using the models <span class="color_lightgreen">${selmodelstr}</span>${(selected_workers.length == 0 ? `` : ` (Pinned to ${selected_workers.length} worker IDs)`)}.`+
+			`${whorun}.`+
+			(multiplayer_active?(!multiplayer_pinged?`<br><br><span class="color_orange">[ Trying to join Multiplayer... ]</span>`:`<br><br><span class="color_green">[ Multiplayer is <b>Active</b>! This session is shared with other server participants.]<br>[ You can leave via exit button in top right corner. ]</span>`):(is_using_kcpp_with_multiplayer()?`<br><br>[ <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="join_multiplayer()"><span class="color_lightgreen">Multiplayer Available</span> - Click Here To Join</a> ]`:``))+
+			`<br><br><span class="color_orange bolded">${nowmode} Selected</span> - Enter a prompt below to begin!`+
+			`<br>Or, <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="document.getElementById('loadfileinput').click()">load a <b>JSON File</b> or a <b>Character Card</b> here.</a>`+
+			`<br>Or, <a href="#" tabindex="${mainmenu_is_untab?`-1`:`0`}" class="color_blueurl mainnav" onclick="display_scenarios()">select a <b>Quick Start Scenario</b> here.</a>`+
+			`<br>${(welcome!=""?`<br><em>${escape_html(welcome)}</em>`:``)}`;
+		}
+
+		//kick out of edit mode
+		if (document.getElementById("allowediting").checked) {
+			document.getElementById("allowediting").checked = inEditMode = false;
+			toggle_editable();
+		}
+		return outputhtml;
+	}
+
 	function render_corpo_welcome()
 	{
 		return `
@@ -24935,7 +24938,7 @@ Current version indicated by LITEVER below.
 		}
 	}
 
-	function repack_postprocess_turn(currchatunit, countmap)
+	function repack_postprocess_turn(currchatunit, countmap, centerimages)
 	{
 		let processed_msg = currchatunit.msg;
 		processed_msg = apply_display_only_regex(processed_msg);
@@ -24953,7 +24956,7 @@ Current version indicated by LITEVER below.
 			}
 
 			//convert the msg into images
-			processed_msg = render_all_media_html(processed_msg,false,true);
+			processed_msg = render_all_media_html(processed_msg,false,centerimages);
 		}
 
 		let namepart = (currchatunit.myturn ? "User" : cosmetic_corpo_ai_nick);
@@ -25420,11 +25423,11 @@ Current version indicated by LITEVER below.
 			let curr = chatunits[i];
 			if(corpo_editing_turn != i)
 			{
-				curr = repack_postprocess_turn(curr, countmap); //change whole object
+				curr = repack_postprocess_turn(curr, countmap, true); //change whole object
 			}
 			else
 			{
-				let reshaped = repack_postprocess_turn(JSON.parse(JSON.stringify(curr)), countmap);
+				let reshaped = repack_postprocess_turn(JSON.parse(JSON.stringify(curr)), countmap, true);
 				curr.name = reshaped.name; //only change name
 			}
 
@@ -25462,9 +25465,10 @@ Current version indicated by LITEVER below.
 				newbodystr += `<div style="width:100%">`;
 			}
 			else {
+				let nametag = (localsettings.show_nametags?`<div class="corpostyleitemheading">${curr.name}</div>`:``);
 				newbodystr += `<div><img ${(curr.myturn ? "" : `onclick="corpo_click_avatar()"`)} src="${(curr.myturn ? human_square : niko_square)}" class="corpoavatar"/></div>
 				<div style="width:100%">
-				<div class="corpostyleitemheading">`+ curr.name + `</div>`;
+				${nametag}`;
 			}
 
 			newbodystr += bodypart + chunkbtns + `</div></div>`;
@@ -25482,14 +25486,15 @@ Current version indicated by LITEVER below.
 			if (localsettings.opmode == 1) {
 				newbodystr += `
 				<div>
-				<div class="corpostyleitemcontent"><p><span class="pending_text">`+ futuretext + `</span></p></div>
+				<div class="corpostyleitemcontent"><p><span class="pending_text">${futuretext}</span></p></div>
 				</div>`;
 			}
 			else {
-				newbodystr += `<div><img src="` + niko_square + `" class="corpoavatar"/></div>
+				let nametag = (localsettings.show_nametags?`<div class="corpostyleitemheading">${namepart}</div>`:``);
+				newbodystr += `<div><img src="${niko_square}" class="corpoavatar"/></div>
 				<div>
-				<div class="corpostyleitemheading">`+ namepart +`</div>
-				<div class="corpostyleitemcontent"><p><span class="pending_text">`+ futuretext +`</span></p></div>
+				${nametag}
+				<div class="corpostyleitemcontent"><p><span class="pending_text">${futuretext}</span></p></div>
 				</div>`;
 			}
 			newbodystr += `</div>`;
@@ -25729,15 +25734,7 @@ Current version indicated by LITEVER below.
 			let curr = chatunits[i];
 			if(curr.msg && curr.msg!="")
 			{
-				if(localsettings.opmode==4)
-				{
-					curr = repack_postprocess_turn(curr, countmap); //change whole object
-				}
-				else
-				{
-					curr.msg = curr.msg.replace(bold_regex,"<b style='opacity:0.7'>$1</b>");
-					curr.msg = curr.msg.replace(italics_regex,"<em style='opacity:0.7'>$1</em>");
-				}
+				curr = repack_postprocess_turn(curr, countmap, true); //change whole object
 				//convert the msg into images
 				curr.msg = render_all_media_html(curr.msg,false,true);
 			}
@@ -25745,6 +25742,10 @@ Current version indicated by LITEVER below.
 			if(curr.myturn)
 			{
 				let namepart = (curr.name?`<span style="font-weight: bolder;color:var(--theme_color_user_name);">${escape_html(curr.name)}</span><br>`:"");
+				if(!localsettings.show_nametags)
+				{
+					namepart = "";
+				}
 				newbodystr += `<div class="chat_outgoing_msg"><div class="chat_sent_msg"><p>`+namepart+curr.msg+`</p></div></div>`;
 			}else{
 				let oname = (curr.name?escape_html(curr.name):"");
@@ -25755,6 +25756,10 @@ Current version indicated by LITEVER below.
 					++colidx;
 				}
 				let namepart = (curr.name?`<span class='${colormap[onametrim]}' style="font-weight: bolder;">${oname}</span><br>`:"");
+				if(!localsettings.show_nametags)
+				{
+					namepart = "";
+				}
 				newbodystr += `<div class="incoming_msg"><div class="chat_received_msg"><div class="chat_received_withd_msg"><p>`+namepart+curr.msg+`</p></div></div></div>`;
 			}
 
@@ -26082,6 +26087,7 @@ Current version indicated by LITEVER below.
 		document.getElementById("start_thinking_tag").value = localsettings.start_thinking_tag;
 		document.getElementById("stop_thinking_tag").value = localsettings.stop_thinking_tag;
 		document.getElementById("hide_think_stream").checked = (localsettings.hide_think_stream?true:false);
+		document.getElementById("handle_mismatched_think").checked = (localsettings.handle_mismatched_think?true:false);
 	}
 
 	function populate_placeholder_tags()
@@ -26968,7 +26974,6 @@ Current version indicated by LITEVER below.
 			this.portrait_width_you = 80;
 			this.portrait_ratio_you = 1.0;
 
-			this.show_chat_names = true;
 			this.rounded_bubbles = true;
 			this.match_background = false;
 
@@ -27139,7 +27144,6 @@ Current version indicated by LITEVER below.
 
 		aestheticInstructUISettings.match_background = document.getElementById('aui_match_background').checked;
 		aestheticInstructUISettings.rounded_bubbles = document.getElementById('aui_rounded_bubbles').checked;
-		aestheticInstructUISettings.show_chat_names = document.getElementById('aui_show_chat_names').checked;
 		aestheticInstructUISettings.font_size = document.getElementById('instruct-font-size').value;
 		aestheticInstructUISettings.border_style = document.getElementById('instructBorderStyle').value;
 		aestheticInstructUISettings.portrait_width_AI = document.getElementById('portrait_width_AI').value;
@@ -27191,7 +27195,6 @@ Current version indicated by LITEVER below.
 		// Apply the settings from the json file to the UI.
 		document.getElementById('aui_match_background').checked = aestheticInstructUISettings.match_background;
 		document.getElementById('aui_rounded_bubbles').checked = aestheticInstructUISettings.rounded_bubbles;
-		document.getElementById('aui_show_chat_names').checked = aestheticInstructUISettings.show_chat_names;
 		document.getElementById('instruct-font-size').value = aestheticInstructUISettings.font_size;
 		document.getElementById('instructBorderStyle').value = aestheticInstructUISettings.border_style;
 		document.getElementById('portrait_width_AI').value = aestheticInstructUISettings.portrait_width_AI;
@@ -27423,7 +27426,7 @@ Current version indicated by LITEVER below.
 				return temphtmlstash[p];
 			});
 
-			curr = repack_postprocess_turn(curr, countmap);
+			curr = repack_postprocess_turn(curr, countmap, true);
 			if(curr.add_stream_msg)
 			{
 				curr.msg += curr.add_stream_msg; //add it last so it doesnt mess up the pending_text tags
@@ -27434,7 +27437,7 @@ Current version indicated by LITEVER below.
 				continue; //if turn is empty skip it
 			}
 
-			let namepart = (curr.name!="" && as.show_chat_names?`<p class='aui_nametag'>${escape_html(curr.name)}</p>`:"");
+			let namepart = (curr.name!="" && localsettings.show_nametags?`<p class='aui_nametag'>${escape_html(curr.name)}</p>`:"");
 			let showavatar = true;
 
 			//adventure and story has no names or avatars, also handle unlabelled first turns for chat/instruct
@@ -28975,6 +28978,11 @@ Current version indicated by LITEVER below.
 								class="helptext">Allows the UI to render LaTeX within markdown formatting (Needs Markdown).</span></span></div>
 								<input type="checkbox" title="Enable LaTeX (Needs Markdown)" id="instruct_has_latex" class="push-right">
 						</div>
+						<div class="settinglabel">
+							<div class="justifyleft">Show Nametags <span class="helpicon">?<span
+								class="helptext">Controls if user and AI nametags are shown or hidden. Recommended.</span></span></div>
+							<input title="Show Nametags" type="checkbox" id="show_nametags" class="push-right">
+						</div>
 						<div class="settinglabel">
 							<div class="justifyleft">Autoscroll <span class="helpicon">?<span
 								class="helptext">Automatically scrolls the text window down when new text is generated</span></span></div>
@@ -29089,71 +29097,70 @@ Current version indicated by LITEVER below.
 						</div>
 						</div>
 						<div id="presetsdesc" class="settingsdesctxt justifyright"></div>
-					</div>
 
-					<div class="settingsbox flex wide">
+						<div class="settingsbox flex wide">
+							<div class="settingitem">
+								<div class="settinglabel">
+									<div class="justifyleft">Temperature <span class="helpicon">?<span
+												class="helptext">Randomness of sampling. High values can increase creativity but
+												may make text less sensible. Lower values will make text more predictable but
+												can become repetitious.</span></span></div>
+									<input title="Temperature" inputmode="decimal" class="justifyright push-right" id="temperature" value=0.5
+										oninput="document.getElementById('temperature_slide').value = this.value;">
+								</div>
+								<div><input title="Temperature Slider" type="range" min="0.1" max="2" step="0.01"
+										id="temperature_slide" oninput="
+									document.getElementById('temperature').value = this.value;"></div>
+								<div class="settingminmax">
+									<div class="justifyleft">0.1</div>
+									<div class="justifyright">2</div>
+								</div>
+							</div>
 
-						<div class="settingitem">
-							<div class="settinglabel">
-								<div class="justifyleft">Temperature <span class="helpicon">?<span
-											class="helptext">Randomness of sampling. High values can increase creativity but
-											may make text less sensible. Lower values will make text more predictable but
-											can become repetitious.</span></span></div>
-								<input title="Temperature" inputmode="decimal" class="justifyright push-right" id="temperature" value=0.5
-									oninput="document.getElementById('temperature_slide').value = this.value;">
+							<div class="settingitem">
+								<div class="settinglabel">
+									<div class="justifyleft">Repeat Penalty <span class="helpicon">?<span
+												class="helptext">Used to penalize words that were already generated or belong to
+												the context (too high causes incoherence!).</span></span></div>
+									<input title="Repetition Penalty" inputmode="decimal" class="justifyright push-right" id="rep_pen" oninput="
+									document.getElementById('rep_pen_slide').value = this.value;">
+								</div>
+								<div><input title="Repetition Penalty Slider" type="range" min="1" max="2" step="0.01"
+										id="rep_pen_slide" oninput="document.getElementById('rep_pen').value = this.value;"></div>
+								<div class="settingminmax">
+									<div class="justifyleft">1</div>
+									<div class="justifyright">2</div>
+								</div>
 							</div>
-							<div><input title="Temperature Slider" type="range" min="0.1" max="2" step="0.01"
-									id="temperature_slide" oninput="
-								document.getElementById('temperature').value = this.value;"></div>
-							<div class="settingminmax">
-								<div class="justifyleft">0.1</div>
-								<div class="justifyright">2</div>
-							</div>
-						</div>
 
-						<div class="settingitem">
-							<div class="settinglabel">
-								<div class="justifyleft">Repeat Penalty <span class="helpicon">?<span
-											class="helptext">Used to penalize words that were already generated or belong to
-											the context (too high causes incoherence!).</span></span></div>
-								<input title="Repetition Penalty" inputmode="decimal" class="justifyright push-right" id="rep_pen" oninput="
-								document.getElementById('rep_pen_slide').value = this.value;">
+							<div class="settingitem">
+								<div class="settinglabel">
+									<div class="justifyleft">Top-P Sampling <span class="helpicon">?<span class="helptext">Used
+												to discard unlikely text in a nucleus sampling process. Lower values will make text
+												more predictable but can become repetitious. Set to 1 to deactivate it.</span></span></div>
+									<input title="Top-P Sampling" inputmode="decimal" class="justifyright push-right" id="top_p" oninput="
+									document.getElementById('top_p_slide').value = this.value;">
+								</div>
+								<div><input title="Top-P Sampling Slider" type="range" min="0" max="1" step="0.01" id="top_p_slide"
+										oninput="document.getElementById('top_p').value = this.value;"></div>
+								<div class="settingminmax">
+									<div class="justifyleft">0</div>
+									<div class="justifyright">1</div>
+								</div>
 							</div>
-							<div><input title="Repetition Penalty Slider" type="range" min="1" max="2" step="0.01"
-									id="rep_pen_slide" oninput="document.getElementById('rep_pen').value = this.value;"></div>
-							<div class="settingminmax">
-								<div class="justifyleft">1</div>
-								<div class="justifyright">2</div>
-							</div>
-						</div>
 
-						<div class="settingitem">
-							<div class="settinglabel">
-								<div class="justifyleft">Top-P Sampling <span class="helpicon">?<span class="helptext">Used
-											to discard unlikely text in a nucleus sampling process. Lower values will make text
-											more predictable but can become repetitious. Set to 1 to deactivate it.</span></span></div>
-								<input title="Top-P Sampling" inputmode="decimal" class="justifyright push-right" id="top_p" oninput="
-								document.getElementById('top_p_slide').value = this.value;">
-							</div>
-							<div><input title="Top-P Sampling Slider" type="range" min="0" max="1" step="0.01" id="top_p_slide"
-									oninput="document.getElementById('top_p').value = this.value;"></div>
-							<div class="settingminmax">
-								<div class="justifyleft">0</div>
-								<div class="justifyright">1</div>
-							</div>
-						</div>
-
-						<div class="settingitem">
-							<div class="settinglabel">
-								<div class="justifyleft">Top-K Sampling <span class="helpicon">?<span class="helptext">Top-K Sampling. Discards all but the K most likely tokens. Set 0 to Deactivate. Range 0 to 100.</span></span></div>
-								<input title="Top-K Sampling" inputmode="decimal" class="justifyright push-right" id="top_k" oninput="
-								document.getElementById('top_k_slide').value = this.value;">
-							</div>
-							<div><input title="Top-K Sampling Slider" type="range" min="0" max="100" step="1" id="top_k_slide"
-									oninput="document.getElementById('top_k').value = this.value;"></div>
-							<div class="settingminmax">
-								<div class="justifyleft">0</div>
-								<div class="justifyright">100</div>
+							<div class="settingitem">
+								<div class="settinglabel">
+									<div class="justifyleft">Top-K Sampling <span class="helpicon">?<span class="helptext">Top-K Sampling. Discards all but the K most likely tokens. Set 0 to Deactivate. Range 0 to 100.</span></span></div>
+									<input title="Top-K Sampling" inputmode="decimal" class="justifyright push-right" id="top_k" oninput="
+									document.getElementById('top_k_slide').value = this.value;">
+								</div>
+								<div><input title="Top-K Sampling Slider" type="range" min="0" max="100" step="1" id="top_k_slide"
+										oninput="document.getElementById('top_k').value = this.value;"></div>
+								<div class="settingminmax">
+									<div class="justifyleft">0</div>
+									<div class="justifyright">100</div>
+								</div>
 							</div>
 						</div>
 					</div>
@@ -29902,6 +29909,12 @@ Current version indicated by LITEVER below.
 							</span> </div>
 							<input title="Hide Streaming Thinking" type="checkbox" id="hide_think_stream" class="push-right">
 						</div>
+						<div class="settinglabel">
+							<div class="justifyleft">Handle Mismatched Thinking <span class="helpicon">?
+								<span class="helptext">Handles cases where the closing think block exists without the opening. Note that this only visually hides the broken thinking, it will still be treated like normal context.</span>
+							</span> </div>
+							<input title="Handle Mismatched Thinking" type="checkbox" id="handle_mismatched_think" class="push-right">
+						</div>
 					</div>
 
 					<div class="settinglabel">
@@ -30260,10 +30273,6 @@ Current version indicated by LITEVER below.
 										<div>px</div>
 										<div style="margin-left:20px"><span class="rectPortraitMode">A/R: </span><input id="portrait_ratio_AI" type="number" placeholder="1.0" step="0.01" value="1.0" style='width:46px;height:20px;font-size:10px;' class="rectPortraitMode"/></div>
 									</div>
-									<div class="ui-settings-inline" style="font-size: 10px; margin-left: 10px">
-										<div style="padding-top: 2px;">Show Names (Chat Mode): </div>
-										<input id="aui_show_chat_names" type="checkbox" style="height: 10px">
-									</div>
 								</div>
 							</div>
 						</div>
