diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 32b1c93ed..179d7c8ca 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -126,14 +126,31 @@ install-data-hook:
 	find $(DESTDIR)$(PRIVATE_HTTPDDIR)/ -type f -print0 | xargs --no-run-if-empty -0 \
 		sed -i \
 			-e 's|%(CONFIGDIR)|$(CONFIGDIR)|g' \
+			-e 's|%(DATADIR)|$(DATADIR)|g' \
+			-e 's|%(FONTDIR)|$(FONTDIR)|g' \
+			-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
+			-e 's|%(LIBDIR)|$(LIBDIR)|g' \
+			-e 's|%(GAMESDIR)|$(GAMESDIR)|g' \
 			-e 's|%(ICONSDIR)|$(ICONSDIR)|g' \
+			-e 's|%(ICONSDIR_VAR)|$(ICONSDIR_VAR)|g' \
+			-e 's|%(LOCALEDIR)|$(LOCALEDIR)|g' \
+			-e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \
 			-e 's|%(PLUGINDIR)|$(PLUGINDIR)|g' \
-			-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
 			-e 's|%(PLUGINDIR_MNT)|$(PLUGINDIR_MNT)|g' \
+			-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
+			-e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \
+			-e 's|%(THEMESDIR)|$(THEMESDIR)|g' \
+			-e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \
+			-e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \
+			-e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \
 			-e 's|%(WEBTVDIR)|$(WEBTVDIR)|g' \
 			-e 's|%(WEBTVDIR_VAR)|$(WEBTVDIR_VAR)|g' \
+			-e 's|%(LOGODIR)|$(LOGODIR)|g' \
+			-e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \
 			-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
 			-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
+			-e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
+			-e 's|%(FLAGDIR)|$(FLAGDIR)|g' \
 	;
 	@# NI-yWeb
 	cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-NI_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css
diff --git a/src/nhttpd/yhttpd_mods/mod_yparser.cpp b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
index 3c403bf8f..b1e6fd9c9 100644
--- a/src/nhttpd/yhttpd_mods/mod_yparser.cpp
+++ b/src/nhttpd/yhttpd_mods/mod_yparser.cpp
@@ -456,24 +456,26 @@ std::string CyParser::YWeb_cgi_cmd(CyhookHandler *hh, std::string ycmd) {
 			else if (ycmd_name.compare("FONTDIR_VAR"))	yresult = FONTDIR_VAR;
 			else if (ycmd_name.compare("LIBDIR"))		yresult = LIBDIR;
 			else if (ycmd_name.compare("GAMESDIR"))		yresult = GAMESDIR;
+			else if (ycmd_name.compare("ICONSDIR"))		yresult = ICONSDIR;
+			else if (ycmd_name.compare("ICONSDIR_VAR"))	yresult = ICONSDIR_VAR;
+			else if (ycmd_name.compare("LOCALEDIR"))	yresult = LOCALEDIR;
+			else if (ycmd_name.compare("LOCALEDIR_VAR"))	yresult = LOCALEDIR_VAR;
 			else if (ycmd_name.compare("PLUGINDIR"))	yresult = PLUGINDIR;
 			else if (ycmd_name.compare("PLUGINDIR_VAR"))	yresult = PLUGINDIR_VAR;
+			else if (ycmd_name.compare("PLUGINDIR_MNT"))	yresult = PLUGINDIR_MNT;
+			else if (ycmd_name.compare("LUAPLUGINDIR"))	yresult = LUAPLUGINDIR;
+			else if (ycmd_name.compare("THEMESDIR"))	yresult = THEMESDIR;
+			else if (ycmd_name.compare("THEMESDIR_VAR"))	yresult = THEMESDIR_VAR;
 			else if (ycmd_name.compare("WEBRADIODIR"))	yresult = WEBRADIODIR;
 			else if (ycmd_name.compare("WEBRADIODIR_VAR"))	yresult = WEBRADIODIR_VAR;
 			else if (ycmd_name.compare("WEBTVDIR"))		yresult = WEBTVDIR;
 			else if (ycmd_name.compare("WEBTVDIR_VAR"))	yresult = WEBTVDIR_VAR;
-			else if (ycmd_name.compare("LUAPLUGINDIR"))	yresult = LUAPLUGINDIR;
-			else if (ycmd_name.compare("LOCALEDIR"))	yresult = LOCALEDIR;
-			else if (ycmd_name.compare("LOCALEDIR_VAR"))	yresult = LOCALEDIR_VAR;
-			else if (ycmd_name.compare("THEMESDIR"))	yresult = THEMESDIR;
-			else if (ycmd_name.compare("THEMESDIR_VAR"))	yresult = THEMESDIR_VAR;
-			else if (ycmd_name.compare("ICONSDIR"))		yresult = ICONSDIR;
-			else if (ycmd_name.compare("ICONSDIR_VAR"))	yresult = ICONSDIR_VAR;
 			else if (ycmd_name.compare("LOGODIR"))		yresult = LOGODIR;
 			else if (ycmd_name.compare("LOGODIR_VAR"))	yresult = LOGODIR_VAR;
 			else if (ycmd_name.compare("PRIVATE_HTTPDDIR"))	yresult = PRIVATE_HTTPDDIR;
 			else if (ycmd_name.compare("PUBLIC_HTTPDDIR"))	yresult = PUBLIC_HTTPDDIR;
 			else if (ycmd_name.compare("HOSTED_HTTPDDIR"))	yresult = HOSTED_HTTPDDIR;
+			else if (ycmd_name.compare("FLAGDIR"))		yresult = FLAGDIR;
 			else						yresult = "";
 		}
 		else if (ycmd_type == "ini-get") {