diff --git a/etc/portage/package.accept_keywords/05boot b/etc/portage/package.accept_keywords/05boot
new file mode 100644
index 0000000..aeab99f
--- /dev/null
+++ b/etc/portage/package.accept_keywords/05boot
@@ -0,0 +1,5 @@
+# /etc/portage/package.accept_keywords/05boot
+# Keywords for boot system
+
+# zlevis
+dev-libs/jose ~amd64
diff --git a/etc/portage/package.license/firmware b/etc/portage/package.license/kernel
similarity index 72%
rename from etc/portage/package.license/firmware
rename to etc/portage/package.license/kernel
index ca3fb7c..b481ef9 100644
--- a/etc/portage/package.license/firmware
+++ b/etc/portage/package.license/kernel
@@ -1,4 +1,4 @@
-# /etc/portage/package.license/firmware
+# /etc/portage/package.license/kernel
 # Accept firmware licenses
 
 sys-kernel/linux-firmware linux-fw-redistributable @BINARY-REDISTRIBUTABLE
diff --git a/etc/portage/package.mask/river b/etc/portage/package.mask/river
new file mode 100644
index 0000000..6e28449
--- /dev/null
+++ b/etc/portage/package.mask/river
@@ -0,0 +1,4 @@
+# /etc/portage/package.mask/river
+# Mask river 0.4 to remain in river classic
+
+>=gui-wm/river-0.4
diff --git a/etc/portage/package.use/05boot b/etc/portage/package.use/05boot
index 5ac3c51..635ee51 100644
--- a/etc/portage/package.use/05boot
+++ b/etc/portage/package.use/05boot
@@ -3,9 +3,7 @@
 
 # installkernel
 sys-kernel/installkernel dracut ukify uki
-
-# systemd-boot
 sys-apps/systemd-utils kernel-install boot ukify
 
-# tpm
+# zlevis
 app-crypt/zlevis dracut
diff --git a/etc/portage/sets/base b/etc/portage/sets/base
index 911335d..c94e38b 100644
--- a/etc/portage/sets/base
+++ b/etc/portage/sets/base
@@ -3,27 +3,34 @@
 
 # kernel
 sys-kernel/linux-firmware
+#sys-firmware/intel-microcode
 sys-kernel/gentoo-sources
 sys-kernel/modprobed-db
-sys-power/acpid
-
-# filesystem
+sys-apps/openrc
 sys-fs/zfs
 sys-fs/zfs-kmod
+sys-power/acpid
+#app-laptop/laptop-mode-tools
+
+# boot
+app-crypt/sbsigntools
+app-crypt/sbctl
+app-crypt/zlevis
+app-crypt/jitterentropy
+sys-apps/systemd-utils
 
 # portage
 sys-apps/portage
+app-eselect/eselect-repository
 app-portage/cpuid2cpuflags
 app-portage/gentoolkit
-app-eselect/eselect-repository
 app-admin/eclean-kernel
 
 # musl
 sys-libs/timezone-data
 sys-libs/error-standalone
 
-# init/services
-sys-apps/openrc
+# services
 net-misc/openntpd
 sys-block/zram-init
 net-misc/networkmanager
@@ -31,8 +38,7 @@ net-wireless/bluez
 net-vpn/tailscale
 net-print/cups-meta
 
-# security
-app-crypt/jitterentropy
+# apparmor
 sys-apps/apparmor
 sys-apps/apparmor-utils
 sec-policy/apparmor-profiles
diff --git a/etc/portage/sets/boot b/etc/portage/sets/boot
deleted file mode 100644
index 2eec959..0000000
--- a/etc/portage/sets/boot
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/portage/sets/boot
-# Set containing packages for boot system
-
-# systemd-boot
-sys-apps/systemd-utils
-
-# secureboot
-app-crypt/sbctl
-app-crypt/sbsigntools
-
-# tpm
-app-crypt/zlevis