diff --git a/make.conf b/make.conf
index 106ea93..0694780 100644
--- a/make.conf
+++ b/make.conf
@@ -19,7 +19,7 @@ INPUT_DEVICES="libinput wacom"
 RUBY_TARGETS="ruby27"
 
 AUD="pipewire pulseaudio screencast -gstreamer"
-GFX="vaapi vulkan -branding"
+GFX="vaapi vdpau vulkan -branding"
 KIT="-gnome -gtk -gtk2 -gtk3 -gtk-doc -qt4"
 MSC="minizip sqlite udisks -fortran -handbook -man -mysql"
 NET="bluetooth -ldap -wifi"
diff --git a/package.accept_keywords/guilded-bin b/package.accept_keywords/guilded-bin
new file mode 100644
index 0000000..90c5375
--- /dev/null
+++ b/package.accept_keywords/guilded-bin
@@ -0,0 +1 @@
+net-im/guilded-bin ~amd64
diff --git a/package.accept_keywords/pipenv b/package.accept_keywords/pipenv
new file mode 100644
index 0000000..a768e72
--- /dev/null
+++ b/package.accept_keywords/pipenv
@@ -0,0 +1 @@
+dev-python/pipenv ~amd64
diff --git a/package.accept_keywords/rocketchat-desktop-bin b/package.accept_keywords/rocketchat-desktop-bin
new file mode 100644
index 0000000..ace42b3
--- /dev/null
+++ b/package.accept_keywords/rocketchat-desktop-bin
@@ -0,0 +1 @@
+net-im/rocketchat-desktop-bin
diff --git a/package.accept_keywords/splatmoji b/package.accept_keywords/splatmoji
new file mode 100644
index 0000000..ce6a769
--- /dev/null
+++ b/package.accept_keywords/splatmoji
@@ -0,0 +1 @@
+x11-misc/splatmoji ~amd64
diff --git a/package.accept_keywords/vivaldi b/package.accept_keywords/vivaldi
new file mode 100644
index 0000000..3a98f61
--- /dev/null
+++ b/package.accept_keywords/vivaldi
@@ -0,0 +1 @@
+www-client/vivaldi ~amd64
diff --git a/package.accept_keywords/vscodium b/package.accept_keywords/vscodium
new file mode 100644
index 0000000..7f2af8f
--- /dev/null
+++ b/package.accept_keywords/vscodium
@@ -0,0 +1 @@
+app-editors/vscodium ~amd64
diff --git a/package.accept_keywords/webcamoid b/package.accept_keywords/webcamoid
new file mode 100644
index 0000000..690b39e
--- /dev/null
+++ b/package.accept_keywords/webcamoid
@@ -0,0 +1 @@
+media-video/webcamoid ~amd64
diff --git a/package.license b/package.license
index 48cc6dd..9a07e7f 100644
--- a/package.license
+++ b/package.license
@@ -1,6 +1,9 @@
 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
+www-client/vivaldi Vivaldi
+www-plugins/chrome-binary-plugins google-chrome # codecs for vivaldi
+net-im/guilded-bin all-rights-reserved
+net-im/rocketchat-desktop-bin android all-rights-reserved
diff --git a/package.mask/jre b/package.mask/jre
new file mode 100644
index 0000000..d2b4040
--- /dev/null
+++ b/package.mask/jre
@@ -0,0 +1 @@
+>=virtual/jre-11
diff --git a/package.use/avahi b/package.use/avahi
new file mode 100644
index 0000000..6213e21
--- /dev/null
+++ b/package.use/avahi
@@ -0,0 +1,4 @@
+# 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/deadbeef b/package.use/deadbeef
new file mode 100644
index 0000000..938526d
--- /dev/null
+++ b/package.use/deadbeef
@@ -0,0 +1 @@
+media-sound/deadbeef lastfm
diff --git a/package.use/kwave b/package.use/kwave
new file mode 100644
index 0000000..2257a38
--- /dev/null
+++ b/package.use/kwave
@@ -0,0 +1 @@
+kde-apps/kwave opus
diff --git a/package.use/libdbusmenu b/package.use/libdbusmenu
new file mode 100644
index 0000000..08ed47c
--- /dev/null
+++ b/package.use/libdbusmenu
@@ -0,0 +1,7 @@
+# required by dev-libs/libappindicator-12.10.1_p20200706::gentoo
+# required by net-im/guilded-bin-1.0.9105465::guru
+# required by guilded-bin (argument)
+# required by net-im/rocketchat-desktop-bin-3.8.7::gentoo
+# required by rocketchat-desktop-bin (argument)
+>=dev-libs/libdbusmenu-16.04.0-r1 gtk3
+
diff --git a/package.use/libvdpau b/package.use/libvdpau
new file mode 100644
index 0000000..ab7d219
--- /dev/null
+++ b/package.use/libvdpau
@@ -0,0 +1,8 @@
+# required by media-libs/mesa-22.1.7::gentoo[vdpau]
+# required by virtual/opengl-7.0-r2::gentoo
+# required by media-video/ffmpeg-4.4.2::gentoo[opengl]
+# required by media-video/mpv-0.34.1-r1::gentoo
+# required by @selected
+# required by @world (argument)
+>=x11-libs/libvdpau-1.5 abi_x86_32
+
diff --git a/package.use/pipewire b/package.use/pipewire
index fe17d20..ebace5d 100644
--- a/package.use/pipewire
+++ b/package.use/pipewire
@@ -1 +1 @@
-media-video/pipewire extra jack-sdk lv2 abi_x86_32
+media-video/pipewire extra jack-sdk lv2 pipewire-alsa sound-server abi_x86_32
diff --git a/package.use/python b/package.use/python
index ba38145..b523f99 100644
--- a/package.use/python
+++ b/package.use/python
@@ -1,2 +1,5 @@
 */* PYTHON_TARGETS: -* python3_10
 */* PYTHON_SINGLE_TARGET: -* python3_10
+
+# Used by dwarf-fortress lnp
+dev-lang/python tk 
diff --git a/package.use/vivaldi b/package.use/vivaldi
new file mode 100644
index 0000000..8cfbc23
--- /dev/null
+++ b/package.use/vivaldi
@@ -0,0 +1 @@
+www-client/vivaldi proprietary-codecs widevine
diff --git a/savedconfig/sys-kernel/linux-firmware-20220411 b/savedconfig/sys-kernel/linux-firmware
similarity index 100%
rename from savedconfig/sys-kernel/linux-firmware-20220411
rename to savedconfig/sys-kernel/linux-firmware