diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index c8af247557e0..6eaa712762fe 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,78 +1,72 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	3D Wayland compositor
 WWW=		https://wayfire.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		nlohmann-json>0:devel/nlohmann-json \
 		wf-config>=0.9.0<0.10.0:devel/wf-config \
 		${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
 		wayland-protocols>=1.12:graphics/wayland-protocols \
 		glm>=0.9.8:math/glm
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libinotify.so:devel/libinotify \
 		libwf-config.so:devel/wf-config \
 		libpng.so:graphics/png \
 		libwayland-server.so:graphics/wayland \
 		libwlroots-0.17.so:x11-toolkits/wlroots017 \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	nlohmann-json>0:devel/nlohmann-json
 TEST_DEPENDS=	doctest>0:devel/doctest
 
 USES=		cmake:indirect compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	WayfireWM
 GH_TUPLE=	WayfireWM:wf-touch:b8b844f:wftouch/subprojects/wf-touch \
 		WayfireWM:wf-utils:08553c4:wfutils/subprojects/wf-utils
 MESON_ARGS=	-Dtests=disabled \
 		-Dwf-touch:tests=disabled \
-		-Dwf-utils:default_library=static \
 		${NULL}
 
 .if !exists(/usr/include/omp.h)
 # LLVM openmp in base doesn't support powerpc, armv6, armv7 yet
 MESON_ARGS+=	-Denable_openmp=false
 .endif
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
-.ifdef GH_TUPLE
-post-configure:
-	@${REINPLACE_CMD} 's/meson install/& \
-		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR}
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
-		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure \
+			${MESON_ARGS:M*tests*:S/=dis/=en/}"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist
index 8775999874d7..dd2bbc5eb275 100644
--- a/x11-wm/wayfire/pkg-plist
+++ b/x11-wm/wayfire/pkg-plist
@@ -1,176 +1,199 @@
 bin/wayfire
+include/wayfire/action/action.hpp
+include/wayfire/action/action_interface.hpp
 include/wayfire/bindings-repository.hpp
 include/wayfire/bindings.hpp
 include/wayfire/compositor-view.hpp
+include/wayfire/condition/access_interface.hpp
+include/wayfire/condition/condition.hpp
+include/wayfire/condition/logic_condition.hpp
+include/wayfire/condition/test_condition.hpp
 include/wayfire/config-backend.hpp
 include/wayfire/config.h
 include/wayfire/core.hpp
 include/wayfire/dassert.hpp
 include/wayfire/debug.hpp
 include/wayfire/geometry.hpp
 include/wayfire/idle.hpp
 include/wayfire/img.hpp
 include/wayfire/input-device.hpp
+include/wayfire/lexer/lexer.hpp
+include/wayfire/lexer/literal.hpp
+include/wayfire/lexer/symbol.hpp
 include/wayfire/matcher.hpp
 include/wayfire/nonstd/observer_ptr.h
 include/wayfire/nonstd/reverse.hpp
 include/wayfire/nonstd/safe-list.hpp
 include/wayfire/nonstd/tracking-allocator.hpp
 include/wayfire/nonstd/wlroots-full.hpp
 include/wayfire/nonstd/wlroots.hpp
 include/wayfire/object.hpp
 include/wayfire/opengl.hpp
 include/wayfire/option-wrapper.hpp
 include/wayfire/output-layout.hpp
 include/wayfire/output.hpp
+include/wayfire/parser/action_parser.hpp
+include/wayfire/parser/condition_parser.hpp
+include/wayfire/parser/lambda_rule_parser.hpp
+include/wayfire/parser/rule_parser.hpp
 include/wayfire/per-output-plugin.hpp
 include/wayfire/plugin.hpp
 include/wayfire/plugins/blur/blur.hpp
 include/wayfire/plugins/common/cairo-util.hpp
 include/wayfire/plugins/common/geometry-animation.hpp
 include/wayfire/plugins/common/input-grab.hpp
 include/wayfire/plugins/common/key-repeat.hpp
 include/wayfire/plugins/common/move-drag-interface.hpp
 include/wayfire/plugins/common/preview-indication.hpp
 include/wayfire/plugins/common/shared-core-data.hpp
 include/wayfire/plugins/common/simple-text-node.hpp
 include/wayfire/plugins/common/simple-texture.hpp
 include/wayfire/plugins/common/util.hpp
 include/wayfire/plugins/common/workspace-wall.hpp
 include/wayfire/plugins/crossfade.hpp
 include/wayfire/plugins/grid.hpp
 include/wayfire/plugins/input-method-v1/input-method-v1.hpp
 include/wayfire/plugins/ipc/ipc-activator.hpp
 include/wayfire/plugins/ipc/ipc-helpers.hpp
 include/wayfire/plugins/ipc/ipc-method-repository.hpp
 include/wayfire/plugins/scale-signal.hpp
 include/wayfire/plugins/vswitch.hpp
 include/wayfire/plugins/wm-actions-signals.hpp
 include/wayfire/plugins/wobbly/wobbly-signal.hpp
 include/wayfire/region.hpp
 include/wayfire/render-manager.hpp
+include/wayfire/rule/lambda_rule.hpp
+include/wayfire/rule/rule.hpp
 include/wayfire/scene-input.hpp
 include/wayfire/scene-operations.hpp
 include/wayfire/scene-render.hpp
 include/wayfire/scene.hpp
 include/wayfire/seat.hpp
 include/wayfire/signal-definitions.hpp
 include/wayfire/signal-provider.hpp
 include/wayfire/toplevel-view.hpp
 include/wayfire/toplevel.hpp
+include/wayfire/touch/touch.hpp
 include/wayfire/txn/transaction-manager.hpp
 include/wayfire/txn/transaction-object.hpp
 include/wayfire/txn/transaction.hpp
 include/wayfire/unstable/translation-node.hpp
 include/wayfire/unstable/wlr-subsurface-controller.hpp
 include/wayfire/unstable/wlr-surface-controller.hpp
 include/wayfire/unstable/wlr-surface-node.hpp
 include/wayfire/unstable/wlr-text-input-v3-popup.hpp
 include/wayfire/unstable/wlr-view-events.hpp
 include/wayfire/unstable/wlr-view-keyboard-interaction.hpp
 include/wayfire/unstable/xdg-toplevel-base.hpp
 include/wayfire/unstable/xwl-toplevel-base.hpp
 include/wayfire/util.hpp
+include/wayfire/utils.hpp
+include/wayfire/variant.hpp
 include/wayfire/view-access-interface.hpp
 include/wayfire/view-helpers.hpp
 include/wayfire/view-transform.hpp
 include/wayfire/view.hpp
 include/wayfire/window-manager.hpp
 include/wayfire/workarea.hpp
 include/wayfire/workspace-set.hpp
 include/wayfire/workspace-stream.hpp
 lib/libwayfire-blur-base.so
+lib/libwf-utils.so
+lib/libwf-utils.so.0
+lib/libwf-utils.so.0.4.0
+lib/libwftouch.a
 lib/wayfire/libalpha.so
 lib/wayfire/libanimate.so
 lib/wayfire/libautostart.so
 lib/wayfire/libblur.so
 lib/wayfire/libcommand.so
 lib/wayfire/libcube.so
 lib/wayfire/libdecoration.so
 lib/wayfire/libdefault-config-backend.so
 lib/wayfire/libdemo-ipc.so
 lib/wayfire/libexpo.so
 lib/wayfire/libextra-gestures.so
 lib/wayfire/libfast-switcher.so
 lib/wayfire/libfisheye.so
 lib/wayfire/libforeign-toplevel.so
 lib/wayfire/libgrid.so
 lib/wayfire/libgtk-shell.so
 lib/wayfire/libidle.so
 lib/wayfire/libinput-method-v1.so
 lib/wayfire/libinvert.so
 lib/wayfire/libipc-rules.so
 lib/wayfire/libipc.so
 lib/wayfire/libmove.so
 lib/wayfire/liboswitch.so
 lib/wayfire/libplace.so
 lib/wayfire/libpreserve-output.so
 lib/wayfire/libresize.so
 lib/wayfire/libscale-title-filter.so
 lib/wayfire/libscale.so
 lib/wayfire/libsession-lock.so
 lib/wayfire/libshortcuts-inhibit.so
 lib/wayfire/libsimple-tile.so
 lib/wayfire/libstipc.so
 lib/wayfire/libswitcher.so
 lib/wayfire/libvswipe.so
 lib/wayfire/libvswitch.so
 lib/wayfire/libwayfire-shell.so
 lib/wayfire/libwindow-rules.so
 lib/wayfire/libwm-actions.so
 lib/wayfire/libwobbly.so
 lib/wayfire/libwrot.so
 lib/wayfire/libwsets.so
 lib/wayfire/libxdg-activation.so
 lib/wayfire/libxkb-bindings.so
 lib/wayfire/libzoom.so
 libdata/pkgconfig/wayfire.pc
+libdata/pkgconfig/wf-utils.pc
 share/man/man1/wayfire.1.gz
 %%EXAMPLESDIR%%/wayfire.ini
 %%DATADIR%%/metadata/alpha.xml
 %%DATADIR%%/metadata/animate.xml
 %%DATADIR%%/metadata/autostart.xml
 %%DATADIR%%/metadata/blur.xml
 %%DATADIR%%/metadata/command.xml
 %%DATADIR%%/metadata/core.xml
 %%DATADIR%%/metadata/cube.xml
 %%DATADIR%%/metadata/decoration.xml
 %%DATADIR%%/metadata/expo.xml
 %%DATADIR%%/metadata/extra-gestures.xml
 %%DATADIR%%/metadata/fast-switcher.xml
 %%DATADIR%%/metadata/fisheye.xml
 %%DATADIR%%/metadata/foreign-toplevel.xml
 %%DATADIR%%/metadata/grid.xml
 %%DATADIR%%/metadata/gtk-shell.xml
 %%DATADIR%%/metadata/idle.xml
 %%DATADIR%%/metadata/input-device.xml
 %%DATADIR%%/metadata/input-method-v1.xml
 %%DATADIR%%/metadata/input.xml
 %%DATADIR%%/metadata/invert.xml
 %%DATADIR%%/metadata/ipc-rules.xml
 %%DATADIR%%/metadata/ipc.xml
 %%DATADIR%%/metadata/move.xml
 %%DATADIR%%/metadata/oswitch.xml
 %%DATADIR%%/metadata/output.xml
 %%DATADIR%%/metadata/place.xml
 %%DATADIR%%/metadata/preserve-output.xml
 %%DATADIR%%/metadata/resize.xml
 %%DATADIR%%/metadata/scale-title-filter.xml
 %%DATADIR%%/metadata/scale.xml
 %%DATADIR%%/metadata/session-lock.xml
 %%DATADIR%%/metadata/shortcuts-inhibit.xml
 %%DATADIR%%/metadata/simple-tile.xml
 %%DATADIR%%/metadata/switcher.xml
 %%DATADIR%%/metadata/vswipe.xml
 %%DATADIR%%/metadata/vswitch.xml
 %%DATADIR%%/metadata/wayfire-shell.xml
 %%DATADIR%%/metadata/window-rules.xml
 %%DATADIR%%/metadata/wm-actions.xml
 %%DATADIR%%/metadata/wobbly.xml
 %%DATADIR%%/metadata/workarounds.xml
 %%DATADIR%%/metadata/wrot.xml
 %%DATADIR%%/metadata/wsets.xml
 %%DATADIR%%/metadata/xdg-activation.xml
 %%DATADIR%%/metadata/zoom.xml
 %%DATADIR%%/protocols/unstable/wayfire-shell-unstable-v2.xml
 share/wayland-sessions/wayfire.desktop