diff --git a/gentoo-related/env/env/ccache.conf b/gentoo-related/env/env/ccache.conf
new file mode 100644
index 0000000..74a0597
--- /dev/null
+++ b/gentoo-related/env/env/ccache.conf
@@ -0,0 +1 @@
+FEATURES="ccache"
diff --git a/gentoo-related/env/env/cpu.conf b/gentoo-related/env/env/cpu.conf
new file mode 100644
index 0000000..639a7fb
--- /dev/null
+++ b/gentoo-related/env/env/cpu.conf
@@ -0,0 +1 @@
+MAKEOPTS="-j4"
diff --git a/gentoo-related/env/env/notmpfs.conf b/gentoo-related/env/env/notmpfs.conf
new file mode 100644
index 0000000..b8a96f4
--- /dev/null
+++ b/gentoo-related/env/env/notmpfs.conf
@@ -0,0 +1 @@
+PORTAGE_TMPDIR="/var/tmp/notmpfs"
diff --git a/gentoo-related/fstab b/gentoo-related/fstab
index 37eb1dd..d70d26a 100644
--- a/gentoo-related/fstab
+++ b/gentoo-related/fstab
@@ -27,20 +27,20 @@
 #UUID=58e72203-57d1-4497-81ad-97655bd56494		/		ext4		noatime		0 1
 #LABEL=swap		none		swap		sw		0 0
 #/dev/cdrom		/mnt/cdrom	auto		noauto,ro	0 0
-UUID=3dc25c44-a86e-4b5f-9bee-6a4998877f36	/               btrfs           defaults,compress=zstd,subvolid=256,subvol=@           0 0
-UUID=3dc25c44-a86e-4b5f-9bee-6a4998877f36	/home           btrfs           defaults,compress=zstd,subvolid=257,subvol=@home       0 0
-UUID=3dc25c44-a86e-4b5f-9bee-6a4998877f36	/.snapshots     btrfs           defaults,compress=zstd,subvolid=258,subvol=@.snapshots 0 0
-
-
 
 # tmpfs for portage compile directory
-tmpfs /var/tmp/portage tmpfs rw,nosuid,noatime,nodev,size=6G,mode=775,uid=portage,gid=portage,x-mount.mkdir=775 0 0
+#tmpfs /var/tmp/portage tmpfs rw,nosuid,noatime,nodev,size=8G,mode=775,uid=portage,gid=portage,x-mount.mkdir=775 0 0
 
+# /dev/sdf3
+UUID=03ae4a2b-b8d3-498b-8ffd-6b0f07ebf17a       /               ext4            rw,relatime     0 1
 
-UUID=5022-39B4 /efi            vfat            noauto,defaults 0 2
+# /dev/sdf1
+UUID=97A7-4562          /efi            vfat            rw,relatime,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro  0 2
 
+# /dev/sdf2 LABEL=swap
+UUID=f2c6b842-bbd8-4396-a025-a39b49376510       none            swap            defaults        0 0
 
+#UUID=fd02c07c-d37d-4ae2-b2d0-903b0ca73797	/home/klein/Games	ext4      	rw,relatime	0 2
 
-UUID=fd02c07c-d37d-4ae2-b2d0-903b0ca73797	/home/lucas/Games	ext4      	rw,relatime	0 2
+UUID=bff367e3-4886-480c-ba7c-6a37c473c0d3	/home	ext4	defaults,noatime	0	2
 
-UUID=5d45dd05-613a-42f3-a384-d908c4803acc	none	swap	sw	0	0
diff --git a/gentoo-related/make.conf b/gentoo-related/make.conf
index 34bffb1..41483e8 100644
--- a/gentoo-related/make.conf
+++ b/gentoo-related/make.conf
@@ -12,7 +12,7 @@ ACCEPT_LICENSE="*"
 
 VIDEO_CARDS="nvidia"
 INPUT_DEVICES="joystick libinput wacom"
-MAKEOPTS="-j6"
+MAKEOPTS="-j8"
 EMERGE_DEFAULT_OPTS="--keep-going=y --quiet-build --with-bdeps=y --complete-graph"
 #PORTAGE_NICENESS="1"
 #PORTAGE_IONICE_COMMAND="/usr/local/bin/io-priority \${PID}"
@@ -20,9 +20,9 @@ FEATURES="candy sign"
 
 CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sse sse2 sse3 sse4_1 sse4_2 ssse3"
 
-USE="fuse pulseaudio abi_x86_32 xinerama pgo \
-     ffmpeg policykit nodoc elogind -systemd networkmanager \
-     -webkit vulkan -wayland dbus zstd"
+USE="fuse screencast pulseaudio -webengine xinerama pgo \
+     ffmpeg policykit networkmanager \
+     -webkit vulkan dbus zstd wayland gstreamer"
 
 CCACHE_DIR="/var/cache/ccache"
 
@@ -38,3 +38,4 @@ LC_MESSAGES=C
 GENTOO_MIRRORS="https://gentoo.c3sl.ufpr.br/ https://gentoo.osuosl.org/ https://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ http://gentoo.mirrors.tera-byte.com/"
 GRUB_PLATFORMS="efi-64"
 
+
diff --git a/gentoo-related/package.accept_keywords b/gentoo-related/package.accept_keywords
index 007c856..0dea02b 100644
--- a/gentoo-related/package.accept_keywords
+++ b/gentoo-related/package.accept_keywords
@@ -1,9 +1,5 @@
 sys-process/btop 
-
-#Firefox:rapid 
-www-client/firefox
-media-libs/dav1d
-
+media-libs/imgui
 sys-apps/flatpak 
 acct-user/flatpak
 acct-group/flatpak 
@@ -17,6 +13,7 @@ app-mobilephone/scrcpy
 app-misc/ufetch
 app-editors/vscodium 
 app-emulation/wine-mono 
+app-emulation/wine-gecko
 app-emulation/wine-staging 
 sys-kernel/zen-sources 
 x11-drivers/nvidia-drivers 
@@ -27,13 +24,11 @@ games-action/polymc
 dev-libs/quazip
 
 app-backup/timeshift
+media-gfx/ueberzug
 
 # Steam
-
-games-util/steam-meta
-games-util/steam-client-meta
+*/*::steam-overlay
 games-util/game-device-udev-rules
-games-util/steam-launcher
 
 # Pcmanfm
 x11-misc/pcmanfm 
@@ -45,11 +40,11 @@ dev-dotnet/dotnet-sdk-bin
 
 app-text/tldr
 net-im/discord-bin
+net-im/discord-canary-bin
 
 # Anime Game Launcher
 app-emulation/dxvk-bin
 games-misc/an-anime-game-launcher-bin
-
 app-editors/notepadqq
 dev-util/android-sdk-update-manager
 dev-libs/nss
@@ -57,9 +52,6 @@ dev-libs/nspr
 www-client/torbrowser-launcher
 media-sound/lyrebird
 media-libs/babl # https://bugs.gentoo.org/856931
-app-emulation/qemu
-app-emulation/libvirt
-app-emulation/virt-manager
 games-misc/cbonsai
 dev-lang/nim
 app-misc/openrgb
@@ -85,6 +77,99 @@ x11-misc/copyq
 
 # Xmonad, xmobar and xmonad-contrib
 x11-wm/xmonad
+dev-haskell/stack
+dev-haskell/unicode-transforms
+dev-haskell/ansi-wl-pprint
+dev-haskell/unix-time
+dev-haskell/optparse-simple
+dev-haskell/neat-interpolation
+dev-haskell/type-equality
+dev-haskell/file-embed
+dev-haskell/libyaml
+dev-haskell/conduit-combinators
+dev-haskell/th-reify-many
+dev-haskell/lifted-async
+dev-haskell/enclosed-exceptions
+dev-haskell/mtl-compat
+dev-haskell/microlens-th
+dev-haskell/old-time
+dev-haskell/microlens-mtl
+dev-haskell/constraints
+dev-haskell/retry
+dev-haskell/ed25519
+dev-haskell/megaparsec
+dev-haskell/tar-conduit
+dev-haskell/rio-orphans
+dev-haskell/vault
+dev-haskell/cryptohash-sha256
+dev-haskell/monad-loops
+dev-haskell/http-api-data
+dev-haskell/persistent
+dev-haskell/parser-combinators
+dev-haskell/base16-bytestring
+dev-haskell/tar
+dev-haskell/unicode-data
+dev-haskell/rio-prettyprint
+dev-haskell/microlens
+dev-haskell/extra
+dev-haskell/hi-file-parser
+dev-haskell/optparse-applicative
+dev-haskell/project-template
+dev-haskell/echo
+dev-haskell/fast-logger
+dev-haskell/infer-license
+dev-haskell/lifted-base
+dev-haskell/silently
+dev-haskell/open-browser
+dev-haskell/hackage-security
+dev-haskell/githash
+dev-haskell/unliftio
+dev-haskell/casa-client
+dev-haskell/zip-archive
+dev-haskell/ansi-terminal
+dev-haskell/safe
+dev-haskell/clock
+dev-haskell/annotated-wl-pprint
+dev-haskell/rio
+dev-haskell/mintty
+dev-haskell/attoparsec-iso8601
+dev-haskell/shelly
+dev-haskell/cmdargs
+dev-haskell/auto-update
+dev-haskell/th-expand-syns
+dev-haskell/filelock
+dev-haskell/easy-file
+dev-haskell/monad-logger
+dev-haskell/colour
+dev-haskell/glob
+dev-haskell/th-lift-instances
+dev-haskell/generic-deriving
+dev-haskell/yaml
+dev-haskell/path-pieces
+dev-haskell/temporary
+dev-haskell/lift-type
+dev-haskell/path-io
+dev-haskell/fsnotify
+dev-haskell/unix-compat
+dev-haskell/stm-chans
+dev-haskell/path
+dev-haskell/hpack
+dev-haskell/text-metrics
+dev-haskell/casa-types
+dev-haskell/resource-pool
+dev-haskell/pantry
+dev-haskell/mustache
+dev-haskell/monad-control
+dev-haskell/http-download
+dev-haskell/persistent-sqlite
+dev-haskell/lukko
+dev-haskell/cabal-install
+dev-haskell/edit-distance
+dev-haskell/resolv
+dev-haskell/http
+dev-haskell/persistent-template
+dev-haskell/cryptonite-conduit
+dev-haskell/digest
 dev-lang/ghc
 dev-haskell/parsec
 dev-haskell/x11
@@ -227,3 +312,36 @@ media-sound/mpd-mpris
 x11-misc/betterlockscreen
 x11-misc/i3lock-color
 x11-misc/xidle
+gui-apps/eww
+
+net-vpn/protonvpn-cli
+net-vpn/protonvpn-gui
+
+
+x11-misc/screenkey
+xfce-extra/xfce4-docklike-plugin
+xfce-extra/xfce4-panel-profiles
+x11-apps/glava
+dev-vcs/lazygit
+dev-python/neovim-remote
+x11-themes/orchis-theme 
+gui-libs/wlroots
+games-util/chiaki
+
+
+gui-wm/hyprland
+x11-libs/libdrm
+gui-libs/wlroots
+>=sys-devel/gcc-12.2.0 ~amd64
+>=sys-devel/gcc-13.0.0 -~amd64
+gui-apps/waybar **
+dev-libs/date
+gui-apps/wofi **
+#gui-apps/hyprpaper
+games-action/multimc-bin
+dev-util/rustup
+dev-lang/rust
+games-action/prismlauncher **
+app-editors/lapce **
+app-editors/helix
+
diff --git a/gentoo-related/package.env b/gentoo-related/package.env
index d9e17f8..b7c0156 100644
--- a/gentoo-related/package.env
+++ b/gentoo-related/package.env
@@ -1,14 +1,19 @@
-app-office/libreoffice		notmpfs.conf ccache.conf
+app-office/libreoffice		ccache.conf notmpfs.conf
 dev-lang/ghc			notmpfs.conf ccache.conf
+dev-haskell/stack		ccache.conf
 dev-lang/mono			notmpfs.conf
-dev-lang/rust			notmpfs.conf
+dev-lang/rust			notmpfs.conf cpu.conf
 dev-lang/spidermonkey		notmpfs.conf
-mail-client/thunderbird		notmpfs.conf
-sys-devel/gcc			notmpfs.conf ccache.conf
-www-client/chromium		notmpfs.conf
-www-client/firefox		notmpfs.conf
-dev-qt/qtwebengine		notmpfs.conf cpu.conf ccache.conf
-net-libs/webkit-gtk		notmpfs.conf cpu.conf ccache.conf
+mail-client/thunderbird		notmpfs.conf ccache.conf cpu.conf
+sys-devel/gcc			notmpfs.conf ccache.conf cpu.conf
+www-client/chromium		notmpfs.conf ccache.conf cpu.conf
+www-client/firefox		notmpfs.conf ccache.conf cpu.conf
+dev-qt/qtwebengine		notmpfs.conf ccache.conf cpu.conf
+net-libs/webkit-gtk		ccache.conf cpu.conf
+dev-python/PyQtWebEngine	ccache.conf cpu.conf
 games-emulation/rpcs3		notmpfs.conf ccache.conf
-app-emulation/qemu		ccache.conf
-media-video/vlc			ccache.conf
+net-libs/nodejs			ccache.conf cpu.conf
+media-video/ffmpeg		ccache.conf
+media-gfx/krita			ccache.conf
+app-emulation/wine-staging	ccache.conf
+dev-util/mingw64-toolchain	ccache.conf
diff --git a/gentoo-related/package.use b/gentoo-related/package.use
index 48e40a4..2bcfde6 100644
--- a/gentoo-related/package.use
+++ b/gentoo-related/package.use
@@ -1,6 +1,8 @@
+dev-lang/python tk
+
 # Awesomewm
 x11-wm/awesome lua_single_target_luajit
-x11-wm/awesome -lua_single_target_lua5-1
+x11-wm/awesome -lua_single_target_lua5-1 -gnome
 dev-lua/lgi lua_targets_luajit
 
 
@@ -16,17 +18,19 @@ media-video/obs-studio nvenc v4l vlc browser
 
 # Personal Preference
 media-gfx/gimp xpm wmf webp jpeg2k heif
-x11-libs/gtk+ -wayland
+x11-libs/gtk+ wayland jpeg svg
+
+
 net-print/hplip parport scanner
 sys-firmware/intel-microcode initramfs
 kde-apps/kdenlive v4l
 app-admin/keepassxc autotype browser yubikey
-media-libs/libsdl2 haptic
+media-libs/libsdl2 haptic gles2
 media-libs/libsndfile minimal
 sys-kernel/linux-firmware initramfs
 media-libs/mesa vulkan
 media-libs/mlt frei0r
-media-sound/mpd alsa audiofile curl dbus expat flac gme libmpdclient mad mikmod network openal openmpt oss soundcloud
+media-sound/mpd alsa audiofile curl dbus expat flac gme libmpdclient mad mikmod network openal openmpt oss soundcloud qobuz
 media-sound/ncmpcpp lto clock outputs taglib visualizer
 sys-libs/ncurses -gpm
 x11-drivers/nvidia-drivers driver dist-kernel
@@ -44,12 +48,12 @@ media-fonts/fontawesome ttf
 dev-libs/libpcre2 pcre32
 
 # Kde
-kde-plasma/plasma-meta browser-integration colord -display-manager -kwallet sddm -wallpapers -crypt -discover
+kde-plasma/plasma-meta browser-integration colord -display-manager -kwallet sddm -wallpapers -crypt -discover gtk bluetooth
 kde-plasma/plasma-desktop emoji ibus
-
+gnome-base/librsvg tools
 # Calibre
 app-accessibility/speech-dispatcher python
-dev-python/PyQt5 webchannel
+dev-python/PyQt5 webchannel sql
 dev-qt/qtwebengine widgets
 dev-qt/qtwebchannel qml
 dev-qt/qtmultimedia widgets
@@ -64,7 +68,7 @@ media-gfx/krita heif qtmedia vc webp color-management
 
 # Anime Game Launcher
 dev-util/xdelta lzma
-app-emulation/wine-staging vulkan
+app-emulation/wine-staging vulkan -unwind
 
 # Tor and Firefox
 net-dns/avahi python
@@ -72,7 +76,7 @@ media-libs/libvpx postproc
 media-libs/libpng apng
 app-crypt/gpgme python
 media-libs/mesa wayland
-www-client/firefox system-png geckodriver hwaccel -pgo
+www-client/firefox system-png geckodriver pgo lto hwaccel
 x11-base/xorg-server xvfb
 
 
@@ -85,3 +89,178 @@ games-emulation/yuzu discord
 x11-misc/xmobar xpm xft mpd timezone doc
 x11-wm/xmonad doc
 
+sys-apps/bubblewrap -suid
+app-office/libreoffice gstreamer googledrive java ldap pdfimport -vulkan clang
+
+# Xfce
+#app-text/poppler -qt5
+xfce-base/xfce4-meta svg
+app-admin/conky mpd nvidia lua-cairo lua-imlib lua-rsvg imlib irc hddtemp weather-metar bundled-toluapp
+
+# Gnome
+gnome-base/gnome-extra-apps -games
+gnome-base/gnome-settings-daemon modemmanager
+gnome-extra/nm-applet appindicator
+
+# Pipewire
+media-video/pipewire sound-server
+media-sound/pulseaudio -daemon
+gui-libs/wlroots tinywl
+
+# Audio compression
+media-libs/rubberband ladspa
+
+# Steam (abi 32)
+x11-drivers/nvidia-drivers abi_x86_32
+gnome-base/librsvg abi_x86_32
+x11-libs/cairo abi_x86_32
+dev-libs/libxml2 abi_x86_32
+dev-util/sysprof-capture abi_x86_32
+media-libs/flac abi_x86_32
+x11-libs/libX11 abi_x86_32
+x11-libs/libXau abi_x86_32
+x11-libs/libxcb abi_x86_32
+x11-libs/libXdmcp abi_x86_32
+dev-libs/libbsd abi_x86_32
+app-crypt/libmd abi_x86_32
+x11-libs/libXcursor abi_x86_32
+x11-libs/libXfixes abi_x86_32
+x11-libs/libXi abi_x86_32
+x11-libs/libXrandr abi_x86_32
+x11-libs/libXrender abi_x86_32
+x11-libs/libXxf86vm abi_x86_32
+media-libs/libglvnd abi_x86_32
+x11-libs/libXcomposite abi_x86_32
+x11-libs/libXinerama abi_x86_32
+net-print/cups abi_x86_32
+media-libs/fontconfig abi_x86_32
+media-libs/libsdl2 abi_x86_32
+net-libs/gnutls abi_x86_32
+media-libs/freetype abi_x86_32
+sys-apps/dbus abi_x86_32
+media-libs/vulkan-loader abi_x86_32
+x11-libs/libXext abi_x86_32
+media-libs/alsa-lib abi_x86_32
+dev-libs/glib abi_x86_32
+media-libs/gst-plugins-base abi_x86_32
+media-libs/gstreamer abi_x86_32
+media-libs/libpulse abi_x86_32
+sys-apps/attr abi_x86_32
+media-plugins/gst-plugins-meta abi_x86_32
+media-libs/gst-plugins-good abi_x86_32
+media-plugins/gst-plugins-a52dec abi_x86_32
+media-plugins/gst-plugins-faad abi_x86_32
+media-plugins/gst-plugins-dts abi_x86_32
+media-libs/gst-plugins-ugly abi_x86_32
+media-plugins/gst-plugins-dvdread abi_x86_32
+media-plugins/gst-plugins-mpeg2dec abi_x86_32
+media-plugins/gst-plugins-resindvd abi_x86_32
+media-plugins/gst-plugins-libav abi_x86_32
+media-plugins/gst-plugins-flac abi_x86_32
+media-plugins/gst-plugins-mpg123 abi_x86_32
+media-plugins/gst-plugins-pulse abi_x86_32
+media-plugins/gst-plugins-x264 abi_x86_32
+media-libs/x264 abi_x86_32
+media-sound/pulseaudio abi_x86_32
+media-sound/mpg123 abi_x86_32
+media-libs/libogg abi_x86_32
+media-video/ffmpeg abi_x86_32
+x11-libs/libXv abi_x86_32
+app-arch/bzip2 abi_x86_32
+media-libs/dav1d abi_x86_32
+media-sound/lame abi_x86_32
+media-libs/xvid abi_x86_32
+media-libs/libvorbis abi_x86_32
+x11-libs/libX abi_x86_32
+sys-libs/zlib abi_x86_32
+media-libs/libdvdnav abi_x86_32
+media-libs/libdvdread abi_x86_32
+media-libs/gst-plugins-bad abi_x86_32
+dev-libs/wayland abi_x86_32
+x11-libs/libdrm abi_x86_32
+dev-lang/orc abi_x86_32
+dev-libs/libffi abi_x86_32
+media-libs/libdvdcss abi_x86_32
+media-libs/libmpeg2 abi_x86_32
+media-libs/libdca abi_x86_32
+media-libs/faad2 abi_x86_32
+media-libs/a52dec abi_x86_32
+media-libs/libsndfile abi_x86_32
+net-libs/libasyncns abi_x86_32
+sys-libs/libcap abi_x86_32
+sys-libs/pam abi_x86_32
+x11-libs/pango abi_x86_32
+media-libs/libtheora abi_x86_32
+media-libs/mesa abi_x86_32
+media-libs/graphene abi_x86_32
+media-libs/libpng abi_x86_32
+dev-libs/expat abi_x86_32
+media-libs/libjpeg-turbo abi_x86_32
+x11-libs/libxshmfence abi_x86_32
+app-arch/zstd abi_x86_32
+sys-devel/llvm abi_x86_32
+sys-libs/ncurses abi_x86_32
+dev-libs/fribidi abi_x86_32
+media-libs/harfbuzz abi_x86_32
+x11-libs/libXft abi_x86_32
+virtual/libiconv abi_x86_32
+sys-apps/systemd-utils abi_x86_32
+virtual/libudev abi_x86_32
+virtual/opengl abi_x86_32
+virtual/libintl abi_x86_32
+x11-libs/libxkbcommon abi_x86_32
+net-dns/libidn2 abi_x86_32
+dev-libs/gmp abi_x86_32
+dev-libs/nettle abi_x86_32
+dev-libs/libunistring abi_x86_32
+dev-libs/libtasn1 abi_x86_32
+dev-util/glslang abi_x86_32
+dev-util/spirv-tools abi_x86_32
+sys-apps/util-linux abi_x86_32
+dev-libs/libpcre abi_x86_32
+dev-libs/icu abi_x86_32
+media-gfx/graphite2 abi_x86_32
+dev-lang/rust-bin abi_x86_32
+virtual/rust abi_x86_32
+virtual/jpeg abi_x86_32
+media-sound/cdparanoia abi_x86_32
+media-plugins/gst-plugins-cdparanoia abi_x86_32
+media-libs/glu abi_x86_32
+virtual/glu abi_x86_32
+sys-libs/binutils-libs abi_x86_32
+x11-libs/gdk-pixbuf abi_x86_32
+media-libs/tiff abi_x86_32
+dev-libs/libevent abi_x86_32
+dev-libs/libusb abi_x86_32
+dev-libs/openssl abi_x86_32
+net-dns/avahi abi_x86_32
+sys-libs/gdbm abi_x86_32
+x11-libs/gtk+ abi_x86_32
+dev-libs/atk abi_x86_32
+media-libs/libepoxy abi_x86_32
+x11-misc/colord abi_x86_32
+app-accessibility/at-spi2-atk abi_x86_32
+x11-libs/libXdamage abi_x86_32
+app-accessibility/at-spi2-core abi_x86_32
+x11-libs/libXtst abi_x86_32
+media-libs/lcms abi_x86_32
+dev-db/sqlite abi_x86_32
+dev-libs/libgusb abi_x86_32
+dev-libs/libgudev abi_x86_32
+sys-libs/readline abi_x86_32
+virtual/libusb abi_x86_32
+media-libs/vulkan-layers abi_x86_32
+sys-apps/systemd abi_x86_32
+app-arch/lz4 abi_x86_32
+dev-libs/libgcrypt abi_x86_32
+dev-libs/libgpg-error abi_x86_32
+
+# Hyprland
+gui-libs/wlroots x11-backend
+gui-wm/hyprland
+gui-apps/waybar mpd tray network
+
+dev-lang/rust-bin clippy dist doc nightly rls rust-analyzer rust-src rustfmt
+dev-lang/rust clippy dist doc nightly rls rust-analyzer rust-src rustfmt
+gui-wm/sway tray
+games-action/prismlauncher lto
diff --git a/gentoo-related/world-set b/gentoo-related/world-set
index 5910083..5662d3b 100644
--- a/gentoo-related/world-set
+++ b/gentoo-related/world-set
@@ -1,63 +1,66 @@
 app-admin/keepassxc
 app-admin/sudo
-app-admin/superadduser
-app-admin/sysklogd
+app-admin/sysstat
 app-admin/system-config-printer
 app-arch/rar
 app-arch/xarchiver
 app-editors/emacs
 app-editors/neovim
-app-editors/notepadqq
 app-editors/vscodium
 app-emulation/virt-manager
 app-emulation/wine-staging
+app-emulation/winetricks
 app-eselect/eselect-repository
 app-misc/cmatrix
-app-misc/dragon
 app-misc/jq
 app-misc/neofetch
 app-misc/openrgb
-app-misc/ranger
 app-misc/screen
-app-misc/tmux
-app-mobilephone/scrcpy
-app-office/libreoffice-bin
+app-office/libreoffice
 app-portage/eix
 app-portage/genlop
 app-portage/gentoolkit
-app-shells/fish
+app-shells/dash
+app-shells/fzf
 app-shells/vivid
 app-shells/zsh
 app-text/calibre
 app-text/tldr
 app-text/tree
 app-text/wgetpaste
+app-text/zathura
+dev-haskell/cabal-install
+dev-haskell/libmpd
+dev-haskell/stack
 dev-java/openjdk:17
 dev-java/openjdk:8
-dev-lang/lua
-dev-lang/nim
-dev-libs/cxxopts
-dev-libs/xxhash
+dev-lang/rust
+dev-lang/rust-bin
+dev-python/neovim-remote
 dev-python/pip
-dev-python/pyqt-distutils
-dev-python/python-distutils-extra
-dev-qt/qtgraphicaleffects
-dev-qt/qtwebengine
+dev-python/pynvim
 dev-util/ccache
 dev-vcs/git
-games-action/polymc
-games-emulation/yuzu
+dev-vcs/lazygit
+games-action/prismlauncher
 games-misc/an-anime-game-launcher-bin
 games-misc/cowsay
 games-misc/fortune-mod
 games-misc/lolcat
+games-util/chiaki
+games-util/game-device-udev-rules
 games-util/gamemode
 games-util/lutris
+games-util/mangohud
 games-util/steam-meta
+gnome-extra/nm-applet
+gui-apps/eww
+gui-apps/wofi
+gui-wm/hyprland
 kde-apps/kdenlive
-kde-plasma/plasma-meta
 lxde-base/lxappearance
 lxqt-base/lxqt-policykit
+mail-client/thunderbird-bin
 media-fonts/alee-fonts
 media-fonts/corefonts
 media-fonts/farsi-fonts
@@ -70,69 +73,78 @@ media-fonts/noto-emoji
 media-fonts/thaifonts-scalable
 media-gfx/feh
 media-gfx/gimp
-media-gfx/imagemagick
 media-gfx/krita
 media-gfx/maim
 media-gfx/ristretto
 media-gfx/ueberzug
-media-sound/alsa-tools
+media-sound/easyeffects
 media-sound/mpc
 media-sound/mpd
 media-sound/ncmpcpp
-media-sound/pasystray
 media-sound/pavucontrol
 media-video/mpv
 media-video/obs-studio
+net-ftp/ftp
 net-im/discord-bin
+net-im/discord-canary-bin
 net-irc/hexchat
+net-irc/weechat
+net-libs/gnutls
+net-libs/nodejs
 net-misc/dhcpcd
 net-misc/networkmanager
+net-p2p/qbittorrent
 net-print/hplip
-net-wireless/iw
 sys-apps/bat
 sys-apps/fd
 sys-apps/flatpak
+sys-apps/hdparm
 sys-apps/lsd
+sys-apps/lshw
+sys-apps/mlocate
 sys-apps/pciutils
 sys-apps/ripgrep
 sys-boot/grub
 sys-boot/os-prober
 sys-firmware/intel-microcode
-sys-fs/btrfs-progs
+sys-firmware/sof-firmware
 sys-fs/dosfstools
 sys-fs/exfat-utils
 sys-fs/fuse-exfat
+sys-fs/ncdu
 sys-fs/ntfs3g
 sys-kernel/genkernel
 sys-kernel/gentoo-kernel-bin
 sys-kernel/linux-firmware
 sys-kernel/zen-sources
+sys-libs/libunwind
 sys-process/btop
-sys-process/cronie
+sys-process/iotop
+sys-process/lsof
 www-client/brave-bin
+www-client/firefox:esr
+x11-apps/glava
 x11-apps/setxkbmap
+x11-apps/xinit
 x11-base/xorg-x11
 x11-drivers/OpenTabletDriver-bin
 x11-drivers/nvidia-drivers
+x11-libs/libdrm
 x11-misc/arandr
 x11-misc/betterlockscreen
 x11-misc/dunst
+x11-misc/mugshot
 x11-misc/nitrogen
 x11-misc/pcmanfm
 x11-misc/picom
 x11-misc/redshift
 x11-misc/rofi
+x11-misc/screenkey
 x11-misc/sddm
-x11-misc/xautolock
+x11-misc/trayer-srg
 x11-misc/xclip
 x11-misc/xdotool
-x11-misc/xidle
-x11-misc/xmobar
-x11-misc/xsensors
 x11-terms/alacritty
 x11-terms/kitty
 x11-terms/rxvt-unicode
-x11-themes/greybird
-x11-wm/xmonad
-x11-wm/xmonad-contrib
-xfce-extra/xfce4-volumed-pulse
+x11-wm/awesome