diff --git a/make.conf b/make.conf
index af7aac4..106ea93 100644
--- a/make.conf
+++ b/make.conf
@@ -10,15 +10,15 @@ ACCEPT_LICENSE="@BINARY-REDISTRIBUTABLE"
 
 # WIP 16-core 32gb
 FEATURES="userfetch parallel-fetch parallel-install -ebuild-locks"
-MAKEOPTS="-j8 --load-average 15.95"
-EMERGE_DEFAULT_OPTS="--jobs 8 --load-average 15.90"
+MAKEOPTS="-j16 --load-average 15.95"
+EMERGE_DEFAULT_OPTS="--jobs 16 --load-average 15.90"
 
 VIDEO_CARDS="amdgpu radeonsi"
 INPUT_DEVICES="libinput wacom"
 
 RUBY_TARGETS="ruby27"
 
-AUD="pipewire pulseaudio screencast"
+AUD="pipewire pulseaudio screencast -gstreamer"
 GFX="vaapi vulkan -branding"
 KIT="-gnome -gtk -gtk2 -gtk3 -gtk-doc -qt4"
 MSC="minizip sqlite udisks -fortran -handbook -man -mysql"
diff --git a/package.accept_keywords/aerc b/package.accept_keywords/aerc
deleted file mode 100644
index 5f61681..0000000
--- a/package.accept_keywords/aerc
+++ /dev/null
@@ -1,2 +0,0 @@
-mail-client/aerc ~amd64
-app-text/pandoc-bin::src_prepare-overlay ~amd64
diff --git a/package.accept_keywords/android-tools b/package.accept_keywords/android-tools
deleted file mode 100644
index 1bb75b3..0000000
--- a/package.accept_keywords/android-tools
+++ /dev/null
@@ -1 +0,0 @@
-dev-util/android-tools ~amd64
diff --git a/package.accept_keywords/barrier b/package.accept_keywords/barrier
deleted file mode 100644
index 48d258f..0000000
--- a/package.accept_keywords/barrier
+++ /dev/null
@@ -1,2 +0,0 @@
-x11-misc/barrier ~amd64
-dev-cpp/gulrak-filesystem ~amd64
diff --git a/package.accept_keywords/bitwarden-desktop-bin b/package.accept_keywords/bitwarden-desktop-bin
deleted file mode 100644
index c1d1e0c..0000000
--- a/package.accept_keywords/bitwarden-desktop-bin
+++ /dev/null
@@ -1 +0,0 @@
-app-admin/bitwarden-desktop-bin ~amd64
diff --git a/package.accept_keywords/crystal b/package.accept_keywords/crystal
deleted file mode 100644
index 728b88e..0000000
--- a/package.accept_keywords/crystal
+++ /dev/null
@@ -1 +0,0 @@
-games-mud/crystal ~amd64
diff --git a/package.accept_keywords/discord-bin b/package.accept_keywords/discord-bin
new file mode 100644
index 0000000..8672010
--- /dev/null
+++ b/package.accept_keywords/discord-bin
@@ -0,0 +1 @@
+net-im/discord-bin
diff --git a/package.accept_keywords/gajim b/package.accept_keywords/gajim
deleted file mode 100644
index bc6e064..0000000
--- a/package.accept_keywords/gajim
+++ /dev/null
@@ -1 +0,0 @@
-net-im/gajim ~amd64
diff --git a/package.accept_keywords/iptables b/package.accept_keywords/iptables
new file mode 100644
index 0000000..6100943
--- /dev/null
+++ b/package.accept_keywords/iptables
@@ -0,0 +1 @@
+net-firewall/iptables ~amd64
diff --git a/package.accept_keywords/kaidan b/package.accept_keywords/kaidan
new file mode 100644
index 0000000..aec1a7c
--- /dev/null
+++ b/package.accept_keywords/kaidan
@@ -0,0 +1 @@
+net-im/kaidan ~amd64
diff --git a/package.accept_keywords/keybase-bin b/package.accept_keywords/keybase-bin
deleted file mode 100644
index 01e9067..0000000
--- a/package.accept_keywords/keybase-bin
+++ /dev/null
@@ -1 +0,0 @@
-app-crypt/keybase-bin ~amd64
diff --git a/package.accept_keywords/luxtorpeda b/package.accept_keywords/luxtorpeda
deleted file mode 100644
index 9f3c0c0..0000000
--- a/package.accept_keywords/luxtorpeda
+++ /dev/null
@@ -1 +0,0 @@
-games-engines/luxtorpeda ~amd64
diff --git a/package.accept_keywords/multimc-bin b/package.accept_keywords/multimc-bin
deleted file mode 100644
index 2e7fa00..0000000
--- a/package.accept_keywords/multimc-bin
+++ /dev/null
@@ -1 +0,0 @@
-games-action/multimc-bin ~amd64
diff --git a/package.accept_keywords/nordvpn b/package.accept_keywords/nordvpn
new file mode 100644
index 0000000..280ec5e
--- /dev/null
+++ b/package.accept_keywords/nordvpn
@@ -0,0 +1 @@
+net-vpn/nordvpn::siina ~amd64
diff --git a/package.accept_keywords/openjdk-bin b/package.accept_keywords/openjdk-bin
deleted file mode 100644
index 006729b..0000000
--- a/package.accept_keywords/openjdk-bin
+++ /dev/null
@@ -1 +0,0 @@
-dev-java/openjdk-bin ~amd64
diff --git a/package.accept_keywords/parsec b/package.accept_keywords/parsec
deleted file mode 100644
index aa57285..0000000
--- a/package.accept_keywords/parsec
+++ /dev/null
@@ -1 +0,0 @@
-games-util/parsec::siina ~amd64
diff --git a/package.accept_keywords/profanity b/package.accept_keywords/profanity
index 0aac4d3..4c51cc4 100644
--- a/package.accept_keywords/profanity
+++ b/package.accept_keywords/profanity
@@ -1 +1,2 @@
 net-im/profanity ~amd64
+dev-libs/libstrophe ~amd64
diff --git a/package.accept_keywords/unrar b/package.accept_keywords/unrar
deleted file mode 100644
index 68480d0..0000000
--- a/package.accept_keywords/unrar
+++ /dev/null
@@ -1 +0,0 @@
-app-arch/unrar ~amd64
diff --git a/package.accept_keywords/webcamoid b/package.accept_keywords/webcamoid
deleted file mode 100644
index 690b39e..0000000
--- a/package.accept_keywords/webcamoid
+++ /dev/null
@@ -1 +0,0 @@
-media-video/webcamoid ~amd64
diff --git a/package.license b/package.license
index 938b3d9..48cc6dd 100644
--- a/package.license
+++ b/package.license
@@ -2,3 +2,5 @@ games-util/steam-launcher::steam-overlay ValveSteamLicense
 net-im/discord-bin all-rights-reserved
 www-client/microsoft-edge microsoft-edge
 games-util/parsec::siina Parsec-EULA
+media-sound/spotify Spotify
+net-vpn/nordvpn::siina NordVPN
diff --git a/package.mask/python b/package.mask/python
index 58f37d8..6fcc912 100644
--- a/package.mask/python
+++ b/package.mask/python
@@ -1 +1 @@
-<=dev-lang/python-2.8
+<=dev-lang/python-3.9
diff --git a/package.use/32-bit/firefox-bin b/package.use/32-bit/firefox-bin
new file mode 100644
index 0000000..ca468e3
--- /dev/null
+++ b/package.use/32-bit/firefox-bin
@@ -0,0 +1,23 @@
+# required by media-sound/pulseaudio-16.0::gentoo
+# required by media-sound/mpg123-1.29.3::gentoo[pulseaudio]
+# required by media-libs/libsndfile-1.1.0-r1::gentoo[-minimal]
+# required by media-libs/lilv-0.24.12::gentoo
+# required by media-video/pipewire-0.3.52-r1::gentoo[lv2]
+# required by media-libs/libsdl2-2.0.20-r1::gentoo[pipewire]
+# required by media-video/ffmpeg-4.4.2::gentoo[sdl]
+# required by www-client/firefox-bin-101.0.1::gentoo[ffmpeg]
+# required by firefox-bin (argument)
+>=media-libs/libpulse-16.0 abi_x86_32
+# required by sys-fs/udev-250::gentoo
+# required by virtual/libudev-232-r7::gentoo[-systemd]
+# required by media-libs/libsdl2-2.0.20-r1::gentoo[udev]
+# required by media-sound/mpg123-1.29.3::gentoo[sdl]
+# required by media-libs/libsndfile-1.1.0-r1::gentoo[-minimal]
+# required by media-libs/lilv-0.24.12::gentoo
+# required by media-video/pipewire-0.3.52-r1::gentoo[lv2]
+# required by kde-plasma/plasma-pa-5.25.1::gentoo
+# required by kde-plasma/plasma-meta-5.25.1::gentoo[pulseaudio]
+# required by @selected
+# required by @world (argument)
+>=sys-apps/systemd-utils-250.7 abi_x86_32
+
diff --git a/package.use/lame b/package.use/32-bit/lame
similarity index 100%
rename from package.use/lame
rename to package.use/32-bit/lame
diff --git a/package.use/simplescreenrecorder b/package.use/32-bit/simplescreenrecorder
similarity index 100%
rename from package.use/simplescreenrecorder
rename to package.use/32-bit/simplescreenrecorder
diff --git a/package.use/steam b/package.use/32-bit/steam
similarity index 99%
rename from package.use/steam
rename to package.use/32-bit/steam
index 79748e1..28959f1 100644
--- a/package.use/steam
+++ b/package.use/32-bit/steam
@@ -30,4 +30,3 @@ app-arch/bzip2 abi_x86_32
 media-libs/vulkan-loader abi_x86_32
 dev-libs/libbsd abi_x86_32
 app-crypt/libmd abi_x86_32
-
diff --git a/package.use/wine b/package.use/32-bit/wine
similarity index 100%
rename from package.use/wine
rename to package.use/32-bit/wine
diff --git a/package.use/barrier b/package.use/barrier
deleted file mode 100644
index 6213e21..0000000
--- a/package.use/barrier
+++ /dev/null
@@ -1,4 +0,0 @@
-# required by x11-misc/barrier-2.4.0::gentoo[gui]
-# required by barrier (argument)
->=net-dns/avahi-0.8-r5 mdnsresponder-compat
-
diff --git a/package.use/calibre b/package.use/calibre
deleted file mode 100644
index 8e9f847..0000000
--- a/package.use/calibre
+++ /dev/null
@@ -1,370 +0,0 @@
-app-text/calibre python_single_target_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/apsw-3.35.4_p1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/beautifulsoup4-4.10.0 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/chardet-4.0.0 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/cssselect-1.1.0-r1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/css-parser-1.0.7-r1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/dbus-python-1.2.18 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/dnspython-2.2.1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/feedparser-6.0.8 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/html2text-2020.1.16-r1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/html5-parser-0.4.10 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/lxml-4.8.0-r1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/markdown-3.3.6 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/mechanize-0.4.7 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/msgpack-1.0.3 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/netifaces-0.11.0 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pillow-9.0.1-r1 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/psutil-5.7.3 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pychm-0.8.6 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pygments-2.11.2 python_targets_python3_9
-# required by dev-python/arrow-1.2.2::gentoo
-# required by dev-python/isoduration-20.11.0::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/python-dateutil-2.8.2 python_targets_python3_9
-# required by dev-python/PyQtWebEngine-5.15.4::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/PyQt5-5.15.4-r1 python_targets_python3_9 webchannel
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/PyQtWebEngine-5.15.4 python_targets_python3_9
-# required by dev-python/rfc3987-1.3.8-r2::gentoo
-# required by dev-python/rfc3986-validator-0.1.1-r1::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/regex-2022.3.15 python_targets_python3_9
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/zeroconf-0.38.4 python_targets_python3_9
-# required by dev-python/css-parser-1.0.7-r1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/setuptools-60.10.0 python_targets_python3_9
-# required by dev-python/PyQtWebEngine-5.15.4::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/sip-4.19.25-r1 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/appdirs-1.4.4-r2 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/jaraco-text-3.7.0-r2 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/more-itertools-8.12.0-r1 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/nspektr-0.3.0 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/ordered-set-4.1.0 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/packaging-21.3-r2 python_targets_python3_9
-# required by dev-python/nspektr-0.3.0::gentoo[-python_targets_python3_8,python_targets_python3_9]
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/importlib_metadata-4.11.3 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/certifi-3021.3.16-r1 python_targets_python3_9
-# required by dev-python/python-dateutil-2.8.2::gentoo
-# required by dev-python/arrow-1.2.2::gentoo
-# required by dev-python/isoduration-20.11.0::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/setuptools_scm-6.4.1 python_targets_python3_9
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/wheel-0.37.1-r1 python_targets_python3_9
-# required by dev-python/rfc3986-validator-0.1.1-r1::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/installer-0.5.0 python_targets_python3_9
-# required by dev-python/pillow-9.0.1-r1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/tomli-2.0.1 python_targets_python3_9
-# required by dev-python/jaraco-text-3.7.0-r2::gentoo
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/flit_core-3.7.1 python_targets_python3_9
-# required by dev-python/importlib_metadata-4.11.3::gentoo
-# required by dev-python/markdown-3.3.6::gentoo[-python_targets_python3_8,python_targets_python3_9]
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/zipp-3.7.0-r1 python_targets_python3_9
-# required by dev-python/packaging-21.3-r2::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pyparsing-3.0.7-r1 python_targets_python3_9
-# required by dev-python/nspektr-0.3.0::gentoo
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/jaraco-context-4.1.1-r2 python_targets_python3_9
-# required by dev-python/nspektr-0.3.0::gentoo
-# required by dev-python/setuptools-60.10.0::gentoo
-# required by dev-python/apsw-3.35.4_p1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/jaraco-functools-3.5.0-r2 python_targets_python3_9
-# required by dev-python/zeroconf-0.38.4::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/ifaddr-0.1.7 python_targets_python3_9
-# required by dev-python/PyQt5-5.15.4-r1::gentoo
-# required by dev-python/PyQtWebEngine-5.15.4::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/PyQt5-sip-12.9.0 python_targets_python3_9
-# required by dev-python/html5lib-1.1::gentoo
-# required by dev-python/beautifulsoup4-4.10.0::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/six-1.16.0 python_targets_python3_9
-# required by dev-python/pillow-9.0.1-r1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/olefile-0.46-r1 python_targets_python3_9
-# required by dev-python/msgpack-1.0.3::gentoo[native-extensions,-python_targets_python3_8,python_targets_python3_10,python_targets_python3_9]
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/cython-0.29.28 python_targets_python3_9
-# required by dev-python/mechanize-0.4.7::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/html5lib-1.1 python_targets_python3_9
-# required by dev-python/html5lib-1.1::gentoo
-# required by dev-python/beautifulsoup4-4.10.0::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/webencodings-0.5.1-r1 python_targets_python3_9
-# required by dev-python/feedparser-6.0.8::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/sgmllib3k-1.0.0 python_targets_python3_9
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/cryptography-3.4.7-r3 python_targets_python3_9
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/idna-3.3 python_targets_python3_9
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/poetry-core-1.0.8 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/attrs-21.4.0 python_targets_python3_9
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/jsonschema-4.4.0-r1 python_targets_python3_9
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/lark-parser-0.11.3-r1 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pyrsistent-0.18.1 python_targets_python3_9
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/tomlkit-0.10.0 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/fqdn-1.5.1-r1 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/isoduration-20.11.0 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/jsonpointer-2.2 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/rfc3339-validator-0.1.4 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/rfc3986-validator-0.1.1-r1 python_targets_python3_9
-# required by dev-python/rfc3986-validator-0.1.1-r1::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/rfc3987-1.3.8-r2 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/uritemplate-4.1.0 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/webcolors-1.11.1 python_targets_python3_9
-# required by dev-python/rfc3339-validator-0.1.4::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/strict-rfc3339-0.7-r2 python_targets_python3_9
-# required by dev-python/isoduration-20.11.0::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/arrow-1.2.2 python_targets_python3_9
-# required by dev-python/attrs-21.4.0::gentoo
-# required by dev-python/jsonschema-4.4.0-r1::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/zope-interface-5.4.0-r2 python_targets_python3_9
-# required by dev-python/cryptography-3.4.7-r3::gentoo[-python_targets_python3_8,python_targets_python3_10,python_targets_python3_9]
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/cffi-1.15.0 python_targets_python3_9
-# required by dev-python/cffi-1.15.0::gentoo[-test]
-# required by dev-python/cryptography-3.4.7-r3::gentoo[-python_targets_python3_8,python_targets_python3_10,python_targets_python3_9]
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/pycparser-2.21 python_targets_python3_9
-# required by dev-python/pycparser-2.21::gentoo[-test]
-# required by dev-python/cffi-1.15.0::gentoo[-test]
-# required by dev-python/cryptography-3.4.7-r3::gentoo[-python_targets_python3_8,python_targets_python3_10,python_targets_python3_9]
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/ply-3.11-r1 python_targets_python3_9
-# required by dev-python/beautifulsoup4-4.10.0::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by calibre (argument)
->=dev-python/soupsieve-2.3.1 python_targets_python3_9
-# required by dev-python/jsonschema-4.4.0-r2::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by @selected
-# required by @world (argument)
->=dev-python/uri_template-1.2.0 python_targets_python3_9
-# required by dev-python/strict-rfc3339-0.7-r2::gentoo
-# required by dev-python/rfc3339-validator-0.1.4::gentoo
-# required by dev-python/jsonschema-4.4.0-r2::gentoo
-# required by dev-python/poetry-core-1.0.8::gentoo
-# required by dev-python/dnspython-2.2.1::gentoo
-# required by app-text/calibre-5.16.1-r1::gentoo[python_single_target_python3_9]
-# required by @selected
-# required by @world (argument)
->=dev-python/gpep517-3 python_targets_python3_9
-
diff --git a/package.use/dino b/package.use/dino
deleted file mode 100644
index d7a9408..0000000
--- a/package.use/dino
+++ /dev/null
@@ -1 +0,0 @@
-net-im/dino -notification-sound
diff --git a/package.use/gajim b/package.use/gajim
deleted file mode 100644
index 230d41b..0000000
--- a/package.use/gajim
+++ /dev/null
@@ -1 +0,0 @@
-net-im/gajim omemo 
diff --git a/package.use/gimp b/package.use/gimp
deleted file mode 100644
index 3ce02e6..0000000
--- a/package.use/gimp
+++ /dev/null
@@ -1 +0,0 @@
-media-gfx/gimp -alsa -mng -udev
diff --git a/package.use/git b/package.use/git
index 46e62d2..abfe50d 100644
--- a/package.use/git
+++ b/package.use/git
@@ -1 +1 @@
-dev-vcs/git -perl
+dev-vcs/git -perl -webdav
diff --git a/package.use/grub b/package.use/grub
deleted file mode 100644
index ab92ea7..0000000
--- a/package.use/grub
+++ /dev/null
@@ -1 +0,0 @@
-sys-boot/grub mount
diff --git a/package.use/jack b/package.use/jack
deleted file mode 100644
index 82b5483..0000000
--- a/package.use/jack
+++ /dev/null
@@ -1,7 +0,0 @@
-# required by media-libs/libsdl2-2.0.20-r1::gentoo[jack]
-# required by app-emulation/wine-vanilla-7.6::gentoo[sdl]
-# required by virtual/wine-0-r7::gentoo
-# required by @selected
-# required by @world (argument)
->=virtual/jack-2 abi_x86_32
-
diff --git a/package.use/kate b/package.use/kate
index d6f1ed8..d9acb80 100644
--- a/package.use/kate
+++ b/package.use/kate
@@ -1 +1 @@
-kde-apps/kate -filebrowser -snippets
+kde-apps/kate -filebrowser -projects -snippets
diff --git a/package.use/libsndfile b/package.use/libsndfile
new file mode 100644
index 0000000..7d0e2cf
--- /dev/null
+++ b/package.use/libsndfile
@@ -0,0 +1,2 @@
+# Conflicts with libsdl2 if minimal not in USE
+media-libs/libsndfile minimal
diff --git a/package.use/mpv b/package.use/mpv
index 1a850f8..b3f7636 100644
--- a/package.use/mpv
+++ b/package.use/mpv
@@ -1 +1 @@
-media-video/mpv python_targets_python3_9 libmpv -bluray -cdda -dvb -dvd
+media-video/mpv libmpv -alsa -bluray -cdda -dvb -dvd -egl -gamepad
diff --git a/package.use/nordvpn b/package.use/nordvpn
new file mode 100644
index 0000000..a68bd23
--- /dev/null
+++ b/package.use/nordvpn
@@ -0,0 +1 @@
+net-vpn/nordvpn ipsymlink
diff --git a/package.use/oidn b/package.use/oidn
deleted file mode 100644
index ecd2eeb..0000000
--- a/package.use/oidn
+++ /dev/null
@@ -1 +0,0 @@
-media-libs/oidn python_single_target_python3_9
diff --git a/package.use/onedrive b/package.use/onedrive
new file mode 100644
index 0000000..0985293
--- /dev/null
+++ b/package.use/onedrive
@@ -0,0 +1 @@
+net-misc/onedrive dmd-2_096
diff --git a/package.use/pyqt5 b/package.use/pyqt5
deleted file mode 100644
index 4440a41..0000000
--- a/package.use/pyqt5
+++ /dev/null
@@ -1,4 +0,0 @@
-# required by www-client/qutebrowser-2.5.0::gentoo[python_single_target_python3_10]
-# required by qutebrowser (argument)
->=dev-python/PyQt5-5.15.4-r1 sql
-
diff --git a/package.use/python b/package.use/python
index 93fb6fa..ba38145 100644
--- a/package.use/python
+++ b/package.use/python
@@ -1,4 +1,2 @@
 */* PYTHON_TARGETS: -* python3_10
 */* PYTHON_SINGLE_TARGET: -* python3_10
-
-dev-lang/python tk
diff --git a/package.use/rocketchat-desktop-bin b/package.use/rocketchat-desktop-bin
index 02e08fb..e13a028 100644
--- a/package.use/rocketchat-desktop-bin
+++ b/package.use/rocketchat-desktop-bin
@@ -2,4 +2,3 @@
 # required by net-im/rocketchat-desktop-bin-3.7.8::gentoo
 # required by rocketchat-desktop-bin (argument)
 >=dev-libs/libdbusmenu-16.04.0-r1 gtk3
-
diff --git a/package.use/spotify b/package.use/spotify
new file mode 100644
index 0000000..0d3d362
--- /dev/null
+++ b/package.use/spotify
@@ -0,0 +1 @@
+media-sound/spotify -libnotify
diff --git a/package.use/vintagstory b/package.use/vintagstory
deleted file mode 100644
index a1763a4..0000000
--- a/package.use/vintagstory
+++ /dev/null
@@ -1 +0,0 @@
-dev-lang/mono -minimal
diff --git a/package.use/vulkan-tools b/package.use/vulkan-tools
deleted file mode 100644
index 566c31d..0000000
--- a/package.use/vulkan-tools
+++ /dev/null
@@ -1 +0,0 @@
-dev-util/vulkan-tools cube
diff --git a/package.use/webcamoid b/package.use/webcamoid
deleted file mode 100644
index ab5a45e..0000000
--- a/package.use/webcamoid
+++ /dev/null
@@ -1 +0,0 @@
-media-video/webcamoid libuvc v4lutils
diff --git a/repos.conf/dmchurch.conf b/repos.conf/dmchurch.conf
deleted file mode 100644
index 06dd6bb..0000000
--- a/repos.conf/dmchurch.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[dmchurch]
-location = /var/db/repos/dmchurch
-sync-type = git
-sync-uri = https://github.com/gentoo-mirror/dmchurch
-auto-sync = yes
-
diff --git a/repos.conf/guru.conf b/repos.conf/guru.conf
index 632196f..d5caf3c 100644
--- a/repos.conf/guru.conf
+++ b/repos.conf/guru.conf
@@ -3,4 +3,4 @@ location = /var/db/repos/guru
 sync-type = git
 sync-uri = https://github.com/gentoo/guru.git
 auto-sync = yes
-
+priority = 100
diff --git a/repos.conf/siina-overlay.conf b/repos.conf/siina-overlay.conf
index 0db7eaa..fad01f8 100644
--- a/repos.conf/siina-overlay.conf
+++ b/repos.conf/siina-overlay.conf
@@ -1,6 +1,6 @@
 [siina]
 location = /var/db/repos/siina-overlay
 sync-type = git
-sync-uri = https://codeberg.org/siina/siina-overlay
+sync-uri = https://github.com/siinamon/siina-overlay
 auto-sync = yes
-
+priority = 100
diff --git a/repos.conf/src_prepare-overlay.conf b/repos.conf/src_prepare-overlay.conf
index a400ff1..808f96b 100644
--- a/repos.conf/src_prepare-overlay.conf
+++ b/repos.conf/src_prepare-overlay.conf
@@ -3,4 +3,4 @@ location = /var/db/repos/src_prepare-overlay
 sync-type = git
 sync-uri = https://github.com/gentoo-mirror/src_prepare-overlay
 auto-sync = yes
-
+priority = 100
diff --git a/repos.conf/steam-overlay.conf b/repos.conf/steam-overlay.conf
index 19b4e80..30137f4 100644
--- a/repos.conf/steam-overlay.conf
+++ b/repos.conf/steam-overlay.conf
@@ -3,4 +3,4 @@ location = /var/db/repos/steam-overlay
 sync-type = git
 sync-uri = https://github.com/anyc/steam-overlay
 auto-sync = yes
-
+priority = 100
diff --git a/sets/aerc b/sets/aerc
index 695fd84..c026c56 100644
--- a/sets/aerc
+++ b/sets/aerc
@@ -1,2 +1,2 @@
 mail-client/aerc
-app-text/pandoc-bin::src_prepare-overlay
+app-text/pandoc-bin
diff --git a/sets/capturecard b/sets/capturecard
deleted file mode 100644
index 91ff569..0000000
--- a/sets/capturecard
+++ /dev/null
@@ -1,3 +0,0 @@
-media-tv/v4l-utils
-media-video/mpv
-
diff --git a/sets/dfhack b/sets/dfhack
deleted file mode 100644
index 348bf45..0000000
--- a/sets/dfhack
+++ /dev/null
@@ -1,2 +0,0 @@
-dev-perl/XML-LibXML
-dev-perl/XML-LibXSLT
diff --git a/sets/dwarf-fortress b/sets/dwarf-fortress
deleted file mode 100644
index 46ee50c..0000000
--- a/sets/dwarf-fortress
+++ /dev/null
@@ -1,4 +0,0 @@
-media-libs/openal
-media-libs/sdl-image
-media-libs/sdl-ttf
-x11-libs/gtk+:2
diff --git a/sets/minecraft b/sets/minecraft
deleted file mode 100644
index 3b54180..0000000
--- a/sets/minecraft
+++ /dev/null
@@ -1,2 +0,0 @@
-dev-java/openjdk-bin
-games-action/multimc-bin
diff --git a/sets/scrotsh b/sets/scrotsh
index 3c44afd..3400127 100644
--- a/sets/scrotsh
+++ b/sets/scrotsh
@@ -1,4 +1,4 @@
 media-gfx/imagemagick
 media-gfx/maim
-media-video/mpv
+media-video/ffmpeg
 x11-misc/xsel