diff --git a/metadata/md5-cache/games-arcade/taisei-1.3.1 b/metadata/md5-cache/games-arcade/taisei-1.3.1
index 95109c5af3..a5e315288e 100644
--- a/metadata/md5-cache/games-arcade/taisei-1.3.1
+++ b/metadata/md5-cache/games-arcade/taisei-1.3.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/taisei-project/taisei/releases/download/v1.3.1/taisei-v1.3.1.tar.xz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ca912d30f7cbe8b34aab0b5738a83701
diff --git a/metadata/md5-cache/gui-apps/wcm-0.4.0 b/metadata/md5-cache/gui-apps/wcm-0.4.0
index e866d672f3..e6e47e37a2 100644
--- a/metadata/md5-cache/gui-apps/wcm-0.4.0
+++ b/metadata/md5-cache/gui-apps/wcm-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-apps/wf-config-0.4.0 ~gui-wm/wayfire-0.4.0
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wcm/archive/v0.4.0.tar.gz -> wcm-0.4.0.tar.gz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7be41e92445e3b390c211a8e3d34dbb8
diff --git a/metadata/md5-cache/gui-apps/wcm-9999 b/metadata/md5-cache/gui-apps/wcm-9999
index 0b0550152a..e68bd1b9c1 100644
--- a/metadata/md5-cache/gui-apps/wcm-9999
+++ b/metadata/md5-cache/gui-apps/wcm-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libxml2 dev-cpp/gtkmm:3.0[wayland] ~gui-apps/wf-config-9999 ~gui-wm/wayfire-9999
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=7be41e92445e3b390c211a8e3d34dbb8
diff --git a/metadata/md5-cache/gui-apps/wf-config-0.4.0 b/metadata/md5-cache/gui-apps/wf-config-0.4.0
index b954a4634e..709dac67d8 100644
--- a/metadata/md5-cache/gui-apps/wf-config-0.4.0
+++ b/metadata/md5-cache/gui-apps/wf-config-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev media-libs/glm dev-libs/libxml2 >=gui-libs/wlroots-0.10.0
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-config/releases/download/0.4.0/wf-config-0.4.0.tar.xz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f03c41f7b84092c50104b11a4807f836
diff --git a/metadata/md5-cache/gui-apps/wf-config-9999 b/metadata/md5-cache/gui-apps/wf-config-9999
index 804fbc5eba..f84ee0f1eb 100644
--- a/metadata/md5-cache/gui-apps/wf-config-9999
+++ b/metadata/md5-cache/gui-apps/wf-config-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev media-libs/glm dev-libs/libxml2 >=gui-libs/wlroots-0.10.0
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=f03c41f7b84092c50104b11a4807f836
diff --git a/metadata/md5-cache/gui-apps/wf-shell-0.4.0 b/metadata/md5-cache/gui-apps/wf-shell-0.4.0
index 4e35570881..52ae7320b3 100644
--- a/metadata/md5-cache/gui-apps/wf-shell-0.4.0
+++ b/metadata/md5-cache/gui-apps/wf-shell-0.4.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=~gui-apps/wf-config-0.4.0 dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection pulseaudio? ( media-sound/pulseaudio ) ~gui-wm/wayfire-0.4.0 >=gui-libs/gtk-layer-shell-0.1
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wf-shell/releases/download/0.4.0/wf-shell-0.4.0.tar.xz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6c4f185299ac9e47e6764803e2d65211
diff --git a/metadata/md5-cache/gui-apps/wf-shell-9999 b/metadata/md5-cache/gui-apps/wf-shell-9999
index dea9a22938..30bd0ac4f4 100644
--- a/metadata/md5-cache/gui-apps/wf-shell-9999
+++ b/metadata/md5-cache/gui-apps/wf-shell-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=~gui-apps/wf-config-9999 dev-cpp/gtkmm:3.0=[wayland] dev-libs/gobject-introspection pulseaudio? ( media-sound/pulseaudio ) ~gui-wm/wayfire-9999 >=gui-libs/gtk-layer-shell-0.1
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=6c4f185299ac9e47e6764803e2d65211
diff --git a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0 b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0
index dfe2152dcf..c84ca97bd4 100644
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0
+++ b/metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/gtk+-3.24.11:3[introspection,wayland] >=dev-libs/wayland-1.10.0 dev-libs/gobject-introspection
 SLOT=0
 SRC_URI=https://github.com/wmww/gtk-layer-shell/archive/v0.1.0/gtk-layer-shell-0.1.0.tar.gz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5ec266f8223cbde91a768bf1509b3b7e
diff --git a/metadata/md5-cache/gui-libs/gtk-layer-shell-9999 b/metadata/md5-cache/gui-libs/gtk-layer-shell-9999
index cc85332f94..e412f6847c 100644
--- a/metadata/md5-cache/gui-libs/gtk-layer-shell-9999
+++ b/metadata/md5-cache/gui-libs/gtk-layer-shell-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=>=x11-libs/gtk+-3.24.11:3[introspection,wayland] >=dev-libs/wayland-1.10.0 dev-libs/gobject-introspection
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=5ec266f8223cbde91a768bf1509b3b7e
diff --git a/metadata/md5-cache/gui-wm/wayfire-0.4.0 b/metadata/md5-cache/gui-wm/wayfire-0.4.0
index c670c5d336..072d147d36 100644
--- a/metadata/md5-cache/gui-wm/wayfire-0.4.0
+++ b/metadata/md5-cache/gui-wm/wayfire-0.4.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev dev-libs/libinput media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gui-libs/gtk-layer-shell wf-config? ( ~gui-apps/wf-config-0.4.0 ) wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
 SLOT=0
 SRC_URI=https://github.com/WayfireWM/wayfire/releases/download/0.4.0/wayfire-0.4.0.tar.xz
-_eclasses_=meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a0df8b5f3641450eed1116020291bc22
diff --git a/metadata/md5-cache/gui-wm/wayfire-9999 b/metadata/md5-cache/gui-wm/wayfire-9999
index cfc0ef0af3..db4c477f8a 100644
--- a/metadata/md5-cache/gui-wm/wayfire-9999
+++ b/metadata/md5-cache/gui-wm/wayfire-9999
@@ -9,5 +9,5 @@ LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-libs/libevdev dev-libs/libinput media-libs/glm media-libs/mesa:=[gles2,wayland,X] media-libs/libjpeg-turbo media-libs/libpng media-libs/freetype:=[X] x11-libs/libdrm x11-libs/gtk+:3=[wayland,X] x11-libs/cairo:=[X,svg] x11-libs/libxkbcommon:=[X] x11-libs/pixman gui-libs/gtk-layer-shell wf-config? ( ~gui-apps/wf-config-9999 ) wlroots? ( >=gui-libs/wlroots-0.10.0[elogind=,systemd=,X] ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) x11-misc/xkeyboard-config
 SLOT=0
-_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	0b22603e8787cab8d798c23c5e711ca5	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=git-r3	86a0188f2ad9eb3d65e4d031ab8a0422	meson	8702f112cb8ac56bbbf180872e275133	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	6f5996d2ae01e0c6f2869ed18f023239	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=a0df8b5f3641450eed1116020291bc22
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a668f3d827..950fb07c2d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 12 Apr 2020 08:35:01 +0000
+Sun, 12 Apr 2020 15:36:17 +0000