diff --git a/x11/swaysettings/Makefile b/x11/swaysettings/Makefile
index 8ca4f7dbb657..a3acb8fa31f4 100644
--- a/x11/swaysettings/Makefile
+++ b/x11/swaysettings/Makefile
@@ -1,52 +1,49 @@
 PORTNAME=	swaysettings
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.4.0
-PORTREVISION=	5
+DISTVERSION=	0.5.0
 CATEGORIES=	x11
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	GUI for setting Sway wallpaper, default apps, GTK themes, etc.
 WWW=		https://github.com/ErikReider/SwaySettings
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	blueprint-compiler:devel/blueprint-compiler
 LIB_DEPENDS=	libpulse.so:audio/pulseaudio \
 		libjson-glib-1.0.so:devel/json-glib \
 		libgee-0.8.so:devel/libgee \
+		libgtop-2.0.so:devel/libgtop \
 		libaccountsservice.so:sysutils/accountsservice \
-		libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell \
-		libhandy-1.so:x11-toolkits/libhandy
+		libudisks2.so:sysutils/libudisks \
+		libgtk4-layer-shell.so:x11-toolkits/gtk4-layer-shell
 
-USES=		compiler:c11 gettext gnome localbase:ldflags meson pkgconfig \
+USES=		compiler:c11 gettext gnome meson pkgconfig \
 		python:build shebangfix vala:build
 USE_GITHUB=	yes
-USE_GNOME=	cairo gdkpixbuf2 gtk30 libxml2
+USE_GNOME=	gdkpixbuf2 gtk40 libadwaita libxml2
 GH_ACCOUNT=	ErikReider
 GH_PROJECT=	SwaySettings
 SHEBANG_FILES=	build-aux/meson/postinstall.py
 GLIB_SCHEMAS=	org.erikreider.swaysettings.gschema.xml
 
 post-patch:
 # Respect PREFIX for images and XKB layouts
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
-		${WRKSRC}/src/Page/Input_Page.vala \
-		${WRKSRC}/src/Pages/Background/Background_Page.vala \
-		${WRKSRC}/src/Pages/Users/Users.vala
+		${WRKSRC}/src/Settings/Page/InputPage.vala \
+		${WRKSRC}/src/Settings/Pages/Background/BackgroundPage.vala \
+		${WRKSRC}/src/Settings/Pages/Users/Users.vala
 # Drop unused dependency
-	@${REINPLACE_CMD} -e 's/granite/gio-unix-2.0/' \
+	@${REINPLACE_CMD} -e 's/granite-7/gio-unix-2.0/' \
 		${WRKSRC}/src/meson.build
 # Disable Linux-only bluez and rfkill
 	@${REINPLACE_CMD} -e '/Bluetooth/d; /Rfkill/d' \
-		${WRKSRC}/src/meson.build \
-		${WRKSRC}/src/${PORTNAME}.gresource.xml
+		${WRKSRC}/src/Settings/meson.build \
+		${WRKSRC}/src/Settings/Pages/meson.build \
+		${WRKSRC}/data/swaysettings.gresource.xml
 	@${REINPLACE_CMD} -e '/bluetooth-symbolic/d' \
-		-e 's/new Bluetooth_Page.*/null;/' \
-		${WRKSRC}/src/Window/Window.vala
-
-post-configure:
-# XXX https://github.com/ErikReider/SwaySettings/issues/36
-	@${REINPLACE_CMD} -e '/pkg/s/accountsservice/AccountsService-1.0/' \
-		${BUILD_WRKSRC}/build.ninja
+		-e 's/new BluetoothPage.*/null;/' \
+		${WRKSRC}/src/Settings/Window/Window.vala
 
 .include <bsd.port.mk>
diff --git a/x11/swaysettings/distinfo b/x11/swaysettings/distinfo
index 217aa0b2d388..577243eab295 100644
--- a/x11/swaysettings/distinfo
+++ b/x11/swaysettings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655322556
-SHA256 (ErikReider-SwaySettings-v0.4.0_GH0.tar.gz) = c04b7fcd4d9e1a9c2535609c63efad6bd1ccc4242aebdea9eb680a4e3a82df58
-SIZE (ErikReider-SwaySettings-v0.4.0_GH0.tar.gz) = 110423
+TIMESTAMP = 1734219716
+SHA256 (ErikReider-SwaySettings-v0.5.0_GH0.tar.gz) = 3003d5651fbb6692a20788a26f4e8c2083416e9fa9b8dbb3a3def1af0fd1c582
+SIZE (ErikReider-SwaySettings-v0.5.0_GH0.tar.gz) = 115704