diff --git a/public/dashboard/css/style.css b/public/dashboard/css/style.css
index 13370e9..25a44e5 100644
--- a/public/dashboard/css/style.css
+++ b/public/dashboard/css/style.css
@@ -395,6 +395,18 @@ padding: 0.05rem 0.4rem 0.15rem;
     padding-bottom: 2rem;
 }
 
+.active-theme{
+    /* border: #2b2d42 0.1rem solid;
+    border-radius: 5%; */
+    box-shadow: inset 0 0 0 2px #2b2d42;
+}
+
+.theme-submit-parent{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
 .theme-submit{
     background-color:#06d6a0 ;
     padding: 1rem;
@@ -416,6 +428,7 @@ padding: 0.05rem 0.4rem 0.15rem;
 .theme-card{
     justify-content: center;
     text-align: center;
+    border-radius: 5%;
 }
 
 .theme-img{
diff --git a/views/dashboard/appearance.ejs b/views/dashboard/appearance.ejs
index 8cac3b8..32fbbdf 100644
--- a/views/dashboard/appearance.ejs
+++ b/views/dashboard/appearance.ejs
@@ -186,7 +186,9 @@
                     </div>
                 </div>
             </div>
-            <a class="theme-submit">Done</a>
+            <div class="theme-submit-parent">
+                <a class="theme-submit">Done</a>
+            </div>
         </div>
        </div>
       
@@ -217,6 +219,8 @@
                 location.reload();
             }
             console.log(data);
+            // Set active theme on page-load
+            $("."+data.theme).addClass("active-theme");
             console.log(status);
         });
     });
@@ -260,10 +264,20 @@
     const toggleModal = () => {
         document.querySelector('.modal').classList.toggle('hidden');
     }
+
     const setTheme = (themeName) => {
-        // const themeCard = document.getElementsByClassName('theme-cards')
         const selecttheme = document.querySelector('#profileTheme');
         selecttheme.value = themeName;
+
+        // Set active Theme on button click
+        const themeArray = document.getElementsByClassName("theme-card");
+        // set all themes as inactive first
+        for(i=0; i<themeArray.length; i++){
+            themeArray[i].classList.remove("active-theme");
+        }
+        // Set border on active theme onClick
+        const activeTheme = document.getElementsByClassName(themeName);
+        activeTheme[0].classList.add("active-theme");
     }
 
     // Toggle Dialog Box