fix: Removal of colortheme from core - conflicts with existing colour picker logic

Author: prima

klite.embd

@@ -3872,7 +3872,6 @@ Current version indicated by LITEVER below.
 		passed_ai_warning: false, //used to store AI safety panel acknowledgement state
 		entersubmit: (is_on_mobile()?false:true), //enter sends the prompt
 		darkmode: true,
-		colortheme: 0, // 0=newtheme, 1=oldtheme, 2=fruity, 3=black
 		render_streaming_markdown: true,
 
 		raw_instruct_tags: false, //experimental flags
@@ -13639,7 +13638,6 @@ Current version indicated by LITEVER below.
 		document.getElementById("show_advanced_load").checked = localsettings.show_advanced_load;
 		document.getElementById("import_tavern_prompt").checked = localsettings.import_tavern_prompt;
 		document.getElementById("invert_colors").checked = localsettings.invert_colors;
-		document.getElementById("colortheme").value = localsettings.colortheme;
 		document.getElementById("sidepanel_mode").checked = localsettings.sidepanel_mode;
 		document.getElementById("trimsentences").checked = localsettings.trimsentences;
 		document.getElementById("trimwhitespace").checked = localsettings.trimwhitespace;
@@ -14114,32 +14112,6 @@ Current version indicated by LITEVER below.
 		}else{
 			document.body.classList.remove("invert_colors");
 		}
-
-		document.body.classList.remove("theme-1");
-		document.body.classList.remove("theme-2");
-		document.body.classList.remove("theme-3");
-		document.body.classList.remove("theme-4");
-		document.body.classList.remove("theme-5");
-		if(localsettings.colortheme==1)
-		{
-			document.body.classList.add("theme-1");
-		}
-		else if(localsettings.colortheme==2)
-		{
-			document.body.classList.add("theme-2");
-		}
-		else if(localsettings.colortheme==3)
-		{
-			document.body.classList.add("theme-3");
-		}
-		else if(localsettings.colortheme==4)
-		{
-			document.body.classList.add("theme-4");
-		}
-		else if(localsettings.colortheme==5)
-		{
-			document.body.classList.add("theme-5");
-		}
 	}
 
 	function update_genimg_button_visiblility()
@@ -14257,7 +14229,6 @@ Current version indicated by LITEVER below.
 		localsettings.show_advanced_load = (document.getElementById("show_advanced_load").checked ? true : false);
 		localsettings.import_tavern_prompt = (document.getElementById("import_tavern_prompt").checked ? true : false);
 		localsettings.invert_colors = (document.getElementById("invert_colors").checked ? true : false);
-		localsettings.colortheme = parseInt(document.getElementById("colortheme").value);
 		localsettings.sidepanel_mode = (document.getElementById("sidepanel_mode").checked ? true : false);
 		localsettings.trimsentences = (document.getElementById("trimsentences").checked ? true : false);
 		localsettings.trimwhitespace = (document.getElementById("trimwhitespace").checked ? true : false);
@@ -39258,7 +39229,11 @@ let showThemePopup = () => {
 	otherFonts.forEach(entry => {
 		fontSelector.appendChild(new Option(entry, entry))
 	})
-	fontSelector.value = getThemeVars()["--theme_font_family"]
+	let fontFamily = getThemeVars()["--theme_font_family"]
+	if (!!fontFamily && otherFonts.includes(fontFamily))
+	{
+		fontSelector.value = getThemeVars()["--theme_font_family"]
+	}
 
 	let updateTheme = () => {
 		let updatedTheme = [...content.querySelectorAll(".colourSelectorSpan,.sizeSelectorSpan")].reduce((o, elem) => {