diff --git a/src/callAll.js b/src/callAll.js
index d2e9176..2471e3a 100644
--- a/src/callAll.js
+++ b/src/callAll.js
@@ -1,13 +1,17 @@
 function themeChange(attach = true) {
   if (attach === true) {
-    document.addEventListener("DOMContentLoaded", function (event) {
-      themeToggle()
-      themeSelect()
-      themeBtn()
-    })
+    document.addEventListener("livewire:navigated", toggleAll)
+			
+    document.addEventListener("DOMContentLoaded", toggleAll)
+    
+    function toggleAll (event) {
+        themeToggle();
+        themeSelect();
+        themeBtn()
+    }
   }else{
     themeToggle()
     themeSelect()
     themeBtn()
   }
-}
\ No newline at end of file
+}
diff --git a/src/callBtn.js b/src/callBtn.js
index cc70d99..d805831 100644
--- a/src/callBtn.js
+++ b/src/callBtn.js
@@ -1,9 +1,12 @@
 function themeChange(attach = true) {
   if (attach === true) {
+    document.addEventListener("livewire:navigated", function (event) {
+      themeBtn()
+    })
     document.addEventListener("DOMContentLoaded", function (event) {
       themeBtn()
     })
   }else{
     themeBtn()
   }
-}
\ No newline at end of file
+}
diff --git a/src/callSelect.js b/src/callSelect.js
index 80f3d62..7fd32f7 100644
--- a/src/callSelect.js
+++ b/src/callSelect.js
@@ -1,9 +1,12 @@
 function themeChange(attach = true) {
   if (attach === true) {
+    document.addEventListener("livewire:navigated", function (event) {
+      themeSelect()
+    })
     document.addEventListener("DOMContentLoaded", function (event) {
       themeSelect()
     })
   }else{
     themeSelect()
   }
-}
\ No newline at end of file
+}
diff --git a/src/callToggle.js b/src/callToggle.js
index 6b901f7..bfd5bbc 100644
--- a/src/callToggle.js
+++ b/src/callToggle.js
@@ -1,9 +1,12 @@
 function themeChange(attach = true) {
   if (attach === true) {
+    document.addEventListener("livewire:navigated", function (event) {
+      themeToggle()
+    })
     document.addEventListener("DOMContentLoaded", function (event) {
       themeToggle()
     })
   }else{
     themeToggle()
   }
-}
\ No newline at end of file
+}