diff --git a/applications/luci-app-appfilter/root/usr/share/rpcd/acl.d/luci-app-appfilter.json b/applications/luci-app-appfilter/root/usr/share/rpcd/acl.d/luci-app-appfilter.json
deleted file mode 100644
index 9900d4caeb5..00000000000
--- a/applications/luci-app-appfilter/root/usr/share/rpcd/acl.d/luci-app-appfilter.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"luci-app-appfilter": {
-		"description": "Grant UCI access for luci-app-appfilter",
-		"read": {
-			"uci": [ "appfilter" ]
-		},
-		"write": {
-			"uci": [ "appfilter" ]
-		}
-	}
-}
diff --git a/applications/luci-app-appfilter/Makefile b/applications/luci-app-oaf/Makefile
similarity index 64%
rename from applications/luci-app-appfilter/Makefile
rename to applications/luci-app-oaf/Makefile
index 09ec5e02665..cd71dd8621a 100644
--- a/applications/luci-app-appfilter/Makefile
+++ b/applications/luci-app-oaf/Makefile
@@ -1,3 +1,4 @@
+
 #
 # This is free software, licensed under the Apache License, Version 2.0 .
 #
@@ -5,11 +6,10 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for OAF
-LUCI_DEPENDS:=+appfilter +luci-compat
-
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+appfilter +kmod-oaf +luci-compat
+PKG_NAME:=luci-app-oaf
 PKG_VERSION:=6.1.2
 PKG_RELEASE:=1
-
-include ../../luci.mk
-
+include $(TOPDIR)/feeds/luci/luci.mk
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10015.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10015.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10015.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10015.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10017.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10017.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10017.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10017.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10024.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10024.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10024.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10024.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10028.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10028.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10028.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10028.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10029.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10029.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10029.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10029.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10033.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10033.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10033.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10033.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10034.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10034.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10034.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10034.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10036.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10036.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10036.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10036.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10037.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10037.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10037.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10037.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10038.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10038.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10038.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10038.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10039.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10039.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10039.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10039.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10099.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10099.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/10099.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/10099.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/1019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/1019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/11003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/11003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14015.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14015.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14015.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14015.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14017.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14017.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14017.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14017.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14024.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14024.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14024.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14024.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/14027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/14027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2015.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2015.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2015.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2015.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2017.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2017.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2017.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2017.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2028.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2028.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2028.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2028.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2033.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2033.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2033.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2033.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2034.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2034.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2034.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2034.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2036.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2036.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2036.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2036.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2037.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2037.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2037.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2037.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2039.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2039.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2039.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2039.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2041.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2041.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2041.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2041.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2042.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2042.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2042.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2042.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2043.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2043.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2043.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2043.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2050.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2050.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2050.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2050.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2051.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2051.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2051.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2051.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2052.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2052.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2052.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2052.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2053.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2053.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2053.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2053.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2054.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2054.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2054.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2054.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2055.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2055.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2055.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2055.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2056.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2056.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2056.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2056.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2057.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2057.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2057.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2057.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2058.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2058.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2058.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2058.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2059.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2059.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2059.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2059.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2060.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2060.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2060.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2060.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2061.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2061.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2061.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2061.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2067.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2067.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2067.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2067.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2068.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2068.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2068.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2068.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2069.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2069.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2069.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2069.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2070.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2070.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2070.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2070.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2071.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2071.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2071.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2071.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2072.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2072.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2072.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2072.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2073.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2073.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2073.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2073.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2074.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2074.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2074.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2074.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2075.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2075.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2075.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2075.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2076.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2076.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2076.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2076.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2077.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2077.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2077.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2077.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2078.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2078.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2078.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2078.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2079.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2079.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2079.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2079.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2080.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2080.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2080.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2080.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2081.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2081.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2081.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2081.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2082.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2082.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2082.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2082.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2083.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2083.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2083.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2083.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2084.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2084.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2084.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2084.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2085.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2085.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2085.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2085.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2087.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2087.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2087.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2087.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2088.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2088.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2088.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2088.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2089.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2089.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2089.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2089.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2093.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2093.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2093.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2093.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2098.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2098.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2098.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2098.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2099.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2099.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2099.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2099.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2100.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2100.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2100.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2100.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2101.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2101.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2101.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2101.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2102.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2102.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2102.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2102.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2103.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2103.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2103.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2103.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2104.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2104.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2104.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2104.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2105.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2105.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2105.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2105.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2106.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2106.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2106.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2106.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2107.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2107.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2107.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2107.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2108.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2108.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2108.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2108.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2109.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2109.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2109.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2109.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2110.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2110.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2110.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2110.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2111.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2111.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2111.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2111.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2112.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2112.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2112.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2112.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2113.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2113.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2113.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2113.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2115.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2115.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2115.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2115.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2116.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2116.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/2116.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/2116.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3017.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3017.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3017.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3017.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3024.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3024.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3024.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3024.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3028.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3028.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3028.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3028.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3029.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3029.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3029.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3029.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3033.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3033.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3033.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3033.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3034.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3034.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3034.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3034.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3038.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3038.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3038.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3038.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3039.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3039.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3039.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3039.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3042.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3042.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3042.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3042.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3043.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3043.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3043.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3043.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3044.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3044.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3044.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3044.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3045.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3045.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3045.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3045.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3046.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3046.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3046.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3046.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3047.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3047.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3047.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3047.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3048.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3048.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3048.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3048.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3049.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3049.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3049.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3049.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3050.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3050.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3050.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3050.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3051.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3051.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3051.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3051.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3052.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3052.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3052.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3052.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3053.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3053.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3053.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3053.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3054.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3054.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3054.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3054.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3055.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3055.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3055.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3055.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3056.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3056.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3056.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3056.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3057.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3057.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3057.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3057.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3058.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3058.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3058.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3058.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3059.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3059.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3059.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3059.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3060.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3060.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3060.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3060.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3061.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3061.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3061.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3061.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3062.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3062.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3062.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3062.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3063.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3063.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3063.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3063.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3064.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3064.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3064.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3064.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3065.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3065.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3065.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3065.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3066.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3066.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3066.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3066.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3067.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3067.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3067.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3067.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3068.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3068.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3068.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3068.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3069.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3069.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3069.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3069.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3070.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3070.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3070.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3070.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3071.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3071.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3071.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3071.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3072.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3072.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3072.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3072.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3073.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3073.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3073.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3073.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3074.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3074.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3074.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3074.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3075.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3075.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3075.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3075.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3077.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3077.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3077.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3077.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3078.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3078.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3078.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3078.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3079.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3079.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3079.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3079.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3081.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3081.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3081.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3081.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3082.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3082.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3082.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3082.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3083.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3083.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3083.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3083.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3084.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3084.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3084.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3084.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3085.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3085.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3085.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3085.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3086.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3086.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3086.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3086.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3087.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3087.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3087.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3087.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3088.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3088.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3088.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3088.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3089.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3089.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3089.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3089.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3090.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3090.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3090.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3090.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3091.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3091.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3091.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3091.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3092.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3092.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3092.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3092.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3093.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3093.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3093.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3093.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3094.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3094.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3094.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3094.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3095.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3095.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3095.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3095.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3096.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3096.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3096.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3096.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3097.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3097.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3097.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3097.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3100.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3100.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3100.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3100.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3101.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3101.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3101.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3101.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3102.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3102.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3102.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3102.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3103.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3103.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3103.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3103.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3104.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3104.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3104.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3104.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3105.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3105.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3105.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3105.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3106.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3106.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3106.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3106.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3107.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3107.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3107.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3107.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3108.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3108.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3108.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3108.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3109.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3109.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3109.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3109.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3110.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3110.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3110.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3110.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3111.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3111.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3111.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3111.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3112.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3112.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3112.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3112.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3113.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3113.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3113.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3113.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3114.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3114.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3114.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3114.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3115.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3115.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3115.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3115.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3116.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3116.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3116.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3116.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3117.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3117.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3117.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3117.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3118.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3118.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3118.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3118.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3119.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3119.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3119.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3119.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3120.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3120.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3120.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3120.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3121.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3121.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3121.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3121.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3122.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3122.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3122.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3122.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3123.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3123.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3123.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3123.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3124.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3124.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3124.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3124.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3125.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3125.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3125.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3125.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3126.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3126.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3126.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3126.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3127.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3127.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3127.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3127.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3128.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3128.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3128.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3128.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3129.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3129.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3129.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3129.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3130.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3130.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3130.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3130.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3131.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3131.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3131.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3131.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3132.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3132.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3132.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3132.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3133.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3133.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3133.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3133.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3134.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3134.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3134.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3134.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3135.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3135.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3135.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3135.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3136.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3136.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3136.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3136.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3137.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3137.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3137.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3137.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3138.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3138.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3138.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3138.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3139.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3139.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3139.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3139.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3140.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3140.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3140.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3140.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3141.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3141.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3141.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3141.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3142.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3142.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3142.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3142.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3143.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3143.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3143.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3143.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3144.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3144.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3144.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3144.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3145.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3145.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3145.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3145.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3146.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3146.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3146.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3146.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3147.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3147.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3147.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3147.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3148.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3148.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3148.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3148.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3149.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3149.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3149.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3149.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3150.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3150.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3150.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3150.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3151.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3151.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3151.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3151.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3152.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3152.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3152.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3152.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3153.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3153.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3153.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3153.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3154.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3154.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3154.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3154.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3155.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3155.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3155.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3155.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3156.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3156.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3156.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3156.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3157.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3157.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3157.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3157.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3158.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3158.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3158.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3158.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3159.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3159.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/3159.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/3159.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4015.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4015.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4015.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4015.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4024.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4024.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4024.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4024.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4028.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4028.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4028.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4028.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4029.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4029.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4029.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4029.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4033.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4033.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4033.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4033.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4034.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4034.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4034.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4034.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4036.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4036.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4036.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4036.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4039.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4039.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4039.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4039.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4041.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4041.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4041.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4041.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4052.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4052.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4052.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4052.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4053.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4053.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4053.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4053.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4054.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4054.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4054.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4054.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4055.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4055.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4055.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4055.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4056.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4056.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4056.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4056.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4057.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4057.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4057.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4057.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4058.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4058.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4058.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4058.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4059.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4059.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/4059.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/4059.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5015.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5015.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5015.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5015.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5016.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5016.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/5016.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/5016.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6014.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6014.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/6014.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/6014.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7007.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7007.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7007.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7007.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7011.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7011.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7011.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7011.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7012.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7012.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7012.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7012.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7013.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7013.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7013.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7013.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7036.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7036.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7036.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7036.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7038.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7038.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7038.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7038.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7041.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7041.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7041.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7041.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7042.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7042.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7042.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7042.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7043.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7043.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7043.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7043.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7044.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7044.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7044.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7044.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7045.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7045.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7045.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7045.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7046.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7046.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7046.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7046.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7047.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7047.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/7047.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/7047.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8002.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8002.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8002.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8002.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8003.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8003.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8003.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8003.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8004.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8004.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8004.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8004.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8005.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8005.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8005.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8005.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8006.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8006.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8006.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8006.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8008.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8008.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8008.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8008.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8009.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8009.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8009.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8009.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8017.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8017.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8017.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8017.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8018.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8018.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8018.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8018.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8019.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8019.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8019.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8019.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8020.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8020.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8020.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8020.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8021.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8021.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8021.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8021.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8022.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8022.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8022.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8022.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8023.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8023.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8023.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8023.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8024.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8024.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8024.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8024.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8025.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8025.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8025.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8025.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8026.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8026.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8026.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8026.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8027.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8027.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8027.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8027.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8028.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8028.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8028.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8028.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8029.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8029.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8029.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8029.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8031.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8031.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8031.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8031.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8032.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8032.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8032.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8032.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8033.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8033.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8033.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8033.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8034.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8034.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8034.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8034.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8035.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8035.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8035.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8035.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8036.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8036.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8036.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8036.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8037.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8037.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8037.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8037.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8038.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8038.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8038.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8038.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8039.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8039.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8039.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8039.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8041.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8041.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8041.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8041.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8042.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8042.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8042.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8042.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8043.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8043.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8043.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8043.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8044.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8044.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8044.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8044.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8045.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8045.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8045.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8045.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8046.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8046.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8046.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8046.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8047.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8047.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8047.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8047.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8048.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8048.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8048.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8048.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8049.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8049.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8049.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8049.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8050.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8050.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8050.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8050.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8051.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8051.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8051.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8051.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8052.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8052.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8052.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8052.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8053.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8053.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8053.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8053.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8054.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8054.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8054.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8054.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8055.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8055.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8055.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8055.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8056.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8056.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8056.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8056.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8057.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8057.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8057.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8057.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8058.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8058.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8058.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8058.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8059.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8059.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8059.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8059.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8060.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8060.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8060.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8060.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8061.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8061.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8061.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8061.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8062.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8062.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8062.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8062.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8063.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8063.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8063.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8063.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8064.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8064.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8064.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8064.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8065.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8065.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8065.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8065.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8066.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8066.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8066.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8066.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8067.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8067.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8067.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8067.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8068.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8068.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8068.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8068.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8069.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8069.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8069.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8069.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8070.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8070.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8070.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8070.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8071.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8071.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8071.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8071.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8072.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8072.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8072.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8072.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8073.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8073.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8073.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8073.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8074.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8074.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8074.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8074.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8075.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8075.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8075.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8075.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8076.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8076.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8076.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8076.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8077.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8077.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8077.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8077.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8079.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8079.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8079.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8079.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8087.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8087.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8087.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8087.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8089.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8089.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8089.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8089.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8090.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8090.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8090.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8090.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8092.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8092.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8092.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8092.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8093.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8093.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8093.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8093.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8096.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8096.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8096.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8096.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8098.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8098.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8098.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8098.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8099.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8099.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8099.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8099.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8100.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8100.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8100.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8100.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8101.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8101.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8101.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8101.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8102.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8102.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8102.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8102.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8103.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8103.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8103.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8103.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8104.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8104.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8104.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8104.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8105.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8105.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8105.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8105.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8106.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8106.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8106.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8106.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8107.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8107.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8107.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8107.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8108.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8108.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8108.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8108.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8109.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8109.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8109.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8109.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8110.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8110.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8110.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8110.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8111.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8111.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8111.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8111.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8112.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8112.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8112.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8112.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8116.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8116.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8116.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8116.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8118.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8118.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8118.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8118.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8119.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8119.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8119.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8119.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8120.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8120.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8120.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8120.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8121.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8121.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8121.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8121.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8122.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8122.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8122.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8122.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8123.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8123.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8123.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8123.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8125.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8125.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8125.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8125.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8127.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8127.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8127.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8127.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8128.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8128.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8128.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8128.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8129.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8129.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8129.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8129.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8131.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8131.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8131.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8131.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8132.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8132.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8132.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8132.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8133.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8133.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8133.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8133.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8134.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8134.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8134.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8134.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8135.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8135.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8135.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8135.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8136.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8136.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8136.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8136.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8137.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8137.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8137.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8137.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8138.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8138.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8138.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8138.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8142.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8142.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8142.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8142.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8143.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8143.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8143.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8143.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8144.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8144.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8144.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8144.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8145.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8145.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8145.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8145.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8146.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8146.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8146.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8146.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8147.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8147.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/8147.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/8147.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9001.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9001.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9001.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9001.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9010.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9010.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9010.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9010.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9030.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9030.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9030.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9030.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9040.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9040.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/9040.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/9040.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/default.png b/applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/default.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/app_icons/default.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/app_icons/default.png
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/css/common.css b/applications/luci-app-oaf/htdocs/luci-static/resources/css/common.css
similarity index 86%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/css/common.css
rename to applications/luci-app-oaf/htdocs/luci-static/resources/css/common.css
index f4bfba466fb..5929e8a74fa 100644
--- a/applications/luci-app-appfilter/htdocs/luci-static/resources/css/common.css
+++ b/applications/luci-app-oaf/htdocs/luci-static/resources/css/common.css
@@ -10,23 +10,23 @@ h1, h2 {
 
 .button-check {
     padding: 3px 8px;
-    background-color: transparent;
-    color: green;
-    border: 1px solid green;
+    background-color: transparent; 
+    color: green; 
+    border: 1px solid green; 
     border-radius: 3px;
     cursor: pointer;
     font-size: 12px;
 }
 .button-container {
     display: flex;
-    justify-content: right;
-    margin-top: 5px;
+    justify-content: right; 
+    margin-top: 5px; 
 }
 
 .submit-button {
     margin-top: 30px;
-    width: 150px;
-    height: 30px;
+    width: 150px; 
+    height: 30px; 
     background-color: #2885e8;
     color: white;
     border: none;
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/echarts.min.js b/applications/luci-app-oaf/htdocs/luci-static/resources/echarts.min.js
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/echarts.min.js
rename to applications/luci-app-oaf/htdocs/luci-static/resources/echarts.min.js
diff --git a/applications/luci-app-appfilter/htdocs/luci-static/resources/icons/arrow.png b/applications/luci-app-oaf/htdocs/luci-static/resources/icons/arrow.png
similarity index 100%
rename from applications/luci-app-appfilter/htdocs/luci-static/resources/icons/arrow.png
rename to applications/luci-app-oaf/htdocs/luci-static/resources/icons/arrow.png
diff --git a/applications/luci-app-appfilter/luasrc/controller/appfilter.lua b/applications/luci-app-oaf/luasrc/controller/appfilter.lua
similarity index 91%
rename from applications/luci-app-appfilter/luasrc/controller/appfilter.lua
rename to applications/luci-app-oaf/luasrc/controller/appfilter.lua
index 6d4b22295ed..5712946926a 100644
--- a/applications/luci-app-appfilter/luasrc/controller/appfilter.lua
+++ b/applications/luci-app-oaf/luasrc/controller/appfilter.lua
@@ -5,15 +5,13 @@ function index()
 	if not nixio.fs.access("/etc/config/appfilter") then
 		return
 	end
-
+	
 	local page
-	page = entry({"admin", "services", "appfilter"}, alias("admin", "services", "appfilter", "app_filter"),_("App Filter"), 10)
-	page.dependent = true
-	page.acl_depends = { "luci-app-appfilter" }
+	entry({"admin", "services", "appfilter"}, alias("admin", "services", "appfilter", "app_filter"),_("App Filter"), 10).dependent = true
 
 
-	entry({"admin", "services", "appfilter", "user_list"},
-		arcombine(cbi("appfilter/user_list",{hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}),
+	entry({"admin", "services", "appfilter", "user_list"}, 
+		arcombine(cbi("appfilter/user_list",{hideapplybtn=true, hidesavebtn=true, hideresetbtn=true}), 
 		cbi("appfilter/dev_status", {hideapplybtn=true, hidesavebtn=true, hideresetbtn=true})),
 		_("User List"), 20).leaf=true
 
@@ -43,6 +41,9 @@ function index()
 	entry({"admin", "network", "set_app_filter_user"}, call("set_app_filter_user"), nil).leaf = true
 	entry({"admin", "network", "del_app_filter_user"}, call("del_app_filter_user"), nil).leaf = true
 	entry({"admin", "network", "add_app_filter_user"}, call("add_app_filter_user"), nil).leaf = true
+	entry({"admin", "network", "get_whitelist_user"}, call("get_whitelist_user"), nil).leaf = true
+	entry({"admin", "network", "add_whitelist_user"}, call("add_whitelist_user"), nil).leaf = true
+	entry({"admin", "network", "del_whitelist_user"}, call("del_whitelist_user"), nil).leaf = true
 	entry({"admin", "network", "upload_file"}, call("handle_file_upload"), nil).leaf = true
 	entry({"admin", "network", "set_nickname"}, call("set_nickname"), nil).leaf = true
 	entry({"admin", "network", "get_oaf_status"}, call("get_oaf_status"), nil).leaf = true
@@ -78,9 +79,9 @@ function handle_feature_upgrade()
 	local fp
 	http.setfilehandler(
 		function(meta, chunk, eof)
-
+	
 			fp = io.open(image_tmp, "w")
-
+			
 			if fp and chunk then
 				fp:write(chunk)
 			end
@@ -115,7 +116,7 @@ function user_status()
 	status_buf=fd:read('*a')
 	fd:close()
 	user_array=json.parse(status_buf)
-
+	
 	local visit_obj=utl.ubus("appfilter", "visit_list", {});
 	local user_array=visit_obj.dev_list
 	local history={}
@@ -203,6 +204,34 @@ function add_app_filter_user()
 	luci.http.write_json(resp_obj);
 end
 
+function get_whitelist_user()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local resp_obj=utl.ubus("appfilter", "get_whitelist_user", {});
+	luci.http.write_json(resp_obj);
+end
+
+function add_whitelist_user()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local req_obj = {}
+	local data_str = luci.http.formvalue("data")
+	req_obj = json.parse(data_str)
+
+	local resp_obj=utl.ubus("appfilter", "add_whitelist_user", req_obj);
+	luci.http.write_json(resp_obj);
+end
+
+function del_whitelist_user()
+	local json = require "luci.jsonc"
+	luci.http.prepare_content("application/json")
+	local req_obj = {}
+	req_obj.mac = luci.http.formvalue("mac")
+	llog("del whitelist user "..req_obj.mac);
+	local resp_obj=utl.ubus("appfilter", "del_whitelist_user", req_obj);
+	luci.http.write_json(resp_obj);
+end
+
 function get_app_filter()
 	local json = require "luci.jsonc"
 	luci.http.prepare_content("application/json")
@@ -213,14 +242,14 @@ end
 function set_app_filter()
 	local json = require "luci.jsonc"
 	luci.http.prepare_content("application/json")
-
+	
 	local app_list_str = luci.http.formvalue("app_list")
 
 	local app_list = {}
 	for id in app_list_str:gmatch("([^,]+)") do
 		table.insert(app_list, tonumber(id))
 	end
-
+	
 	local req_obj = {
 		app_list = app_list
 	}
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/advance.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/advance.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/advance.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/advance.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/app_filter.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/app_filter.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/app_filter.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/app_filter.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/base_setting.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/base_setting.lua
similarity index 99%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/base_setting.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/base_setting.lua
index 78668f1fbce..f79c9e18648 100644
--- a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/base_setting.lua
+++ b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/base_setting.lua
@@ -19,7 +19,7 @@ s = m:section(TypedSection, "global", translate("Basic Settings"))
 s:option(Flag, "enable", translate("Enable App Filter"), translate(""))
 s.anonymous = true
 
-o=s:option(ListValue, "work_mode", translate("Work Mode"),translate(""))
+o=s:option(ListValue, "work_mode", translate("Work Mode"),translate("")) 
 o.default=0
 o:value(0, translate("Gateway Mode"))
 o:value(1,translate("Bypass Mode"))
@@ -28,7 +28,7 @@ local rule_count = 0
 local version = ""
 
 
--- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"),
+-- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"), 
 -- translate("If there is no app you want, you can add the app by updating the app feature file"))
 -- s.anonymous = true
 -- s.addremove = false
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/dev_status.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/dev_status.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/dev_status.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/dev_status.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/feature.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua
similarity index 93%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/feature.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua
index 854666c284d..e8a04d721ca 100644
--- a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/feature.lua
+++ b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/feature.lua
@@ -13,17 +13,17 @@ local SYS = require "luci.sys"
 local m, s
 
 local function llog(message)
-    local log_file = "/tmp/log/oaf_luci.log"
-    local fd = io.open(log_file, "a")
+    local log_file = "/tmp/log/oaf_luci.log"  
+    local fd = io.open(log_file, "a")  
     if fd then
-        local timestamp = os.date("%Y-%m-%d %H:%M:%S")
-        fd:write(string.format("[%s] %s\n", timestamp, message))
-        fd:close()
+        local timestamp = os.date("%Y-%m-%d %H:%M:%S")  
+        fd:write(string.format("[%s] %s\n", timestamp, message))  
+        fd:close() 
     end
 end
 
 m = Map("appfilter", translate(""),
-    translate("The feature library is used to describe app features, app filtering effect and number-dependent feature library"))
+    translate("The feature library is used to describe App features, App filtering effect and number-dependent feature library"))
 
 local rule_count = 0
 local version = ""
@@ -42,7 +42,7 @@ local display_str = "<style>" ..
                     ".item-style { margin-top:15px;}" ..
                     "</style>" ..
                     "<div class='item-style'>" ..
-                        "<span class='label-style'>"..translate("Current version")..":</span> " .. version ..
+                        "<span class='label-style'>"..translate("Current version")..":</span> " .. version .. 
                     "</div>" ..
                     "<div class='item-style'>" ..
                         "<span class='label-style'>"..translate("Feature format")..":</span> " ..format ..
@@ -140,3 +140,5 @@ elseif luci.http.formvalue("download") then
 end
 
 return m
+
+
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/overview.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/overview.lua
similarity index 99%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/overview.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/overview.lua
index 78668f1fbce..f79c9e18648 100644
--- a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/overview.lua
+++ b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/overview.lua
@@ -19,7 +19,7 @@ s = m:section(TypedSection, "global", translate("Basic Settings"))
 s:option(Flag, "enable", translate("Enable App Filter"), translate(""))
 s.anonymous = true
 
-o=s:option(ListValue, "work_mode", translate("Work Mode"),translate(""))
+o=s:option(ListValue, "work_mode", translate("Work Mode"),translate("")) 
 o.default=0
 o:value(0, translate("Gateway Mode"))
 o:value(1,translate("Bypass Mode"))
@@ -28,7 +28,7 @@ local rule_count = 0
 local version = ""
 
 
--- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"),
+-- s = m:section(TypedSection, "appfilter", translate("App Filter Rules"), 
 -- translate("If there is no app you want, you can add the app by updating the app feature file"))
 -- s.anonymous = true
 -- s.addremove = false
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/time.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/time.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/time.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/time.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/time_setting.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/time_setting.lua
similarity index 99%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/time_setting.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/time_setting.lua
index 53e08ca0bca..52a8aa96c4d 100644
--- a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/time_setting.lua
+++ b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/time_setting.lua
@@ -18,7 +18,7 @@ s = m:section(TypedSection, "time", translate("Time Setting"),translate("The sec
 s.anonymous = true
 
 
-o=s:option(ListValue, "time_mode", translate("Time Mode"),translate(""))
+o=s:option(ListValue, "time_mode", translate("Time Mode"),translate("")) 
 o.default=0
 o:value(0,translate("Blacklist mode"))
 o:value(1,translate("Whitelist mode"))
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/user.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/user.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user_list.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/user_list.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user_list.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/user_list.lua
diff --git a/applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user_setting.lua b/applications/luci-app-oaf/luasrc/model/cbi/appfilter/user_setting.lua
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/model/cbi/appfilter/user_setting.lua
rename to applications/luci-app-oaf/luasrc/model/cbi/appfilter/user_setting.lua
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/advance.htm b/applications/luci-app-oaf/luasrc/view/admin_network/advance.htm
similarity index 84%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/advance.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/advance.htm
index c6ff04bac57..4f45ddb9096 100644
--- a/applications/luci-app-appfilter/luasrc/view/admin_network/advance.htm
+++ b/applications/luci-app-oaf/luasrc/view/admin_network/advance.htm
@@ -17,7 +17,7 @@
 <script type="text/javascript">//<![CDATA[
 
 		function init_data() {
-			getAppFilterAdvData();
+			getAppFilterAdvData(); 
 		}
         function showSuccessMessage(message = '<%:Settings saved successfully%>') {
 			const modal = document.getElementById('modal');
@@ -29,7 +29,7 @@
 			}, 1000);
 		}
 
-
+		
 
         function validateLanIfname(lanIfname) {
             const regex = /^[a-zA-Z0-9-]{2,8}$/;
@@ -57,7 +57,7 @@
                 showSuccessMessage();
             });
         }
-
+ 
 		function submitHandle() {
 			submitAppFilterAdv();
 		}
@@ -86,10 +86,15 @@
                     } else {
                         document.getElementById('autoLoadEngineSwitch').checked = false;
                     }
-
-
-
-
+                }
+            );
+            
+            new XHR().get('<%=url('admin/network/get_oaf_status')%>', null,
+                function (x, data) {
+                    if (data && data.data) {
+                        document.getElementById('oafVersion').textContent = data.data.version || '--';
+                        document.getElementById('engineVersion').textContent = data.data.engine_version || '--';
+                    }
                 }
             );
         }
@@ -109,6 +114,17 @@
 <div class="cbi-section cbi-tblsection">
     <div style="max-width: 1000px; margin-left: 10px;padding: 5px;">
 
+        <!-- Version Information -->
+        <div style="margin-top: 10px; display: flex; align-items: center;">
+            <label style="margin-right: 5px;width:150px"><%:OAF Version%></label>
+            <span id="oafVersion">--</span>
+        </div>
+        
+        <div style="margin-top: 10px; display: flex; align-items: center;">
+            <label style="margin-right: 5px;width:150px"><%:OAF Driver Version%></label>
+            <span id="engineVersion">--</span>
+        </div>
+        
 
         <div style="margin-top: 10px; display: flex; align-items: center;">
             <label for="disableHnatSwitch" style="margin-right: 5px;width:150px"><%:Disable Software/Hardware Acceleration%></label>
@@ -121,7 +137,7 @@
         <div class="desc">
             <span><%:Software and hardware acceleration, NAT offload and other modules may affect filtering or statistics functions. This interface only attempts to turn them off, but may not be completely successful. Please check the status in the firewall or network acceleration menu. Re-enabling acceleration requires a device restart to take effect.%></span>
         </div>
-
+        
         <div style="margin-top: 10px; display: flex; align-items: center;">
             <label for="autoLoadEngineSwitch" style="margin-right: 5px;width:150px"><%:Auto-load oaf driver%></label>
             <label class="switch">
@@ -141,7 +157,7 @@
         </div>
 
         <div class="desc">
-            <span><%:The name of the LAN interface, used for detecting terminal information. The system default is bridge interface (br-lan). If the LAN port has been modified to a physical interface, please modify it to the corresponding name, such as eth0.%></span>
+            <span><%:The name of the LAN interface, used for detecting terminal information. The system default is bridge interface (br-lan). If the LAN port has been modified to a physical interface, please modify it to the corresponding name, such as eth0, support fuzzy matching, For example, you can setup lan to match br-lan and br-lan2.%></span>
         </div>
 
 
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/app_filter.htm b/applications/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
similarity index 88%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/app_filter.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
index ee40125c289..957802c2c13 100644
--- a/applications/luci-app-appfilter/luasrc/view/admin_network/app_filter.htm
+++ b/applications/luci-app-oaf/luasrc/view/admin_network/app_filter.htm
@@ -1,26 +1,26 @@
 <link rel="stylesheet" href="<%=resource%>/css/common.css">
 
 <style>
-
+ 
     #appContainer {
         display: flex;
         flex-wrap: wrap;
         margin-top: 20px;
     }
-
+    
 
 .arrow {
-    width: 12px;
-    height: 12px;
-    background-image: url('<%=resource%>/icons/arrow.png');
-    background-size: contain;
-    background-repeat: no-repeat;
-    transition: transform 0.3s ease;
-    display: inline-block;
-    transform: rotate(0deg);
+    width: 12px; 
+    height: 12px; 
+    background-image: url('<%=resource%>/icons/arrow.png'); 
+    background-size: contain; 
+    background-repeat: no-repeat; 
+    transition: transform 0.3s ease; 
+    display: inline-block; 
+    transform: rotate(0deg); 
 }
 .arrow.expanded {
-    transform: rotate(90deg);
+    transform: rotate(90deg); 
 }
 
     .category {
@@ -39,7 +39,7 @@
         box-sizing: border-box;
         padding: 5px;
         display: flex;
-        align-items: center;
+        align-items: center; 
     }
     .app-items-row {
         display: flex;
@@ -47,30 +47,49 @@
         justify-content: flex-start;
     }
     .app-item label {
+        display: flex;
+        align-items: center; 
+        width: 100%; 
+        text-align: left; 
+    }
+    
+
+    .app-item input[type="checkbox"] {
+        margin: 0;
+        vertical-align: middle;
+        position: relative;
+        top: 0;
+    }
+    
+    .app-item img {
+        vertical-align: middle;
+        display: inline-block;
+    }
+    
+    .app-item label div {
         display: flex;
         align-items: center;
-        width: 100%;
-        text-align: left;
+        gap: 5px;
     }
 
     h2 {
-        margin-bottom: 10px;
+        margin-bottom: 10px; 
     }
     .category-title {
         display: flex;
         justify-content: space-between;
-        align-items: center;
+        align-items: center; 
         width: 100%;
-        cursor: pointer;
-        margin-bottom: 10px;
+        cursor: pointer; 
+        margin-bottom: 10px; 
     }
     .category-name {
-        font-size: 14px;
+        font-size: 14px; 
         font-weight: normal;
     }
 
     .category-title div {
-        gap: 6px;
+        gap: 6px; 
     }
 
     .select-all-btn {
@@ -103,18 +122,25 @@
         padding: 3px 0;
         border-bottom: 1px solid #eee;
         width: 100%;
+        gap: 5px;
+    }
+    
+    .select-all-container input[type="checkbox"] {
+        margin: 0;
+        vertical-align: middle;
+        position: relative;
+        top: 0;
     }
 
     .select-all-label {
         font-size: 12px;
         color: #666;
-        margin-left: 5px;
         cursor: pointer;
     }
 
     @media (max-width: 600px) {
         .app-item {
-            width: 25%;
+            width: 25%; 
         }
     }
 
@@ -160,12 +186,12 @@
 			renderAppList(data)
 		}
 
-
+		
 		function init_data() {
 			getAppFilterData().then(() => {
 				getClassListData();
 			});
-			getAppFilterBaseData();
+			getAppFilterBaseData(); 
 		}
 
 		function getAppFilterData() {
@@ -175,7 +201,7 @@
 						if (Array.isArray(data.app_list)) {
 							app_filter_data = data.app_list;
 						}
-						resolve();
+						resolve(); 
 					}
 				);
 			});
@@ -191,29 +217,29 @@
 
         function renderAppList(data) {
             const container = document.getElementById('appContainer');
-            container.innerHTML = '';
+            container.innerHTML = ''; 
 
             data.class_list.forEach((category, index) => {
                 const categoryTitle = document.createElement('div');
-                categoryTitle.className = 'category-title';
+                categoryTitle.className = 'category-title'; 
 
                 const categoryName = document.createElement('span');
                 categoryName.textContent = `${category.name} (${category.app_list.length} <%:items%>)`;
                 categoryName.className = 'category-name';
 
                 const rightContainer = document.createElement('div');
-                rightContainer.style.display = 'flex';
-                rightContainer.style.alignItems = 'center';
+                rightContainer.style.display = 'flex'; 
+                rightContainer.style.alignItems = 'center'; 
 
                 const appCount = document.createElement('span');
-                const selectedCount = category.app_list.filter(app =>
+                const selectedCount = category.app_list.filter(app => 
                     app_filter_data.includes(parseInt(app.split(',')[0]))
                 ).length;
-                appCount.textContent = `<%:Selected%> ${selectedCount} <%:items%>`;
-                appCount.className = 'app-count';
+                appCount.textContent = `<%:Selected%> ${selectedCount} <%:items%>`; 
+                appCount.className = 'app-count'; 
 
                 const arrow = document.createElement('span');
-                arrow.className = 'arrow';
+                arrow.className = 'arrow'; 
 
                 rightContainer.appendChild(appCount);
                 rightContainer.appendChild(arrow);
@@ -224,7 +250,7 @@
 
                 const appList = document.createElement('div');
                 appList.className = 'app-list';
-
+                
                 if (index === 1 || index === 2) {
                     appList.style.display = 'flex';
                     arrow.classList.add('expanded');
@@ -285,14 +311,15 @@
                     const label = document.createElement('label');
 
                     const containerDiv = document.createElement('div');
-                    containerDiv.style.display = 'flex';
+                    containerDiv.style.display = 'flex'; 
                     containerDiv.style.alignItems = 'center';
+                    containerDiv.style.gap = '5px';
 
                     const checkbox = document.createElement('input');
                     checkbox.type = 'checkbox';
                     checkbox.name = 'app';
                     checkbox.value = app.split(',')[0];
-
+                    
                     if (app_filter_data.includes(parseInt(checkbox.value))) {
                         checkbox.checked = true;
                     }
@@ -307,13 +334,12 @@
                     const withIcon = appDetails[2] === '1';
 
                     const icon = document.createElement('img');
-                    icon.src = withIcon ? `<%=resource%>/app_icons/${appId}.png` : `<%=resource%>/app_icons/default.png`;
+                    icon.src = withIcon ? `<%=resource%>/app_icons/${appId}.png` : `<%=resource%>/app_icons/default.png`; 
                     icon.alt = `Icon for ${appName}`;
-                    icon.style.width = '20px';
-                    icon.style.height = '20px';
-                    icon.style.marginRight = '5px';
-                    icon.style.marginLeft = '5px';
+                    icon.style.width = '20px'; 
+                    icon.style.height = '20px'; 
                     icon.style.borderRadius = '7px';
+                    icon.style.verticalAlign = 'middle';
                     containerDiv.appendChild(checkbox);
                     containerDiv.appendChild(icon);
                     containerDiv.appendChild(document.createTextNode(appName));
@@ -322,7 +348,7 @@
                     appItem.appendChild(label);
                     appItemsRow.appendChild(appItem);
                 });
-
+                
                 appList.appendChild(appItemsRow);
                 container.appendChild(appList);
             });
@@ -332,14 +358,14 @@
             const checkboxes = document.querySelectorAll(`input[name="app"]`);
             const categoryAppIds = category.app_list.map(app => parseInt(app.split(',')[0]));
             const isAllSelected = selectAllCheckbox.checked;
-
+            
             checkboxes.forEach(checkbox => {
                 const appId = parseInt(checkbox.value);
                 if (categoryAppIds.includes(appId)) {
                     checkbox.checked = isAllSelected;
                 }
             });
-
+            
             updateCategorySelection(category, selectAllCheckbox, appCount);
         }
 
@@ -347,16 +373,16 @@
             const checkboxes = document.querySelectorAll(`input[name="app"]`);
             const categoryAppIds = category.app_list.map(app => parseInt(app.split(',')[0]));
             let selectedCount = 0;
-
+            
             checkboxes.forEach(checkbox => {
                 const appId = parseInt(checkbox.value);
                 if (categoryAppIds.includes(appId) && checkbox.checked) {
                     selectedCount++;
                 }
             });
-
+            
             appCount.textContent = `<%:Selected%> ${selectedCount} <%:items%>`;
-
+            
             selectAllCheckbox.checked = selectedCount === category.app_list.length;
         }
 
@@ -379,9 +405,9 @@
                 console.log("set_app_filter data is " + data);
                 init_data();
                 const modal = document.getElementById('modal');
-                modal.style.display = 'flex';
+                modal.style.display = 'flex'; 
                 setTimeout(() => {
-                    modal.style.display = 'none';
+                    modal.style.display = 'none'; 
                 }, 1000);
             }
             );
@@ -393,18 +419,18 @@
             const recordSwitch = document.getElementById('recordSwitch').checked;
             const data = {
                 data: {
-                    enable: filterSwitch ? 1 : 0,
+                    enable: filterSwitch ? 1 : 0, 
                     work_mode: workMode,
                     record_enable: recordSwitch ? 1 : 0
                 }
             };
             console.log("submitAppFilterBase");
             new XHR().post('<%=url('admin/network/set_app_filter_base')%>', {
-
-                enable: filterSwitch ? 1 : 0,
+                
+                enable: filterSwitch ? 1 : 0, 
                 work_mode: workMode,
                 record_enable: recordSwitch ? 1 : 0
-
+                
             },
 
 
@@ -416,7 +442,7 @@
 
 
         }
-
+ 
 		function submitHandle() {
 			submitAppFilterBase();
 			submitAppSelection();
@@ -456,7 +482,7 @@
             window.location.href = '<%=url('admin/services/appfilter/time')%>';
         }
 
-
+   
         function updateRunStatus() {
             new XHR().get('<%=url('admin/network/get_oaf_status')%>', null,
                 function (x, data) {
@@ -471,13 +497,13 @@
                         } else {
                             if (data.data.enable === 1) {
                                 runStatusElement.textContent = '<%:Running%>';
-                                runStatusElement.style.color = 'green';
+                                runStatusElement.style.color = 'green'; 
                                 if (data.data.time_mode == 1 && data.data.filter == 1) {
                                     runDescElement.textContent = `(<%:Will close in%> ${data.data.remain_time} <%:minutes%>)`;
                                 }
                             } else {
                                 runStatusElement.textContent = '<%:Not Running%>';
-                                runStatusElement.style.color = 'red';
+                                runStatusElement.style.color = 'red'; 
                                 if (data.data.time_mode == 1) {
                                     if (data.data.match_time == 0) {
                                         runDescElement.textContent = `(<%:Current time is not within the time range%>)`;
@@ -492,7 +518,7 @@
                     }
                     else{
                         runStatusElement.textContent = '<%:Not Running%>';
-                        runStatusElement.style.color = 'red';
+                        runStatusElement.style.color = 'red'; 
                         runDescElement.textContent = `(<%:oaf driver not loaded, please download the oaf.ko driver file corresponding to the kernel version of this firmware for installation, and enable auto-loading. Current kernel version is%> ${data.data.kernel_version})`;
                     }
                 }
@@ -502,7 +528,7 @@
         window.onload = function() {
             init_data();
             updateRunStatus();
-            setInterval(updateRunStatus, 5000);
+            setInterval(updateRunStatus, 5000); 
         };
 //]]></script>
 
@@ -539,24 +565,25 @@
                 <option value="1"><%:Bypass Mode%></option>
             </select>
         </div>
-
+ 
 
         <div style="margin-top: 10px;">
             <span><%:App Selection%>:</span>
         </div>
+        
         <div style="margin-top: 5px; margin-bottom: 10px;">
-            <span style="font-size: 12px; color: #999;"><%:If the APP you want is not in the list, you can upgrade the feature library of the official website or customize the APP%></span>
+            <span style="font-size: 12px; color: #999;"><%:If the App you want is not in the list, you can upgrade the feature library of the official website or customize the App%></span>
         </div>
         <div id="appContainer"></div>
 
         <div style="display: flex; justify-content: flex-start; align-items: center;width: 600px;margin-top: 10px;">
             <div style="width: 280px; display: inline-block;">
-                <label><%:Effective Time%>:</label>
+                <label><%:Effective Time%>:</label> 
                 <button type="button" class="button-check" onclick="redirectToTimeConfig()"><%:View%></button>
             </div>
 
             <div style="width: 280px; display: inline-block; margin-left: 10px;">
-                <label><%:Effective User%>:</label>
+                <label><%:Effective User%>:</label> 
                 <!-- <span style="color: green;">5个</span> -->
                 <button type="button" class="button-check" onclick="redirectToUserConfig()"><%:View%></button>
             </div>
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/dev_status.htm b/applications/luci-app-oaf/luasrc/view/admin_network/dev_status.htm
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/dev_status.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/dev_status.htm
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/time.htm b/applications/luci-app-oaf/luasrc/view/admin_network/time.htm
similarity index 88%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/time.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/time.htm
index 34df6edf9bc..f0fab143939 100644
--- a/applications/luci-app-appfilter/luasrc/view/admin_network/time.htm
+++ b/applications/luci-app-oaf/luasrc/view/admin_network/time.htm
@@ -64,7 +64,7 @@
         border-top: 1px solid #ddd;
         padding-top: 15px;
     }
-
+    
     .advanced-toggle {
         display: flex;
         align-items: center;
@@ -73,7 +73,7 @@
         font-size: 14px;
         margin-bottom: 15px;
     }
-
+    
     .advanced-toggle .arrow {
         margin-right: 8px;
         width: 12px;
@@ -85,15 +85,15 @@
         display: inline-block;
         transform: rotate(0deg);
     }
-
+    
     .advanced-toggle.expanded .arrow {
         transform: rotate(90deg);
     }
-
+    
     .advanced-content {
         display: none;
     }
-
+    
     .advanced-content.expanded {
         display: block;
     }
@@ -108,8 +108,8 @@
             "mode":1
         }
         let time_data = {}
-
-
+        
+		
 		function init_data() {
             getAppFilterTimeData().then(() => {
                 renderTimeData();
@@ -122,7 +122,7 @@
 					function (x, data) {
 						time_data = data.data;
                         console.log(data.data);
-						resolve();
+						resolve(); 
 					}
 				);
 			});
@@ -134,6 +134,17 @@
 			const maxEntries = 64;
 			const mode = document.getElementById('timeMode').value;
 
+			if (!time_data.weekday_list || time_data.weekday_list.length === 0) {
+				if (mode === "0") {
+					const errorContainer = document.getElementById('errorContainer');
+					errorContainer.innerHTML = '<%:Please select at least one weekday%>';
+				} else {
+					const dynamicWeekdayErrorContainer = document.getElementById('dynamicWeekdayErrorContainer');
+					dynamicWeekdayErrorContainer.innerHTML = '<%:Please select at least one weekday%>';
+					dynamicWeekdayErrorContainer.style.display = 'block';
+				}
+				return;
+			}
 
 			if (mode === "0") {
 				if (!time_data.time_list || time_data.time_list.length === 0) {
@@ -145,6 +156,18 @@
 				if (time_data.time_list.length > maxEntries) {
 					const errorContainer = document.getElementById('errorContainer');
 					errorContainer.innerHTML = '<%:Time periods cannot exceed 64 entries%>';
+					return; 
+				}
+			} else {
+				if (!time_data.start_time || !time_data.end_time) {
+					const dynamicErrorContainer = document.getElementById('dynamicErrorContainer');
+					dynamicErrorContainer.innerHTML = '<%:Please set start and end time%>';
+					return;
+				}
+				
+				if (time_data.start_time >= time_data.end_time) {
+					const dynamicErrorContainer = document.getElementById('dynamicErrorContainer');
+					dynamicErrorContainer.innerHTML = '<%:End time must be greater than start time%>';
 					return;
 				}
 			}
@@ -160,7 +183,7 @@
 				function (x, data) {
 					init_data();
 					const modal = document.getElementById('modal');
-					modal.style.display = 'flex';
+					modal.style.display = 'flex'; 
 					setTimeout(() => {
 						modal.style.display = 'none';
 					}, 1000);
@@ -187,7 +210,7 @@
                         document.getElementById('filterSwitch').checked = false;
                     }
                     document.getElementById('workMode').value = data.data.work_mode;
-
+       
                 }
             );
         }
@@ -236,11 +259,10 @@
 
         function getTimeFormData() {
             const mode = document.getElementById('timeMode').value;
-            // Select weekday checkboxes based on mode
             const selector = mode === "0" ? '#staticWeekdaySelector' : '.advanced-content';
             const weekdays = Array.from(document.querySelectorAll(`${selector} input[name="weekday"]:checked`))
                 .map(cb => parseInt(cb.value));
-
+            
             let timeData = {
                 mode: parseInt(mode),
                 weekday_list: weekdays
@@ -253,7 +275,7 @@
                         end: row.querySelector('.end-time').value
                     }));
                 timeData.time_list = time_list;
-            } else {
+            } else { 
                 timeData.start_time = document.getElementById('startTime').value;
                 timeData.end_time = document.getElementById('endTime').value;
                 timeData.allow_time = parseInt(document.getElementById('allowTime').value);
@@ -268,6 +290,14 @@
             element.nextElementSibling.classList.toggle('expanded');
         }
 
+        function clearDynamicWeekdayError() {
+            const dynamicWeekdayErrorContainer = document.getElementById('dynamicWeekdayErrorContainer');
+            if (dynamicWeekdayErrorContainer) {
+                dynamicWeekdayErrorContainer.style.display = 'none';
+                dynamicWeekdayErrorContainer.innerHTML = '';
+            }
+        }
+
         function addTimeValidation() {
             document.querySelectorAll('.start-time, .end-time').forEach(input => {
                 input.addEventListener('blur', validateTime);
@@ -309,14 +339,11 @@
         }
 
         function renderTimeData() {
-            // Set mode
             const timeMode = document.getElementById('timeMode');
             timeMode.value = time_data.mode;
 
-            // Clear previous selections
             document.querySelectorAll('input[name="weekday"]').forEach(cb => cb.checked = false);
 
-            // Set weekday checkboxes for both modes
             time_data.weekday_list.forEach(day => {
                 const staticCheckbox = document.querySelector(`#staticWeekdaySelector input[name="weekday"][value="${day}"]`);
                 const dynamicCheckbox = document.querySelector(`.advanced-content input[name="weekday"][value="${day}"]`);
@@ -324,7 +351,6 @@
                 if (dynamicCheckbox) dynamicCheckbox.checked = true;
             });
 
-            // Render static mode data
             const tbody = document.getElementById('timeTableBody');
             tbody.innerHTML = '';
             if (time_data.time_list) {
@@ -352,21 +378,15 @@
             if (time_data.deny_time) {
                 document.getElementById('denyTime').value = time_data.deny_time;
             }
-
-            // Ensure the correct content is displayed based on the mode
             toggleModeContent();
-
-            // Add validation to time inputs
             addTimeValidation();
-
-
         }
 
         function validateDynamicTime() {
             const startTimeInput = document.getElementById('startTime');
             const endTimeInput = document.getElementById('endTime');
             const dynamicErrorContainer = document.getElementById('dynamicErrorContainer');
-            dynamicErrorContainer.innerHTML = ''; // 清空之前的错误信息
+            dynamicErrorContainer.innerHTML = ''; 
 
             const startTime = startTimeInput.value;
             const endTime = endTimeInput.value;
@@ -409,10 +429,9 @@
 
     <div style="max-width: 1000px; margin-left: 5px;padding: 5px;">
 
-    <!-- Add Time Rules Section -->
     <div class="time-rules">
         <h3><%:Time Rules%></h3>
-
+        
         <div class="mode-selector" style="margin-bottom: 15px;">
             <label><%:Mode Selection%>：</label>
             <select id="timeMode" onchange="toggleModeContent()">
@@ -421,7 +440,6 @@ <h3><%:Time Rules%></h3>
             </select>
         </div>
 
-        <!-- 星期选择器移到这里作为固定时间模式的部分 -->
         <div id="staticWeekdaySelector" class="weekday-selector">
             <label><%:Weekday Selection%>：</label>
             <div class="weekday-item"><input type="checkbox" name="weekday" value="1"> <%:Mon%></div>
@@ -432,8 +450,7 @@ <h3><%:Time Rules%></h3>
             <div class="weekday-item"><input type="checkbox" name="weekday" value="6"> <%:Sat%></div>
             <div class="weekday-item"><input type="checkbox" name="weekday" value="0"> <%:Sun%></div>
         </div>
-
-        <!-- 固定时间模式内容 -->
+     
         <div id="staticTimeContent">
             <table class="time-table">
                 <thead>
@@ -446,18 +463,17 @@ <h3><%:Time Rules%></h3>
                 <tbody id="timeTableBody">
                 </tbody>
 
-
+               
             </table>
             <div id="errorContainer" style="color: red; font-size: 12px; margin-top: 10px;"></div>
             <button class="add-time-btn" onclick="addTimeRow()"><%:Add Time Period%></button>
         </div>
 
-        <!-- 动态时间模式内容 -->
         <div id="dynamicTimeContent" style="display: none;">
             <div style="color: #666; font-size: 13px; margin-bottom: 15px;">
                 <%:Dynamic time mode refers to dynamically adjusting app filter switches, such as allowing children to play games for 20 minutes after studying for 1 hour, automatically enabling filtering after exceeding entertainment time, and repeating the cycle.%>
             </div>
-
+            
             <div class="dynamic-time-settings">
                 <div class="setting-item">
                     <label><%:Enable Duration Each Time (Study Time)%>:</label>
@@ -469,25 +485,25 @@ <h3><%:Time Rules%></h3>
                     <input type="number" id="allowTime" min="1" value="10">
                     <span><%:minutes%></span>
                 </div>
-
+          
                 <div class="advanced-settings">
                     <div class="advanced-toggle" onclick="toggleAdvanced(this)">
                         <span class="arrow"></span>
                         <span><%:Advanced Settings%></span>
                     </div>
                     <div class="advanced-content">
-                        <!-- 星期选择器只在高级设置中显示 -->
                         <div class="weekday-selector" style="margin-bottom: 15px;">
                             <label><%:Weekday Selection%>：</label>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="1"> <%:Mon%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="2"> <%:Tue%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="3"> <%:Wed%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="4"> <%:Thur%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="5"> <%:Fri%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="6"> <%:Sat%></div>
-                            <div class="weekday-item"><input type="checkbox" name="weekday" value="0"> <%:Sun%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="1" onchange="clearDynamicWeekdayError()"> <%:Mon%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="2" onchange="clearDynamicWeekdayError()"> <%:Tue%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="3" onchange="clearDynamicWeekdayError()"> <%:Wed%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="4" onchange="clearDynamicWeekdayError()"> <%:Thur%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="5" onchange="clearDynamicWeekdayError()"> <%:Fri%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="6" onchange="clearDynamicWeekdayError()"> <%:Sat%></div>
+                            <div class="weekday-item"><input type="checkbox" name="weekday" value="0" onchange="clearDynamicWeekdayError()"> <%:Sun%></div>
                         </div>
-
+                        <div id="dynamicWeekdayErrorContainer" style="color: red; font-size: 12px; margin-top: 5px; display: none;"></div>
+                        
                         <div class="setting-item">
                             <label><%:Daily Study Time Range%>：</label>
                             <input type="time" id="startTime" required style="margin-right: 5px;" onchange="validateDynamicTime()">
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/user.htm b/applications/luci-app-oaf/luasrc/view/admin_network/user.htm
similarity index 56%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/user.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/user.htm
index 884214c0784..149886c6655 100644
--- a/applications/luci-app-appfilter/luasrc/view/admin_network/user.htm
+++ b/applications/luci-app-oaf/luasrc/view/admin_network/user.htm
@@ -6,23 +6,14 @@
         border-collapse: collapse;
         margin-top: 15px;
     }
-
+    
     .user-list th, .user-list td {
         padding: 8px;
         border: 1px solid #ddd;
         text-align: left;
     }
+    
 
-    /* Add user button */
-    .add-user-btn {
-        margin-top: 10px;
-        padding: 5px 15px;
-        background-color: #113861;
-        color: white;
-        border: none;
-        border-radius: 3px;
-        cursor: pointer;
-    }
     .mode-selection {
         margin-bottom: 10px;
         margin-top: 10px;
@@ -36,7 +27,7 @@
         cursor: pointer;
     }
 
-
+    
     /* Modal styles */
     .modal {
         display: none;
@@ -48,7 +39,7 @@
         background-color: rgba(0, 0, 0, 0.5);
         z-index: 1000;
     }
-
+    
     .modal-content {
         background-color: white;
         margin: 15% auto;
@@ -57,20 +48,22 @@
         width: 60%;
         max-width: 600px;
     }
-
+    
     .user-selection {
         max-height: 300px;
         overflow-y: auto;
         margin: 15px 0;
     }
-
+    
     .user-item {
         padding: 8px;
         border-bottom: 1px solid #eee;
         display: flex;
         align-items: center;
     }
+    
 
+    
 </style>
 
 <script type="text/javascript">//<![CDATA[
@@ -79,23 +72,23 @@
         mode: 1
     };
 
-
-    let allUsers = [
-
-        ];
+    let whitelistData = {
+        users: []
+    };
+            
+    let allUsers = [];
     function initData() {
-        userData.list = [
-
-        ];
+        userData.list = [];
         getAppFilterUserData();
         getAllUsersData();
+        getWhitelistData();
     }
 
 
     function getAllUsersData() {
         new XHR().get('<%=url('admin/network/get_all_users')%>', {flag: 2, page: 0},
             function (x, data) {
- 				if (Array.isArray(data.data.list))
+ 				if (Array.isArray(data.data.list))  
                 	allUsers = data.data.list;
                 renderAutoUserData();
             }
@@ -108,8 +101,8 @@
             function (x, data) {
 
                 userData = data.data;
-				if (!Array.isArray(userData.list))
-                	userData.list=[]
+				if (!Array.isArray(userData.list))                                  
+                	userData.list=[]   
                 renderUserData();
                 render_mode_description(userData.mode);
             }
@@ -121,8 +114,8 @@
         const table = document.getElementById('user_table');
         const rows = table.querySelectorAll('.tr:not(.table-titles)');
         rows.forEach(row => row.remove());
+        
 
-        // Update mode selection radio buttons
         const modeRadios = document.querySelectorAll('input[name="mode"]');
 
         console.log("userData.mode = " + userData.mode);
@@ -132,24 +125,31 @@
         });
         if (userData.mode === 1) {
             document.getElementById('user_table').style.display = 'table';
-            document.getElementById('auto_user_table').style.display = 'none';
+            document.getElementById('auto_user_section').style.display = 'none';
+            document.getElementById('whitelist_section').style.display = 'none';
         } else {
             document.getElementById('user_table').style.display = 'none';
-            document.getElementById('auto_user_table').style.display = 'table';
+            document.getElementById('auto_user_section').style.display = 'block';
+            document.getElementById('whitelist_section').style.display = 'block';
         }
 
         // Hide add button and actions column header in manual mode
-        const addButton = document.querySelector('.cbi-button-add');
+        const manualAddButton = document.querySelector('.cbi-section-create:last-child .cbi-button-add');
+        const whitelistAddButton = document.querySelector('#whitelist_section .cbi-button-add');
         const actionsHeader = document.querySelector('.table-titles .th:last-child');
-        if (addButton) {
-            addButton.style.display = userData.mode === 1 ? 'inline-block' : 'none';
+        
+        if (manualAddButton) {
+            manualAddButton.style.display = userData.mode === 1 ? 'inline-block' : 'none';
+        }
+        if (whitelistAddButton) {
+            whitelistAddButton.style.display = userData.mode === 0 ? 'inline-block' : 'none';
         }
         if (actionsHeader) {
             actionsHeader.style.display = userData.mode === 1 ? '' : 'none';
         }
-
+        
         const displayList = userData.mode === 1 ? userData.list : allUsers;
-
+        
         displayList.forEach((user, index) => {
             const hostname = user.hostname || '--';
             const nickname = user.nickname || '--';
@@ -168,24 +168,57 @@
 
     function renderAutoUserData() {
         const table = document.getElementById('auto_user_table');
+ 
         const rows = table.querySelectorAll('.tr:not(.table-titles)');
         rows.forEach(row => row.remove());
-        console.log("allUsers  111");
-        const displayList =  allUsers;
-        console.log("allUsers 222");
-        displayList.forEach((user, index) => {
-            const hostname = user.hostname || '--';
-            const nickname = user.nickname || '--';
-            const row = document.createElement('div');
-            row.className = 'tr';
-            row.innerHTML = `
-                <div class="td">${user.mac}</div>
-                <div class="td">${hostname}</div>
-                <div class="td">${nickname}</div>
-            `;
-            table.appendChild(row);
-        });
-        console.log("allUsers 333");
+        
+ 
+        const displayList = allUsers.filter(user => user.is_whitelist !== 1);
+        
+        if (displayList.length === 0) {
+      
+            document.getElementById('no_users_message').style.display = 'block';
+        } else {
+      
+            document.getElementById('no_users_message').style.display = 'none';
+            
+      
+            displayList.forEach((user, index) => {
+                const hostname = user.hostname || '--';
+                const nickname = user.nickname || '--';
+                
+                const row = document.createElement('div');
+                row.className = 'tr';
+                row.innerHTML = `
+                    <div class="td">${user.mac}</div>
+                    <div class="td">${hostname}</div>
+                    <div class="td">${nickname}</div>
+                                    <div class="td">
+                    <button type="button" class="cbi-button cbi-button-add" onclick="addUserToWhitelist('${user.mac}')"><%:Add to Whitelist%></button>
+                </div>
+                `;
+                table.appendChild(row);
+            });
+        }
+    }
+
+    function addUserToWhitelist(mac) {
+        const data = {
+            mac_list: [mac]
+        };
+        const data_str = JSON.stringify(data);
+        
+        new XHR().post('<%=url('admin/network/add_whitelist_user')%>', 
+            { data: data_str },
+            function(x, data) {
+                setTimeout(() => {
+                    getWhitelistData();
+                    getAllUsersData(); 
+                    renderAutoUserData(); 
+                }, 500); 
+                showSuccessMessage('<%:Add to whitelist successful%>');
+            }
+        );
     }
 
     function showSuccessMessage(message = '<%:Settings saved successfully%>') {
@@ -200,7 +233,7 @@
 
     function removeUser(index) {
         const userToRemove = userData.list[index];
-        new XHR().post('<%=url('admin/network/del_app_filter_user')%>',
+        new XHR().post('<%=url('admin/network/del_app_filter_user')%>', 
             { mac: userToRemove.mac },
             function(x, data) {
                 getAppFilterUserData();
@@ -208,12 +241,13 @@
             }
         );
     }
-
+    
 
     function showUserModal() {
+        console.log("showUserModal");
         const modal = document.getElementById('userModal');
         modal.style.display = 'flex';
-
+        
         const userList = document.getElementById('userList');
         userList.innerHTML = '';
 
@@ -221,10 +255,10 @@
             const userElement = document.createElement('div');
             userElement.style.padding = '8px';
             userElement.style.borderBottom = '1px solid #eee';
-
+            
             // Determine the display name
             const displayName = user.nickname || user.hostname || '';
-
+            
             userElement.innerHTML = `
                 <label style="display: flex; align-items: center;">
                     <input type="checkbox" value="${user.mac}" style="margin-right: 8px;">
@@ -235,7 +269,7 @@
             userList.appendChild(userElement);
         });
     }
-
+    
     function closeUserModal() {
         const modal = document.getElementById('userModal');
         modal.style.display = 'none';
@@ -244,16 +278,16 @@
     function addSelectedUsers() {
         const userList = document.getElementById('userList');
         const checkboxes = userList.querySelectorAll('input[type="checkbox"]:checked');
-
+        
         const selectedMacs = Array.from(checkboxes).map(checkbox => checkbox.value);
-
+        
         var data = {
             mac_list: selectedMacs
         }
         var data_str = JSON.stringify(data);
 
         console.log(selectedMacs);
-        new XHR().post('<%=url('admin/network/add_app_filter_user')%>',
+        new XHR().post('<%=url('admin/network/add_app_filter_user')%>', 
             { data: data_str },
             function(x, data) {
                 getAppFilterUserData();
@@ -277,7 +311,7 @@
         renderUserData();
         render_mode_description(newMode);
 
-        new XHR().post('<%=url('admin/network/set_app_filter_user')%>',
+        new XHR().post('<%=url('admin/network/set_app_filter_user')%>', 
         { mode: newMode },
         function(x, data) {
             console.log('Mode updated successfully');
@@ -285,6 +319,117 @@
         });
     }
 
+    function getWhitelistData() {
+        new XHR().get('<%=url('admin/network/get_whitelist_user')%>', null,
+            function (x, data) {
+                if (data.data && Array.isArray(data.data.list)) {
+                    whitelistData.users = data.data.list;
+                } else {
+                    whitelistData.users = [];
+                }
+                renderWhitelistData();
+            }
+        );
+    }
+
+    function renderWhitelistData() {
+        const table = document.getElementById('whitelist_table');
+        if (!table) return;
+        
+        const rows = table.querySelectorAll('.tr:not(.table-titles)');
+        rows.forEach(row => row.remove());
+        
+        whitelistData.users.forEach((user, index) => {
+            const hostname = user.hostname || '--';
+            const nickname = user.nickname || '--';
+            const row = document.createElement('div');
+            row.className = 'tr';
+            row.innerHTML = `
+                <div class="td">${user.mac}</div>
+                <div class="td">${hostname}</div>
+                <div class="td">${nickname}</div>
+                <div class="td"><button type="button" class="delete-button" onclick="removeWhitelistUser(${index})"><%:Delete%></button></div>
+            `;
+            table.appendChild(row);
+        });
+    }
+
+    function showWhitelistModal() {
+        console.log("showWhitelistModal");
+        const modal = document.getElementById('whitelistModal');
+        modal.style.display = 'flex';
+        
+        const userList = document.getElementById('whitelistUserList');
+        userList.innerHTML = '';
+
+        allUsers.forEach(user => {
+            const userElement = document.createElement('div');
+            userElement.style.padding = '8px';
+            userElement.style.borderBottom = '1px solid #eee';
+            
+            // Determine the display name
+            const displayName = user.nickname || user.hostname || '';
+            
+            userElement.innerHTML = `
+                <label style="display: flex; align-items: center;">
+                    <input type="checkbox" value="${user.mac}" style="margin-right: 8px;">
+                    <span>${user.mac}</span>
+                    <span style="color: #666; margin-left: 8px;">${displayName ? `(${displayName})` : ''}</span>
+                </label>
+            `;
+            userList.appendChild(userElement);
+        });
+    }
+    
+    function closeWhitelistModal() {
+        const modal = document.getElementById('whitelistModal');
+        modal.style.display = 'none';
+    }
+
+    function addSelectedWhitelistUsers() {
+        console.log("addSelectedWhitelistUsers");
+        const userList = document.getElementById('whitelistUserList');
+        const checkboxes = userList.querySelectorAll('input[type="checkbox"]:checked');
+        
+        const selectedMacs = Array.from(checkboxes).map(checkbox => checkbox.value);
+        
+        var data = {
+            mac_list: selectedMacs
+        }
+        var data_str = JSON.stringify(data);
+
+        console.log(selectedMacs);
+        new XHR().post('<%=url('admin/network/add_whitelist_user')%>', 
+            { data: data_str },
+            function(x, data) {
+          
+                setTimeout(() => {
+                    getWhitelistData();
+                    getAllUsersData(); 
+                    renderAutoUserData(); 
+                }, 500); 
+                closeWhitelistModal();
+                showSuccessMessage('<%:Add to whitelist successful%>');
+            }
+        );
+    }
+
+    function removeWhitelistUser(index) {
+        const userToRemove = whitelistData.users[index];
+        new XHR().post('<%=url('admin/network/del_whitelist_user')%>', 
+            { mac: userToRemove.mac },
+            function(x, data) {
+ 
+                setTimeout(() => {
+                    getWhitelistData();
+                    getAllUsersData(); 
+                    renderAutoUserData();
+                }, 500);
+                showSuccessMessage('<%:Remove from whitelist successful%>');
+            }
+        );
+    }
+
     window.onload = initData;
 //]]></script>
 
@@ -295,11 +440,11 @@
             <input type="radio" name="mode" value="1" checked onclick="switchMode(1)"> <%:Manual Mode%>
         </div>
 
-    <!-- Add a new element for mode description -->
+
     <div id="modeDescription" style="margin-bottom: 15px;">
         <%:In manual mode, only the following added terminals are controlled%>
     </div>
-
+    
     <div class="table" id="user_table" style="display: none;">
         <div class="tr table-titles">
             <div class="th"><%:MAC%></div>
@@ -309,18 +454,40 @@
         </div>
     </div>
 
-    <div class="table" id="auto_user_table" style="display: none;">
-        <div class="tr table-titles">
-            <div class="th"><%:MAC%></div>
-            <div class="th"><%:Hostname%></div>
-            <div class="th"><%:Remark%></div>
+    <div id="auto_user_section" style="display: none; margin-top: 20px;">
+        <h3 style="margin-bottom: 15px;"><%:Effective Users%></h3>
+        <div class="table" id="auto_user_table">
+            <div class="tr table-titles">
+                <div class="th"><%:MAC%></div>
+                <div class="th"><%:Hostname%></div>
+                <div class="th"><%:Remark%></div>
+                <div class="th"><%:Actions%></div>
+            </div>
+        </div>
+
+        <div id="no_users_message" style="display: none; text-align: center; padding: 40px 0; color: #666; font-size: 14px;">
+            <%:No Users Available%>
         </div>
     </div>
 
-    <div class="cbi-section-create">
-        <input type="button" class="cbi-button cbi-button-add" value="<%:Add User%>" onclick="showUserModal()" />
+
+    <div id="whitelist_section" style="display: none; margin-top: 20px;">
+        <h3 style="margin-bottom: 15px;"><%:Whitelist Users%></h3>
+        <div style="margin-bottom: 15px;"><%:Users in whitelist are not controlled%></div>
+        <div class="table" id="whitelist_table">
+            <div class="tr table-titles">
+                <div class="th"><%:MAC%></div>
+                <div class="th"><%:Hostname%></div>
+                <div class="th"><%:Remark%></div>
+                <div class="th"><%:Actions%></div>
+            </div>
+        </div>
     </div>
 
+     <div class="cbi-section-create">
+        <input type="button" class="cbi-button cbi-button-add" value="<%:Add User%>" onclick="showUserModal()" />
+    </div> 
+
     </div>
 </div>
 
@@ -334,8 +501,7 @@ <h3 style="margin: 0 0 15px 0;"><%:Select Device%></h3>
                 <button type="button" onclick="closeUserModal()" style="padding: 5px 15px;"><%:Cancel%></button>
             </div>
         </div>
-    </div>
-
+    </div> 
 
     <div id="modal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5); z-index: 1000; justify-content: center; align-items: center;">
         <div style="background-color: rgba(0, 0, 0, 0.5); padding: 10px; border-radius: 5px; text-align: center; width: 130px; height: 70px; color: white; display: flex; justify-content: center; align-items: center;">
diff --git a/applications/luci-app-appfilter/luasrc/view/admin_network/user_status.htm b/applications/luci-app-oaf/luasrc/view/admin_network/user_status.htm
similarity index 74%
rename from applications/luci-app-appfilter/luasrc/view/admin_network/user_status.htm
rename to applications/luci-app-oaf/luasrc/view/admin_network/user_status.htm
index 85764c0bb70..f6e2ce5f86f 100644
--- a/applications/luci-app-appfilter/luasrc/view/admin_network/user_status.htm
+++ b/applications/luci-app-oaf/luasrc/view/admin_network/user_status.htm
@@ -4,14 +4,13 @@
 <script type="text/javascript" src="<%=resource%>/echarts.min.js?v=5.0"></script>
 
 	<script type="text/javascript">//<![CDATA[
-		let visit_time_data = []; // Use mock data for chart display
+		let visit_time_data = []; 
 		let user_list_data = {
-			total_num: 0,
 			list: [
-
+				
 			]
 		}
-		let cur_page = 1;
+		let cur_page = 0;
 
 		function getAllUsersData(page) {
 			new XHR().get('<%=url('admin/network/get_all_users')%>', {flag: 3, page: page},
@@ -23,18 +22,11 @@
 		}
 
 		window.onload = function() {
-			cur_page = 1;
+			cur_page = 0; // default fetch all
 			getAllUsersData(cur_page);
 
 			setInterval(function() {
-				console.log("get user data");
 				getAllUsersData(cur_page);
-				// new XHR().get('<%=url('admin/network/get_all_users')%>', {flag: 3, page: 0},
-				// 	function (x, data) {
-				// 		user_list_data = data.data
-				// 		render_user_list(user_list_data);
-				// 	}
-				// );
 			}, 3000);
 		}
 
@@ -48,55 +40,9 @@
 			}, 1000);
 		}
 
-
-
-		function generateMockData() {
-			return [
-				{ app_id: "App1", visit_time: 3600 },
-				{ app_id: "App2", visit_time: 1800 },
-				{ app_id: "App3", visit_time: 2400 },
-				{ app_id: "App4", visit_time: 1200 },
-				{ app_id: "App5", visit_time: 3000 }
-			];
-		}
-
-		function generateUserListData() {
-			return {
-				total_num: 5,
-				list: [
-					{
-						hostname: "Device1",
-						mac: "00:11:22:33:44:55",
-						ip: "192.168.1.2",
-						applist: [{ name: "App1" }, { name: "App2" }],
-						online: 1
-					}
-				]
-			};
-		}
-
-		function generateVisitListData() {
-			return {
-				list: [
-					{
-						appname: "App1",
-						hostname: "Device1",
-						mac: "00:11:22:33:44:55",
-						first_time: "2023-10-01 10:00:00",
-						total_time: 3600,
-						latest_action: 0
-					}
-
-				]
-			};
-		}
-
 		function render_user_list(data) {
 			var tb = document.getElementById('user_status_table');
-			var total_num = data.total_num
 			var user_list = data.list;
-			console.log("total_num = " + total_num);
-			// table
 			if (user_list && tb) {
 				while (tb.rows.length > 1)
 					tb.deleteRow(1);
@@ -108,7 +54,7 @@
 					var tr = tb.insertRow(-1);
 					tr.className = 'tr';
 					if (user_list[i].online != 1) {
-						tr.style.color = '#A9A9A9'; // 设置离线行的字体颜色为浅灰色
+						tr.style.color = '#A9A9A9'; 
 					}
 					tr.insertCell(-1).innerHTML = `
 						<div style="display: flex; align-items: center;">
@@ -120,33 +66,30 @@
 					`;
 					tr.insertCell(-1).innerHTML = user_list[i].ip;
 					// lua api return {}
-				     if (!Array.isArray(user_list[i].applist))
-                         user_list[i].applist = []
+				     if (!Array.isArray(user_list[i].applist))           
+                         user_list[i].applist = [] 
 					var app_list_str = user_list[i].applist.map(app => {
-						// Assuming app.name corresponds to the app's icon filename
-						return `<img src="<%=resource%>/app_icons/${app.id}.png" alt="${app.name}" title="${app.name}" style="width: 20px; height: 20px; border-radius: 5px; margin-right: 8px;">`;
+						var iconSrc = app.icon === 0 ? '<%=resource%>/app_icons/default.png' : `<%=resource%>/app_icons/${app.id}.png`;
+						return `<img src="${iconSrc}" alt="${app.name}" title="${app.name}" style="width: 20px; height: 20px; border-radius: 5px; margin-right: 8px;">`;
 					}).join("") || "--";
 					tr.insertCell(-1).innerHTML = app_list_str;
-					// 正在访问APP列
 					var current_app = user_list[i].app || "--";
 					tr.insertCell(-1).innerHTML = current_app;
-					// 正在访问URL列
 					var current_url = user_list[i].url || "--";
 					var display_url = current_url;
-					// 处理URL显示长度，超过22个字符时进行截断
 					if (current_url !== "--" && current_url.length > 20) {
 						display_url = current_url.substring(0, 10) + "..." + current_url.substring(current_url.length - 10);
 					}
 					tr.insertCell(-1).innerHTML = `<span title="${current_url}">${display_url}</span>`;
-					tr.insertCell(-1).innerHTML = user_list[i].online == 1
-						? `<span style="color: green;"><%:Online%></span>`
+					tr.insertCell(-1).innerHTML = user_list[i].online == 1 
+						? `<span style="color: green;"><%:Online%></span>` 
 						: "<%:Offline%>";
 					tr.insertCell(-1).innerHTML = `
 						<button type="button" class="cbi-button cbi-button-add" onclick="showDetails('${user_list[i].mac}')" style="margin-right: 5px;"><%:Details%></button>
 						<button type="button" class="cbi-button cbi-button-add" onclick="showModifyNickname('${user_list[i].mac}')"><%:Remark%></button>
 					`;
 
-
+					
 					var childs = tr.childNodes;
 					Array.prototype.forEach.call(childs, function (child) {
 						child.className = 'td';
@@ -159,33 +102,30 @@
 			var tb = document.getElementById('visit_list_table');
 			var visit_list = data.list;
 			if (visit_list && tb) {
-				/* clear all rows */
 				while (tb.rows.length > 1)
 					tb.deleteRow(1);
 				for (var i = 0; i < visit_list.length; i++) {
-					var action_status = visit_list[i].act == 1 ? "<%:Filtered%>" : "<%:Unfiltered%>";
+					var action_status = visit_list[i].act == 1 ? 
+						'<span style="color: red;"><%:Filtered%></span>' : 
+						'<span style="color: green;"><%:Unfiltered%></span>';
 					var hostname = visit_list[i].hostname == "" || visit_list[i].hostname == "*" ? "--" : visit_list[i].hostname;
 					var tr = tb.insertRow(-1);
 					tr.className = 'tr';
 
-					// Add app icon before app name with fixed height for alignment
+					var iconSrc = visit_list[i].icon === 0 ? '<%=resource%>/app_icons/default.png' : `<%=resource%>/app_icons/${visit_list[i].id}.png`;
 					tr.insertCell(-1).innerHTML = `
 						<div style="height: 24px; display: flex; align-items: center;">
-							<img src="<%=resource%>/app_icons/${visit_list[i].id}.png" alt="${visit_list[i].name}" title="${visit_list[i].name}" style="width: 20px; height: 20px; border-radius: 5px; margin-right: 4px;">
+							<img src="${iconSrc}" alt="${visit_list[i].name}" title="${visit_list[i].name}" style="width: 20px; height: 20px; border-radius: 5px; margin-right: 4px;">
 							<span>${visit_list[i].name}</span>
 						</div>
 					`;
 
 
-					// Convert timestamp to readable date string
-					var first_time_date = new Date(visit_list[i].ft * 1000); // Assuming first_time is in seconds
-					var first_time_str = first_time_date.toLocaleString(); // Convert to local date string
-
-					var latest_time_date = new Date(visit_list[i].lt * 1000); // Assuming first_time is in seconds
-					var latest_time_str = latest_time_date.toLocaleString(); // Convert to local date string
-
-
+					var first_time_date = new Date(visit_list[i].ft * 1000);
+					var first_time_str = first_time_date.toLocaleString(); 
 
+					var latest_time_date = new Date(visit_list[i].lt * 1000); 
+					var latest_time_str = latest_time_date.toLocaleString(); 
 
 					tr.insertCell(-1).innerHTML = first_time_str;
 					tr.insertCell(-1).innerHTML = latest_time_str;
@@ -207,7 +147,6 @@
 					tr.insertCell(-1).innerHTML = total_time_str;
 					tr.insertCell(-1).innerHTML = action_status;
 
-
 					var childs = tr.childNodes;
 					Array.prototype.forEach.call(childs, function (child) {
 						child.className = 'td';
@@ -219,11 +158,11 @@
 		function showDetails(mac) {
 			var modal = document.getElementById('detailsModal');
 			modal.style.display = 'flex';
+			updateDeviceInfoTitle(mac);
 
 			new XHR().get('<%=url('admin/network/dev_visit_time')%>/' + mac, null,
 				function (x, st) {
 					visit_time_data = st;
-					console.log("visit_time_data = " + visit_time_data);
 					display_app_visit_view(visit_time_data);
 				}
 			);
@@ -231,12 +170,31 @@
 			new XHR().get('<%=url('admin/network/dev_visit_list')%>/' + mac, null,
 				function (x, st) {
 					visit_list_data = st;
-					console.log("visit_list_data = " + visit_list_data);
 					render_visit_list_table(visit_list_data);
 				}
 			);
 		}
 
+		function updateDeviceInfoTitle(mac) {
+			var deviceInfo = '(' + mac + ')';
+			
+			if (user_list_data && user_list_data.list) {
+				var device = user_list_data.list.find(function(user) {
+					return user.mac === mac;
+				});
+				
+				if (device) {
+					if (device.nickname && device.nickname.trim() !== '') {
+						deviceInfo = '(' + device.nickname + ')';
+					} else if (device.hostname && device.hostname.trim() !== '') {
+						deviceInfo = '(' + device.hostname + ')';
+					}
+				}
+			}
+			
+			document.getElementById('deviceInfo').textContent = deviceInfo;
+		}
+
 		function showModifyNickname(mac) {
 			var modal = document.getElementById('nicknameModal');
 			modal.style.display = 'flex';
@@ -259,13 +217,12 @@
 				return;
 			}
 
-			new XHR().post('<%=url('admin/network/set_nickname')%>',
+			new XHR().post('<%=url('admin/network/set_nickname')%>', 
 			{ mac: mac, nickname: nickname },
 			function(x, data) {
 				console.log('Nickname updated successfully');
 				closeModal('nicknameModal');
 				showSuccessMessage('<%:Settings saved successfully%>');
-				// Optionally, refresh the user list to reflect changes
 				getAllUsersData(cur_page);
 			});
 		}
@@ -324,7 +281,7 @@
 		var app_stat_array = new Array();
 		if (data.length == 0){
 			var app_obj ={}
-			app_obj.name = "未知APP"
+			app_obj.name = "<%:Unknown App%>"
 			app_obj.value = 0
 			app_obj.legendname = app_obj.name
 			app_stat_array.push(app_obj)
@@ -340,7 +297,6 @@
 				app_stat_array.push(app_obj);
 			}
 		}
-		console.log("hello")
         var total_time_str = get_display_time(total_time);
         var option = {
 			grid:{
@@ -396,7 +352,7 @@
                     name: "<%:Visit Time%>",
                     type: 'pie',
                     radius: ['58%', '70%'],
-                    center: ['35%', '50%'], // 饼图的中心位置,调整离开左侧的距离
+                    center: ['35%', '50%'], 
                     clockwise: false,
                     avoidLabelOverlap: true,
                     itemStyle: {
@@ -430,9 +386,6 @@
         myChart.setOption(option);
     }
 
-// user_list_data = generateUserListData();
-// visit_list_data = generateVisitListData();
-
 //]]></script>
 
 <div style="max-height: 750px; overflow-y: auto;padding-right: 20px;"> <!-- Added container with fixed height and overflow -->
@@ -477,10 +430,10 @@
 </div>
 <!-- Details Modal -->
 <div id="detailsModal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5); z-index: 1000; justify-content: center; align-items: center;">
-    <div style="background-color: white; padding: 20px; border-radius: 5px; text-align: left; width: 750px; height: 500px; display: flex; flex-direction: column; position: relative;">
-        <button type="button" onclick="closeModal('detailsModal')" style="position: absolute; top: 10px; right: 10px; background-color: transparent; border: none; font-size: 24px; color: #333; cursor: pointer; width: 30px; height: 30px;">&times;</button>
-        <h4 style="margin-top:2px"><%:Device Details%></h4>
-
+    <div style="background-color: white; padding: 30px; border-radius: 8px; text-align: left; width: 800px; height: 550px; display: flex; flex-direction: column; position: relative; box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);">
+        <button type="button" onclick="closeModal('detailsModal')" style="position: absolute; top: 15px; right: 15px; background-color: transparent; border: none; font-size: 24px; color: #666; cursor: pointer; width: 30px; height: 30px; border-radius: 50%; transition: background-color 0.2s;">&times;</button>
+        <h4 style="margin: 0 0 25px 0; color: #333; font-size: 18px;"><%:Device Details%> <span id="deviceInfo" style="color: #666; font-size: 14px; font-weight: normal;"></span></h4>
+        
         <!-- Tab List -->
         <ul class="tab-list">
             <!-- <li class="tab-item onclick="showTabContent('tab1')">基本信息</li> -->
@@ -520,7 +473,7 @@ <h4 style="margin-top:2px"><%:Device Details%></h4>
 						<th class="th">
 							<%:App Name%>
 						</th>
-
+			
 						<th class="th">
 							<%:Start Time%>
 						</th>
@@ -549,15 +502,25 @@ <h4 style="margin-top:2px"><%:Device Details%></h4>
 
 <!-- Nickname Modal -->
 <div id="nicknameModal" style="display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background-color: rgba(0, 0, 0, 0.5); z-index: 1000; justify-content: center; align-items: center;">
-    <div style="background-color: white; padding: 20px; border-radius: 5px; text-align: left; width: 400px; display: flex; flex-direction: column; position: relative;">
-        <button type="button" onclick="closeModal('nicknameModal')" style="position: absolute; top: 10px; right: 10px; background-color: transparent; border: none; font-size: 24px; color: #333; cursor: pointer; width: 30px; height: 30px;">&times;</button>
-        <h4 style="margin-top:2px"><%:Modify Remark%></h4>
-        <p style="margin-bottom: 10px;"><span class="field-label"><%:MAC Address%>:</span> <span id="nicknameMacDisplay">--</span></p>
+    <div style="background-color: white; padding: 30px; border-radius: 8px; text-align: left; width: 450px; display: flex; flex-direction: column; position: relative; box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);">
+        <button type="button" onclick="closeModal('nicknameModal')" style="position: absolute; top: 15px; right: 15px; background-color: transparent; border: none; font-size: 24px; color: #666; cursor: pointer; width: 30px; height: 30px; border-radius: 50%; transition: background-color 0.2s;">&times;</button>
+        
+        <h4 style="margin: 0 0 25px 0; color: #333; font-size: 18px;"><%:Modify Remark%></h4>
+        
+        <div style="margin-bottom: 20px;">
+            <p style="margin: 0 0 8px 0; color: #666; font-size: 14px;"><span class="field-label"><%:MAC Address%>:</span> <span id="nicknameMacDisplay" style="color: #333; font-weight: 500;">--</span></p>
+        </div>
+        
         <input type="hidden" id="nicknameMac" value="">
-        <p style="margin-bottom: 10px;"><span class="field-label"><%:Remark%>:</span> <input type="text" id="nicknameInput" style="padding: 5px; background-color: white;width: 200px"></p>
-        <div style="display: flex; justify-content: flex-end;">
-			<button type="button" class="cbi-button cbi-button-add" onclick="closeModal('nicknameModal')"><%:Cancel%></button>
-            <button type="button" class="cbi-button cbi-button-add" onclick="submitNicknameChange()" style="margin-right: 10px;"><%:OK%></button>
+        
+        <div style="margin-bottom: 30px;">
+            <p style="margin: 0 0 8px 0; color: #666; font-size: 14px;"><span class="field-label"><%:Remark%>:</span></p>
+            <input type="text" id="nicknameInput" style="padding: 10px; background-color: #f8f9fa; border: 1px solid #ddd; border-radius: 4px; width: 100%; font-size: 14px; transition: border-color 0.2s;" placeholder="请输入备注信息">
+        </div>
+        
+        <div style="display: flex; justify-content: flex-end; gap: 15px; margin-top: 10px;">
+            <button type="button" class="cbi-button cbi-button-add" onclick="closeModal('nicknameModal')"><%:Cancel%></button>
+            <button type="button" class="cbi-button cbi-button-add" onclick="submitNicknameChange()"><%:OK%></button>
         </div>
     </div>
 </div>
@@ -569,32 +532,40 @@ <h4 style="margin-top:2px"><%:Modify Remark%></h4>
 </div>
 <style>
     .tab-container {
-        margin-top: 20px;
+        margin-top: 10px;
     }
     .tab-list {
         display: flex;
         list-style-type: none;
-        padding: 0;
-        margin: 0;
-        border-bottom: 1px solid #ccc;
+        padding: 0 0 0 10px;
+        margin: 0 0 10px 0;
+        border-bottom: 1px solid #e0e0e0;
     }
     .tab-item {
-        padding: 3px 16px;
+        padding: 4px 12px;
         cursor: pointer;
-        border: 1px solid #ccc;
+        border: 1px solid #e0e0e0;
         border-bottom: none;
-        background-color: #f9f9f9;
-        border-radius: 5px 5px 0 0;
-        margin-right: 6px;
-        transition: background-color 0.3s ease;
+        background-color: #f0f0f0;
+        border-radius: 6px 6px 0 0;
+        margin-right: 8px;
+        transition: all 0.2s ease;
+        color: #333;
+        font-size: 13px;
     }
     .tab-item.active {
-        font-weight: bold;
-		background-color: #ccc;
-        color: rgb(80, 80, 140); /* Change text color to blue */
+        background-color: white;
+        color: rgb(133, 133, 203);
+        border-color: #e0e0e0;
+        border-bottom: 1px solid white;
+        margin-bottom: -1px;
+		font-size: 13px;
+        z-index: 1;
+        position: relative;
     }
     .tab-item:hover {
-        background-color: #d0d0d0;
+        background-color: #e0e0e0;
+        border-color: #d0d0d0;
     }
 
 	.tab-body {
@@ -603,7 +574,7 @@ <h4 style="margin-top:2px"><%:Modify Remark%></h4>
 		padding: 25px;
 	}
 	.tab-body.active {
-
+		
 		display: block;
 	}
 
@@ -614,8 +585,8 @@ <h4 style="margin-top:2px"><%:Modify Remark%></h4>
 	.field-label {
 		font-weight: bold;
 		color: #333;
-		width: 75px; /* Set a fixed width for all labels */
-		display: inline-block; /* Ensure the width is applied */
+		width: 75px; 
+		display: inline-block; 
 	}
 	.field-value {
 		color: #4CAF50;
@@ -642,15 +613,15 @@ <h4 style="margin-top:2px"><%:Modify Remark%></h4>
 	}
 
 	#visit_list_table .td {
-		padding: 4px 8px !important; /* 调整访问记录表格的行高 */
-		height: 28px !important; /* 设置固定行高 */
-		vertical-align: middle !important; /* 垂直居中对齐 */
+		padding: 4px 8px !important; 
+		height: 28px !important; 
+		vertical-align: middle !important; 
 	}
 
 	#visit_list_table .th {
-		padding: 6px 8px !important; /* 调整表头行高 */
-		height: 32px !important; /* 设置固定表头行高 */
-		vertical-align: middle !important; /* 垂直居中对齐 */
+		padding: 6px 8px !important; 
+		height: 32px !important; 
+		vertical-align: middle !important;
 	}
 
 </style>
diff --git a/applications/luci-app-appfilter/luasrc/view/cbi/oaf_dvalue.htm b/applications/luci-app-oaf/luasrc/view/cbi/oaf_dvalue.htm
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/view/cbi/oaf_dvalue.htm
rename to applications/luci-app-oaf/luasrc/view/cbi/oaf_dvalue.htm
diff --git a/applications/luci-app-appfilter/luasrc/view/cbi/oaf_upload.htm b/applications/luci-app-oaf/luasrc/view/cbi/oaf_upload.htm
similarity index 100%
rename from applications/luci-app-appfilter/luasrc/view/cbi/oaf_upload.htm
rename to applications/luci-app-oaf/luasrc/view/cbi/oaf_upload.htm
diff --git a/applications/luci-app-appfilter/po/zh_Hans/appfilter.po b/applications/luci-app-oaf/po/zh-cn/oaf.po
similarity index 89%
rename from applications/luci-app-appfilter/po/zh_Hans/appfilter.po
rename to applications/luci-app-oaf/po/zh-cn/oaf.po
index 7188027665f..0e66a4e7e4b 100644
--- a/applications/luci-app-appfilter/po/zh_Hans/appfilter.po
+++ b/applications/luci-app-oaf/po/zh-cn/oaf.po
@@ -205,14 +205,14 @@ msgstr "黑名单模式"
 msgid "Whitelist mode"
 msgstr "白名单模式"
 
-msgid "The feature library is used to describe app features, app filtering effect and number-dependent feature library"
-msgstr "特征库用于描述app特征，app过滤效果和个数依赖特征库"
+msgid "The feature library is used to describe App features, App filtering effect and number-dependent feature library"
+msgstr "特征库用于描述App特征，App过滤效果和个数依赖特征库"
 
 msgid "User List"
 msgstr "用户列表"
 
-msgid "If there is no app you want, you can add the app by updating the app feature file"
-msgstr "如果没有你想要的APP，可以通过升级特征库增加APP"
+msgid "If there is no App you want, you can add the App by updating the App feature file"
+msgstr "如果没有你想要的App，可以通过升级特征库增加App"
 
 msgid "Feature format"
 msgstr "特征码格式"
@@ -454,5 +454,45 @@ msgstr "正在更新，请稍后..."
 msgid "Feature library files can be downloaded from the official website. After downloading, upload to upgrade. Note the feature code format version, which needs to be consistent with the current feature code format!"
 msgstr "特征库文件可以通过官网下载，下载后上传升级，注意特征码格式版本，需要和当前特征码格式一致！"
 
-msgid "If the APP you want is not in the list, you can upgrade the feature library of the official website or customize the APP"
-msgstr "如果列表中没有你想要的APP，可以通过升级官网的特征库或者自定义APP"
+msgid "If the App you want is not in the list, you can upgrade the feature library of the official website or customize the App"
+msgstr "如果列表中没有你想要的App，可以通过升级官网的特征库或者自定义App"
+
+msgid "Effective Users"
+msgstr "生效的用户"
+
+msgid "No Users Available"
+msgstr "暂无用户"
+
+msgid "Users in whitelist are not controlled"
+msgstr "白名单中的用户不受管控"
+
+msgid "Whitelist Users"
+msgstr "白名单用户"
+
+msgid "Add to Whitelist"
+msgstr "添加到白名单"
+
+msgid "Add to whitelist successful"
+msgstr "添加到白名单成功"
+
+msgid "Remove from whitelist successful"
+msgstr "从白名单移除成功"
+
+msgid "Please select at least one weekday"
+msgstr "请至少选择一个星期"
+
+msgid "Please set start and end time"
+msgstr "请设置开始和结束时间"
+
+msgid "Unknown App"
+msgstr "未知App"
+
+
+msgid "OAF Version"
+msgstr "OAF版本"
+
+msgid "OAF Driver Version"
+msgstr "OAF驱动版本"
+
+
+
diff --git a/applications/luci-app-oaf/po/zh_Hans/oaf.po b/applications/luci-app-oaf/po/zh_Hans/oaf.po
new file mode 100644
index 00000000000..b50fc611db9
--- /dev/null
+++ b/applications/luci-app-oaf/po/zh_Hans/oaf.po
@@ -0,0 +1,494 @@
+msgid "website"
+msgstr "常用网站"
+
+msgid "appfilter"
+msgstr "应用过滤"
+
+msgid "App Filter"
+msgstr "应用过滤"
+
+msgid "game"
+msgstr "游戏"
+
+msgid "web"
+msgstr "网页"
+
+msgid "video"
+msgstr "视频"
+
+msgid "chat"
+msgstr "聊天"
+
+msgid "download"
+msgstr "下载"
+
+msgid "p2p"
+msgstr "p2p"
+
+msgid "music"
+msgstr "音乐"
+
+msgid "shopping"
+msgstr "购物"
+
+msgid "working"
+msgstr "办公"
+
+msgid "employee"
+msgstr "招聘"
+
+msgid "Basic Settings"
+msgstr "基本设置"
+
+msgid "App Filter Rules"
+msgstr "应用过滤规则"
+
+msgid "It takes effect for all users by default, and only takes effect for the selected users when checked"
+msgstr "默认对所有用户生效，勾选后只对选择的用户生效"
+
+msgid "Select users"
+msgstr "选择用户"
+
+msgid "Id"
+msgstr "编号"
+
+msgid "Hostname"
+msgstr "主机名"
+
+msgid "Common App(TOP5)"
+msgstr "常用APP(TOP5)"
+
+msgid "Online Status"
+msgstr "在线状态"
+
+msgid "Client List"
+msgstr "终端列表"
+
+msgid "Online"
+msgstr "在线"
+
+msgid "Offline"
+msgstr "离线"
+
+msgid "App Time Statistics"
+msgstr "App 时间统计"
+
+msgid "Filter Status"
+msgstr "过滤状态"
+
+msgid "Data Statistics"
+msgstr "数据统计"
+
+msgid "Current Version"
+msgstr "当前版本"
+
+msgid "App Feature Num"
+msgstr "特征码个数"
+
+msgid "Update feature"
+msgstr "特征库更新"
+
+msgid "Time Setting"
+msgstr "时间控制"
+
+msgid "Sun"
+msgstr "周日"
+
+msgid "Mon"
+msgstr "周一"
+
+msgid "Tue"
+msgstr "周二"
+
+msgid "Wed"
+msgstr "周三"
+
+msgid "Thur"
+msgstr "周四"
+
+msgid "Fri"
+msgstr "周五"
+
+msgid "Sat"
+msgstr "周六"
+
+msgid "Update the feature file successfully, please refresh the page"
+msgstr "更新特征库成功，请刷新页面!"
+
+msgid "Failed to update feature file, format error"
+msgstr "更新特征库失败，格式错误!"
+
+msgid "Select feature file:"
+msgstr "选择本地特征库文件:"
+
+msgid "Start Time1"
+msgstr "开始时间1"
+
+msgid "End Time1"
+msgstr "结束时间1"
+
+msgid "Start Time2"
+msgstr "开始时间2"
+
+msgid "End Time2"
+msgstr "结束时间2"
+
+msgid "App Name"
+msgstr "App名称"
+
+msgid "Visit Time"
+msgstr "访问时间"
+
+msgid "App classification time statistics"
+msgstr "App分类时间统计"
+
+msgid "Percentage"
+msgstr "占比"
+
+msgid "Filtered"
+msgstr "已过滤"
+
+msgid "Unfiltered"
+msgstr "未过滤"
+
+msgid "h"
+msgstr "小时"
+
+msgid "m"
+msgstr "分"
+
+msgid "Enable App Filter"
+msgstr "开启应用过滤"
+
+msgid "App Feature"
+msgstr "应用特征库"
+
+msgid "Effective User"
+msgstr "生效用户"
+
+msgid "Effective Time"
+msgstr "生效时间"
+
+msgid "Basic Settings"
+msgstr "基本设置"
+
+msgid "Please close the modules that may conflict, such as acceleration, ad filtering, and multi-dial"
+msgstr "请先关闭加速、广告过滤、多拨等可能冲突的模块"
+
+msgid "Work Mode"
+msgstr "工作模式"
+
+msgid "Gateway Mode"
+msgstr "网关模式"
+
+msgid "Bypass Mode"
+msgstr "旁路模式"
+
+msgid "Current version"
+msgstr "当前版本"
+
+msgid "App number"
+msgstr "App个数"
+
+msgid "Feature download"
+msgstr "特征库下载"
+
+msgid "The second time is optional, the end time must be greater than the start time"
+msgstr "时间2为选填，结束时间要大于开始时间"
+
+msgid "Time Mode"
+msgstr "时间匹配模式"
+
+msgid "Blacklist mode"
+msgstr "黑名单模式"
+
+msgid "Whitelist mode"
+msgstr "白名单模式"
+
+msgid "The feature library is used to describe App features, App filtering effect and number-dependent feature library"
+msgstr "特征库用于描述App特征，App过滤效果和个数依赖特征库"
+
+msgid "User List"
+msgstr "用户列表"
+
+msgid "If there is no App you want, you can add the App by updating the App feature file"
+msgstr "如果没有你想要的App，可以通过升级特征库增加App"
+
+msgid "Feature format"
+msgstr "特征码格式"
+
+msgid "Settings saved successfully"
+msgstr "设置成功"
+
+msgid "Invalid LAN interface name. Please ensure it is no more than 8 characters long and contains only letters, numbers, and -."
+msgstr "LAN接口名称无效。请确保其长度不超过8，并且只包含字母、数字和-。"
+
+msgid "Disable Software/Hardware Acceleration"
+msgstr "关闭软/硬件加速"
+
+msgid "Software and hardware acceleration, NAT offload and other modules may affect filtering or statistics functions. This interface only attempts to turn them off, but may not be completely successful. Please check the status in the firewall or network acceleration menu. Re-enabling acceleration requires a device restart to take effect."
+msgstr "软硬件加速、NAT offload等模块会影响过滤或统计功能，在该界面只是尝试关闭，不一定能够完全成功，请在防火墙或者网络加速菜单中查看关闭状态，重新开启加速需要重启设备生效。"
+
+msgid "Auto-load oaf driver"
+msgstr "自动加载oaf驱动"
+
+msgid "If the oaf driver cannot be manually unloaded or the current driver is unstable, you can turn off auto-loading at startup and manually install a suitable driver. It is recommended to use the official stable OpenWrt firmware."
+msgstr "如果oaf驱动无法手动卸载或者当前驱动不稳定，可以关闭开机自动加载，然后手动安装合适的驱动，建议用openwrt官方稳定版固件。"
+
+msgid "LAN Interface"
+msgstr "LAN接口"
+
+msgid "The name of the LAN interface, used for detecting terminal information. The system default is bridge interface (br-lan). If the LAN port has been modified to a physical interface, please modify it to the corresponding name, such as eth0, support fuzzy matching, For example, you can setup lan to match br-lan and br-lan2."
+msgstr "LAN接口的名称，用于探测终端信息，系统默认都是桥接口(br-lan)，如果将lan口修改成了物理接口，请修改为对应的名称，比如eth0，支持模糊匹配，比如可以设置lan用来匹配br-lan和br-lan2"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Please add at least one time period"
+msgstr "至少添加一个时间段"
+
+msgid "Time periods cannot exceed 64 entries"
+msgstr "时间段不能超过64条"
+
+msgid "Delete"
+msgstr "删除"
+
+msgid "Invalid time format, please enter a valid time format (HH:MM)"
+msgstr "时间格式不合法，请输入有效的时间格式 (HH:MM)"
+
+msgid "End time must be greater than start time"
+msgstr "结束时间必须大于开始时间"
+
+msgid "Time Rules"
+msgstr "时间规则"
+
+msgid "Mode Selection"
+msgstr "模式选择"
+
+msgid "Fixed Time"
+msgstr "固定时间"
+
+msgid "Dynamic Time"
+msgstr "动态时间"
+
+msgid "Weekday Selection"
+msgstr "星期选择"
+
+msgid "Start Time"
+msgstr "开始时间"
+
+msgid "End Time"
+msgstr "结束时间"
+
+msgid "Actions"
+msgstr "操作"
+
+msgid "Add Time Period"
+msgstr "添加时间段"
+
+msgid "Dynamic time mode refers to dynamically adjusting app filter switches, such as allowing children to play games for 20 minutes after studying for 1 hour, automatically enabling filtering after exceeding entertainment time, and repeating the cycle."
+msgstr "动态时间模式是指动态调整应用过滤开关，比如小孩学习1个小时后奖励20分钟玩游戏，超过娱乐时间后自动开启过滤，反复循环。"
+
+msgid "Enable Duration Each Time (Study Time)"
+msgstr "每次启用时长(学习时间)"
+
+msgid "minutes"
+msgstr "分钟"
+
+msgid "Disable Duration Each Time (Break Time)"
+msgstr "每次关闭时长(课余时间)"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Daily Study Time Range"
+msgstr "每天学习时间范围"
+
+msgid "This time range represents the daily school time period, which is a continuous time period. During this time period, filtering rules are dynamically enabled and disabled. Outside the time range, filtering is disabled by default."
+msgstr "该时间范围表示每天上学的时间段，是一段连续时间，在该时间段内实行过滤规则动态开启关闭，时间范围外默认关闭过滤"
+
+msgid "Delete successful"
+msgstr "删除成功"
+
+msgid "Add successful"
+msgstr "添加成功"
+
+msgid "In automatic mode, all newly joined terminals will be controlled, and random MAC addresses on mobile phones are also applicable"
+msgstr "自动模式下，所有新加入的终端将会被管控，手机随机MAC也适用"
+
+msgid "In manual mode, only specified terminals are controlled"
+msgstr "手动模式下，只有指定终端被管控"
+
+msgid "Mode switch successful"
+msgstr "模式切换成功"
+
+msgid "Automatic Mode"
+msgstr "自动模式"
+
+msgid "Manual Mode"
+msgstr "手动模式"
+
+msgid "In manual mode, only the following added terminals are controlled"
+msgstr "手动模式下，只有以下添加的终端被管控"
+
+msgid "Remark"
+msgstr "备注"
+
+msgid "Add User"
+msgstr "添加用户"
+
+msgid "Select Device"
+msgstr "选择设备"
+
+msgid "OK"
+msgstr "确定"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Details"
+msgstr "详情"
+
+msgid "Please enter a valid remark"
+msgstr "请输入合法的备注"
+
+msgid "Device Info"
+msgstr "设备信息"
+
+msgid "IP Address"
+msgstr "IP地址"
+
+msgid "Active App"
+msgstr "活跃APP"
+
+msgid "Current URL"
+msgstr "正在访问URL"
+
+msgid "Device Details"
+msgstr "设备详情"
+
+msgid "App Statistics"
+msgstr "APP统计"
+
+msgid "Access Records"
+msgstr "访问记录"
+
+msgid "App Name"
+msgstr "APP名称"
+
+msgid "Start Time"
+msgstr "开始访问时间"
+
+msgid "Last Time"
+msgstr "最后访问时间"
+
+msgid "Duration"
+msgstr "访问时长"
+
+msgid "Modify Remark"
+msgstr "修改备注"
+
+msgid "MAC Address"
+msgstr "MAC地址"
+
+msgid "Time Configuration"
+msgstr "时间配置"
+
+msgid "User Configuration"
+msgstr "用户配置"
+
+msgid "items"
+msgstr "个"
+
+msgid "Selected"
+msgstr "已选"
+
+msgid "Select All"
+msgstr "全选"
+
+msgid "Deselect All"
+msgstr "取消全选"
+
+msgid "Not Configured"
+msgstr "未配置"
+
+msgid "Running"
+msgstr "运行中"
+
+msgid "Will close in"
+msgstr "分钟后关闭"
+
+msgid "Not Running"
+msgstr "未运行"
+
+msgid "Current time is not within the time range"
+msgstr "当前时间不在时间范围内"
+
+msgid "Will start in"
+msgstr "分钟后开启"
+
+msgid "oaf driver not loaded, please download the oaf.ko driver file corresponding to the kernel version of this firmware for installation, and enable auto-loading. Current kernel version is"
+msgstr "oaf驱动未加载,请下载该固件对应内核版本的oaf.ko驱动文件进行安装，并开启自动加载，当前内核版本为"
+
+msgid "Running Status"
+msgstr "运行状态"
+
+msgid "App Record"
+msgstr "应用记录"
+
+msgid "App Selection"
+msgstr "应用选择"
+
+msgid "View"
+msgstr "查看"
+
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+msgid "Feature Library Update"
+msgstr "特征库升级"
+
+msgid "Updating, please wait..."
+msgstr "正在更新，请稍后..."
+
+msgid "Feature library files can be downloaded from the official website. After downloading, upload to upgrade. Note the feature code format version, which needs to be consistent with the current feature code format!"
+msgstr "特征库文件可以通过官网下载，下载后上传升级，注意特征码格式版本，需要和当前特征码格式一致！"
+
+msgid "If the App you want is not in the list, you can upgrade the feature library of the official website or customize the App"
+msgstr "如果列表中没有你想要的App，可以通过升级官网的特征库或者自定义App"
+
+msgid "Effective Users"
+msgstr "生效的用户"
+
+msgid "No Users Available"
+msgstr "暂无用户"
+
+msgid "Users in whitelist are not controlled"
+msgstr "白名单中的用户不受管控"
+
+msgid "Whitelist Users"
+msgstr "白名单用户"
+
+msgid "Add to Whitelist"
+msgstr "添加到白名单"
+
+msgid "Add to whitelist successful"
+msgstr "添加到白名单成功"
+
+msgid "Remove from whitelist successful"
+msgstr "从白名单移除成功"
+
+msgid "Please select at least one weekday"
+msgstr "请至少选择一个星期"
+
+msgid "Please set start and end time"
+msgstr "请设置开始和结束时间"
+
+msgid "Unknown App"
+msgstr "未知App"
+
+msgid "OAF Version"
+msgstr "OAF版本"
+
+msgid "OAF Driver Version"
+msgstr "OAF驱动版本"
\ No newline at end of file
diff --git a/applications/luci-app-appfilter/root/etc/uci-defaults/94_feature_3.0 b/applications/luci-app-oaf/root/etc/uci-defaults/94_feature_3.0
old mode 100644
new mode 100755
similarity index 100%
rename from applications/luci-app-appfilter/root/etc/uci-defaults/94_feature_3.0
rename to applications/luci-app-oaf/root/etc/uci-defaults/94_feature_3.0
diff --git a/applications/luci-app-oaf/root/usr/share/rpcd/acl.d/luci-app-oaf.json b/applications/luci-app-oaf/root/usr/share/rpcd/acl.d/luci-app-oaf.json
new file mode 100644
index 00000000000..2199037c28f
--- /dev/null
+++ b/applications/luci-app-oaf/root/usr/share/rpcd/acl.d/luci-app-oaf.json
@@ -0,0 +1,19 @@
+{
+    "luci-app-oaf": {
+        "description": "Grant access to OpenAppFilter configuration",
+        "read": {
+            "uci": [ "appfilter", "user_info" ],
+  			"ubus": {
+                "appfilter": [ "get_all_users", "get_oaf_status", "get_app_filter", "set_app_filter", "class_list", "dev_list", "app_class_visit_time", "dev_visit_time", "dev_visit_list", "set_app_filter_base", "get_app_filter_base", "set_app_filter_adv", "get_app_filter_adv", "set_app_filter_time", "get_app_filter_time", "get_app_filter_user", "set_app_filter_user", "del_app_filter_user", "add_app_filter_user", "set_nickname", "get_whitelist_user", "add_whitelist_user", "del_whitelist_user"]
+             }
+
+        },  
+        "write": {
+            "cgi-io": [ "upload" ],
+            "file": {
+                "/etc/appfilter/*": [ "write" ]
+            },  
+            "uci": [ "appfilter" ]
+        }   
+    }   
+}