diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index a66a042f..45dc996a 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -17,7 +17,7 @@ define Package/gluon-config-mode-core
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Configuration wizard for user friendly setup of new mesh nodes
-  DEPENDS:=+gluon-setup-mode +gluon-web-theme +gluon-lock-password +pretty-hostname
+  DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-web-theme +uhttpd
 endef
 
 define Build/Prepare
@@ -35,6 +35,12 @@ endef
 define Package/gluon-config-mode-core/install
 	$(CP) ./files/* $(1)/
 	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
+
+	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
+	$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
+	$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
+	$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
+
 	$(call GluonInstallI18N,gluon-config-mode-core,$(1))
 endef
 
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50uhttpd b/package/gluon-config-mode-core/files/lib/gluon/setup-mode/rc.d/S50uhttpd
similarity index 100%
rename from package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50uhttpd
rename to package/gluon-config-mode-core/files/lib/gluon/setup-mode/rc.d/S50uhttpd
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index b76ab6c0..5a6e9b32 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -15,7 +15,7 @@ define Package/gluon-setup-mode
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=Setup mode
-  DEPENDS:=+gluon-core +gluon-web-model +ubus +uhttpd +dnsmasq
+  DEPENDS:=+gluon-core +gluon-lock-password +ubus +dnsmasq
 endef
 
 define Package/gluon-setup-mode/description