diff --git a/index.go.html b/index.go.html
index 4fd6768..21e34a5 100644
--- a/index.go.html
+++ b/index.go.html
@@ -13,10 +13,8 @@
     {{ else }}
     <link id="style-theme" rel="stylesheet" href="{{ .Data.CSSDarkURL }}"/>
     {{ end }}
-    <link rel="icon" href="/favicon.ico" type="image/x-icon" />
-    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <script type="application/javascript">
-        const TheParameters = "{{ .Parameters }}"
+        var TheParameters = "{{ .Parameters }}"
         const CssLightURL = "{{ .Data.CSSLightURL }}"
         const CssDarkURL = "{{ .Data.CSSDarkURL }}"
         const SunImageURL = "{{ .Data.SunImageLocation }}"
diff --git a/index.js b/index.js
index 31eec32..61b120f 100644
--- a/index.js
+++ b/index.js
@@ -3,7 +3,7 @@ This file is (C) Captain ALM
 Under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License
 */
 const EntryData = []
-function SetupJS(){
+function SetupJS() {
     SetupJSTheme()
 }
 function CreateEntry(id, name, videourl, videotype, start, end, duration) {
@@ -59,18 +59,33 @@ function SetupJSTheme() {
         th.onclick = ToggleTheme
     }
 }
+function PushHistory(url) {
+    let s = true
+    if (window.history) {
+        if (window.history.pushState) {
+            window.history.pushState({}, "", url)
+            s = false
+        }
+    }
+    if (s) {
+        document.location.href = url
+    }
+}
 function ToggleTheme() {
     let th = document.getElementById("theme")
     let thimg = document.getElementById("theme-img")
     let thsty = document.getElementById("style-theme")
     let logo = document.getElementById("logo")
+    let url = document.location.href
+    url = url.split('?', 1)
     if (document.getElementById("so-theme")) {
         thimg.src = SunImageURL
         thimg.alt = "()"
         th.title = "Switch to Light Mode"
         document.getElementById("so-form").removeChild(document.getElementById("so-theme"))
         logo.href = "?"
-        thsty.src = CssDarkURL
+        PushHistory(url+"?"+TheParameters)
+        thsty.href = CssDarkURL
     } else {
         thimg.src = MoonImageURL
         thimg.alt = "{"
@@ -81,6 +96,11 @@ function ToggleTheme() {
         thi.id = "so-theme"
         document.getElementById("so-form").appendChild(thi)
         logo.href = "?light"
-        thsty.src = CssLightURL
+        if (TheParameters === "") {
+            PushHistory(url+"?light")
+        } else {
+            PushHistory(url+"?light&"+TheParameters)
+        }
+        thsty.href = CssLightURL
     }
 }