12 files changed, 22 insertions, 24 deletions
diff --git a/conf/intel/portage/package.keywords/00-generic.package.keywords b/conf/intel/portage/package.keywords/00-generic.package.keywords
index 0109fe6..b8ad3f6 100644
--- a/conf/intel/portage/package.keywords/00-generic.package.keywords
+++ b/conf/intel/portage/package.keywords/00-generic.package.keywords
@@ -5,14 +5,6 @@ dev-libs/nss ~amd64
 dev-ruby/paint ~amd64
 dev-util/kbuild ~amd64
 games-misc/lolcat ~amd64
-media-gfx/librecad ~amd64
-media-gfx/rawtherapee ~amd64
-media-libs/libbluray ~amd64
-net-firewall/ufw-frontends ~amd64
-sys-apps/inxi ~amd64
-sys-firmware/b43-firmware ~amd64
-sys-firmware/b43legacy-firmware ~amd64
-sys-fs/cryptsetup ~amd64
 x11-apps/copyq ~amd64
 x11-apps/radeontop ~amd64
 x11-libs/qscintilla ~amd64
diff --git a/conf/intel/portage/package.keywords/00-internet.package.keywords b/conf/intel/portage/package.keywords/00-internet.package.keywords
index d7c6b29..18b4621 100644
--- a/conf/intel/portage/package.keywords/00-internet.package.keywords
+++ b/conf/intel/portage/package.keywords/00-internet.package.keywords
@@ -1,4 +1,5 @@
 mail-client/trojita ~amd64
+net-firewall/ufw-frontends ~amd64
 net-im/qtox ~amd64
 net-libs/tox ~amd64
 net-misc/cmst ~amd64
diff --git a/conf/intel/portage/package.keywords/00-multimedia.package.keywords b/conf/intel/portage/package.keywords/00-multimedia.package.keywords
index bd5007b..c6d36b7 100644
--- a/conf/intel/portage/package.keywords/00-multimedia.package.keywords
+++ b/conf/intel/portage/package.keywords/00-multimedia.package.keywords
@@ -1,3 +1,6 @@
+media-gfx/librecad ~amd64
+media-gfx/rawtherapee ~amd64
+media-libs/libbluray ~amd64
 media-tv/sopcast ~amd64
 media-tv/tv-maxe ~amd64
 media-tv/v4l-utils ~amd64
diff --git a/conf/intel/portage/package.keywords/00-system.package.keywords b/conf/intel/portage/package.keywords/00-system.package.keywords
new file mode 100644
index 0000000..aea0315
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-system.package.keywords
@@ -0,0 +1,4 @@
+sys-apps/inxi ~amd64
+sys-firmware/b43-firmware ~amd64
+sys-firmware/b43legacy-firmware ~amd64
+sys-fs/cryptsetup ~amd64
diff --git a/conf/intel/portage/package.use/00-drmstack.package.use b/conf/intel/portage/package.use/00-drmstack.package.use
index ba73393..f6c3a83 100644
--- a/conf/intel/portage/package.use/00-drmstack.package.use
+++ b/conf/intel/portage/package.use/00-drmstack.package.use
@@ -2,10 +2,5 @@ media-libs/mesa d3d9 gles1 gles2 vulkan xa
 sys-devel/clang-runtime -openmp
 sys-devel/clang -static-analyzer
 sys-devel/llvm libedit
-x11-base/xorg-server xvfb
-x11-drivers/nvidia-drivers gtk2 -driver -kms -uvm
-x11-drivers/xf86-video-intel uxa
-x11-drivers/xf86-video-qxl xspice
 x11-libs/libdrm libkms
 x11-libs/libva utils
-
diff --git a/conf/intel/portage/package.use/00-emulation.package.use b/conf/intel/portage/package.use/00-emulation.package.use
new file mode 100644
index 0000000..cfae534
--- /dev/null
+++ b/conf/intel/portage/package.use/00-emulation.package.use
@@ -0,0 +1,5 @@
+app-emulation/wine d3d9 staging s3tc vaapi -gstreamer -mono -realtime -prelink
+app-emulation/aqemu vnc
+app-emulation/docker overlay -aufs -btrfs
+app-emulation/libvirt numa virt-network
+app-emulation/qemu gtk gtk2 iscsi numa usb usbredir virgl spice ssh
diff --git a/conf/intel/portage/package.use/00-generic.package.use b/conf/intel/portage/package.use/00-generic.package.use
index 28a7b59..5c9b7eb 100644
--- a/conf/intel/portage/package.use/00-generic.package.use
+++ b/conf/intel/portage/package.use/00-generic.package.use
@@ -1,15 +1,9 @@
 app-admin/sudo -sendmail
 app-admin/testdisk ewf ntfs
 app-crypt/heimdal -ssl
-app-emulation/wine d3d9 staging s3tc vaapi -gstreamer -mono -realtime -prelink
 app-misc/calamares-runtime branding
 app-text/xmlto text
 dev-db/sqlite secure-delete
 dev-lang/fpc source
 dev-libs/libpcre pcre16
 dev-libs/libgusb vala
-kde-apps/k3b encode mad
-lxqt-base/lxqt-meta branding
-sys-fs/dosfstools compat
-sys-libs/libseccomp static-libs
-sys-libs/zlib minizip
diff --git a/conf/intel/portage/package.use/00-kdeapps.package.use b/conf/intel/portage/package.use/00-kdeapps.package.use
new file mode 100644
index 0000000..e12482f
--- /dev/null
+++ b/conf/intel/portage/package.use/00-kdeapps.package.use
@@ -0,0 +1 @@
+kde-apps/k3b encode mad
diff --git a/conf/intel/portage/package.use/00-lxqt.package.use b/conf/intel/portage/package.use/00-lxqt.package.use
new file mode 100644
index 0000000..7eb0ffe
--- /dev/null
+++ b/conf/intel/portage/package.use/00-lxqt.package.use
@@ -0,0 +1 @@
+lxqt-base/lxqt-meta branding
diff --git a/conf/intel/portage/package.use/00-system.package.use b/conf/intel/portage/package.use/00-system.package.use
index 796063e..67d93fd 100644
--- a/conf/intel/portage/package.use/00-system.package.use
+++ b/conf/intel/portage/package.use/00-system.package.use
@@ -1,7 +1,3 @@
-app-emulation/aqemu vnc
-app-emulation/docker overlay -aufs -btrfs
-app-emulation/libvirt numa virt-network
-app-emulation/qemu gtk gtk2 iscsi numa usb usbredir virgl spice ssh
 sys-apps/systemd sysv-utils cryptsetup -http
 sys-boot/grub device-mapper mount truetype
 sys-devel/gcc go
@@ -9,4 +5,6 @@ sys-fs/cryptsetup -gcrypt -nettle
 sys-kernel/genkernel-next cryptsetup crypt mdadm dmraid plymouth iscsi
 sys-kernel/redcore-sources symlink
 sys-kernel/linux-redcore dmraid dracut symlink grub iscsi mdadm luks lvm zfs plymouth
-
+sys-fs/dosfstools compat
+sys-libs/libseccomp static-libs
+sys-libs/zlib minizip
diff --git a/conf/intel/portage/package.use/00-x11base.package.use b/conf/intel/portage/package.use/00-x11base.package.use
new file mode 100644
index 0000000..ede3449
--- /dev/null
+++ b/conf/intel/portage/package.use/00-x11base.package.use
@@ -0,0 +1,4 @@
+x11-base/xorg-server xvfb
+x11-drivers/nvidia-drivers gtk2 -driver -kms -uvm
+x11-drivers/xf86-video-intel uxa
+x11-drivers/xf86-video-qxl xspice
diff --git a/conf/intel/portage/package.use/00-x11.package.use b/conf/intel/portage/package.use/00-x11misc.package.use
index 23b43b9..23b43b9 100644
--- a/conf/intel/portage/package.use/00-x11.package.use
+++ b/conf/intel/portage/package.use/00-x11misc.package.use