diff --git a/package.json b/package.json
index 047b72120..34aeebad9 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     },
     {
       "type": "subscription",
-      "url": "hhttps://coreui.io/pricing/?framework=bootstrap"
+      "url": "https://coreui.io/pricing/?framework=bootstrap"
     }
   ],
   "scripts": {
diff --git a/src/js/color-modes.js b/src/js/color-modes.js
index 800620630..dfefef55c 100644
--- a/src/js/color-modes.js
+++ b/src/js/color-modes.js
@@ -48,7 +48,7 @@
 
   window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
     const storedTheme = getStoredTheme()
-    if (storedTheme !== 'light' || storedTheme !== 'dark') {
+    if (storedTheme !== 'light' && storedTheme !== 'dark') {
       setTheme(getPreferredTheme())
     }
   })
diff --git a/src/js/main.js b/src/js/main.js
index ab99daf3f..0d67eea0b 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -13,7 +13,6 @@ Chart.defaults.plugins.tooltip.enabled = false
 Chart.defaults.plugins.tooltip.mode = 'index'
 Chart.defaults.plugins.tooltip.position = 'nearest'
 Chart.defaults.plugins.tooltip.external = coreui.ChartJS.customTooltips
-Chart.defaults.defaultFontColor = coreui.Utils.getStyle('--cui-body-color')
 
 document.documentElement.addEventListener('ColorSchemeChange', () => {
   cardChart1.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--cui-primary')
diff --git a/src/js/widgets.js b/src/js/widgets.js
index 7e80ae3e2..114ef2b57 100644
--- a/src/js/widgets.js
+++ b/src/js/widgets.js
@@ -13,7 +13,6 @@ Chart.defaults.plugins.tooltip.enabled = false
 Chart.defaults.plugins.tooltip.mode = 'index'
 Chart.defaults.plugins.tooltip.position = 'nearest'
 Chart.defaults.plugins.tooltip.external = coreui.ChartJS.customTooltips
-Chart.defaults.defaultFontColor = coreui.Utils.getStyle('--cui-body-color')
 
 document.documentElement.addEventListener('ColorSchemeChange', () => {
   cardChart1.data.datasets[0].pointBackgroundColor = coreui.Utils.getStyle('--cui-primary')
diff --git a/src/views/404.html b/src/views/404.html
index 9107f101b..54d637bf9 100644
--- a/src/views/404.html
+++ b/src/views/404.html
@@ -78,7 +78,5 @@ <h4 class="pt-3">Oops! You're lost.</h4>
       });
       
     </script>
-    <script> 
-    </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/src/views/500.html b/src/views/500.html
index 67ddf7361..5fc6f930f 100644
--- a/src/views/500.html
+++ b/src/views/500.html
@@ -78,7 +78,5 @@ <h4 class="pt-3">Houston, we have a problem!</h4>
       });
       
     </script>
-    <script> 
-    </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/src/views/login.html b/src/views/login.html
index bf5ef17d4..01287aec9 100644
--- a/src/views/login.html
+++ b/src/views/login.html
@@ -68,7 +68,10 @@ <h1>Login</h1>
                   </div>
                   <div class="row">
                     <div class="col-6">
-                      <button class="btn btn-primary px-4" type="button">Login</button>
+                      <button class="btn btn-primary px-4" type="button" id="loginBtn">
+                        <span class="spinner-border spinner-border-sm d-none" role="status" aria-hidden="true"></span>
+                        <span class="btn-text">Login</span>
+                      </button>
                     </div>
                     <div class="col-6 text-end">
                       <button class="btn btn-link px-0" type="button">Forgot password?</button>
@@ -101,9 +104,28 @@ <h2>Sign up</h2>
           header.classList.toggle('shadow-sm', document.documentElement.scrollTop > 0);
         }
       });
+
+      // Login button loading state example
+      const loginBtn = document.getElementById('loginBtn');
+      if (loginBtn) {
+        loginBtn.addEventListener('click', function() {
+          const spinner = this.querySelector('.spinner-border');
+          const btnText = this.querySelector('.btn-text');
+          
+          // Show loading state
+          spinner.classList.remove('d-none');
+          btnText.textContent = 'Logging in...';
+          this.disabled = true;
+          
+          // Simulate API call (remove this in production)
+          setTimeout(() => {
+            spinner.classList.add('d-none');
+            btnText.textContent = 'Login';
+            this.disabled = false;
+          }, 2000);
+        });
+      }
       
     </script>
-    <script> 
-    </script>
   </body>
 </html>
\ No newline at end of file
diff --git a/src/views/register.html b/src/views/register.html
index bfdb464b4..f48e9e7ed 100644
--- a/src/views/register.html
+++ b/src/views/register.html
@@ -78,7 +78,10 @@ <h1>Register</h1>
                     </svg></span>
                   <input class="form-control" type="password" placeholder="Repeat password">
                 </div>
-                <button class="btn btn-block btn-success" type="button">Create Account</button>
+                <button class="btn btn-block btn-success" type="button" id="registerBtn">
+                  <span class="spinner-border spinner-border-sm d-none" role="status" aria-hidden="true"></span>
+                  <span class="btn-text">Create Account</span>
+                </button>
               </div>
             </div>
           </div>
@@ -96,9 +99,28 @@ <h1>Register</h1>
           header.classList.toggle('shadow-sm', document.documentElement.scrollTop > 0);
         }
       });
+
+      // Register button loading state example
+      const registerBtn = document.getElementById('registerBtn');
+      if (registerBtn) {
+        registerBtn.addEventListener('click', function() {
+          const spinner = this.querySelector('.spinner-border');
+          const btnText = this.querySelector('.btn-text');
+          
+          // Show loading state
+          spinner.classList.remove('d-none');
+          btnText.textContent = 'Creating Account...';
+          this.disabled = true;
+          
+          // Simulate API call (remove this in production)
+          setTimeout(() => {
+            spinner.classList.add('d-none');
+            btnText.textContent = 'Create Account';
+            this.disabled = false;
+          }, 2000);
+        });
+      }
       
     </script>
-    <script> 
-    </script>
   </body>
 </html>
\ No newline at end of file