diff --git a/code/options.js b/code/options.js
index d5b68bb..586701d 100644
--- a/code/options.js
+++ b/code/options.js
@@ -12,7 +12,7 @@ btn.onclick = function() {
     modal.style.display = "block";
     document.getElementById("color_pickers").style.display= (displ!="points" ? "none" : "inline");
     document.getElementById("gems_picker").style.display= (displ=="points" ? "none" : "inline");
-    document.getElementById(getCookie("displayMode")+"_di").classList.add("selected");
+    document.getElementById(getCookie("displayMode")+"_di").classList.add(selectedTheme);
 }
 
 // When the user clicks on <span> (x), close the modal
@@ -53,10 +53,10 @@ function selectDisplay(e)
 {
     displ=e;
     setCookie("displayMode",e,30);
-    document.getElementById("points_di").classList.remove("selected");
-    document.getElementById("gems_di").classList.remove("selected");
-    document.getElementById("both_di").classList.remove("selected");
-    document.getElementById(e+"_di").classList.add("selected");
+    document.getElementById("points_di").classList.remove(selectedTheme);
+    document.getElementById("gems_di").classList.remove(selectedTheme);
+    document.getElementById("both_di").classList.remove(selectedTheme);
+    document.getElementById(e+"_di").classList.add(selectedTheme);
     backgroundBoth();
     dispDots();
     if(displ=="both")
diff --git a/code/themeSwitcher.js b/code/themeSwitcher.js
index 0d31a4f..02c38c5 100644
--- a/code/themeSwitcher.js
+++ b/code/themeSwitcher.js
@@ -37,14 +37,18 @@ function applyLight(li) {
     document.getElementsByTagName("body")[0].classList.remove((li=="true" ? "night" : "day"));
 
     var all = document.getElementsByClassName('selected'+(li!="true" ? "Day" : "Night"));
-    console.log('selected'+(li=="true" ? "Day" : "Night"));
-    
+    var ids=[];
+    for (var cpt = 0; cpt < all.length; cpt++)
+    {
+        ids.push(all[cpt].id);
+    }
+
     selectedTheme = "selected"+(li=="true" ? "Day" : "Night");
-    for (var cpt = 0; cpt < all.length; cpt++) {
-        var el=all[cpt];
+
+    for (var cpt = 0; cpt < ids.length; cpt++) {
+        var el=document.getElementById(ids[cpt]);
         el.classList.remove('selected'+(li!="true" ? "Day" : "Night"));
         el.classList.add('selected'+(li=="true" ? "Day" : "Night"));
-        console.log(el.id+ " : " + el.classList);
     }
 }