diff --git a/src/main/resources/templates/pub/index.html b/src/main/resources/templates/pub/index.html
index 3d8e59d..4f34502 100644
--- a/src/main/resources/templates/pub/index.html
+++ b/src/main/resources/templates/pub/index.html
@@ -98,8 +98,16 @@
             document.getElementById('name').hidden = true;
             document.getElementById('room').hidden = true;
             document.getElementById('results').hidden = false;
-            document.getElementById('nameLabel').innerHTML = 'Name: <strong>' + document.getElementById('name').value + '</strong>';
-            document.getElementById('roomLabel').innerHTML = 'Room: <strong>' + document.getElementById('room').value + '</strong>';
+            document.getElementById('nameLabel').innerHTML = '<strong style="font-size:x-large;">' + document.getElementById('name').value + '</strong>';
+            document.getElementById('roomLabel').innerHTML = '<strong style="font-size:large;">' + document.getElementById('room').value + '</strong>';
+            document.title = document.getElementById('name').value + ' - Dice-Tower';
+
+            if (localStorage.getItem(document.getElementById('name').value + "-theme")) {
+                document.getElementById('theme').value = localStorage.getItem(document.getElementById('name').value + "-theme")
+            }
+            if (localStorage.getItem(document.getElementById('name').value + "-themeColor")) {
+                document.getElementById('themeColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeColor"));
+            }
         }
     }
 
@@ -121,8 +129,8 @@
 
     for (let i = 0; i < coll.length; i++) {
         coll[i].addEventListener("click", function () {
-            localStorage.setItem("theme", document.getElementById('theme').value)
-            localStorage.setItem("themeColor", document.getElementById('themeColor').value)
+            localStorage.setItem(document.getElementById('name').value + "-theme", document.getElementById('theme').value)
+            localStorage.setItem(document.getElementById('name').value + "-themeColor", document.getElementById('themeColor').value)
             const content = this.nextElementSibling;
             if (content.style.display === "block") {
                 content.style.display = "none";
@@ -135,12 +143,6 @@
         if (!localStorage.getItem("userId")) {
             localStorage.setItem("userId", self.crypto.randomUUID());
         }
-        if (localStorage.getItem("theme")) {
-            document.getElementById('theme').value = localStorage.getItem("theme")
-        }
-        if (localStorage.getItem("themeColor")) {
-            document.getElementById('themeColor').setColor(localStorage.getItem("themeColor"));
-        }
     })
 </script>
 </body>