diff --git a/pages/base.html b/pages/base.html
index 9d59350..14c9874 100644
--- a/pages/base.html
+++ b/pages/base.html
@@ -27,6 +27,11 @@
           <li><a href="/about" class="nav-link px-2 text-white">About</a></li>
         </ul>
 
+        <div class="text-end">
+          <button id="theme-switch-btn" class="btn btn-secondary">
+            <img id="theme-svg" src="/static/images/brightness-high.svg" alt="Change theme">
+          </button>
+        </div>
         <div class="text-end" id="bar-auth">
           <a href="/login" class="btn btn-outline-light me-2">Login</a>
           <a href="/register" class="btn btn-warning">Sign-up</a>
@@ -62,6 +67,24 @@
         return;
       }
 
+      // Theme
+      let theme = localStorage.getItem("theme");
+      if (theme) {
+        document.documentElement.setAttribute('data-bs-theme', theme);
+      }
+
+      document.getElementById('theme-switch-btn').addEventListener('click', () => {
+          if (document.documentElement.getAttribute('data-bs-theme') == 'dark') {
+              document.documentElement.setAttribute('data-bs-theme','light');
+              localStorage.setItem("theme", "light");
+              document.getElementById("theme-svg").src = "/static/images/brightness-high.svg";
+          } else {
+              document.documentElement.setAttribute('data-bs-theme','dark');
+              localStorage.setItem("theme", "dark");
+              document.getElementById("theme-svg").src = "/static/images/moon-stars.svg";
+          }
+      })
+
     }, false)
 </script>
 
diff --git a/static/images/brightness-high.svg b/static/images/brightness-high.svg
new file mode 100644
index 0000000..f00d050
--- /dev/null
+++ b/static/images/brightness-high.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-brightness-high" viewBox="0 0 16 16">
+  <path d="M8 11a3 3 0 1 1 0-6 3 3 0 0 1 0 6m0 1a4 4 0 1 0 0-8 4 4 0 0 0 0 8M8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0m0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13m8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5M3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8m10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0m-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0m9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707M4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708"/>
+</svg>
\ No newline at end of file
diff --git a/static/images/moon-stars.svg b/static/images/moon-stars.svg
new file mode 100644
index 0000000..ae138c2
--- /dev/null
+++ b/static/images/moon-stars.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-moon-stars" viewBox="0 0 16 16">
+  <path d="M6 .278a.77.77 0 0 1 .08.858 7.2 7.2 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277q.792-.001 1.533-.16a.79.79 0 0 1 .81.316.73.73 0 0 1-.031.893A8.35 8.35 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.75.75 0 0 1 6 .278M4.858 1.311A7.27 7.27 0 0 0 1.025 7.71c0 4.02 3.279 7.276 7.319 7.276a7.32 7.32 0 0 0 5.205-2.162q-.506.063-1.029.063c-4.61 0-8.343-3.714-8.343-8.29 0-1.167.242-2.278.681-3.286"/>
+  <path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.73 1.73 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.73 1.73 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.73 1.73 0 0 0 1.097-1.097zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.16 1.16 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.16 1.16 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732z"/>
+</svg>
\ No newline at end of file