diff --git a/applications/luci-app-ahcp/root/etc/uci-defaults/luci-ahcp b/applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
similarity index 100%
rename from applications/luci-app-ahcp/root/etc/uci-defaults/luci-ahcp
rename to applications/luci-app-ahcp/root/etc/uci-defaults/40_luci-ahcp
diff --git a/applications/luci-app-asterisk/root/etc/uci-defaults/luci-asterisk b/applications/luci-app-asterisk/root/etc/uci-defaults/40_luci-asterisk
similarity index 100%
rename from applications/luci-app-asterisk/root/etc/uci-defaults/luci-asterisk
rename to applications/luci-app-asterisk/root/etc/uci-defaults/40_luci-asterisk
diff --git a/applications/luci-app-ddns/root/etc/uci-defaults/luci-ddns b/applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
similarity index 100%
rename from applications/luci-app-ddns/root/etc/uci-defaults/luci-ddns
rename to applications/luci-app-ddns/root/etc/uci-defaults/40_luci-ddns
diff --git a/applications/luci-app-dump1090/root/etc/uci-defaults/luci-dump1090 b/applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
similarity index 100%
rename from applications/luci-app-dump1090/root/etc/uci-defaults/luci-dump1090
rename to applications/luci-app-dump1090/root/etc/uci-defaults/40_luci-dump1090
diff --git a/applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics b/applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/40_luci-freifunk-diagnostics
similarity index 100%
rename from applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/luci-freifunk-diagnostics
rename to applications/luci-app-freifunk-diagnostics/root/etc/uci-defaults/40_luci-freifunk-diagnostics
diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
similarity index 100%
rename from applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd
rename to applications/luci-app-fwknopd/root/etc/uci-defaults/40_luci-fwknopd
diff --git a/applications/luci-app-hd-idle/root/etc/uci-defaults/luci-hd_idle b/applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
similarity index 100%
rename from applications/luci-app-hd-idle/root/etc/uci-defaults/luci-hd_idle
rename to applications/luci-app-hd-idle/root/etc/uci-defaults/40_luci-hd_idle
diff --git a/applications/luci-app-minidlna/root/etc/uci-defaults/luci-minidlna b/applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
similarity index 100%
rename from applications/luci-app-minidlna/root/etc/uci-defaults/luci-minidlna
rename to applications/luci-app-minidlna/root/etc/uci-defaults/40_luci-minidlna
diff --git a/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer b/applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
similarity index 100%
rename from applications/luci-app-mjpg-streamer/root/etc/uci-defaults/luci-mjpg-streamer
rename to applications/luci-app-mjpg-streamer/root/etc/uci-defaults/40_luci-mjpg-streamer
diff --git a/applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio b/applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/40_luci-mmc-over-gpio
similarity index 100%
rename from applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/luci-mmc-over-gpio
rename to applications/luci-app-mmc-over-gpio/root/etc/uci-defaults/40_luci-mmc-over-gpio
diff --git a/applications/luci-app-olsr/root/etc/uci-defaults/luci-olsr b/applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
similarity index 100%
rename from applications/luci-app-olsr/root/etc/uci-defaults/luci-olsr
rename to applications/luci-app-olsr/root/etc/uci-defaults/40_luci-olsr
diff --git a/applications/luci-app-p2pblock/root/etc/uci-defaults/luci-p2pblock b/applications/luci-app-p2pblock/root/etc/uci-defaults/40_luci-p2pblock
similarity index 100%
rename from applications/luci-app-p2pblock/root/etc/uci-defaults/luci-p2pblock
rename to applications/luci-app-p2pblock/root/etc/uci-defaults/40_luci-p2pblock
diff --git a/applications/luci-app-p910nd/root/etc/uci-defaults/luci-p910nd b/applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
similarity index 100%
rename from applications/luci-app-p910nd/root/etc/uci-defaults/luci-p910nd
rename to applications/luci-app-p910nd/root/etc/uci-defaults/40_luci-p910nd
diff --git a/applications/luci-app-polipo/root/etc/uci-defaults/luci-polipo b/applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
similarity index 100%
rename from applications/luci-app-polipo/root/etc/uci-defaults/luci-polipo
rename to applications/luci-app-polipo/root/etc/uci-defaults/40_luci-polipo
diff --git a/applications/luci-app-privoxy/root/etc/uci-defaults/luci-privoxy b/applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
similarity index 100%
rename from applications/luci-app-privoxy/root/etc/uci-defaults/luci-privoxy
rename to applications/luci-app-privoxy/root/etc/uci-defaults/40_luci-privoxy
diff --git a/applications/luci-app-radicale/root/etc/uci-defaults/luci-radicale b/applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
similarity index 100%
rename from applications/luci-app-radicale/root/etc/uci-defaults/luci-radicale
rename to applications/luci-app-radicale/root/etc/uci-defaults/40_luci-radicale
diff --git a/applications/luci-app-radvd/root/etc/uci-defaults/luci-radvd b/applications/luci-app-radvd/root/etc/uci-defaults/40_luci-radvd
similarity index 100%
rename from applications/luci-app-radvd/root/etc/uci-defaults/luci-radvd
rename to applications/luci-app-radvd/root/etc/uci-defaults/40_luci-radvd
diff --git a/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/luci-shadowsocks-libev b/applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
similarity index 100%
rename from applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/luci-shadowsocks-libev
rename to applications/luci-app-shadowsocks-libev/root/etc/uci-defaults/40_luci-shadowsocks-libev
diff --git a/applications/luci-app-shairplay/root/etc/uci-defaults/luci-shairplay b/applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
similarity index 100%
rename from applications/luci-app-shairplay/root/etc/uci-defaults/luci-shairplay
rename to applications/luci-app-shairplay/root/etc/uci-defaults/40_luci-shairplay
diff --git a/applications/luci-app-shairport/root/etc/uci-defaults/luci-shairport b/applications/luci-app-shairport/root/etc/uci-defaults/40_luci-shairport
similarity index 100%
rename from applications/luci-app-shairport/root/etc/uci-defaults/luci-shairport
rename to applications/luci-app-shairport/root/etc/uci-defaults/40_luci-shairport
diff --git a/applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics b/applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics
similarity index 100%
rename from applications/luci-app-statistics/root/etc/uci-defaults/luci-statistics
rename to applications/luci-app-statistics/root/etc/uci-defaults/40_luci-statistics
diff --git a/applications/luci-app-transmission/root/etc/uci-defaults/luci-transmission b/applications/luci-app-transmission/root/etc/uci-defaults/40_luci-transmission
similarity index 100%
rename from applications/luci-app-transmission/root/etc/uci-defaults/luci-transmission
rename to applications/luci-app-transmission/root/etc/uci-defaults/40_luci-transmission
diff --git a/applications/luci-app-udpxy/root/etc/uci-defaults/luci-udpxy b/applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
similarity index 100%
rename from applications/luci-app-udpxy/root/etc/uci-defaults/luci-udpxy
rename to applications/luci-app-udpxy/root/etc/uci-defaults/40_luci-udpxy
diff --git a/applications/luci-app-ushare/root/etc/uci-defaults/luci-ushare b/applications/luci-app-ushare/root/etc/uci-defaults/40_luci-ushare
similarity index 100%
rename from applications/luci-app-ushare/root/etc/uci-defaults/luci-ushare
rename to applications/luci-app-ushare/root/etc/uci-defaults/40_luci-ushare
diff --git a/applications/luci-app-vnstat/root/etc/uci-defaults/luci-vnstat b/applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
similarity index 100%
rename from applications/luci-app-vnstat/root/etc/uci-defaults/luci-vnstat
rename to applications/luci-app-vnstat/root/etc/uci-defaults/40_luci-vnstat
diff --git a/applications/luci-app-watchcat/root/etc/uci-defaults/luci-watchcat b/applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
similarity index 100%
rename from applications/luci-app-watchcat/root/etc/uci-defaults/luci-watchcat
rename to applications/luci-app-watchcat/root/etc/uci-defaults/40_luci-watchcat
diff --git a/applications/luci-app-wshaper/root/etc/uci-defaults/wshaper b/applications/luci-app-wshaper/root/etc/uci-defaults/40_wshaper
similarity index 100%
rename from applications/luci-app-wshaper/root/etc/uci-defaults/wshaper
rename to applications/luci-app-wshaper/root/etc/uci-defaults/40_wshaper
diff --git a/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck b/contrib/package/freifunk-gwcheck/root/etc/uci-defaults/50_freifunk-gwcheck
similarity index 100%
rename from contrib/package/freifunk-gwcheck/root/etc/uci-defaults/freifunk-gwcheck
rename to contrib/package/freifunk-gwcheck/root/etc/uci-defaults/50_freifunk-gwcheck
diff --git a/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate b/contrib/package/freifunk-mapupdate/root/etc/uci-defaults/50_freifunk-mapupdate
similarity index 100%
rename from contrib/package/freifunk-mapupdate/root/etc/uci-defaults/freifunk-mapupdate
rename to contrib/package/freifunk-mapupdate/root/etc/uci-defaults/50_freifunk-mapupdate
diff --git a/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
similarity index 100%
rename from themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap
rename to themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap
diff --git a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic
similarity index 100%
rename from themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic
rename to themes/luci-theme-freifunk-generic/root/etc/uci-defaults/30_luci-theme-freifunk-generic
diff --git a/themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material
similarity index 100%
rename from themes/luci-theme-material/root/etc/uci-defaults/luci-theme-material
rename to themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material
diff --git a/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt
similarity index 100%
rename from themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt
rename to themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt