diff --git a/etc/portage/sets/base b/etc/portage/sets/base
index 303ab2b..5af7cdb 100644
--- a/etc/portage/sets/base
+++ b/etc/portage/sets/base
@@ -1,7 +1,35 @@
 # /etc/portage/sets/base
 # Set containing system base packages
 
+# kernel
+sys-kernel/linux-firmware
+#sys-firmware/intel-microcode
+sys-kernel/gentoo-sources
+sys-apps/openrc
+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
+dev-util/ccache
+
+# musl
+sys-libs/timezone-data
+sys-libs/error-standalone
+
 # services
+net-misc/openntpd
 sys-block/zram-init
 net-misc/networkmanager
 net-wireless/bluez
@@ -13,12 +41,10 @@ sys-apps/apparmor
 sys-apps/apparmor-utils
 sec-policy/apparmor-profiles
 
-# tools/shell
+# shell
 app-admin/doas
-app-admin/eselect
-app-eselect/eselect-repository
-app-portage/cpuid2cpuflags
-app-portage/gentoolkit
-dev-util/ccache
+app-editors/vim
 app-editors/neovim
 sys-process/htop
+app-misc/fastfetch
+net-fs/cifs-utils
diff --git a/etc/portage/sets/sys b/etc/portage/sets/sys
deleted file mode 100644
index ce6e8f2..0000000
--- a/etc/portage/sets/sys
+++ /dev/null
@@ -1,21 +0,0 @@
-# /etc/portage/sets/sys
-# Set containing necessary system packages
-
-# kernel
-sys-kernel/linux-firmware
-sys-kernel/gentoo-kernel
-sys-fs/zfs
-sys-fs/zfs-kmod
-sys-power/acpid
-
-# boot
-app-crypt/sbsigntools
-app-crypt/sbctl
-app-crypt/tpm2-tools
-app-crypt/zlevis
-app-crypt/jitterentropy
-sys-apps/systemd-utils
-
-# musl
-sys-libs/timezone-data
-sys-libs/error-standalone