diff --git a/404.html b/404.html
index 52afe3e..92ae6e1 100644
--- a/404.html
+++ b/404.html
@@ -33,13 +33,13 @@
 
         @keyframes glow {
             0% {
-                filter: drop-shadow(0 0 10px white);
+                filter: drop-shadow(0 0 8px white);
             }
             50% {
-                filter: drop-shadow(0 0 20px white);
+                filter: drop-shadow(0 0 16px white);
             }
             100% {
-                filter: drop-shadow(0 0 10px white);
+                filter: drop-shadow(0 0 8px white);
             }
         }
         
@@ -55,4 +55,4 @@
     <p class="text">404 - Page not found!</p>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/CNAME b/CNAME
index 7032dd5..f174eee 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1 @@
-demo.emulatorjs.org
\ No newline at end of file
+demo.emulatorjs.org
diff --git a/README.md b/README.md
index 0ddd004..cefa46e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # EmulatorJS - Demo
 This has version selection from the cdn.
 ## Usage
-You can access the demo page at: [https://demo.emulatorjs.org](https://demo.emulatorjs.org)
\ No newline at end of file
+You can access the demo page at: [https://demo.emulatorjs.org](https://demo.emulatorjs.org)
diff --git a/ads.txt b/ads.txt
index 4cad853..c62ac5e 100644
--- a/ads.txt
+++ b/ads.txt
@@ -1 +1 @@
-google.com, pub-8832864985153925, DIRECT, f08c47fec0942fa0
\ No newline at end of file
+google.com, pub-8832864985153925, DIRECT, f08c47fec0942fa0
diff --git a/index.html b/index.html
index 34248b3..c7c2996 100644
--- a/index.html
+++ b/index.html
@@ -8,269 +8,7 @@
         <link rel="apple-touch-icon" href="img/icon.png" />
         <link rel="manifest" href="manifest.json" />
         <meta name="theme-color" content="#000"/>
-        <style>
-            body, html {
-                height: 100%;
-                background-color: black;
-                color: white;
-            }
-
-            body {
-                margin: 0;
-                overflow: hidden;
-            }
-
-            body, #box, #top {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                flex-direction: column;
-            }
-
-            #box {
-                color: #aaa;
-                height: 20em;
-                width: 30em;
-                max-width: 80%;
-                max-height: 80%;
-                background-color: #333;
-                border-radius: 0.4em;
-                border: 2px solid #555;
-                position: relative;
-                flex-direction: column;
-                transition-duration: 0.2s;
-                overflow: hidden;
-                font-family: monospace;
-                font-weight: bold;
-                font-size: 20px;
-                margin: 5px;
-                padding: 10px;
-                text-align: center;
-            }
-
-            #box:hover, #box[drag] {
-                border-color: #1AAFFF;
-                color: #ddd
-            }
-
-            #input {
-                cursor: pointer;
-                position: absolute;
-                left: 0;
-                top: 0;
-                width: 100%;
-                height: 100%;
-                opacity: 0;
-            }
-
-            #display {
-                width: 100%;
-                height: 100%
-            }
-
-            select, button {
-                padding: 0 0.4em;
-                margin: 0.5em 0.1em;
-                width: 15em;
-                max-width: 100%;
-                font-family: monospace;
-                font-weight: bold;
-                font-size: 16px;
-                background-color: #444;
-                color: #aaa;
-                border-radius: 0.4em;
-                border: 1px solid #555;
-                cursor: pointer;
-                transition-duration: 0.2s;
-                vertical-align:top;
-                height: 2.5em;
-            }
-
-            select:hover, button:hover {
-                background-color: #666;
-                color: #ddd
-            }
-
-            .logo {
-                width: 130px;
-                height: 130px;
-                filter: drop-shadow(0 0 10px white);
-            }
-
-            #top, #version {
-                margin: 5px;
-            }
-
-            #version button {
-                fill: #aaa;
-                width: auto;
-                padding: 0.2em 0.3em;
-                text-align: center;
-                margin: 0.5em 0.1em;
-            }
-            #version svg {
-                margin-top: 0.05em;
-                margin-left: 0.05em;
-                width: 1.8em;
-            }
-            .popup {
-                position: fixed;
-                top: 50%;
-                left: 50%;
-                width: 100%;
-                height: 100%;
-                z-index: 2000;
-                visibility: hidden;
-                -webkit-backface-visibility: hidden;
-                -moz-backface-visibility: hidden;
-                backface-visibility: hidden;
-            }
-            .popup .content {
-                background-color: #333;
-                border-radius: 0.4em;
-                border: 2px solid #555;
-                padding: 1em;
-                max-width: 80%;
-                max-height: 80%;
-                min-width: 30%;
-                width: min-content;
-                position: fixed;
-            }
-            .show {
-                visibility: visible;
-            }
-            .popup-overlay {
-                position: fixed;
-                width: 100%;
-                height: 100%;
-                visibility: hidden;
-                top: 0;
-                left: 0;
-                z-index: 1000;
-                opacity: 0;
-                background-color: rgba(0, 0, 0, 0.5);
-                -webkit-transition: all 0.3s;
-                transition: all 0.3s;
-            }
-            .show ~ .popup-overlay {
-                opacity: 1;
-                visibility: visible;
-            }
-            .popup-animate .content {
-                -webkit-transform: translateX(-50%) translateY(-50%) scale(0.7);
-                -ms-transform: translateX(-50%) translateY(-50%) scale(0.7);
-                transform: translateX(-50%) translateY(-50%) scale(0.7);
-                opacity: 0;
-                -webkit-transition: all 0.3s;
-                transition: all 0.3s;
-            }
-            .show.popup-animate .content {
-                -webkit-transform: translateX(-50%) translateY(-50%) scale(1);
-                -ms-transform: translateX(-50%) translateY(-50%) scale(1);
-                transform: translateX(-50%) translateY(-50%) scale(1);
-                opacity: 1;
-            }
-            .popup .title, .popup .options p {
-                display: flex;
-                align-items: center;
-            }
-            .popup .options p {
-                margin: 1em 0;
-                font-size: 18px;
-            }
-            .popup .title h1 {
-                margin: 0 0 0.3em;
-                font-size: 48px;
-            }
-            .popup .options button {
-                width: auto;
-                padding: 0 0.5em;
-                font-weight: bold;
-                margin: 0 0.5em;
-                font-size: 14px;
-                border-radius: 0.4em;
-            }
-            .popup .bottom {
-                display: flex;
-                justify-content: flex-end;
-                align-items: center;
-                margin-top: 1em;
-            }
-            #installbox {
-                display: inline-flex;
-                align-items: baseline;
-            }
-            #installboxtext {
-                margin-top: 0 !important;
-            }
-            button:disabled {
-                background-color: #666;
-                color: #aaa;
-                cursor: not-allowed;
-            }
-            .hide {
-                display: none !important;
-            }
-            .switch {
-                position: relative;
-                display: inline-block;
-                width: 51px;
-                height: 25px;
-                margin: 0 0.5em;
-            }
-
-            .switch input {
-                opacity: 0;
-                width: 0;
-                height: 0;
-            }
-
-            .slider {
-                position: absolute;
-                cursor: pointer;
-                top: 0;
-                left: 0;
-                right: 0;
-                bottom: 0;
-                background-color: #ccc;
-                -webkit-transition: .4s;
-                transition: .4s;
-            }
-
-            .slider:before {
-                position: absolute;
-                content: "";
-                height: 18px;
-                width: 18px;
-                left: 4px;
-                bottom: 4px;
-                background-color: white;
-                -webkit-transition: .4s;
-                transition: .4s;
-            }
-
-            input:checked + .slider {
-                background-color: #1AAFFF;
-            }
-
-            input:focus + .slider {
-                box-shadow: 0 0 1px #1AAFFF;
-            }
-
-            input:checked + .slider:before {
-                -webkit-transform: translateX(26px);
-                -ms-transform: translateX(26px);
-                transform: translateX(26px);
-            }
-
-            .slider.round {
-                border-radius: 34px;
-            }
-
-            .slider.round:before {
-                border-radius: 50%;
-            }
-        </style>
+        <link rel="stylesheet" href="main.css"/>
     </head>
     <body>
         <div id="top">
@@ -291,7 +29,7 @@ <h1>EmulatorJS Demo</h1>
                     <path d="M8 2a5.53 5.53 0 0 0-3.594 1.342c-.766.66-1.321 1.52-1.464 2.383C1.266 6.095 0 7.555 0 9.318 0 11.366 1.708 13 3.781 13h8.906C14.502 13 16 11.57 16 9.773c0-1.636-1.242-2.969-2.834-3.194C12.923 3.999 10.69 2 8 2m2.354 4.854-3 3a.5.5 0 0 1-.708 0l-1.5-1.5a.5.5 0 1 1 .708-.708L7 8.793l2.646-2.647a.5.5 0 0 1 .708.708"/>
                 </svg>
             </button>
-            <button id="settings" onclick="openSettings()">
+            <button id="settings">
                 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
                     <path d="M9.405 1.05c-.413-1.4-2.397-1.4-2.81 0l-.1.34a1.464 1.464 0 0 1-2.105.872l-.31-.17c-1.283-.698-2.686.705-1.987 1.987l.169.311c.446.82.023 1.841-.872 2.105l-.34.1c-1.4.413-1.4 2.397 0 2.81l.34.1a1.464 1.464 0 0 1 .872 2.105l-.17.31c-.698 1.283.705 2.686 1.987 1.987l.311-.169a1.464 1.464 0 0 1 2.105.872l.1.34c.413 1.4 2.397 1.4 2.81 0l.1-.34a1.464 1.464 0 0 1 2.105-.872l.31.17c1.283.698 2.686-.705 1.987-1.987l-.169-.311a1.464 1.464 0 0 1 .872-2.105l.34-.1c1.4-.413 1.4-2.397 0-2.81l-.34-.1a1.464 1.464 0 0 1-.872-2.105l.17-.31c.698-1.283-.705-2.686-1.987-1.987l-.311.169a1.464 1.464 0 0 1-2.105-.872zM8 10.93a2.929 2.929 0 1 1 0-5.86 2.929 2.929 0 0 1 0 5.858z"/>
                 </svg>
@@ -303,64 +41,40 @@ <h1>EmulatorJS Demo</h1>
                     <h1>Settings</h1>
                 </div>
                 <div class="options">
-                    <p>Enable Debuging: <label class="switch"><input type="checkbox" id="debug"/><span class="slider round"></span></label></p>
+                    <div class="buttonbox"><p>Enable Debuging: <label class="switch"><input type="checkbox" id="debug"/><span class="slider round"></span></label></p></div><br>
+                    <div class="buttonbox"><p>Clean Cache: </p><button id="cache">Clean</button></div><br>
+                    <div class="buttonbox"><p>Language: </p><select id="language"></select> <p id="languageHelp"></p></div><br>
+                    <div class="buttonbox last"><p>Custom Path: </p><input type="text" id="customPath" placeholder="https://cdn.emulatorjs.org/stable/"></input> <p id="customPathValid"></p></div>
                     <p id="offline-status">Offline Status: CHECKING</p>
                     <p>Offline Cores will be available soon.</p>
                     <p class="hide">Remove All Saved Versions: <button id="remove-version" onclick="removeallsaved()">Remove All</button></p>
-                    <div id="installbox"><p id="installboxtext">Install PWA:</p> <button id="install">Install</button></div>
+                    <div id="installbox" class="buttonbox"><p id="installboxtext">Install PWA: </p><button id="install">Install</button></div><br>
                     </div>
                 <div class="bottom">
-                    <button onclick="closeSettings()">Close</button>
+                    <button id="settings-close">Close</button>
                 </div>
             </div>
         </div>
         <div class="popup-overlay"></div>
+        <script src="main.js"></script>
         <script>
             if ("serviceWorker" in navigator) {
                 const req = navigator.serviceWorker.register("sw.js");
-                console.log(req);
             };
+
             loadJSON("/versions", (response) => {
+                const offlineStatus = document.getElementById("offline-status");
                 if (!response) {
                     loadJSON("https://cdn.emulatorjs.org/versions.json", resp => loadVersions(resp));
-                    document.getElementById("offline-status").textContent = "Offline Status: NOT INSTALLED";
+                    offlineStatus.textContent = "Offline Status: NOT INSTALLED";
                 } else {
                     loadVersions(response);
-                    document.getElementById("offline-status").textContent = "Offline Status: READY";
-                }
-            });
-            function loadVersions(response) {
-                const version_select = document.getElementById("version-select");
-                var versions = JSON.parse(response);
-                version_select.innerHTML = "";
-                addOptions(version_select, versions.releases, versions.default, versions.github);
-                addOptions(version_select, versions.versions, versions.default);
-                version_select.addEventListener("change", () => {
-                    localStorage.setItem("version", version_select[version_select.selectedIndex].textContent);
-                    window.cdn = "https://cdn.emulatorjs.org/" + version_select[version_select.selectedIndex].value + "data/";
-                });
-            }
-            let enableDebug = false;
-            const queryString = window.location.search;
-            const urlParams = new URLSearchParams(queryString);
-            const debugCheckbox = document.getElementById("debug");
-            if (parseInt(urlParams.get('debug')) === 1 || urlParams.get('debug') === "true") {
-                enableDebug = true;
-                console.log("Debug is enabled");
-                debugCheckbox.checked = true;
-            } else {
-                console.log("Debug is disabled");
-                debugCheckbox.checked = false;
-            }
-            debugCheckbox.addEventListener("change", () => {
-                enableDebug = debugCheckbox.checked;
-                console.log("Debug is now " + (enableDebug ? "enabled" : "disabled"));
-                if (enableDebug) {
-                    history.replaceState(null, '', '?debug=1');
-                } else {
-                    history.replaceState(null, '', window.location.pathname);
+                    offlineStatus.textContent = "Offline Status: READY";
                 }
             });
+
+            loadSettings();
+
             input.addEventListener("change", async () => {
                 const url = input.files[0];
                 const parts = input.files[0].name.split(".");
@@ -419,10 +133,12 @@ <h1>Settings</h1>
                             "Bandai WonderSwan (Color)": "ws",
                             "ColecoVision": "coleco",
                             "Commodore 64": "vice_x64",
-                            "PlayStation Portable": "psp"
-                        }
-                        if (window.cdn && window.cdn.includes("nightly")) {
-                            cores["dos"] = "dosbox_pure";
+                            "Commodore 128": "vice_x128",
+                            "Commodore VIC20": "vice_xvic",
+                            "Commodore Plus/4": "vice_xplus4",
+                            "Commodore PET": "vice_xpet",
+                            "PlayStation Portable": "psp",
+                            "DOS": "dosbox_pure"
                         }
 
                         const button = document.createElement("button")
@@ -470,7 +186,10 @@ <h1>Settings</h1>
                 window.EJS_pathtodata = cdn;
                 window.EJS_startOnLoaded = true;
                 window.EJS_AdUrl = "ads.html";
-                window.EJS_DEBUG_XX = enableDebug;
+                window.EJS_DEBUG_XX = window.debug;
+                if (window.language !== "auto") {
+                    window.EJS_language = window.language;
+                }
                 if (core === "psp" || core === "dosbox_pure") {
                     window.EJS_threads = true;
                 }
@@ -485,74 +204,6 @@ <h1>Settings</h1>
             box.ondragover = () => box.setAttribute("drag", true);
             box.ondragleave = () => box.removeAttribute("drag");
 
-            function detectAdBlock(url) {
-                let adBlockEnabled = false;
-                try {
-                    const adframe = document.querySelector('iframe[src="'+window.EJS_AdUrl+'"]');
-                    var adpage = adframe.contentWindow.document;
-                    window.EJS_AdUrl = adframe.src;
-                    if (!adpage) {
-                        adBlockEnabled = true;
-                    }
-                } catch (e) {
-                    adBlockEnabled = true;
-                }
-                if (adBlockEnabled) {
-                    window.EJS_adBlocked(url);
-                    
-                }
-            }
-
-            function loadJSON(url, callback) {
-                var xobj = new XMLHttpRequest();
-                xobj.overrideMimeType("application/json");
-                xobj.open('GET', url, true);
-
-                xobj.onreadystatechange = function () {
-                    if (xobj.readyState === 4) {
-                        if (xobj.status === 200) {
-                            callback(xobj.responseText);
-                        } else {
-                            callback(null);
-                        }
-                    }
-                };
-
-                xobj.send();
-            }
-
-
-            function addOptions(select, options, default_option, github) {
-                for (const version in options) {
-                    const option = document.createElement("option");
-                    option.value = options[version];
-                    if (version == "stable"){
-                        option.textContent = "stable ("+github+")";
-                    } else {
-                        option.textContent = version;
-                    }
-                    if (localStorage.getItem("version") && localStorage.getItem("version") === version) {
-                        option.selected = true;
-                        window.cdn = "https://cdn.emulatorjs.org/" + option.value + "data/";
-                    } else if (version.includes(default_option)) {
-                        option.selected = true;
-                        window.cdn = "https://cdn.emulatorjs.org/" + option.value + "data/";
-                    }
-                    select.appendChild(option);
-                }
-            }
-
-            function openSettings() {
-                document.getElementById("popup-settings").classList.add("show");
-                if (localStorage.getItem("pwa") == "false") {
-                    checkinstall();
-                }
-            }
-
-            function closeSettings() {
-                document.getElementById("popup-settings").classList.remove("show");
-            }
-
             let installPrompt = null;
             const installButton = document.querySelector("#install");
             const installBox = document.querySelector("#installbox");
@@ -567,6 +218,7 @@ <h1>Settings</h1>
                 installButton.disabled = false;
                 console.log("Supported");
             });
+
             installButton.addEventListener("click", async () => {
                 if (!installPrompt) {
                     return;
@@ -575,36 +227,7 @@ <h1>Settings</h1>
                 console.log(`Install prompt was: ${result.outcome}`);
                 installPrompt = null;
             });
-            function checkinstall(overide) {
-                console.log("Checking install");
-                if (navigator.userAgent.includes("Firefox") || (navigator.userAgent.includes("OPR") && !navigator.userAgent.includes("Mobile"))) {
-                    installButton.style.display = "none";
-                    installBoxText.innerHTML = "PWA's are not supported on this browser.";
-                    return;
-                }
-                if (window.matchMedia('(display-mode: standalone)').matches || overide) {
-                    installButton.textContent = "Installed";
-                    installButton.disabled = true;
-                    installButton.style.display = "inline";
-                    installBoxText.innerHTML = "Install PWA: ";
-                } else {
-                    installButton.style.display = "none";
-                    if (navigator.userAgent.includes("Safari") && !navigator.userAgent.includes("Chrome")) {
-                        installBoxText.innerHTML = "PWA's are supported on this browser, but prompt is not supported.<br> Please install manually";
-                        return;
-                    }
-                    if ('getInstalledRelatedApps' in navigator) {
-                        navigator.getInstalledRelatedApps().then((relatedApps) => {
-                            if (relatedApps.length > 0) {
-                                checkinstall(true);
-                                return;
-                            }
-                        });
-                    }
-                    installBoxText.innerHTML = "PWA is either already installed, or prompt is not supported on this browser.<br> Please install manually.<br>Note: PWA's are not supported in Incognito/Private mode.";
-                }
-                
-            }
+
             document.addEventListener('visibilitychange', function() {
                 window.matchMedia('(display-mode: standalone)').addListener(event => {
                     if (event.matches) {
diff --git a/main.css b/main.css
new file mode 100644
index 0000000..f346a93
--- /dev/null
+++ b/main.css
@@ -0,0 +1,298 @@
+body,
+html {
+    height: 100%;
+    background-color: black;
+    color: white;
+}
+
+body {
+    margin: 0;
+    overflow: hidden;
+}
+
+body,
+#box,
+#top {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+}
+
+#box {
+    color: #aaa;
+    height: 20em;
+    width: 30em;
+    max-width: 80%;
+    max-height: 80%;
+    background-color: #333;
+    border-radius: 0.4em;
+    border: 2px solid #555;
+    position: relative;
+    flex-direction: column;
+    transition-duration: 0.2s;
+    overflow: hidden;
+    font-family: monospace;
+    font-weight: bold;
+    font-size: 20px;
+    margin: 5px;
+    padding: 10px;
+    text-align: center;
+}
+
+#box:hover,
+#box[drag] {
+    border-color: #1AAFFF;
+    color: #ddd
+}
+
+#input {
+    cursor: pointer;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    opacity: 0;
+}
+
+#display {
+    width: 100%;
+    height: 100%
+}
+
+select,
+input[type="text"],
+button {
+    padding: 0 0.4em;
+    margin: 0.5em 0.1em;
+    width: 15em;
+    max-width: 100%;
+    font-family: monospace;
+    font-weight: bold;
+    font-size: 16px;
+    background-color: #444;
+    color: #aaa;
+    border-radius: 0.4em;
+    border: 1px solid #555;
+    cursor: pointer;
+    transition-duration: 0.2s;
+    vertical-align: top;
+    height: 2.5em;
+}
+
+select:hover,
+button:hover {
+    background-color: #666;
+    color: #ddd
+}
+
+.logo {
+    width: 130px;
+    height: 130px;
+    filter: drop-shadow(0 0 8px white);
+}
+
+#top,
+#version {
+    margin: 5px;
+}
+
+#version button {
+    fill: #aaa;
+    width: auto;
+    padding: 0.2em 0.3em;
+    text-align: center;
+    margin: 0.5em 0.1em;
+}
+
+#version svg {
+    margin-top: 0.05em;
+    margin-left: 0.05em;
+    width: 1.8em;
+}
+
+.popup {
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    width: 100%;
+    height: 100%;
+    z-index: 2000;
+    visibility: hidden;
+    -webkit-backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    backface-visibility: hidden;
+}
+
+.popup .content {
+    background-color: #333;
+    border-radius: 0.4em;
+    border: 2px solid #555;
+    padding: 1em;
+    max-width: 80%;
+    max-height: 80%;
+    min-width: 30%;
+    width: min-content;
+    position: fixed;
+    overflow-x: auto;
+}
+
+.show {
+    visibility: visible;
+}
+
+.popup-overlay {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    visibility: hidden;
+    top: 0;
+    left: 0;
+    z-index: 1000;
+    opacity: 0;
+    background-color: rgba(0, 0, 0, 0.5);
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s;
+}
+
+.show~.popup-overlay {
+    opacity: 1;
+    visibility: visible;
+}
+
+.popup-animate .content {
+    -webkit-transform: translateX(-50%) translateY(-50%) scale(0.7);
+    -ms-transform: translateX(-50%) translateY(-50%) scale(0.7);
+    transform: translateX(-50%) translateY(-50%) scale(0.7);
+    opacity: 0;
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s;
+}
+
+.show.popup-animate .content {
+    -webkit-transform: translateX(-50%) translateY(-50%) scale(1);
+    -ms-transform: translateX(-50%) translateY(-50%) scale(1);
+    transform: translateX(-50%) translateY(-50%) scale(1);
+    opacity: 1;
+}
+
+.popup .title,
+.popup .options p {
+    display: flex;
+    align-items: center;
+}
+
+.popup .options p {
+    margin: 0.5em 0;
+    font-size: 18px;
+}
+
+.popup .title h1 {
+    margin: 0 0 0.3em;
+    font-size: 48px;
+}
+
+.popup .bottom {
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    margin-top: 1em;
+}
+
+.buttonbox {
+    display: inline-flex;
+    align-items: baseline;
+    flex-wrap: wrap;
+    margin-bottom: 0.2em;
+}
+
+.buttonbox.last {
+    margin-bottom: 0 !important;
+}
+
+.buttonbox p {
+    margin: 0 !important;
+}
+
+.buttonbox select,
+.buttonbox input[type="text"],
+.buttonbox button {
+    padding: 0 0.4em;
+    margin: 0.5em;;
+    width: auto;
+    font-size: 14px;
+    height: 2em;
+}
+
+.buttonbox button:disabled,
+.buttonbox select:disabled,
+.buttonbox input[type="text"]:disabled {
+    background-color: #666;
+    color: #aaa;
+    cursor: not-allowed;
+}
+
+.hide {
+    display: none !important;
+}
+
+.switch {
+    position: relative;
+    display: inline-block;
+    width: 51px;
+    height: 25px;
+    margin: 0.5em;
+}
+
+.switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
+
+.slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+
+.slider:before {
+    position: absolute;
+    content: "";
+    height: 18px;
+    width: 18px;
+    left: 4px;
+    bottom: 4px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+
+input:checked+.slider {
+    background-color: #1AAFFF;
+}
+
+input:focus+.slider {
+    box-shadow: 0 0 1px #1AAFFF;
+}
+
+input:checked+.slider:before {
+    -webkit-transform: translateX(26px);
+    -ms-transform: translateX(26px);
+    transform: translateX(26px);
+}
+
+.slider.round {
+    border-radius: 34px;
+}
+
+.slider.round:before {
+    border-radius: 50%;
+}
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..f570e91
--- /dev/null
+++ b/main.js
@@ -0,0 +1,312 @@
+function loadJSON(url, callback) {
+    if (typeof fetch === 'function') {
+        fetch(url)
+            .then(response => {
+                if (response.ok) {
+                    return response.text();
+                } else {
+                    return null;
+                }
+            })
+            .then(data => callback(data))
+            .catch(() => callback(null));
+    } else {
+        var xobj = new XMLHttpRequest();
+        xobj.overrideMimeType("application/json");
+        xobj.open('GET', url, true);
+        xobj.onreadystatechange = function () {
+            if (xobj.readyState === 4) {
+                if (xobj.status === 200) {
+                    callback(xobj.responseText);
+                } else {
+                    callback(null);
+                }
+            }
+        };
+        xobj.send();
+    }
+}
+
+function loadVersions(response) {
+    const version_select = document.getElementById("version-select");
+    var versions = JSON.parse(response);
+    version_select.innerHTML = "";
+    addOptions(version_select, versions.releases, versions.default, versions.github);
+    addOptions(version_select, { "custom": "" }, versions.default);
+    addOptions(version_select, versions.versions, versions.default);
+    version_select.addEventListener("change", () => {
+        versionChange();
+    });
+}
+
+function versionChange(key, value) {
+    if (key && value) {
+        localStorage.setItem("version", value);
+        setCDNPath(key);
+        checkSettings(value);
+    } else {
+        const version_select = document.getElementById("version-select");
+        localStorage.setItem("version", version_select[version_select.selectedIndex].textContent);
+        setCDNPath(version_select[version_select.selectedIndex].value);
+        checkSettings(version_select[version_select.selectedIndex].textContent);
+    }
+}
+
+function setCDNPath(option) {
+    console.log("CDN Path: " + option);
+    if (option === "custom/") {
+        console.log("Using custom path");
+        window.cdn = localStorage.getItem("custom_cdn");
+    } else {
+        window.cdn = "https://cdn.emulatorjs.org/" + option + "data/";
+    }
+}
+
+function detectAdBlock(url) {
+    let adBlockEnabled = false;
+    try {
+        const adframe = document.querySelector('iframe[src="' + window.EJS_AdUrl + '"]');
+        var adpage = adframe.contentWindow.document;
+        window.EJS_AdUrl = adframe.src;
+        if (!adpage) {
+            adBlockEnabled = true;
+        }
+    } catch (e) {
+        adBlockEnabled = true;
+    }
+    if (adBlockEnabled) {
+        window.EJS_adBlocked(url);
+    }
+}
+
+function addOptions(select, options, default_option, github) {
+    for (const version in options) {
+        const option = document.createElement("option");
+        option.value = options[version];
+        if (version == "stable") {
+            option.textContent = "stable (" + github + ")";
+        } else {
+            option.textContent = version;
+        }
+        const saveVersion = localStorage.getItem("version");
+        if (version === "custom") {
+            option.id = "custom-version";
+            if (localStorage.getItem("custom_cdn")) {
+                option.value = "custom/";
+            } else {
+                option.disabled = true;
+            }
+        }
+        if ((saveVersion && saveVersion === version) || (!saveVersion && version === default_option.split("/")[0]) || saveVersion.includes(version)) {
+            option.selected = true;
+            versionChange(option.value, option.textContent);
+        }
+        select.appendChild(option);
+    }
+}
+
+function loadSettings() {
+    const settingsButton = document.getElementById("settings");
+    const settingsClose = document.getElementById("settings-close");
+    settingsButton.addEventListener("click", () => {
+        document.getElementById("popup-settings").classList.add("show");
+        if (localStorage.getItem("pwa") == "false") {
+            checkinstall();
+        }
+    });
+    settingsClose.addEventListener("click", () => {
+        document.getElementById("popup-settings").classList.remove("show");
+    });
+
+    window.debug = false;
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+    const debugCheckbox = document.getElementById("debug");
+    if (parseInt(urlParams.get('debug')) === 1 || urlParams.get('debug') === "true") {
+        debug = true;
+        console.log("Debug is enabled");
+        debugCheckbox.checked = true;
+    } else {
+        console.log("Debug is disabled");
+        debugCheckbox.checked = false;
+    }
+
+    debugCheckbox.addEventListener("change", () => {
+        enableDebug = debugCheckbox.checked;
+        console.log("Debug is now " + (enableDebug ? "enabled" : "disabled"));
+        if (enableDebug) {
+            history.replaceState(null, '', '?debug=1');
+        } else {
+            history.replaceState(null, '', window.location.pathname);
+        }
+    });
+
+    let systemLang;
+    try {
+        systemLang = Intl.DateTimeFormat().resolvedOptions().locale;
+    } catch(e) {}
+    console.log("System language: " + systemLang);
+    const lang_select = document.getElementById("language");
+    loadLanguages(systemLang, lang_select);
+    lang_select.addEventListener("change", () => {
+        const selectedLang = lang_select.value;
+        window.language = selectedLang;
+        localStorage.setItem("language", selectedLang);
+        console.log("Language changed to: " + selectedLang);
+    });
+
+    const customPathInput = document.getElementById("customPath");
+    const customPathValid = document.getElementById("customPathValid");
+    const savedPath = localStorage.getItem("custom_cdn");
+    const urlRegex = /^(https?:\/\/)(localhost|\d{1,3}(\.\d{1,3}){3}|([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})(:\d+)?(\/.*)?\/$/;
+    if (savedPath && urlRegex.test(savedPath)) {
+        customPathInput.value = savedPath;
+        customPathValid.textContent = "Valid URL";
+        customPathValid.style.color = "green";
+    } else {
+        localStorage.removeItem("custom_cdn");
+    }
+    let pathValid = false;
+    customPathInput.addEventListener("input", () => {
+        const customPath = customPathInput.value.trim();
+        
+        if (urlRegex.test(customPath)) {
+            customPathValid.textContent = "Valid URL";
+            customPathValid.style.color = "green";
+            pathValid = true;
+        } else if(customPath === "") {
+            customPathValid.textContent = "";
+            customPathValid.style.color = "";
+            pathValid = false;
+        } else {
+            customPathValid.textContent = "Invalid URL";
+            customPathValid.style.color = "red";
+            pathValid = false;
+        }
+    });
+    customPathInput.addEventListener("change", () => {
+        const customOption = document.getElementById("custom-version");
+        const versionSelect = document.getElementById("version-select");
+        const customPath = customPathInput.value.trim();
+        if (pathValid) {
+            customOption.disabled = false;
+            versionSelect.selectedIndex = 3;
+            localStorage.setItem("custom_cdn", customPath);
+        } else {
+            customOption.disabled = true;
+            versionSelect.selectedIndex = 0;
+            localStorage.removeItem("custom_cdn");
+        }
+        versionChange();
+    });
+
+    const cacheButton = document.getElementById("cache");
+    cacheButton.addEventListener("click", () => {
+        if (confirm("Are you sure you want to clear the cache? This will remove all saved data.")) {
+            localStorage.clear();
+            console.log("Cleared localStorage");
+            indexedDB.databases().then(dbs => {
+                dbs.forEach(db => {
+                if (db.name) {
+                    indexedDB.deleteDatabase(db.name);
+                    console.log(`Deleted IndexedDB: ${db.name}`);
+                }
+                });
+            });
+            caches.keys().then(cacheNames => {
+                return Promise.all(
+                    cacheNames.map(name => {
+                        console.log(`Deleting cache: ${name}`);
+                        return caches.delete(name);
+                    })
+                );
+            });
+        }
+    });
+}
+
+function checkSettings(version) {
+    if (version.includes("stable")) {
+        version = version.replace("stable (", "").replace(")", "");
+    }
+    const lang_select = document.getElementById("language");
+    const langHelp = document.getElementById("languageHelp");
+    if (version === "custom" || version === "latest" || version === "nightly" || version > "4.2.2") {
+        console.log("Language Support: Enabled");
+        lang_select.disabled=false;
+        lang_select.style.width = "auto";
+        langHelp.innerHTML = "";
+    } else {
+        console.log("Language Support: Disabled");
+        lang_select.disabled=true;
+        lang_select.style.width = "140px";
+        langHelp.innerHTML = "Language selection isn't available for versions 4.2.2 and below.";
+    }
+}
+
+function checkinstall(overide) {
+    console.log("Checking install");
+    if (navigator.userAgent.includes("Firefox") || (navigator.userAgent.includes("OPR") && !navigator.userAgent.includes("Mobile"))) {
+        installButton.style.display = "none";
+        installBoxText.innerHTML = "PWA's are not supported on this browser.";
+        return;
+    }
+    if (window.matchMedia('(display-mode: standalone)').matches || overide) {
+        installButton.textContent = "Installed";
+        installButton.disabled = true;
+        installButton.style.display = "inline";
+        installBoxText.innerHTML = "Install PWA: ";
+    } else {
+        installButton.style.display = "none";
+        if (navigator.userAgent.includes("Safari") && !navigator.userAgent.includes("Chrome")) {
+            installBoxText.innerHTML = "PWA's are supported on this browser, but prompt is not supported.<br> Please install manually";
+            return;
+        }
+        if ('getInstalledRelatedApps' in navigator) {
+            navigator.getInstalledRelatedApps().then((relatedApps) => {
+                if (relatedApps.length > 0) {
+                    checkinstall(true);
+                    return;
+                }
+            });
+        }
+        installBoxText.innerHTML = "PWA is either already installed, or prompt is not supported on this browser.<br> Please install manually.<br>Note: PWA's are not supported in Incognito/Private mode.";
+    }
+}
+
+function loadLanguages(sysLang, lang_select) {
+    langs = {
+        "auto": "Auto (" + sysLang + ")",
+        "en": "English (US)",
+        "pt": "Portuguese (Brazil)",
+        "es": "Spanish (Latin America)",
+        "el": "Greek (Modern Greek)",
+        "ja": "Japanese (Japan)",
+        "zh": "Chinese (Simplified)",
+        "hi": "Hindi (India)",
+        "ar": "Arabic (Saudi Arabia)",
+        "jv": "Javanese (Indonesia)",
+        "bn": "Bengali (Bangladesh)",
+        "ru": "Russian (Russia)",
+        "de": "German (Germany)",
+        "ko": "Korean (South Korea)",
+        "af": "French (France)",
+        "it": "Italian (Italy)",
+        "tr": "Turkish (Turkey)",
+        "fa": "Persian (Afghanistan)",
+        "ro": "Romanian (Romania)",
+        "vi": "Vietnamese (Vietnam)"
+    };
+    for (const lang in langs) {
+        const option = document.createElement("option");
+        option.value = lang;
+        option.textContent = langs[lang];
+        lang_select.appendChild(option);
+    }
+    let selectedLang = localStorage.getItem("language");
+    if (selectedLang) {
+        lang_select.value = selectedLang;
+    } else {
+        localStorage.setItem("language", "auto");
+    }
+}
diff --git a/manifest.json b/manifest.json
index 51c2440..908a9b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,4 +35,5 @@
         "purpose": "maskable"
       }
     ]
-  }
\ No newline at end of file
+  }
+  
\ No newline at end of file
diff --git a/sw.js b/sw.js
index fb62999..070de9e 100644
--- a/sw.js
+++ b/sw.js
@@ -1,7 +1,8 @@
 const CACHE_NAME = "offline-demo";
-const STABLE_EJS_VER = "4.2.1";
 const OFFLINE_FILES = [
     "index.html",
+    "main.js",
+    "main.css",
     "404.html",
     "favicon.ico",
     "manifest.json",
@@ -21,6 +22,21 @@ const OFFLINE_FILES = [
     "https://cdn.emulatorjs.org/stable/data/compression/libunrar.js",
     "https://cdn.emulatorjs.org/stable/data/compression/libunrar.wasm"
 ];
+let STABLE_EJS_VER = "4.2.3"; // Fallback version if the request fails
+
+importScripts('/main.js');
+
+try {
+    loadJSON("https://cdn.emulatorjs.org/versions.json", (response) => {
+        if (response) {
+            STABLE_EJS_VER = JSON.parse(response).github;
+        }
+        console.log("Stable EmulatorJS version:", STABLE_EJS_VER);
+    });
+} catch (e) {
+    console.warn("Failed to get Stable EmulatorJS version:", e, "Using fallback version:", STABLE_EJS_VER);
+}
+
 
 self.addEventListener("install", (event) => {
     event.waitUntil(