diff --git a/themes/luci-theme-material/htdocs/css/style.css b/themes/luci-theme-material/htdocs/material/css/style.css
similarity index 100%
rename from themes/luci-theme-material/htdocs/css/style.css
rename to themes/luci-theme-material/htdocs/material/css/style.css
diff --git a/themes/luci-theme-material/htdocs/favicon.ico b/themes/luci-theme-material/htdocs/material/favicon.ico
similarity index 100%
rename from themes/luci-theme-material/htdocs/favicon.ico
rename to themes/luci-theme-material/htdocs/material/favicon.ico
diff --git a/themes/luci-theme-material/htdocs/fonts/font.eot b/themes/luci-theme-material/htdocs/material/fonts/font.eot
similarity index 100%
rename from themes/luci-theme-material/htdocs/fonts/font.eot
rename to themes/luci-theme-material/htdocs/material/fonts/font.eot
diff --git a/themes/luci-theme-material/htdocs/fonts/font.svg b/themes/luci-theme-material/htdocs/material/fonts/font.svg
similarity index 100%
rename from themes/luci-theme-material/htdocs/fonts/font.svg
rename to themes/luci-theme-material/htdocs/material/fonts/font.svg
diff --git a/themes/luci-theme-material/htdocs/fonts/font.ttf b/themes/luci-theme-material/htdocs/material/fonts/font.ttf
similarity index 100%
rename from themes/luci-theme-material/htdocs/fonts/font.ttf
rename to themes/luci-theme-material/htdocs/material/fonts/font.ttf
diff --git a/themes/luci-theme-material/htdocs/fonts/font.woff b/themes/luci-theme-material/htdocs/material/fonts/font.woff
similarity index 100%
rename from themes/luci-theme-material/htdocs/fonts/font.woff
rename to themes/luci-theme-material/htdocs/material/fonts/font.woff
diff --git a/themes/luci-theme-material/htdocs/js/jquery.min.js b/themes/luci-theme-material/htdocs/material/js/jquery.min.js
similarity index 100%
rename from themes/luci-theme-material/htdocs/js/jquery.min.js
rename to themes/luci-theme-material/htdocs/material/js/jquery.min.js
diff --git a/themes/luci-theme-material/htdocs/js/script.js b/themes/luci-theme-material/htdocs/material/js/script.js
similarity index 100%
rename from themes/luci-theme-material/htdocs/js/script.js
rename to themes/luci-theme-material/htdocs/material/js/script.js
diff --git a/themes/luci-theme-material/htdocs/logo.png b/themes/luci-theme-material/htdocs/material/logo.png
similarity index 100%
rename from themes/luci-theme-material/htdocs/logo.png
rename to themes/luci-theme-material/htdocs/material/logo.png
diff --git a/themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material b/themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material
index 4731a658ff..b01337821c 100755
--- a/themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material
+++ b/themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material
@@ -1,7 +1,7 @@
-#!/bin/sh
-uci batch <<-EOF
-	set luci.themes.Material=/luci-static/material
-	set luci.main.mediaurlbase=/luci-static/material
-	commit luci
-EOF
-exit 0
+#!/bin/sh
+uci batch <<-EOF
+	set luci.themes.Material=/luci-static/material
+	set luci.main.mediaurlbase=/luci-static/material
+	commit luci
+EOF
+exit 0