diff --git a/profiles/default/package.keywords/default b/profiles/default/package.keywords/default
index 83a534159..632379d34 100644
--- a/profiles/default/package.keywords/default
+++ b/profiles/default/package.keywords/default
@@ -42,6 +42,7 @@ media-gfx/darktable amd64
 ~media-sound/lxmusic-0.4.7 amd64
 ~media-sound/strawberry-1.0.23 amd64
 ~media-sound/volumeicon-0.5.1 amd64
+~media-tv/kodi-20.3 amd64
 ~media-video/avidemux-2.8.1 amd64
 ~media-video/obs-studio-29.1.3 amd64
 ~media-video/shotcut-23.09.29 amd64
diff --git a/profiles/default/package.keywords/kodi b/profiles/default/package.keywords/kodi
deleted file mode 100644
index 3bd6b3043..000000000
--- a/profiles/default/package.keywords/kodi
+++ /dev/null
@@ -1,38 +0,0 @@
-~media-plugins/kodi-audiodecoder-modplug-3.0.0 amd64
-~media-plugins/kodi-audiodecoder-vgmstream-3.0.0 amd64
-~media-plugins/kodi-audioencoder-flac-19.0.0 amd64
-~media-plugins/kodi-audioencoder-lame-19.0.0 amd64
-~media-plugins/kodi-audioencoder-vorbis-19.0.0 amd64
-~media-plugins/kodi-audioencoder-wav-19.0.0 amd64
-~media-plugins/kodi-inputstream-adaptive-19.0.0 amd64
-~media-plugins/kodi-inputstream-rtmp-19.0.0 amd64
-~media-plugins/kodi-peripheral-joystick-19.0.0 amd64
-~media-plugins/kodi-pvr-argustv-7.1.2 amd64
-~media-plugins/kodi-pvr-demo-7.1.4 amd64
-~media-plugins/kodi-pvr-dvblink-9.1.2 amd64
-~media-plugins/kodi-pvr-dvbviewer-7.3.3 amd64
-~media-plugins/kodi-pvr-filmon-6.1.2 amd64
-~media-plugins/kodi-pvr-iptvsimple-7.6.9 amd64
-~media-plugins/kodi-pvr-mediaportal-tvserver-8.2.1 amd64
-~media-plugins/kodi-pvr-mythtv-7.3.1 amd64
-~media-plugins/kodi-pvr-nextpvr-8.2.6 amd64
-~media-plugins/kodi-pvr-njoy-7.1.1 amd64
-~media-plugins/kodi-pvr-pctv-6.1.1 amd64
-~media-plugins/kodi-pvr-stalker-7.1.1 amd64
-~media-plugins/kodi-pvr-vbox-8.1.2 amd64
-~media-plugins/kodi-pvr-vuplus-7.4.9 amd64
-~media-plugins/kodi-pvr-wmc-6.1.2 amd64
-~media-plugins/kodi-screensaver-asteroids-2.4.2 amd64
-~media-plugins/kodi-screensaver-biogenesis-2.3.2 amd64
-~media-plugins/kodi-screensaver-greynetic-2.3.1 amd64
-~media-plugins/kodi-screensaver-pingpong-2.2.2 amd64
-~media-plugins/kodi-screensaver-pyro-3.3.0 amd64
-~media-plugins/kodi-visualization-fishbmc-19.0.0 amd64
-~media-plugins/kodi-visualization-goom-19.0.0 amd64
-~media-plugins/kodi-visualization-projectm-19.0.1 amd64
-~media-plugins/kodi-visualization-shadertoy-19.1.1 amd64
-~media-plugins/kodi-visualization-spectrum-19.0.0 amd64
-~media-plugins/kodi-visualization-waveform-19.0.1 amd64
-~media-plugins/kodi-audiodecoder-snesapu-3.0.0 amd64
-~media-plugins/kodi-audiodecoder-stsound-3.0.0 amd64
-~media-plugins/kodi-audiodecoder-nosefart-3.0.0 amd64
diff --git a/profiles/default/package.use/exactly-one-of b/profiles/default/package.use/exactly-one-of
index c42d493cb..ff422c97b 100644
--- a/profiles/default/package.use/exactly-one-of
+++ b/profiles/default/package.use/exactly-one-of
@@ -16,8 +16,8 @@ net-analyzer/ossec-hids hybrid postgres
 # exactly-one-of ( iptables nftables )
 net-misc/connman -nftables
 
-# exactly-one-of ( gbm raspberry-pi wayland X )
-media-tv/kodi -wayland
+# exactly-one-of ( gbm raspberry-pi wayland X ) ( gbm wayland X ) vdpau? ( !gbm )
+media-tv/kodi -gbm -wayland
 
 # jit? ( lua_single_target_luajit )
 # exactly-one-of ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 )