diff --git a/block-devices b/block-devices
index 814c3ae..b210a4a 100644
--- a/block-devices
+++ b/block-devices
@@ -1,10 +1,8 @@
 sys-fs/bindfs
 sys-fs/cryptsetup
 sys-fs/dmraid
-# Uncomment if you don't use systemd
-sys-fs/eudev
+# Uncomment if you use OpenRC
+#sys-fs/eudev
 sys-fs/fuse
 sys-fs/lvm2
 sys-fs/mdadm
-# Uncomment if you use systemd
-#sys-fs/udev
diff --git a/boot-uefi b/boot-uefi
new file mode 100644
index 0000000..a120200
--- /dev/null
+++ b/boot-uefi
@@ -0,0 +1,4 @@
+app-crypt/sbsigntools
+sys-boot/efibootmgr
+sys-boot/refind
+
diff --git a/core-extra b/core-extra
index 7a04a79..695f611 100644
--- a/core-extra
+++ b/core-extra
@@ -16,6 +16,7 @@ app-editors/nano-syntax-highlighting
 app-editors/vim
 app-misc/fdupes
 app-misc/jq
+app-misc/ranger
 app-misc/screenfetch
 app-misc/tmux
 app-text/ix
diff --git a/filesystems b/filesystems
index 2f6c2cd..b479b67 100644
--- a/filesystems
+++ b/filesystems
@@ -1,8 +1,8 @@
+sys-fs/btrfs-progs
+sys-fs/btrfsmaintenance
 sys-fs/dosfstools
 sys-fs/e2fsprogs
 sys-fs/e2tools
-#sys-fs/exfat-nofuse
-#sys-fs/exfat-utils-nofuse
 sys-fs/f2fs-tools
 sys-fs/jfsutils
 sys-fs/mtools
@@ -12,3 +12,5 @@ sys-fs/reiserfsprogs
 sys-fs/sysfsutils
 sys-fs/udftools
 sys-fs/xfsprogs
+sys-fs/zfs
+sys-fs/zfs-kmod
diff --git a/gstreamer b/gstreamer
new file mode 100644
index 0000000..e7e4df0
--- /dev/null
+++ b/gstreamer
@@ -0,0 +1,6 @@
+media-libs/gstreamer
+media-libs/gst-plugins-bad
+media-libs/gst-plugins-base
+media-libs/gst-plugins-good
+media-libs/gst-plugins-ugly
+media-libs/gst-rtsp-server
diff --git a/gui-kde-all b/gui-kde-all
index 0276a4e..c19d31a 100644
--- a/gui-kde-all
+++ b/gui-kde-all
@@ -1,6 +1,7 @@
+@gui-qt4-all
+@mariadb
 kde-apps/kdeadmin-meta
 kde-apps/kdebase-meta
-kde-apps/kdecore-meta
 kde-apps/kdegraphics-meta
 kde-apps/kdemultimedia-meta
 kde-apps/kdenetwork-filesharing
@@ -12,9 +13,12 @@ kde-apps/krdc
 kde-apps/krfb
 kde-apps/lokalize
 kde-apps/umbrello
+kde-apps/yakuake
 kde-frameworks/oxygen-icons
+kde-misc/kimtoy
+kde-misc/plasma-redshift-control
+kde-misc/systemd-kcm
 kde-plasma/plasma-meta
 x11-misc/sddm
 x11-themes/oxygen-gtk
-@mariadb
 
diff --git a/gui-media b/gui-media
new file mode 100644
index 0000000..513a3c4
--- /dev/null
+++ b/gui-media
@@ -0,0 +1,4 @@
+app-doc/gimp-help
+media-gfx/gimp
+media-sound/audacity
+kde-apps/kdenlive
diff --git a/gui-qt4-all b/gui-qt4-all
index b458f93..db8f8e4 100644
--- a/gui-qt4-all
+++ b/gui-qt4-all
@@ -1,2 +1,3 @@
+app-editors/retext
 dev-db/sqlitebrowser
-
+sys-block/partitionmanager
diff --git a/gui-x32-all b/gui-x32-all
index 6fd80b9..a73adfc 100644
--- a/gui-x32-all
+++ b/gui-x32-all
@@ -2,5 +2,5 @@ app-admin/keepass
 app-admin/system-config-printer
 app-crypt/veracrypt
 app-misc/trash-cli
-sys-apps/gsmartcontrol
-sys-apps/gnome-disk-utility
+net-misc/remmina
+x11-misc/autokey
diff --git a/gui-x64-all b/gui-x64-all
index 2c58c56..8d6492d 100644
--- a/gui-x64-all
+++ b/gui-x64-all
@@ -1,3 +1,5 @@
 @gui-x32-all
+app-office/libreoffice
 net-im/discord-bin
 www-client/firefox
+www-plugins/freshplayerplugin
diff --git a/kernel-extra b/kernel-extra
index f1f177a..43c84ad 100644
--- a/kernel-extra
+++ b/kernel-extra
@@ -1,3 +1,2 @@
 sys-kernel/dracut
-sys-kernel/genkernel
 sys-kernel/linux-firmware