diff --git a/gulp/res/js/expand.js b/gulp/res/js/expand.js
index 4215839a..500e5138 100644
--- a/gulp/res/js/expand.js
+++ b/gulp/res/js/expand.js
@@ -46,6 +46,8 @@ window.addEventListener('DOMContentLoaded', (event) => {
 		const toggle = function(thumb, exp, fn, src) {
 			if (loopEnabled) {
 				exp.loop = true;
+			} else {
+				exp.loop = false;
 			}
 			if (!heightlimitEnabled) {
 				exp.classList.add('mh-100');
diff --git a/gulp/res/js/theme.js b/gulp/res/js/theme.js
index ea05520b..87d63bb7 100644
--- a/gulp/res/js/theme.js
+++ b/gulp/res/js/theme.js
@@ -13,7 +13,7 @@ async function changeTheme(e, type) {
 	//check for theme style tag
 	let tempLink = document.getElementById(`custom${type}`);
 	let defaultLink = document.getElementById(type);
-	if (theme === 'default') {
+	if (theme === 'default' || theme === defaultLink.dataset.theme) {
 		defaultLink.rel = 'stylesheet';
 		await new Promise(resolve => { setTimeout(resolve, 100) });//ew
 		if (tempLink) {