--- a/luci-theme-argon/root/etc/uci-defaults/30_luci-theme-argon
+++ b/luci-theme-argon/root/etc/uci-defaults/30_luci-theme-argon
@@ -63,7 +63,6 @@ if [ "$PKG_UPGRADE" != 1 ]; then
 	uci get luci.themes.Argon >/dev/null 2>&1 || \
 	uci batch <<-EOF
 		set luci.themes.Argon=/luci-static/argon
-		set luci.main.mediaurlbase=/luci-static/argon
 		commit luci
 	EOF
 fi

--- a/luci-theme-argon/root/usr/share/luci/menu.d/luci-app-argon-config.json
+++ b/luci-theme-argon/root/usr/share/luci/menu.d/luci-app-argon-config.json
@@ -8,7 +8,14 @@
 		},
 		"depends": {
 			"acl": [ "luci-app-argon-config" ],
-			"uci": { "argon": true }
+			"uci": {
+				"argon": true,
+				"luci": {
+					"main": {
+						"mediaurlbase": "/luci-static/argon"
+					}
+				}
+			}
 		}
 	}
 }

--- a/luci-theme-argon/ucode/template/themes/argon/head.ut
+++ b/luci-theme-argon/ucode/template/themes/argon/head.ut
@@ -67,7 +67,7 @@
 
 -%}
 <!DOCTYPE html>
-<html lang="{{ dispatcher.lang }}" data-argon-mode="{{ mode }}">
+<html lang="{{ dispatcher.lang }}" data-argon-mode="{{ mode }}" {% if (mode == 'dark'): %} data-darkmode="true"{% elif (mode == 'light'): %} data-darkmode="false"{% endif %}>
 
 <head>
 	{% if (!is_login): %}