From 88d85213ec3a2c51888df7437b2f0dde74c32d46 Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Sun, 21 Dec 2025 21:31:21 -0500
Subject: [PATCH 01/10] Implement light-dark color scheme support

---
 css/main.css | 70 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 12 deletions(-)

diff --git a/css/main.css b/css/main.css
index ab40a93199..e022ddabfa 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,12 +1,16 @@
     /* NAVIGATION BAR AND GENERAL STYLES */
+    :root {
+      color-scheme: light dark; /* Informs the browser the site supports both schemes */
+    }
     body {
-      color: #3c3c3c;
+      background-color: light-dark(#ffffff, #232323);
+      color: light-dark(#3c3c3c, #cacaca);
       padding-left: 1em;
       padding-right: 1em;
     }
 
     .navbar {
-      background-color: #5755d9;
+      background-color: light-dark(#5755d9, #3a386f);
       padding: 1em 1em 1em 1em;
     }
 
@@ -57,9 +61,11 @@
       border-radius: 1em;
       padding: 0.5em;
       padding-left: 1em;
-      border: solid 1px #dadee4;
+      background-color: light-dark(#fff, #2d2d2d);
+      border: solid 1px light-dark(#dadee4, #3a386f);
       box-shadow: none;
       margin: -1;
+      color:light-dark(#3c3c3c, #cacaca);
     }
 
     .panel-header {
@@ -111,21 +117,39 @@
         transform: scale(1, 1);
       }
     }
-
+    .modal-overlay {
+      background: light-dark(#ffffff4b,#5e5e5ebc)!important;
+          /* Add the blur effect */
+      /* Apply the blur to the backdrop */
+      backdrop-filter: blur(5px);
+      -webkit-backdrop-filter: blur(5px); /* Safari support */
+    }
     .btn {
       border-radius: 0.4em;
+      background-color: light-dark(#ffffff, #232323);
     }
 
     #connectmydevice {
       margin-right: 1.5em;
+      background-color:#fff
     }
-
+    .menu{
+      background-color:light-dark(#ffffff, #313131);
+      color: light-dark(#3c3c3c, #cacaca);
+    }
+    
     .btn.input-group-btn {
 
       border-bottom-right-radius: 1em;
       border-top-right-radius: 1em;
     }
-
+    .btn.btn-clear{
+      color:light-dark(#000000,#FFFFFF);
+    }
+    .form-select{
+      background-color:light-dark(#ffffff, #232323)!important;
+      border-radius:0.4em;
+    }
     .btn.btn-favourite:focus,
     .btn.btn-favourite:focus-visible,
     .btn-favourite:focus,
@@ -336,9 +360,12 @@
       padding-left: 0.01em;
     }
 
+    .avatar {
+      background-color: transparent!important;
+    }
     .avatar img {
-      border-radius: 5px 5px 5px 5px;
-      background: #fff;
+      background-color: transparent!important;
+      border-radius: 0.3em!important;
     }
 
     #toastcontainer {
@@ -403,7 +430,7 @@
       
       box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.025);
       
-      border: solid 1.3px #dadee47c;
+      border: solid 1.3px light-dark(#dadee47c,#484848);
       margin: 0;
       /* spacing handled by container gap */
       padding: 0.9em;
@@ -422,7 +449,25 @@
     }
     .chip{
       border-radius: 0.7em;
-
+      background-color: light-dark(#EEF0F3,#424242);
+    }
+    code{
+      background-color: light-dark(#fdf2f2,#2f2e2e);
+    }
+    .hero-img {
+      filter: invert(0%);
+    }
+    @media (prefers-color-scheme: dark) {
+      .hero-img {
+        filter: invert(100%);
+      }
+      .modal-title{
+        color: #FFFFFF;
+      }
+    }
+    .hero.bg-gray{
+      background-color: light-dark(#F7F7F9,#2C2C2C)!important;
+      border-radius:1em;
     }
     .link-github {
       position: absolute;
@@ -448,7 +493,7 @@
       justify-content: flex-end;
       padding: 0em 1em;
       margin-right: 0.05em;
-      background-color: rgba(87, 85, 217, 0.055);
+      background-color: light-dark(rgba(87, 85, 217, 0.055), rgba(87, 85, 217, 0.152));
       border-radius: 999px;
       font-family: sans-serif;
       height: auto;
@@ -457,7 +502,7 @@
 
     .modal-container {
       border-radius: 1.5em;
-      background-color: rgb(253, 253, 255);
+      background-color: light-dark(rgb(253, 253, 255), rgb(44, 44, 44));
       padding: 1em;
 
     }
@@ -476,6 +521,7 @@
       align-items: center;
       /* Centers vertically */
       text-align: left;
+      color:light-dark(#3c3c3c, #cacaca);
 
     }
 

From 56717a300869bd9a70303b32374e3335ec713934 Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Sun, 21 Dec 2025 21:32:27 -0500
Subject: [PATCH 02/10] add a theme setting dropdown in settings page

---
 index.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 21ff5e5443..e5e6e24ded 100644
--- a/index.html
+++ b/index.html
@@ -122,7 +122,7 @@
     <div class="container apploader-tab" id="morecontainer" style="display:none">
       <div class="hero bg-gray">
         <div class="hero-body">
-          <a href="https://banglejs.com" target="_blank"><img src="img/banglejs-logo-mid.png" alt="Bangle.js"></a>
+          <a class="hero-img"href="https://banglejs.com" target="_blank"><img src="img/banglejs-logo-mid.png" alt="Bangle.js"></a>
           <h2>App Loader</h2>
           <p>A tool for uploading and removing apps from <a href="https://banglejs.com" target="_blank">Bangle.js Smart Watches</a></p>
         </div>
@@ -152,7 +152,9 @@ <h3>Utilities</h3>
            <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button>
         </p>
         <h3>Settings</h3>
+        
         <div class="form-group">
+          
           <label class="form-switch">
             <input type="checkbox" id="settings-pretokenise">
             <i class="form-icon"></i> Pretokenise apps before upload (smaller, faster apps)
@@ -174,11 +176,21 @@ <h3>Settings</h3>
             <i class="form-icon"></i> Send app analytics to banglejs.com (apps installed, favourites, firmware version).<br/>
               <small>Used for 'Sort by Installed/Favourited' functionality. See the <a href="http://www.espruino.com/Privacy">privacy policy</a></small>.
           </label>
+          <select class="form-select form-inline" id="settings-theme" style="width: 10em">
+            <option value="light">Light</option>
+            <option value="dark">Dark</option>
+            <option value="device">Device</option>
+            
+          </select>&nbsp;&nbsp;<span>App Loader Theme</span>
+          </div>
           <div class="form-group">
             <select class="form-select form-inline"  id="settings-lang" style="width: 10em">
               <option value="">None (English)</option>
             </select>&nbsp;&nbsp;<span>Translations (<a href="https://github.com/espruino/BangleApps/issues/1311" target="_blank">BETA - more info</a>). Any apps that are uploaded to Bangle.js after changing this will have any text automatically translated.</span>
           </div>
+          <div class="form-group">
+          
+          
           <details>
             <summary>Advanced Options</summary>
             <label class="form-switch">

From eec4865165832e0d3e1c889711f0c6f6573708b7 Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Mon, 22 Dec 2025 13:35:53 -0500
Subject: [PATCH 03/10] Update submodule URL for EspruinoAppLoaderCore

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index c2c1104c23..c434de0873 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "EspruinoAppLoaderCore"]
 	path = core
-	url = https://github.com/espruino/EspruinoAppLoaderCore.git
+	url = https://github.com/RKBoss6/EspruinoAppLoaderCore.git
 [submodule "webtools"]
 	path = webtools
 	url = https://github.com/espruino/EspruinoWebTools.git

From c1f62835c1d51c0dda6e351c4ead799d4c3fafb0 Mon Sep 17 00:00:00 2001
From: RKBoss6 <onkarka@northvilleschools.net>
Date: Mon, 22 Dec 2025 13:50:09 -0500
Subject: [PATCH 04/10] updated submodule test

---
 core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core b/core
index 1a23f49bd3..d1952f560a 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 1a23f49bd3fcc332577788a3c8d14bbb4344a563
+Subproject commit d1952f560a50644673fe070ac5bc66a00135f752

From 4cd23905f5cc698c5062fb6aeb522d17a80275e3 Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Mon, 22 Dec 2025 15:36:48 -0500
Subject: [PATCH 05/10] Update css/main.css

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index e022ddabfa..974e0d7096 100644
--- a/css/main.css
+++ b/css/main.css
@@ -65,7 +65,7 @@
       border: solid 1px light-dark(#dadee4, #3a386f);
       box-shadow: none;
       margin: -1;
-      color:light-dark(#3c3c3c, #cacaca);
+      color: light-dark(#3c3c3c, #cacaca);
     }
 
     .panel-header {

From 742705838d130d007214569ffb95d6444e5cf2fd Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Mon, 22 Dec 2025 15:36:55 -0500
Subject: [PATCH 06/10] Update css/main.css

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index 974e0d7096..1f4ae85c61 100644
--- a/css/main.css
+++ b/css/main.css
@@ -131,7 +131,7 @@
 
     #connectmydevice {
       margin-right: 1.5em;
-      background-color:#fff
+      background-color:#fff;
     }
     .menu{
       background-color:light-dark(#ffffff, #313131);

From 29f0d3a59f75d286233758f93a755aa3b1b56368 Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Mon, 22 Dec 2025 15:37:03 -0500
Subject: [PATCH 07/10] Update css/main.css

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/main.css b/css/main.css
index 1f4ae85c61..bf8f1c932c 100644
--- a/css/main.css
+++ b/css/main.css
@@ -521,7 +521,7 @@
       align-items: center;
       /* Centers vertically */
       text-align: left;
-      color:light-dark(#3c3c3c, #cacaca);
+      color: light-dark(#3c3c3c, #cacaca);
 
     }
 

From 0c8ede4aa7c5466899998333c24e8a9ddd63807f Mon Sep 17 00:00:00 2001
From: RKBoss6 <kabironkar@gmail.com>
Date: Tue, 23 Dec 2025 12:27:25 -0500
Subject: [PATCH 08/10] Change summary style for Advanced Options details

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index e5e6e24ded..2c7a8d1411 100644
--- a/index.html
+++ b/index.html
@@ -192,7 +192,7 @@ <h3>Settings</h3>
           
           
           <details>
-            <summary>Advanced Options</summary>
+            <summary style="cursor: pointer;">Advanced Options</summary>
             <label class="form-switch">
               <input type="checkbox" id="settings-minify">
               <i class="form-icon"></i> Minify apps before upload (⚠️DANGER⚠️: Not recommended. Uploads smaller, faster apps but this <b>will</b> break many apps)

From 7edc8f96a0c17efc09fe7ed9ba5f035ba408d783 Mon Sep 17 00:00:00 2001
From: RKBoss6 <onkarka@northvilleschools.net>
Date: Tue, 23 Dec 2025 13:07:35 -0500
Subject: [PATCH 09/10] fix hero img not responding to theme changes

---
 core         |  2 +-
 css/main.css | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core b/core
index d1952f560a..4fb873a3cc 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit d1952f560a50644673fe070ac5bc66a00135f752
+Subproject commit 4fb873a3cc37465d255017eca5728de399e8ec52
diff --git a/css/main.css b/css/main.css
index bf8f1c932c..874566ff1a 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,7 @@
     /* NAVIGATION BAR AND GENERAL STYLES */
     :root {
       color-scheme: light dark; /* Informs the browser the site supports both schemes */
+      --hero-img-filter: invert(0%);
     }
     body {
       background-color: light-dark(#ffffff, #232323);
@@ -457,13 +458,16 @@
     .hero-img {
       filter: invert(0%);
     }
-    @media (prefers-color-scheme: dark) {
-      .hero-img {
-        filter: invert(100%);
-      }
-      .modal-title{
-        color: #FFFFFF;
-      }
+    
+
+    html[data-theme="dark"] {
+      --hero-img-filter: invert(100%);
+    }
+    .hero-img {
+      filter: var(--hero-img-filter);
+    }
+    .modal-title{
+      color: light-dark(#000000,#FFFFFF);
     }
     .hero.bg-gray{
       background-color: light-dark(#F7F7F9,#2C2C2C)!important;

From e517ba462507bc626472c262a264a2a52493e865 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Thu, 8 Jan 2026 09:32:18 +0000
Subject: [PATCH 10/10] Removing extra newlines, fixing indentation

---
 index.html | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 2c7a8d1411..43be8ac20e 100644
--- a/index.html
+++ b/index.html
@@ -152,9 +152,7 @@ <h3>Utilities</h3>
            <button class="btn tooltip" id="newGithubIssue" data-tooltip="Create a new issue on GitHub">New issue on GitHub</button>
         </p>
         <h3>Settings</h3>
-        
         <div class="form-group">
-          
           <label class="form-switch">
             <input type="checkbox" id="settings-pretokenise">
             <i class="form-icon"></i> Pretokenise apps before upload (smaller, faster apps)
@@ -179,18 +177,15 @@ <h3>Settings</h3>
           <select class="form-select form-inline" id="settings-theme" style="width: 10em">
             <option value="light">Light</option>
             <option value="dark">Dark</option>
-            <option value="device">Device</option>
-            
+            <option value="device">Device</option>            
           </select>&nbsp;&nbsp;<span>App Loader Theme</span>
-          </div>
-          <div class="form-group">
-            <select class="form-select form-inline"  id="settings-lang" style="width: 10em">
-              <option value="">None (English)</option>
-            </select>&nbsp;&nbsp;<span>Translations (<a href="https://github.com/espruino/BangleApps/issues/1311" target="_blank">BETA - more info</a>). Any apps that are uploaded to Bangle.js after changing this will have any text automatically translated.</span>
-          </div>
-          <div class="form-group">
-          
-          
+        </div>
+        <div class="form-group">
+          <select class="form-select form-inline"  id="settings-lang" style="width: 10em">
+            <option value="">None (English)</option>
+          </select>&nbsp;&nbsp;<span>Translations (<a href="https://github.com/espruino/BangleApps/issues/1311" target="_blank">BETA - more info</a>). Any apps that are uploaded to Bangle.js after changing this will have any text automatically translated.</span>
+        </div>
+        <div class="form-group">
           <details>
             <summary style="cursor: pointer;">Advanced Options</summary>
             <label class="form-switch">