diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index 3844fd2..ac5e061 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -8,29 +8,21 @@ ABI_X86="64 32"
 
 POLICY_TYPES="mcs"
 
-USE="
-	X
-	fcitx4 cjk icu truetype idn fontconfig spell
+USE="${USE}
+	X gui widgets
+	fcitx4 truetype fontconfig spell
 	opengl vaapi vdpau xinerama libkms dri
 	bluray drm dvd lcms bdplus v4l aacs colord
 	pulseaudio ogg mp3 alsa vorbis
 	jpeg zimg png tiff gif exif xmp svg apng
-	elogind dbus udev policykit udisks
-	python ruby
-	lz4 lzma
-	vim-syntax
+	udisks
 	bluetooth usb
-	sqlite berkdb gdbm
-	pkcs11
+	gdbm
 	gtk cairo
 	wifi
-	device-mapper
-	ipset iproute2
 	modemmanager networkmanager
-	spice
-	ssh nss
-	cups scanner ocr
+	cups scanner ocr printsupport
 	libnotify
 	hwaccel
-	http2
+	qt qt5
 	"
diff --git a/profiles/targets/desktop/package.use/pyqt5 b/profiles/targets/desktop/package.use/pyqt5
new file mode 100644
index 0000000..ab5c47d
--- /dev/null
+++ b/profiles/targets/desktop/package.use/pyqt5
@@ -0,0 +1 @@
+dev-python/PyQt5 network webchannel
diff --git a/profiles/targets/desktop/package.use/spice b/profiles/targets/desktop/package.use/spice
new file mode 100644
index 0000000..bca37f3
--- /dev/null
+++ b/profiles/targets/desktop/package.use/spice
@@ -0,0 +1 @@
+net-misc/spice-gtk usbredir
diff --git a/profiles/targets/server/make.defaults b/profiles/targets/server/make.defaults
index 4979ff2..a2cf8a0 100644
--- a/profiles/targets/server/make.defaults
+++ b/profiles/targets/server/make.defaults
@@ -7,7 +7,7 @@ GRUB_PLATFORMS="efi-64 pc"
 ABI_X86="64"
 
 PLOICY_TYPES="mcs"
-USE="
+USE="${USE}
 	cjk icu idn
 	elogind dbus udev policykit
 	python ruby