diff --git a/pekwm/.footprint b/pekwm/.footprint
index 23492b4d5..f0837c285 100644
--- a/pekwm/.footprint
+++ b/pekwm/.footprint
@@ -36,6 +36,15 @@ drwxr-xr-x	root/root	usr/share/pekwm/themes/default/
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-left_unfocus.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/bottom-right_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-close.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-close_hover.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-close_press.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-max.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-max_hover.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-max_press.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-min.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-min_hover.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/button-min_press.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/button.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/button_hover.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/button_press.png
@@ -58,5 +67,8 @@ drwxr-xr-x	root/root	usr/share/pekwm/themes/default/
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/top-border_unfocus.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/top-left_unfocus.png
+-rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right-no-buttons.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right.png
 -rw-r--r--	root/root	usr/share/pekwm/themes/default/top-right_unfocus.png
+drwxr-xr-x	root/root	usr/share/pekwm/themes/pion/
+-rw-r--r--	root/root	usr/share/pekwm/themes/pion/theme
diff --git a/pekwm/.signature b/pekwm/.signature
index 93e667c80..c5e651ca1 100644
--- a/pekwm/.signature
+++ b/pekwm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF348YlJjSyVUPXI/B8sEXm2Dor0g1tKmF6fYvB6fSbaIN+qio1wQiIRCel2UbHK2BDaHqdv9q40IFjnt2OrEe1gY=
-SHA256 (Pkgfile) = a873f2dc48ee9e5d1038b8912cff6f8eea83c0f6fc4ca6701ac969ddcac82167
-SHA256 (.footprint) = b91a5632c62ba828db009bfee8662e226674d7dc45061ce9992722994dec1c4a
-SHA256 (release-0.1.17.tar.gz) = 7b5a07a377494588e95d68b87a3f4d823f813cb29053618bfad691a00cd8afb6
+RWSagIOpLGJF3+oggefFah0n+Rve5UX3Ox33FGwbGKR0NUXIkDR4H/3whZdM8Z9S69MTIAnNPoAy0IQu6mp1JX29pd+0OzZXwAc=
+SHA256 (Pkgfile) = e903bce3f20e5dac0e6a6ba6f8b21416bf43481d4edda4666d2bea94055d989e
+SHA256 (.footprint) = 01f011e02fd81baaab1a7176fdf6846208c70afb62b3069185af290cd6a83eec
+SHA256 (release-0.1.18.tar.gz) = e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a
diff --git a/pekwm/Pkgfile b/pekwm/Pkgfile
index 775ac9094..5a48b49f4 100644
--- a/pekwm/Pkgfile
+++ b/pekwm/Pkgfile
@@ -4,24 +4,17 @@
 # Depends on: imlib2 xorg-libxft xorg-libxpm xorg-libxrandr
 
 name=pekwm
-version=0.1.17
-release=2
-source=(https://github.com/pekdon/pekwm/archive/release-0.1.17.tar.gz)
+version=0.1.18
+release=1
+source=(https://github.com/pekdon/pekwm/archive/release-$version.tar.gz)
 
 build() {
-	cd $name-release-$version
+	cmake -S $name-release-$version -B build -G Ninja \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+		-D CMAKE_C_FLAGS_RELEASE="$CFLAGS"
 
-	#./autogen.sh
-	aclocal
-	autoheader
-	autoconf
-	automake -a
-
-	./configure \
-		--prefix=/usr \
-		--enable-xft \
-		--disable-xinerama
-
-	make
-	make DESTDIR=$PKG install
+	cmake --build build
+	DESTDIR=$PKG cmake --install build
 }