diff --git a/bluetooth b/bluetooth
new file mode 100644
index 0000000..2e46f88
--- /dev/null
+++ b/bluetooth
@@ -0,0 +1,5 @@
+net-wireless/bluez
+net-wireless/bluez-hcidump
+net-wireless/bluez-tools
+media-sound/bluez-alsa
+sys-firmware/bluez-firmware
diff --git a/core-extra b/core-extra
index d07824d..7a04a79 100644
--- a/core-extra
+++ b/core-extra
@@ -12,11 +12,12 @@ app-admin/sysklogd
 app-benchmarks/stress
 app-benchmarks/sysbench
 app-editors/nano
+app-editors/nano-syntax-highlighting
 app-editors/vim
+app-misc/fdupes
+app-misc/jq
 app-misc/screenfetch
 app-misc/tmux
-app-shells/gentoo-zsh-completions
-app-shells/zsh-completions
 app-text/ix
 app-text/tree
 dev-perl/rename
@@ -26,6 +27,7 @@ dev-util/shellcheck
 dev-util/strace
 dev-vcs/git
 games-misc/lolcat
+net-misc/unison
 sys-apps/dmidecode
 sys-apps/haveged
 sys-apps/hdparm
@@ -39,10 +41,12 @@ sys-apps/smartmontools
 sys-auth/polkit
 sys-block/parted
 sys-fs/ncdu
+sys-fs/quotatool
 sys-power/acpid
 sys-power/cpupower
 sys-process/cronie
 sys-process/ftop
+sys-process/glances
 sys-process/iotop
 sys-process/lsof
 sys-process/time
diff --git a/filesystems b/filesystems
index 3fec7d4..1c8c922 100644
--- a/filesystems
+++ b/filesystems
@@ -1,3 +1,4 @@
+sys-fs/dosfstools
 sys-fs/e2fsprogs
 sys-fs/e2tools
 #sys-fs/exfat-nofuse
@@ -7,6 +8,7 @@ sys-fs/f2fs-tools
 sys-fs/jfsutils
 sys-fs/mtools
 sys-fs/ntfs3g
+sys-fs/quota
 sys-fs/reiserfsprogs
 sys-fs/sysfsutils
 sys-fs/udftools
diff --git a/fonts-base b/fonts-base
index 03c9e98..c932cbd 100644
--- a/fonts-base
+++ b/fonts-base
@@ -1,4 +1,3 @@
-media-fonts/arphicfonts
 media-fonts/corefonts
 media-fonts/digital_7
 media-fonts/fantasque-sans-mono
@@ -7,11 +6,10 @@ media-fonts/fira-mono
 media-fonts/fira-sans
 media-fonts/freefont
 media-fonts/hack
+media-fonts/liberation-fonts
 media-fonts/noto
 media-fonts/noto-cjk
 media-fonts/overpass
 media-fonts/powerline-symbols
 media-fonts/roboto
-media-fonts/source-han-sans
 media-fonts/symbola
-media-fonts/wqy-zenhei
diff --git a/fonts-oriental b/fonts-oriental
new file mode 100644
index 0000000..501fa59
--- /dev/null
+++ b/fonts-oriental
@@ -0,0 +1,5 @@
+media-fonts/arphicfonts
+media-fonts/baekmuk-fonts
+media-fonts/ja-ipafonts
+media-fonts/source-han-sans
+media-fonts/wqy-zenhei
diff --git a/gui-gtk-all b/gui-gtk-all
index 0104886..999e24e 100644
--- a/gui-gtk-all
+++ b/gui-gtk-all
@@ -1,4 +1,5 @@
 app-editors/marker
 dev-util/geany
 dev-util/geany-plugins
+gnome-extra/nm-applet
 x11-misc/gtkdialog
diff --git a/gui-gtk-icons b/gui-gtk-icons
new file mode 100644
index 0000000..a20566c
--- /dev/null
+++ b/gui-gtk-icons
@@ -0,0 +1,12 @@
+x11-themes/adwaita-icon-theme
+x11-themes/arc-icon-theme
+x11-themes/elementary-xfce-icon-theme
+x11-themes/gnome-icon-theme-extras
+x11-themes/gnome-icon-theme-symbolic
+x11-themes/human-icon-theme
+x11-themes/nou-icon-theme
+x11-themes/numix-icon-theme
+x11-themes/numix-icon-theme-circle
+x11-themes/tangerine-icon-theme
+x11-themes/tango-icon-theme-extras
+x11-themes/vertex-icon-theme
diff --git a/gui-gtk-lite b/gui-gtk-lite
index 4ddceb1..bc214a3 100644
--- a/gui-gtk-lite
+++ b/gui-gtk-lite
@@ -1,3 +1,10 @@
 @deadbeef
 @gui-gtk-all
+lxde-base/lxappearance
+lxde-base/lxinput
+lxde-base/lxlauncher
+lxde-base/lxpanel
+lxde-base/lxrandr
+lxde-base/lxtask
+sci-calculators/galculator
 x11-terms/sakura
diff --git a/gui-x32-all b/gui-x32-all
index 3819a07..6fd80b9 100644
--- a/gui-x32-all
+++ b/gui-x32-all
@@ -1,3 +1,6 @@
 app-admin/keepass
+app-admin/system-config-printer
 app-crypt/veracrypt
+app-misc/trash-cli
 sys-apps/gsmartcontrol
+sys-apps/gnome-disk-utility
diff --git a/init-openrc b/init-openrc
new file mode 100644
index 0000000..2d7d7b5
--- /dev/null
+++ b/init-openrc
@@ -0,0 +1,4 @@
+app-admin/openrc-settingsd
+sys-apps/openrc
+sys-apps/opentmpfiles
+sys-fs/eudev
diff --git a/networking b/networking
index 6c60655..4a2b5e2 100644
--- a/networking
+++ b/networking
@@ -1,8 +1,13 @@
 net-analyzer/iftop
+net-analyzer/iptraf-ng
+net-analyzer/nmap
 net-analyzer/traceroute
+net-misc/curl
 net-misc/dhcp
 net-misc/ntp
 net-misc/openssh
+net-misc/wget
 net-misc/whois
 net-misc/wol
 sys-apps/ethtool
+www-client/w3m
diff --git a/pekwm b/pekwm
index a5eb4d7..3f5924c 100644
--- a/pekwm
+++ b/pekwm
@@ -1,9 +1,8 @@
 @xorg
+@gui-gtk-icons
 @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/shell-zsh b/shell-zsh
new file mode 100644
index 0000000..ddac8a8
--- /dev/null
+++ b/shell-zsh
@@ -0,0 +1,8 @@
+app-misc/powerline
+app-shells/gentoo-zsh-completions
+app-shells/oh-my-zsh
+app-shells/oh-my-zsh-bullet-train-theme
+app-shells/zsh
+app-shells/zsh-completions
+app-shells/zsh-syntax-highlighting
+media-fonts/powerline-symbols
diff --git a/xorg b/xorg
index a7fe856..84d2f61 100644
--- a/xorg
+++ b/xorg
@@ -5,4 +5,7 @@ x11-misc/wmctrl
 x11-misc/xdg-user-dirs
 x11-misc/xdialog
 x11-misc/xdotool
+x11-apps/xdpyinfo
+x11-apps/xrandr
 x11-misc/xsel
+