diff --git a/core-extra b/core-extra
index efbc79b..d07824d 100644
--- a/core-extra
+++ b/core-extra
@@ -1,3 +1,8 @@
+@archival
+@block-devices
+@filesystems
+@kernel-extra
+@portage-tools
 app-admin/ansible
 app-admin/hddtemp
 app-admin/logrotate
@@ -6,16 +11,20 @@ app-admin/superadduser
 app-admin/sysklogd
 app-benchmarks/stress
 app-benchmarks/sysbench
+app-editors/nano
 app-editors/vim
 app-misc/screenfetch
 app-misc/tmux
 app-shells/gentoo-zsh-completions
 app-shells/zsh-completions
+app-text/ix
 app-text/tree
 dev-perl/rename
 dev-util/checkbashisms
 dev-util/dialog
+dev-util/shellcheck
 dev-util/strace
+dev-vcs/git
 games-misc/lolcat
 sys-apps/dmidecode
 sys-apps/haveged
diff --git a/deadbeef b/deadbeef
new file mode 100644
index 0000000..2c61d51
--- /dev/null
+++ b/deadbeef
@@ -0,0 +1,3 @@
+media-plugins/deadbeef-vu-meter
+media-plugins/deadbeef-waveform-seekbar
+media-sound/deadbeef
diff --git a/fonts b/fonts-base
similarity index 83%
rename from fonts
rename to fonts-base
index 2fb9304..03c9e98 100644
--- a/fonts
+++ b/fonts-base
@@ -1,8 +1,7 @@
 media-fonts/arphicfonts
-media-fonts/cantarell
 media-fonts/corefonts
-media-fonts/dejavu
 media-fonts/digital_7
+media-fonts/fantasque-sans-mono
 media-fonts/fira-code
 media-fonts/fira-mono
 media-fonts/fira-sans
@@ -10,7 +9,7 @@ media-fonts/freefont
 media-fonts/hack
 media-fonts/noto
 media-fonts/noto-cjk
-media-fonts/oxygen-fonts
+media-fonts/overpass
 media-fonts/powerline-symbols
 media-fonts/roboto
 media-fonts/source-han-sans
diff --git a/fonts-gtk b/fonts-gtk
new file mode 100644
index 0000000..a9e6fc5
--- /dev/null
+++ b/fonts-gtk
@@ -0,0 +1 @@
+media-fonts/cantarell
diff --git a/fonts-perl b/fonts-perl
new file mode 100644
index 0000000..24c496b
--- /dev/null
+++ b/fonts-perl
@@ -0,0 +1 @@
+media-fonts/dejavu
diff --git a/fonts-qt b/fonts-qt
new file mode 100644
index 0000000..6f3942a
--- /dev/null
+++ b/fonts-qt
@@ -0,0 +1 @@
+media-fonts/oxygen-fonts
diff --git a/gui-gtk-all b/gui-gtk-all
new file mode 100644
index 0000000..0104886
--- /dev/null
+++ b/gui-gtk-all
@@ -0,0 +1,4 @@
+app-editors/marker
+dev-util/geany
+dev-util/geany-plugins
+x11-misc/gtkdialog
diff --git a/gui-gtk-lite b/gui-gtk-lite
new file mode 100644
index 0000000..4ddceb1
--- /dev/null
+++ b/gui-gtk-lite
@@ -0,0 +1,3 @@
+@deadbeef
+@gui-gtk-all
+x11-terms/sakura
diff --git a/ime b/ime-ibus
similarity index 100%
rename from ime
rename to ime-ibus
diff --git a/kernel-extra b/kernel-extra
index 43c84ad..f1f177a 100644
--- a/kernel-extra
+++ b/kernel-extra
@@ -1,2 +1,3 @@
 sys-kernel/dracut
+sys-kernel/genkernel
 sys-kernel/linux-firmware
diff --git a/network-filesystems b/network-filesystems
index a7c99cc..145713a 100644
--- a/network-filesystems
+++ b/network-filesystems
@@ -1,4 +1,3 @@
 net-fs/sshfs
 net-fs/nfs-utils
 net-fs/cifs-utils
-
diff --git a/pekwm b/pekwm
new file mode 100644
index 0000000..a5eb4d7
--- /dev/null
+++ b/pekwm
@@ -0,0 +1,9 @@
+@xorg
+@gui-gtk-lite
+lxde-base/lxappearance
+x11-misc/lightdm
+x11-misc/lightdm-slick-greeter
+x11-misc/nitrogen
+x11-misc/pekwm-menu
+x11-misc/tint2
+x11-wm/pekwm
diff --git a/portage-tools b/portage-tools
index 925ea0c..95f921e 100644
--- a/portage-tools
+++ b/portage-tools
@@ -1,6 +1,14 @@
+#app-admin/eclean-kernel
 app-portage/cpuid2cpuflags
+#app-portage/diffmask
 app-portage/eix
+#app-portage/flaggie
 app-portage/genlop
+app-portage/gentoolkit
+#app-portage/install-mask
 app-portage/layman
 app-portage/pfl
 app-portage/portage-utils
+#app-portage/portpeek
+#app-portage/repoman
+#app-portage/smart-live-rebuild
diff --git a/thunar b/thunar
new file mode 100644
index 0000000..6c1701f
--- /dev/null
+++ b/thunar
@@ -0,0 +1,13 @@
+xfce-base/thunar
+gnome-base/gvfs
+app-arch/xarchiver
+xfce-extra/thunar-archive-plugin
+#xfce-extra/thunar-dropbox
+xfce-extra/thunar-media-tags-plugin
+xfce-extra/thunar-shares-plugin
+#xfce-extra/thunar-torrent-property
+xfce-extra/thunar-vcs-plugin
+xfce-extra/thunar-volman
+xfce-extra/tumbler
+#media-gxf/raw-thumbnailer
+gnome-extra/libgsf