Merge branch 'theme' into 'pregmod-master'

make (user) themes persist trough page reloads

See merge request !6528

src/gui/theming.js

@@ -5,6 +5,13 @@ App.UI.Theme = (function() {
 	let currentThemeElement = null;
 	let devTheme = null;
 
+	// reload theme on page reload
+	$(document).on(":passagestart", () => {
+		if (currentThemeElement === null && V.theme !== 0) {
+			load(V.theme);
+		}
+	});
+
 	return {
 		selector: selector,
 		devTheme: reloadDevTheme,

src/uncategorized/options.tw

@@ -1057,7 +1057,7 @@ This save was created using FC version $ver build $releaseID.
 	</div>
 
 	<p>
-		UI theme selector. Allows to select a single CSS file to be loaded. <span class="red">The file has to be located in the same directory as the HTML file otherwise it will simply not load at all.</span> <span class="yellow">Themes do not persist through page reloads.</span>
+		UI theme selector. Allows to select a single CSS file to be loaded. <span class="red">The file has to be located in the same directory as the HTML file otherwise it will simply not load at all.</span>
 		<<print App.UI.DOM.includeDOM(App.UI.Theme.selector(), "themeSelector")>>
 	</p>