diff --git a/devel/wxformbuilder/Makefile b/devel/wxformbuilder/Makefile
index ad9d338bb50e..307bf75545bc 100644
--- a/devel/wxformbuilder/Makefile
+++ b/devel/wxformbuilder/Makefile
@@ -1,42 +1,24 @@
 PORTNAME=	wxformbuilder
-DISTVERSION=	3.5.0-beta
-PORTREVISION=	11
+DISTVERSION=	4.2.1
 CATEGORIES=	devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-nightly/${DISTVERSION}
-DISTNAME=	wxFormBuilder_v${DISTVERSION}-source
+MASTER_SITES=	https://github.com/wxFormBuilder/wxFormBuilder/releases/download/v${DISTVERSION}/
+DISTNAME=	wxFormBuilder-${DISTVERSION}-source-full
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	FreeBSD@Shaneware.Biz
 COMMENT=	WYSIWYG GUI Designer and Code Generator for wxWidgets
-WWW=		http://wxformbuilder.org/
+WWW=		https://github.com/wxFormBuilder/wxFormBuilder/
 
 LICENSE=	GPLv2
 
-USES=		compiler:c++11-lib dos2unix gmake zip
-USE_CSTD=	c++11
-USE_LDCONFIG=	yes
-USE_WX=		3.0+
-WRKSRC=		${WRKDIR}/source
-MAKE_ARGS=	config=release ARCH=
-BUILD_WRKSRC=	${WRKSRC}/build/${WX_VERSION}/gmake
-DOS2UNIX_GLOB=	*.lua
+LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
-do-configure:
-	cd ${WRKSRC} && ${SH} create_build_files4.sh
+USES=		cmake compiler:c++17-lang desktop-file-utils shared-mime-info
+USE_LDCONFIG=	yes
+USE_WX=		3.2+
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%WX_CONFIG%%|${WX_CONFIG}|g' ${WRKSRC}/build/premake/wxwidgets.lua \
-		${WRKSRC}/create_build_files4.sh ${WRKSRC}/sdk/plugin_interface/premake.lua \
-		${WRKSRC}/sdk/premake/scripts/wxpresets.lua
+EXTRACT_AFTER_ARGS=	--exclude third_party/tinyxml2 \
+			--no-same-owner --no-same-permissions
 
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/wxformbuilder
-	(cd ${WRKSRC}/output && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	(cd ${STAGEDIR}${DATADIR}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/bin)
-	${RM} -r ${STAGEDIR}${DATADIR}/bin/
-	(cd ${STAGEDIR}${DATADIR}/lib && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/lib)
-	${RM} -r ${STAGEDIR}${DATADIR}/lib/
-	${RM} -r ${STAGEDIR}${DATADIR}/share/
-	${RM} ${STAGEDIR}${DATADIR}/license.txt
-	${RM} ${STAGEDIR}${DATADIR}/Changelog.txt
+WRKSRC=		${WRKDIR}/${DISTNAME:S|-source-full||}
 
 .include <bsd.port.mk>
diff --git a/devel/wxformbuilder/distinfo b/devel/wxformbuilder/distinfo
index f2f13e7649bf..568d1123ded7 100644
--- a/devel/wxformbuilder/distinfo
+++ b/devel/wxformbuilder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wxFormBuilder_v3.5.0-beta-source.zip) = a8991efc268de36377ef21ad99320ff15d35d1b14ac6b50e5e63f7af86e16b64
-SIZE (wxFormBuilder_v3.5.0-beta-source.zip) = 2303953
+TIMESTAMP = 1781454545
+SHA256 (wxFormBuilder-4.2.1-source-full.tar.gz) = f0dbf353100077ee3fd6d412ccba3daa61891ee766e416154b2a6322ec34d2ed
+SIZE (wxFormBuilder-4.2.1-source-full.tar.gz) = 1846703
diff --git a/devel/wxformbuilder/files/patch-CMakeLists.txt b/devel/wxformbuilder/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..e37af4e2ef3e
--- /dev/null
+++ b/devel/wxformbuilder/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig	2024-05-29 20:13:30 UTC
++++ CMakeLists.txt
+@@ -91,6 +91,7 @@ find_package(Boost 1.71.0 REQUIRED)
+ restore_variable(BUILD_SHARED_LIBS)
+ # TODO: Some Boost packages do not include the CMake config files so config mode with the headers component can't be used
+ find_package(Boost 1.71.0 REQUIRED)
++find_package(tinyxml2 REQUIRED)
+ 
+ include(cmake/macros.cmake)
+ include(cmake/revision.cmake)
+@@ -104,7 +105,6 @@ stash_variable(BUILD_SHARED_LIBS ${WXFB_TINYXML2_SHARE
+ add_subdirectory(third_party/md5)
+ add_subdirectory(third_party/stack_trace)
+ stash_variable(BUILD_SHARED_LIBS ${WXFB_TINYXML2_SHARED})
+-add_subdirectory(third_party/tinyxml2 EXCLUDE_FROM_ALL)
+ restore_variable(BUILD_SHARED_LIBS)
+ 
+ if(NOT WXFB_BUILD_PLUGIN_HOST)
diff --git a/devel/wxformbuilder/files/patch-build_premake_bsd_Premake4.make b/devel/wxformbuilder/files/patch-build_premake_bsd_Premake4.make
deleted file mode 100644
index 513cb5d28a8d..000000000000
--- a/devel/wxformbuilder/files/patch-build_premake_bsd_Premake4.make
+++ /dev/null
@@ -1,35 +0,0 @@
---- build/premake/bsd/Premake4.make.orig	2011-10-20 19:58:38 UTC
-+++ build/premake/bsd/Premake4.make
-@@ -26,13 +26,13 @@ ifeq ($(config),release)
-   DEFINES   += -DNDEBUG
-   INCLUDES  += -I../4.3/src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -Os
-+  CFLAGS    += $(CPPFLAGS) -Wall -Os
-   CXXFLAGS  += $(CFLAGS) 
-   LDFLAGS   += -s -rdynamic
--  LIBS      += 
-+  LIBS      += -lm
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
-   LDDEPS    += 
--  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-+  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
-   define PREBUILDCMDS
-   endef
-   define PRELINKCMDS
-@@ -48,13 +48,13 @@ ifeq ($(config),debug)
-   DEFINES   += -D_DEBUG
-   INCLUDES  += -I../4.3/src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) $(ARCH) -Wall -g
-+  CFLAGS    += $(CPPFLAGS) -Wall -g
-   CXXFLAGS  += $(CFLAGS) 
-   LDFLAGS   += -rdynamic
-   LIBS      += 
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
-   LDDEPS    += 
--  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
-+  LINKCMD    = $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(LIBS)
-   define PREBUILDCMDS
-   endef
-   define PRELINKCMDS
diff --git a/devel/wxformbuilder/files/patch-build_premake_wxformbuilder.lua b/devel/wxformbuilder/files/patch-build_premake_wxformbuilder.lua
deleted file mode 100644
index 90e8f790d734..000000000000
--- a/devel/wxformbuilder/files/patch-build_premake_wxformbuilder.lua
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/premake/wxformbuilder.lua.orig	2015-08-29 07:06:33 UTC
-+++ build/premake/wxformbuilder.lua
-@@ -101,7 +101,7 @@ end
-         libdirs             {"../../output/lib/wxformbuilder"}
-         targetdir           "../../output/bin"
-         targetname          "wxformbuilder"
--        links               {"dl"}
-+        links               {}
- 
-     configuration "windows"
-         files               {"../../src/*.rc"}
diff --git a/devel/wxformbuilder/files/patch-build_premake_wxwidgets.lua b/devel/wxformbuilder/files/patch-build_premake_wxwidgets.lua
deleted file mode 100644
index f2ddcb3a625b..000000000000
--- a/devel/wxformbuilder/files/patch-build_premake_wxwidgets.lua
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/premake/wxwidgets.lua.orig	2015-08-29 07:09:15 UTC
-+++ build/premake/wxwidgets.lua
-@@ -246,7 +246,7 @@ function wx_config_Private(wxRoot, wxDeb
- 
-     -- use wx-config to figure out build parameters
-     function wx_config_for_posix()
--        local configCmd = "wx-config" -- this is the wx-config command line
-+        local configCmd = "%%WX_CONFIG%%" -- this is the wx-config command line
-         if wxRoot ~= "" then configCmd = path.join(wxRoot, "wx-config") end
- 
-         local function checkYesNo(value, option)
diff --git a/devel/wxformbuilder/files/patch-cmake_functions.cmake b/devel/wxformbuilder/files/patch-cmake_functions.cmake
new file mode 100644
index 000000000000..b1ec17c3ee9b
--- /dev/null
+++ b/devel/wxformbuilder/files/patch-cmake_functions.cmake
@@ -0,0 +1,11 @@
+--- cmake/functions.cmake.orig	2026-05-02 02:29:25 UTC
++++ cmake/functions.cmake
+@@ -200,7 +200,7 @@ function(wxfb_create_target_wxwidgets)
+   endif()
+   if(NOT wxWidgets_wxrc_EXECUTABLE)
+     # Config-Mode does not search for wxrc, assume the environment is properly setup and search for it ourself
+-    find_program(wxWidgets_wxrc_EXECUTABLE NAMES wxrc REQUIRED)
++    find_program(wxWidgets_wxrc_EXECUTABLE NAMES wxrc wxrc-3.2 REQUIRED)
+     mark_as_advanced(wxWidgets_wxrc_EXECUTABLE)
+   endif()
+ 
diff --git a/devel/wxformbuilder/files/patch-create__build__files4.sh b/devel/wxformbuilder/files/patch-create__build__files4.sh
deleted file mode 100644
index a383ff36da02..000000000000
--- a/devel/wxformbuilder/files/patch-create__build__files4.sh
+++ /dev/null
@@ -1,50 +0,0 @@
---- create_build_files4.sh.orig	2013-08-02 21:08:28 UTC
-+++ create_build_files4.sh
-@@ -4,7 +4,7 @@
- shared=""
- arch=""
- wxroot=""
--wxpath=`wx-config --prefix`
-+wxpath=`%%WX_CONFIG%% --prefix`
- 
- # These works only on wxWidgets 2.8.10+
- #wxcharset=`wx-config --query-chartype`
-@@ -63,7 +63,7 @@ done
- 
- # Autodetect wxWidgets version
- if [ "$wxroot" = "" ]; then
--    wxver=`wx-config --release`
-+    wxver=`%%WX_CONFIG%% --release`
- else
-     wxpath=${wxroot#-*=}
-     wxver=`$wxpath/wx-config --release`
-@@ -72,9 +72,9 @@ fi
- wxversion="--wx-version="$wxver
- 
- # Autodetect OS
-+unamestr=`uname`
- isbsd=`expr "$unamestr" : '.*BSD'`
- platform="unknown"
--unamestr=$(uname)
- 
- if ( [ "$isbsd" -gt "0" ] ); then
-     platform="bsd"
-@@ -86,12 +86,12 @@ fi
- 
- # Build premake
- cd build
--make CONFIG=Release -C./premake/$platform
-+gmake CONFIG=Release -C./premake/$platform
- 
--./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch codeblocks
--./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch $rpath codelite
-+#./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch codeblocks
-+#./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch $rpath codelite
- ./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch $rpath gmake
--if [ "$platform" = "macosx" ]; then
--   ./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch xcode3
--fi
-+#if [ "$platform" = "macosx" ]; then
-+#   ./premake/$platform/bin/release/premake4 --file=./premake/solution.lua $wxunicode $wxroot $wxversion $mediactrl $shared $arch xcode3
-+#fi
- 
diff --git a/devel/wxformbuilder/files/patch-sdk_plugin__interface_premake.lua b/devel/wxformbuilder/files/patch-sdk_plugin__interface_premake.lua
deleted file mode 100644
index 49794193df30..000000000000
--- a/devel/wxformbuilder/files/patch-sdk_plugin__interface_premake.lua
+++ /dev/null
@@ -1,17 +0,0 @@
---- sdk/plugin_interface/premake.lua.orig	2015-08-29 07:10:51 UTC
-+++ sdk/plugin_interface/premake.lua
-@@ -216,10 +216,10 @@ else
- 	table.insert( package.buildoptions, "-fPIC" )
- 
- 	-- Set wxWidgets build options.
--	table.insert( package.config["Debug"].buildoptions, "`wx-config "..debug_option.." --cflags`" )
--	table.insert( package.config["Release"].buildoptions, "`wx-config --debug=no --cflags`" )
-+	table.insert( package.config["Debug"].buildoptions, "`%%WX_CONFIG%% "..debug_option.." --cflags`" )
-+	table.insert( package.config["Release"].buildoptions, "`%%WX_CONFIG%% --debug=no --cflags`" )
- 
- 	-- Set the wxWidgets link options.
--	table.insert( package.config["Debug"].linkoptions, "`wx-config "..debug_option.." --libs`" )
--	table.insert( package.config["Release"].linkoptions, "`wx-config --libs`" )
-+	table.insert( package.config["Debug"].linkoptions, "`%%WX_CONFIG%% "..debug_option.." --libs`" )
-+	table.insert( package.config["Release"].linkoptions, "`%%WX_CONFIG%% --libs`" )
- end
diff --git a/devel/wxformbuilder/files/patch-sdk_premake_scripts_wxpresets.lua b/devel/wxformbuilder/files/patch-sdk_premake_scripts_wxpresets.lua
deleted file mode 100644
index dccc2b41d895..000000000000
--- a/devel/wxformbuilder/files/patch-sdk_premake_scripts_wxpresets.lua
+++ /dev/null
@@ -1,30 +0,0 @@
---- sdk/premake/scripts/wxpresets.lua.orig	2015-08-29 07:11:48 UTC
-+++ sdk/premake/scripts/wxpresets.lua
-@@ -197,12 +197,12 @@ function ConfigureWxWidgets( package, al
- 		table.insert( package.excludes, matchrecursive( "*.rc" ) )
- 		
- 		-- Set wxWidgets build options.
--		table.insert( package.config["Debug"].buildoptions, "`wx-config "..debug_option.." --cflags`" )
--		table.insert( package.config["Release"].buildoptions, "`wx-config --debug=no --cflags`" )
-+		table.insert( package.config["Debug"].buildoptions, "`%%WX_CONFIG%% "..debug_option.." --cflags`" )
-+		table.insert( package.config["Release"].buildoptions, "`%%WX_CONFIG%% --debug=no --cflags`" )
- 		
- 		-- Set the wxWidgets link options.
--		table.insert( package.config["Debug"].linkoptions, "`wx-config "..debug_option.." --libs`" )
--		table.insert( package.config["Release"].linkoptions, "`wx-config --libs`" )
-+		table.insert( package.config["Debug"].linkoptions, "`%%WX_CONFIG%% "..debug_option.." --libs`" )
-+		table.insert( package.config["Release"].linkoptions, "`%%WX_CONFIG%% --libs`" )
- 		
- 		-- Set the Linux defines.
- 		table.insert( package.defines, "__WXGTK__" )
-@@ -212,8 +212,8 @@ function ConfigureWxWidgets( package, al
- 			package.config["Release"].target = targetName
- 			package.config["Debug"].target = targetName.."d"
- 		else
--			package.config["Debug"].target = "`wx-config "..debug_option.." --basename`_"..targetName.."-`wx-config --release`"
--			package.config["Release"].target = "`wx-config --basename`_"..targetName.."-`wx-config --release`"
-+			package.config["Debug"].target = "`%%WX_CONFIG%% "..debug_option.." --basename`_"..targetName.."-`%%WX_CONFIG%% --release`"
-+			package.config["Release"].target = "`%%WX_CONFIG%% --basename`_"..targetName.."-`%%WX_CONFIG%% --release`"
- 		end
- 	end
- end
diff --git a/devel/wxformbuilder/pkg-plist b/devel/wxformbuilder/pkg-plist
index 9047c8706583..7bf680ff8c4b 100644
--- a/devel/wxformbuilder/pkg-plist
+++ b/devel/wxformbuilder/pkg-plist
@@ -1,193 +1,208 @@
 bin/wxformbuilder
 lib/wxformbuilder/libadditional.so
 lib/wxformbuilder/libcommon.so
 lib/wxformbuilder/libcontainers.so
 lib/wxformbuilder/libforms.so
 lib/wxformbuilder/liblayout.so
+share/applications/org.wxformbuilder.wxFormBuilder.desktop
+share/icons/hicolor/128x128/apps/org.wxformbuilder.wxFormBuilder.png
+share/icons/hicolor/128x128/mimetypes/org.wxformbuilder.wxFormBuilder.application-x-wxformbuilder.png
+share/icons/hicolor/48x48/apps/org.wxformbuilder.wxFormBuilder.png
+share/icons/hicolor/48x48/mimetypes/org.wxformbuilder.wxFormBuilder.application-x-wxformbuilder.png
+share/metainfo/org.wxformbuilder.wxFormBuilder.metainfo.xml
+share/mime/packages/org.wxformbuilder.wxFormBuilder.xml
+%%DATADIR%%/CHANGELOG.md
+%%DATADIR%%/LICENSE
+%%DATADIR%%/plugins/additional/icons/bitmap_toggle_button.xpm
 %%DATADIR%%/plugins/additional/icons/calendar.xpm
 %%DATADIR%%/plugins/additional/icons/calendar16x16.xpm
 %%DATADIR%%/plugins/additional/icons/checklistbox.xpm
 %%DATADIR%%/plugins/additional/icons/colourPickerIcon.xpm
 %%DATADIR%%/plugins/additional/icons/combo_box.xpm
 %%DATADIR%%/plugins/additional/icons/custom_control.xpm
+%%DATADIR%%/plugins/additional/icons/customcode.xpm
 %%DATADIR%%/plugins/additional/icons/dataview_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/dataviewlist_column.xpm
 %%DATADIR%%/plugins/additional/icons/dataviewlist_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/dataviewtree_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/datepicker.xpm
 %%DATADIR%%/plugins/additional/icons/dirPicker.xpm
 %%DATADIR%%/plugins/additional/icons/filePicker.xpm
 %%DATADIR%%/plugins/additional/icons/fontPicker.xpm
 %%DATADIR%%/plugins/additional/icons/genericdir_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/grid.xpm
 %%DATADIR%%/plugins/additional/icons/htmlwin.xpm
 %%DATADIR%%/plugins/additional/icons/hyperlink_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/media_ctrl.xpm
 %%DATADIR%%/plugins/additional/icons/propgrid.xpm
 %%DATADIR%%/plugins/additional/icons/propgriditem.xpm
 %%DATADIR%%/plugins/additional/icons/propgridman.xpm
 %%DATADIR%%/plugins/additional/icons/propgridpage.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_bar.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_button.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_button_dropdown.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_button_hybrid.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_button_toggle.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_buttonbar.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_gallery.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_page.xpm
 %%DATADIR%%/plugins/additional/icons/ribbon_panel.xpm
 %%DATADIR%%/plugins/additional/icons/richtextctrl.xpm
 %%DATADIR%%/plugins/additional/icons/scintilla.xpm
 %%DATADIR%%/plugins/additional/icons/scrollbar.xpm
 %%DATADIR%%/plugins/additional/icons/search.xpm
 %%DATADIR%%/plugins/additional/icons/spin_ctrl.xpm
+%%DATADIR%%/plugins/additional/icons/spin_ctrl_double.xpm
 %%DATADIR%%/plugins/additional/icons/spinbtn.xpm
+%%DATADIR%%/plugins/additional/icons/timepicker.xpm
 %%DATADIR%%/plugins/additional/icons/timer.xpm
 %%DATADIR%%/plugins/additional/icons/toggle_button.xpm
 %%DATADIR%%/plugins/additional/icons/tree_ctrl.xpm
+%%DATADIR%%/plugins/additional/icons/treelistctrl.xpm
+%%DATADIR%%/plugins/additional/icons/treelistctrlcolumn.xpm
 %%DATADIR%%/plugins/additional/xml/additional.cppcode
 %%DATADIR%%/plugins/additional/xml/additional.luacode
 %%DATADIR%%/plugins/additional/xml/additional.phpcode
 %%DATADIR%%/plugins/additional/xml/additional.pythoncode
 %%DATADIR%%/plugins/additional/xml/additional.xml
 %%DATADIR%%/plugins/additional/xml/data.cppcode
 %%DATADIR%%/plugins/additional/xml/data.luacode
 %%DATADIR%%/plugins/additional/xml/data.phpcode
 %%DATADIR%%/plugins/additional/xml/data.pythoncode
 %%DATADIR%%/plugins/additional/xml/data.xml
 %%DATADIR%%/plugins/additional/xml/ribbon.cppcode
 %%DATADIR%%/plugins/additional/xml/ribbon.luacode
 %%DATADIR%%/plugins/additional/xml/ribbon.phpcode
 %%DATADIR%%/plugins/additional/xml/ribbon.pythoncode
 %%DATADIR%%/plugins/additional/xml/ribbon.xml
 %%DATADIR%%/plugins/common/icons/animation.xpm
 %%DATADIR%%/plugins/common/icons/auitoolbar.xpm
 %%DATADIR%%/plugins/common/icons/bitmap_button.xpm
 %%DATADIR%%/plugins/common/icons/button.xpm
 %%DATADIR%%/plugins/common/icons/button16x16.xpm
 %%DATADIR%%/plugins/common/icons/checkbox.xpm
 %%DATADIR%%/plugins/common/icons/choice.xpm
 %%DATADIR%%/plugins/common/icons/combo_box.xpm
 %%DATADIR%%/plugins/common/icons/gauge.xpm
 %%DATADIR%%/plugins/common/icons/infobar.xpm
 %%DATADIR%%/plugins/common/icons/list_box.xpm
 %%DATADIR%%/plugins/common/icons/list_ctrl.xpm
 %%DATADIR%%/plugins/common/icons/menu.xpm
 %%DATADIR%%/plugins/common/icons/menubar.xpm
 %%DATADIR%%/plugins/common/icons/menuitem.xpm
 %%DATADIR%%/plugins/common/icons/radio_box.xpm
 %%DATADIR%%/plugins/common/icons/radio_button.xpm
 %%DATADIR%%/plugins/common/icons/separator.xpm
 %%DATADIR%%/plugins/common/icons/slider.xpm
 %%DATADIR%%/plugins/common/icons/static_bitmap.xpm
 %%DATADIR%%/plugins/common/icons/static_line.xpm
 %%DATADIR%%/plugins/common/icons/static_text.xpm
 %%DATADIR%%/plugins/common/icons/statusbar.xpm
 %%DATADIR%%/plugins/common/icons/submenu.xpm
 %%DATADIR%%/plugins/common/icons/text_ctrl.xpm
 %%DATADIR%%/plugins/common/icons/tool.xpm
 %%DATADIR%%/plugins/common/icons/toolSeparator.xpm
 %%DATADIR%%/plugins/common/icons/toolbar.xpm
 %%DATADIR%%/plugins/common/xml/common.cppcode
 %%DATADIR%%/plugins/common/xml/common.luacode
 %%DATADIR%%/plugins/common/xml/common.phpcode
 %%DATADIR%%/plugins/common/xml/common.pythoncode
 %%DATADIR%%/plugins/common/xml/common.xml
 %%DATADIR%%/plugins/common/xml/menutoolbar.cppcode
 %%DATADIR%%/plugins/common/xml/menutoolbar.luacode
 %%DATADIR%%/plugins/common/xml/menutoolbar.phpcode
 %%DATADIR%%/plugins/common/xml/menutoolbar.pythoncode
 %%DATADIR%%/plugins/common/xml/menutoolbar.xml
 %%DATADIR%%/plugins/containers/icons/auinotebook.xpm
 %%DATADIR%%/plugins/containers/icons/choicebook.xpm
+%%DATADIR%%/plugins/containers/icons/collpane.xpm
 %%DATADIR%%/plugins/containers/icons/listbook.xpm
 %%DATADIR%%/plugins/containers/icons/notebook.xpm
 %%DATADIR%%/plugins/containers/icons/panel.xpm
 %%DATADIR%%/plugins/containers/icons/scrollwin.xpm
 %%DATADIR%%/plugins/containers/icons/splitter_window.xpm
 %%DATADIR%%/plugins/containers/xml/containers.cppcode
 %%DATADIR%%/plugins/containers/xml/containers.luacode
 %%DATADIR%%/plugins/containers/xml/containers.phpcode
 %%DATADIR%%/plugins/containers/xml/containers.pythoncode
 %%DATADIR%%/plugins/containers/xml/containers.xml
 %%DATADIR%%/plugins/forms/icons/dialog.xpm
 %%DATADIR%%/plugins/forms/icons/doc_mdi_parent_frame.xpm
 %%DATADIR%%/plugins/forms/icons/doc_parent_frame.xpm
 %%DATADIR%%/plugins/forms/icons/document.xpm
 %%DATADIR%%/plugins/forms/icons/frame.xpm
 %%DATADIR%%/plugins/forms/icons/frame16x16.png
 %%DATADIR%%/plugins/forms/icons/menubar.xpm
 %%DATADIR%%/plugins/forms/icons/panel.xpm
 %%DATADIR%%/plugins/forms/icons/toolbar.xpm
 %%DATADIR%%/plugins/forms/icons/wizard.xpm
 %%DATADIR%%/plugins/forms/icons/wizpage.xpm
 %%DATADIR%%/plugins/forms/xml/forms.cppcode
 %%DATADIR%%/plugins/forms/xml/forms.luacode
 %%DATADIR%%/plugins/forms/xml/forms.phpcode
 %%DATADIR%%/plugins/forms/xml/forms.pythoncode
 %%DATADIR%%/plugins/forms/xml/forms.xml
 %%DATADIR%%/plugins/layout/icons/flex_grid_sizer.xpm
 %%DATADIR%%/plugins/layout/icons/grid_bag_sizer.xpm
 %%DATADIR%%/plugins/layout/icons/grid_sizer.xpm
 %%DATADIR%%/plugins/layout/icons/sizer.xpm
 %%DATADIR%%/plugins/layout/icons/sizer16x16.xpm
 %%DATADIR%%/plugins/layout/icons/spacer.xpm
 %%DATADIR%%/plugins/layout/icons/staticbox_sizer.xpm
 %%DATADIR%%/plugins/layout/icons/stddialogbuttonsizer.xpm
+%%DATADIR%%/plugins/layout/icons/wrap_sizer.xpm
 %%DATADIR%%/plugins/layout/xml/layout.cppcode
 %%DATADIR%%/plugins/layout/xml/layout.luacode
 %%DATADIR%%/plugins/layout/xml/layout.phpcode
 %%DATADIR%%/plugins/layout/xml/layout.pythoncode
 %%DATADIR%%/plugins/layout/xml/layout.xml
 %%DATADIR%%/resources/about.html
 %%DATADIR%%/resources/icons/balign.png
 %%DATADIR%%/resources/icons/bottom.xpm
 %%DATADIR%%/resources/icons/c++.png
 %%DATADIR%%/resources/icons/chalign.png
 %%DATADIR%%/resources/icons/copy.xpm
 %%DATADIR%%/resources/icons/cpp.png
 %%DATADIR%%/resources/icons/cut.png
 %%DATADIR%%/resources/icons/cvalign.png
 %%DATADIR%%/resources/icons/delete.png
 %%DATADIR%%/resources/icons/designer.png
 %%DATADIR%%/resources/icons/events.png
 %%DATADIR%%/resources/icons/expand.png
 %%DATADIR%%/resources/icons/generate.png
 %%DATADIR%%/resources/icons/h.png
 %%DATADIR%%/resources/icons/lalign.png
 %%DATADIR%%/resources/icons/left.xpm
 %%DATADIR%%/resources/icons/logo.png
 %%DATADIR%%/resources/icons/logo.xpm
 %%DATADIR%%/resources/icons/lua.png
 %%DATADIR%%/resources/icons/new.png
 %%DATADIR%%/resources/icons/open.png
 %%DATADIR%%/resources/icons/paste.png
 %%DATADIR%%/resources/icons/php.png
 %%DATADIR%%/resources/icons/prefs.xpm
 %%DATADIR%%/resources/icons/project.xpm
 %%DATADIR%%/resources/icons/properties.png
 %%DATADIR%%/resources/icons/python.png
 %%DATADIR%%/resources/icons/ralign.png
 %%DATADIR%%/resources/icons/redo.png
 %%DATADIR%%/resources/icons/right.xpm
 %%DATADIR%%/resources/icons/save.png
 %%DATADIR%%/resources/icons/stretch.png
 %%DATADIR%%/resources/icons/swap.png
 %%DATADIR%%/resources/icons/talign.png
 %%DATADIR%%/resources/icons/top.xpm
 %%DATADIR%%/resources/icons/undo.png
 %%DATADIR%%/resources/icons/wxwin16x16.xpm
 %%DATADIR%%/resources/icons/xrc.png
-%%DATADIR%%/resources/splash.png
-%%DATADIR%%/resources/wxFormBuilder_Banner.png
-%%DATADIR%%/xml/default.cppcode
-%%DATADIR%%/xml/default.luacode
-%%DATADIR%%/xml/default.phpcode
-%%DATADIR%%/xml/default.pythoncode
-%%DATADIR%%/xml/default.xml
-%%DATADIR%%/xml/icons.xml
-%%DATADIR%%/xml/objtypes.xml
-%%DATADIR%%/xml/properties.cppcode
-%%DATADIR%%/xml/properties.luacode
-%%DATADIR%%/xml/properties.phpcode
-%%DATADIR%%/xml/properties.pythoncode
+%%DATADIR%%/resources/xml/default.cppcode
+%%DATADIR%%/resources/xml/default.luacode
+%%DATADIR%%/resources/xml/default.phpcode
+%%DATADIR%%/resources/xml/default.pythoncode
+%%DATADIR%%/resources/xml/default.xml
+%%DATADIR%%/resources/xml/icons.xml
+%%DATADIR%%/resources/xml/objtypes.xml
+%%DATADIR%%/resources/xml/properties.cppcode
+%%DATADIR%%/resources/xml/properties.luacode
+%%DATADIR%%/resources/xml/properties.phpcode
+%%DATADIR%%/resources/xml/properties.pythoncode