diff --git a/devel/libnsutils/Makefile b/devel/libnsutils/Makefile
--- a/devel/libnsutils/Makefile
+++ b/devel/libnsutils/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libnsutils
-PORTVERSION=	0.1.0
+PORTVERSION=	0.1.1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/devel/libnsutils/distinfo b/devel/libnsutils/distinfo
--- a/devel/libnsutils/distinfo
+++ b/devel/libnsutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590480505
-SHA256 (libnsutils-0.1.0-src.tar.gz) = 790c6516344abe82f6289d656392e9ccebe475b20cc7e1e2d843011385f7aef0
-SIZE (libnsutils-0.1.0-src.tar.gz) = 8840
+TIMESTAMP = 1704365062
+SHA256 (libnsutils-0.1.1-src.tar.gz) = 5694b4526e458ed000413ce6027589cbe10a257a7ecf065a01421dc7299dea92
+SIZE (libnsutils-0.1.1-src.tar.gz) = 8996
diff --git a/devel/libnsutils/pkg-plist b/devel/libnsutils/pkg-plist
--- a/devel/libnsutils/pkg-plist
+++ b/devel/libnsutils/pkg-plist
@@ -1,3 +1,4 @@
+include/nsutils/assert.h
 include/nsutils/base64.h
 include/nsutils/endian.h
 include/nsutils/errors.h
diff --git a/devel/libparserutils/Makefile b/devel/libparserutils/Makefile
--- a/devel/libparserutils/Makefile
+++ b/devel/libparserutils/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libparserutils
-PORTVERSION=	0.2.4
+PORTVERSION=	0.2.5
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/devel/libparserutils/distinfo b/devel/libparserutils/distinfo
--- a/devel/libparserutils/distinfo
+++ b/devel/libparserutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536021210
-SHA256 (libparserutils-0.2.4-src.tar.gz) = 322bae61b30ccede3e305bf6eae2414920649775bc5ff1d1b688012a3c4947d8
-SIZE (libparserutils-0.2.4-src.tar.gz) = 74521
+TIMESTAMP = 1704365062
+SHA256 (libparserutils-0.2.5-src.tar.gz) = 317ed5c718f17927b5721974bae5de32c3fd6d055db131ad31b4312a032ed139
+SIZE (libparserutils-0.2.5-src.tar.gz) = 74518
diff --git a/devel/netsurf-buildsystem/Makefile b/devel/netsurf-buildsystem/Makefile
--- a/devel/netsurf-buildsystem/Makefile
+++ b/devel/netsurf-buildsystem/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	buildsystem
-PORTVERSION=	1.9
+PORTVERSION=	1.10
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 PKGNAMEPREFIX=	netsurf-
diff --git a/devel/netsurf-buildsystem/distinfo b/devel/netsurf-buildsystem/distinfo
--- a/devel/netsurf-buildsystem/distinfo
+++ b/devel/netsurf-buildsystem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612663021
-SHA256 (buildsystem-1.9.tar.gz) = 93841e314a688209a20b8745f065393f3a90f01be68f45e96bc8d2f4a2aa9a2a
-SIZE (buildsystem-1.9.tar.gz) = 38723
+TIMESTAMP = 1704365062
+SHA256 (buildsystem-1.10.tar.gz) = 3d3e39d569e44677c4b179129bde614c65798e2b3e6253160239d1fd6eae4d79
+SIZE (buildsystem-1.10.tar.gz) = 39221
diff --git a/devel/nsgenbind/Makefile b/devel/nsgenbind/Makefile
--- a/devel/nsgenbind/Makefile
+++ b/devel/nsgenbind/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	nsgenbind
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	devel
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/devel/nsgenbind/distinfo b/devel/nsgenbind/distinfo
--- a/devel/nsgenbind/distinfo
+++ b/devel/nsgenbind/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590480413
-SHA256 (nsgenbind-0.8-src.tar.gz) = 4d8d53ad000ada712772365e6a73eb8fc5ce97584af9c865ac5b26a2187f1cb3
-SIZE (nsgenbind-0.8-src.tar.gz) = 117463
+TIMESTAMP = 1704365062
+SHA256 (nsgenbind-0.9-src.tar.gz) = 232ce0f66cbc2c3eed6288ae26de2c567bbfbbc01d8b0f6fc6c1c1649d4b385d
+SIZE (nsgenbind-0.9-src.tar.gz) = 117484
diff --git a/dns/libnspsl/Makefile b/dns/libnspsl/Makefile
--- a/dns/libnspsl/Makefile
+++ b/dns/libnspsl/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libnspsl
-PORTVERSION=	0.1.6
+PORTVERSION=	0.1.7
 CATEGORIES=	dns
 MASTER_SITES=	https://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/dns/libnspsl/distinfo b/dns/libnspsl/distinfo
--- a/dns/libnspsl/distinfo
+++ b/dns/libnspsl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611158625
-SHA256 (libnspsl-0.1.6-src.tar.gz) = d3c58205cb78d310bf81ca55347a2d098719cecac7046bc367983b138b45020b
-SIZE (libnspsl-0.1.6-src.tar.gz) = 320130
+TIMESTAMP = 1704365062
+SHA256 (libnspsl-0.1.7-src.tar.gz) = 3684cec32f555daed431993e0bf6cbd9374f6c908446237e089f0b61d694ac80
+SIZE (libnspsl-0.1.7-src.tar.gz) = 337538
diff --git a/graphics/libnsbmp/Makefile b/graphics/libnsbmp/Makefile
--- a/graphics/libnsbmp/Makefile
+++ b/graphics/libnsbmp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libnsbmp
-PORTVERSION=	0.1.6
+PORTVERSION=	0.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/graphics/libnsbmp/distinfo b/graphics/libnsbmp/distinfo
--- a/graphics/libnsbmp/distinfo
+++ b/graphics/libnsbmp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1590480472
-SHA256 (libnsbmp-0.1.6-src.tar.gz) = 79c49365f860ed451bfc4109eddec8de3e9b7ce5a3be069596bd2aa19279324f
-SIZE (libnsbmp-0.1.6-src.tar.gz) = 463348
+TIMESTAMP = 1704365062
+SHA256 (libnsbmp-0.1.7-src.tar.gz) = 5407a7682a122baaaa5a15b505290e2d37df54c13c5edef4b09d12c862d82293
+SIZE (libnsbmp-0.1.7-src.tar.gz) = 466530
diff --git a/graphics/libnsgif/Makefile b/graphics/libnsgif/Makefile
--- a/graphics/libnsgif/Makefile
+++ b/graphics/libnsgif/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libnsgif
-PORTVERSION=	0.2.1
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/graphics/libnsgif/distinfo b/graphics/libnsgif/distinfo
--- a/graphics/libnsgif/distinfo
+++ b/graphics/libnsgif/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536011356
-SHA256 (libnsgif-0.2.1-src.tar.gz) = 9eaea534cd70b53c5aaf45317ae957701685a6b4a88dbe34ed26f4faae879a4b
-SIZE (libnsgif-0.2.1-src.tar.gz) = 268328
+TIMESTAMP = 1704365062
+SHA256 (libnsgif-1.0.0-src.tar.gz) = 6014c842f61454d2f5a0f8243d7a8d7bde9b7da3ccfdca2d346c7c0b2c4c061b
+SIZE (libnsgif-1.0.0-src.tar.gz) = 282568
diff --git a/graphics/libnsgif/files/patch-Makefile b/graphics/libnsgif/files/patch-Makefile
--- a/graphics/libnsgif/files/patch-Makefile
+++ b/graphics/libnsgif/files/patch-Makefile
@@ -1,9 +1,9 @@
---- Makefile.orig	2016-01-03 11:46:21 UTC
-+++ Makefile
-@@ -45,5 +45,5 @@ include $(NSBUILD)/Makefile.top
+--- Makefile.orig       2024-01-03 20:52:18.221899000 +0000
++++ Makefile    2024-01-03 20:53:08.289191000 +0000
+@@ -46,5 +46,5 @@
  # Extra installation rules
  I := /$(INCLUDEDIR)
- INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsgif.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/nsgif.h
 -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
 -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
 +INSTALL_ITEMS := $(INSTALL_ITEMS) /libdata/pkgconfig:lib$(COMPONENT).pc.in
diff --git a/graphics/libnsgif/pkg-plist b/graphics/libnsgif/pkg-plist
--- a/graphics/libnsgif/pkg-plist
+++ b/graphics/libnsgif/pkg-plist
@@ -1,5 +1,5 @@
-include/libnsgif.h
+include/nsgif.h
 lib/libnsgif.so
-lib/libnsgif.so.0
+lib/libnsgif.so.1
 lib/libnsgif.so.%%VERSION%%
 libdata/pkgconfig/libnsgif.pc
diff --git a/textproc/libcss/Makefile b/textproc/libcss/Makefile
--- a/textproc/libcss/Makefile
+++ b/textproc/libcss/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libcss
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 CATEGORIES=	textproc
 MASTER_SITES=	https://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/textproc/libcss/distinfo b/textproc/libcss/distinfo
--- a/textproc/libcss/distinfo
+++ b/textproc/libcss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591912468
-SHA256 (libcss-0.9.1-src.tar.gz) = d2dce16e93392e8d6a7209420d47c2d56a3811701a0e81a724fc541c63d3c6dc
-SIZE (libcss-0.9.1-src.tar.gz) = 522715
+TIMESTAMP = 1704365062
+SHA256 (libcss-0.9.2-src.tar.gz) = 2df215bbec34d51d60c1a04b01b2df4d5d18f510f1f3a7af4b80cddb5671154e
+SIZE (libcss-0.9.2-src.tar.gz) = 545016
diff --git a/textproc/libcss/files/patch-Makefile b/textproc/libcss/files/patch-Makefile
--- a/textproc/libcss/files/patch-Makefile
+++ b/textproc/libcss/files/patch-Makefile
@@ -1,9 +1,9 @@
---- Makefile.orig	2016-02-16 10:49:56 UTC
-+++ Makefile
-@@ -65,5 +65,5 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):i
- INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/select.h
+--- Makefile.orig       2024-01-03 19:15:49.826265000 +0000
++++ Makefile    2024-01-03 19:16:56.913023000 +0000
+@@ -66,5 +66,5 @@
  INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/stylesheet.h
  INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/types.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/unit.h
 -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
 -INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
 +INSTALL_ITEMS := $(INSTALL_ITEMS) /libdata/pkgconfig:lib$(COMPONENT).pc.in
diff --git a/textproc/libcss/pkg-plist b/textproc/libcss/pkg-plist
--- a/textproc/libcss/pkg-plist
+++ b/textproc/libcss/pkg-plist
@@ -9,6 +9,7 @@
 include/libcss/select.h
 include/libcss/stylesheet.h
 include/libcss/types.h
+include/libcss/unit.h
 lib/libcss.so
 lib/libcss.so.0
 lib/libcss.so.%%VERSION%%
diff --git a/www/libdom/Makefile b/www/libdom/Makefile
--- a/www/libdom/Makefile
+++ b/www/libdom/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libdom
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/www/libdom/distinfo b/www/libdom/distinfo
--- a/www/libdom/distinfo
+++ b/www/libdom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591233349
-SHA256 (libdom-0.4.1-src.tar.gz) = 98ee072471e55e208c9878e515c410ad462ca36f87b4afcbecad023f3a2cef4a
-SIZE (libdom-0.4.1-src.tar.gz) = 872954
+TIMESTAMP = 1704365062
+SHA256 (libdom-0.4.2-src.tar.gz) = d05e45af16547014c2b0a3aecf3670fa13d419f505b3f5fc7ac8a1491fc30f3c
+SIZE (libdom-0.4.2-src.tar.gz) = 878706
diff --git a/www/libdom/pkg-plist b/www/libdom/pkg-plist
--- a/www/libdom/pkg-plist
+++ b/www/libdom/pkg-plist
@@ -19,6 +19,7 @@
 include/dom/core/pi.h
 include/dom/core/string.h
 include/dom/core/text.h
+include/dom/core/tokenlist.h
 include/dom/core/typeinfo.h
 include/dom/dom.h
 include/dom/events/custom_event.h
diff --git a/www/libhubbub/Makefile b/www/libhubbub/Makefile
--- a/www/libhubbub/Makefile
+++ b/www/libhubbub/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libhubbub
-PORTVERSION=	0.3.7
+PORTVERSION=	0.3.8
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/libs/releases/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/www/libhubbub/distinfo b/www/libhubbub/distinfo
--- a/www/libhubbub/distinfo
+++ b/www/libhubbub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595077519
-SHA256 (libhubbub-0.3.7-src.tar.gz) = 9e7ae253e6c9069e757eb9ad4e4846f38b4db52c0ca0151446a9fa4a977735b6
-SIZE (libhubbub-0.3.7-src.tar.gz) = 784780
+TIMESTAMP = 1704365062
+SHA256 (libhubbub-0.3.8-src.tar.gz) = 8ac1e6f5f3d48c05141d59391719534290c59cd029efc249eb4fdbac102cd5a5
+SIZE (libhubbub-0.3.8-src.tar.gz) = 780549
diff --git a/www/netsurf/Makefile b/www/netsurf/Makefile
--- a/www/netsurf/Makefile
+++ b/www/netsurf/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	netsurf
-PORTVERSION=	3.10
+PORTVERSION=	3.11
 PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	http://download.netsurf-browser.org/netsurf/releases/source/
@@ -38,7 +38,7 @@
 CPE_VENDOR=	${PORTNAME}-browser
 USE_GNOME=	cairo glib20 gtk30 librsvg2
 
-SHEBANG_FILES=	utils/split-messages.pl
+SHEBANG_FILES=	tools/split-messages.pl
 perl_CMD=	${PERL}
 
 MAKE_ARGS=	CC="${CC}" \
@@ -74,15 +74,15 @@
 .for d in applications pixmaps
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/${d}
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/deoptions.gtk3.ui \
+	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/deoptions.ui \
 		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/enoptions.gtk3.ui \
+	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/enoptions.ui \
 		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/froptions.gtk3.ui \
+	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/froptions.ui \
 		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/itoptions.gtk3.ui \
+	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/itoptions.ui \
 		${STAGEDIR}${PREFIX}/share/netsurf
-	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/nloptions.gtk3.ui \
+	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/nloptions.ui \
 		${STAGEDIR}${PREFIX}/share/netsurf
 	${INSTALL_DATA} ${WRKSRC}/frontends/gtk/res/netsurf-gtk.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
diff --git a/www/netsurf/distinfo b/www/netsurf/distinfo
--- a/www/netsurf/distinfo
+++ b/www/netsurf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591232159
-SHA256 (netsurf-3.10-src.tar.gz) = 36484429e193614685c2ff246f55bd0a6dddf31a018bee45e0d1f7c28851995e
-SIZE (netsurf-3.10-src.tar.gz) = 4084480
+TIMESTAMP = 1704365062
+SHA256 (netsurf-3.11-src.tar.gz) = c28a626aefee428d053b13f88b5c440922245976522d12eaf137cfd32d201cb2
+SIZE (netsurf-3.11-src.tar.gz) = 4311767
diff --git a/www/netsurf/files/patch-Makefile b/www/netsurf/files/patch-Makefile
--- a/www/netsurf/files/patch-Makefile
+++ b/www/netsurf/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-05-24 20:55:29 UTC
-+++ Makefile
-@@ -484,16 +484,6 @@ ifneq ($(CC_MAJOR),2)
+--- Makefile.orig	2024-01-03 21:22:00.348100000 +0000
++++ Makefile	2024-01-03 21:40:04.264692000 +0000
+@@ -105,16 +105,6 @@
    COMMON_WARNFLAGS += -Wno-unused-parameter
  endif
  
@@ -17,42 +17,19 @@
  # deal with chaging warning flags for different platforms
  ifeq ($(HOST),OpenBSD)
    # OpenBSD headers are not compatible with redundant declaration warning
-@@ -547,7 +537,6 @@ ifeq ($(HOST),mint)
- else
-     $(eval $(call pkg_config_find_and_add_enabled,CURL,libcurl,Curl))
- endif
--$(eval $(call pkg_config_find_and_add_enabled,OPENSSL,openssl,OpenSSL))
- 
- $(eval $(call pkg_config_find_and_add_enabled,UTF8PROC,libutf8proc,utf8))
- $(eval $(call pkg_config_find_and_add_enabled,WEBP,libwebp,WEBP))
-@@ -680,14 +669,21 @@ $$(MESSAGES_TARGET)/$(1)/Messages: resources/FatMessag
- 	$$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ -z $$<
+@@ -302,9 +292,15 @@
+ # ----------------------------------------------------------------------------
  
- CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
-+CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)options.gtk3.ui
- MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
- 
- endef
  
 +buildui: 
 +	@echo "BUILDUI: options ui for each language in resources/FatMessages"
-+	@$(PERL) utils/buildui.pl resources/FatMessages frontends/gtk/res/options.gtk3.ui $(MESSAGES_TARGET) options.gtk3.ui
++	@$(PERL) utils/buildui.pl resources/FatMessages frontends/gtk/res/gtk3/options.ui $(MESSAGES_TARGET) options.ui
 +
  # generate the message file rules
  $(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
  	$(call split_messages,$(LANG))))
- 
-+MESSAGES += buildui
 +
++MESSAGES += buildui
+ 
  clean-messages:
  	$(VQ)echo "   CLEAN: $(CLEAN_MESSAGES)"
- 	$(Q)$(RM) $(CLEAN_MESSAGES)
-@@ -710,7 +706,7 @@ OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,
- # Include directory flags
- IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
- 
--$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
-+$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES) 
- 	$(VQ)echo "    LINK: $(EXETARGET)"
- ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
- 	$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
diff --git a/www/netsurf/pkg-plist b/www/netsurf/pkg-plist
--- a/www/netsurf/pkg-plist
+++ b/www/netsurf/pkg-plist
@@ -5,21 +5,21 @@
 %%DATADIR%%/SearchEngines
 %%DATADIR%%/adblock.css
 %%DATADIR%%/ca-bundle.txt
-%%DATADIR%%/cookies.gtk3.ui
+%%DATADIR%%/cookies.ui
 %%DATADIR%%/credits.html
 %%DATADIR%%/de/Messages
 %%DATADIR%%/de/welcome.html
 %%DATADIR%%/default.css
 %%DATADIR%%/default.ico
-%%DATADIR%%/downloads.gtk3.ui
+%%DATADIR%%/downloads.ui
 %%DATADIR%%/en/Messages
 %%DATADIR%%/en/credits.html
 %%DATADIR%%/en/licence.html
 %%DATADIR%%/en/welcome.html
 %%DATADIR%%/favicon.png
 %%DATADIR%%/fr/Messages
-%%DATADIR%%/globalhistory.gtk3.ui
-%%DATADIR%%/hotlist.gtk3.ui
+%%DATADIR%%/globalhistory.ui
+%%DATADIR%%/hotlist.ui
 %%DATADIR%%/icons/arrow-l.png
 %%DATADIR%%/icons/content.png
 %%DATADIR%%/icons/directory.png
@@ -37,25 +37,25 @@
 %%DATADIR%%/ja/welcome.html
 %%DATADIR%%/languages
 %%DATADIR%%/licence.html
-%%DATADIR%%/localhistory.gtk3.ui
+%%DATADIR%%/localhistory.ui
 %%DATADIR%%/netsurf-16x16.xpm
-%%DATADIR%%/netsurf.gtk3.ui
+%%DATADIR%%/netsurf.ui
 %%DATADIR%%/netsurf.png
 %%DATADIR%%/netsurf.xpm
 %%DATADIR%%/nl/Messages
 %%DATADIR%%/nl/credits.html
 %%DATADIR%%/nl/licence.html
 %%DATADIR%%/nl/welcome.html
-%%DATADIR%%/options.gtk3.ui
-%%DATADIR%%/deoptions.gtk3.ui
-%%DATADIR%%/enoptions.gtk3.ui
-%%DATADIR%%/froptions.gtk3.ui
-%%DATADIR%%/itoptions.gtk3.ui
-%%DATADIR%%/nloptions.gtk3.ui
-%%DATADIR%%/pageinfo.gtk3.ui
-%%DATADIR%%/password.gtk3.ui
+%%DATADIR%%/options.ui
+%%DATADIR%%/deoptions.ui
+%%DATADIR%%/enoptions.ui
+%%DATADIR%%/froptions.ui
+%%DATADIR%%/itoptions.ui
+%%DATADIR%%/nloptions.ui
+%%DATADIR%%/pageinfo.ui
+%%DATADIR%%/password.ui
 %%DATADIR%%/quirks.css
-%%DATADIR%%/tabcontents.gtk3.ui
+%%DATADIR%%/tabcontents.ui
 %%DATADIR%%/throbber/throbber0.png
 %%DATADIR%%/throbber/throbber1.png
 %%DATADIR%%/throbber/throbber2.png
@@ -65,8 +65,8 @@
 %%DATADIR%%/throbber/throbber6.png
 %%DATADIR%%/throbber/throbber7.png
 %%DATADIR%%/throbber/throbber8.png
-%%DATADIR%%/toolbar.gtk3.ui
-%%DATADIR%%/viewdata.gtk3.ui
-%%DATADIR%%/warning.gtk3.ui
+%%DATADIR%%/toolbar.ui
+%%DATADIR%%/viewdata.ui
+%%DATADIR%%/warning.ui
 %%DATADIR%%/welcome.html
 share/pixmaps/netsurf.xpm