split keywords per category

56 files changed, 211 insertions, 212 deletions

diff --git a/conf/intel/portage/package.keywords/00-app-admin.package.keywords b/conf/intel/portage/package.keywords/00-app-admin.package.keywords
new file mode 100644
index 0000000..4a57fca
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-app-admin.package.keywords
@@ -0,0 +1 @@
+app-admin/keepassxc
diff --git a/conf/intel/portage/package.keywords/00-app.package.keywords b/conf/intel/portage/package.keywords/00-app-emulation.package.keywords
index abef5ef..5a03c52 100644
--- a/conf/intel/portage/package.keywords/00-app.package.keywords
+++ b/conf/intel/portage/package.keywords/00-app-emulation.package.keywords
@@ -1,4 +1,3 @@
-app-admin/keepassxc
 app-emulation/playonlinux
 app-emulation/steam
 app-emulation/wine-any
@@ -7,10 +6,3 @@ app-emulation/wine-mono
 app-emulation/wine-staging
 app-emulation/winetricks
 app-emulation/wine-vanilla
-app-misc/radeontop
-app-office/libreoffice
-app-office/libreoffice-l10n
-app-office/wps-office
-app-text/calibre
-app-text/cutemarked
-app-text/libnumbertext
diff --git a/conf/intel/portage/package.keywords/00-app-misc.package.keywords b/conf/intel/portage/package.keywords/00-app-misc.package.keywords
new file mode 100644
index 0000000..e2d46d6
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-app-misc.package.keywords
@@ -0,0 +1 @@
+app-misc/radeontop
diff --git a/conf/intel/portage/package.keywords/00-app-office.package.keywords b/conf/intel/portage/package.keywords/00-app-office.package.keywords
new file mode 100644
index 0000000..8aab478
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-app-office.package.keywords
@@ -0,0 +1,3 @@
+app-office/libreoffice
+app-office/libreoffice-l10n
+app-office/wps-office
diff --git a/conf/intel/portage/package.keywords/00-app-text.package.keywords b/conf/intel/portage/package.keywords/00-app-text.package.keywords
new file mode 100644
index 0000000..9f44dc7
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-app-text.package.keywords
@@ -0,0 +1,3 @@
+app-text/calibre
+app-text/cutemarked
+app-text/libnumbertext
diff --git a/conf/intel/portage/package.keywords/00-dev-cpp.package.keywords b/conf/intel/portage/package.keywords/00-dev-cpp.package.keywords
new file mode 100644
index 0000000..a14e06b
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-cpp.package.keywords
@@ -0,0 +1 @@
+dev-cpp/glibmm
diff --git a/conf/intel/portage/package.keywords/00-dev-db.package.keywords b/conf/intel/portage/package.keywords/00-dev-db.package.keywords
new file mode 100644
index 0000000..6c27115
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-db.package.keywords
@@ -0,0 +1 @@
+dev-db/sqlitestudio
diff --git a/conf/intel/portage/package.keywords/00-dev-lang.package.keywords b/conf/intel/portage/package.keywords/00-dev-lang.package.keywords
new file mode 100644
index 0000000..e522058
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-lang.package.keywords
@@ -0,0 +1,3 @@
+dev-lang/fpc
+dev-lang/lazarus
+dev-lang/rust
diff --git a/conf/intel/portage/package.keywords/00-dev-libs.package.keywords b/conf/intel/portage/package.keywords/00-dev-libs.package.keywords
new file mode 100644
index 0000000..9a70427
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-libs.package.keywords
@@ -0,0 +1,10 @@
+dev-libs/d0_blind_id
+dev-libs/flatbuffers
+dev-libs/glib
+dev-libs/kasync
+dev-libs/libclc
+dev-libs/nspr
+dev-libs/nss
+dev-libs/sink
+dev-libs/wayland
+dev-libs/wayland-protocols
diff --git a/conf/intel/portage/package.keywords/00-dev-python.package.keywords b/conf/intel/portage/package.keywords/00-dev-python.package.keywords
new file mode 100644
index 0000000..40d27d9
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-python.package.keywords
@@ -0,0 +1,5 @@
+dev-python/gitdb2
+dev-python/git-python
+dev-python/pynacl
+dev-python/python-evdev
+dev-python/smmap2
diff --git a/conf/intel/portage/package.keywords/00-dev.package.keywords b/conf/intel/portage/package.keywords/00-dev-qt.package.keywords
index 3dac588..44d0919 100644
--- a/conf/intel/portage/package.keywords/00-dev.package.keywords
+++ b/conf/intel/portage/package.keywords/00-dev-qt.package.keywords
@@ -1,23 +1,3 @@
-dev-cpp/glibmm
-dev-db/sqlitestudio
-dev-lang/fpc
-dev-lang/lazarus
-dev-lang/rust
-dev-libs/d0_blind_id
-dev-libs/flatbuffers
-dev-libs/glib
-dev-libs/kasync
-dev-libs/libclc
-dev-libs/nspr
-dev-libs/nss
-dev-libs/sink
-dev-libs/wayland
-dev-libs/wayland-protocols
-dev-python/gitdb2
-dev-python/git-python
-dev-python/pynacl
-dev-python/python-evdev
-dev-python/smmap2
 dev-qt/designer
 dev-qt/linguist-tools
 dev-qt/qdbus
@@ -57,9 +37,3 @@ dev-qt/qtwidgets
 dev-qt/qtx11extras
 dev-qt/qtxml
 dev-qt/qtxmlpatterns
-dev-ruby/paint
-dev-util/gdbus-codegen
-dev-util/glib-utils
-dev-util/patchelf
-dev-util/pycharm-community
-dev-util/vulkan-headers
diff --git a/conf/intel/portage/package.keywords/00-dev-ruby.package.keywords b/conf/intel/portage/package.keywords/00-dev-ruby.package.keywords
new file mode 100644
index 0000000..9eaa014
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-ruby.package.keywords
@@ -0,0 +1 @@
+dev-ruby/paint
diff --git a/conf/intel/portage/package.keywords/00-dev-util.package.keywords b/conf/intel/portage/package.keywords/00-dev-util.package.keywords
new file mode 100644
index 0000000..0177d2f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-dev-util.package.keywords
@@ -0,0 +1,5 @@
+dev-util/gdbus-codegen
+dev-util/glib-utils
+dev-util/patchelf
+dev-util/pycharm-community
+dev-util/vulkan-headers
diff --git a/conf/intel/portage/package.keywords/00-games-action.package.keywords b/conf/intel/portage/package.keywords/00-games-action.package.keywords
new file mode 100644
index 0000000..8ea0186
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-action.package.keywords
@@ -0,0 +1,3 @@
+games-action/chromium-bsu
+games-action/supertuxkart
+games-action/teeworlds
diff --git a/conf/intel/portage/package.keywords/00-games-emulation.package.keywords b/conf/intel/portage/package.keywords/00-games-emulation.package.keywords
new file mode 100644
index 0000000..704815d
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-emulation.package.keywords
@@ -0,0 +1,2 @@
+games-emulation/snes9x
+games-emulation/zsnes
diff --git a/conf/intel/portage/package.keywords/00-games-fps.package.keywords b/conf/intel/portage/package.keywords/00-games-fps.package.keywords
new file mode 100644
index 0000000..cd7811d
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-fps.package.keywords
@@ -0,0 +1,3 @@
+games-fps/urbanterror
+games-fps/urbanterror-data
+games-fps/xonotic
diff --git a/conf/intel/portage/package.keywords/00-games-misc.package.keywords b/conf/intel/portage/package.keywords/00-games-misc.package.keywords
new file mode 100644
index 0000000..6581510
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-misc.package.keywords
@@ -0,0 +1,4 @@
+games-misc/lolcat
+games-misc/opengfx
+games-misc/openmsx
+games-misc/opensfx
diff --git a/conf/intel/portage/package.keywords/00-games-puzzle.package.keywords b/conf/intel/portage/package.keywords/00-games-puzzle.package.keywords
new file mode 100644
index 0000000..02f28b7
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-puzzle.package.keywords
@@ -0,0 +1 @@
+games-puzzle/zaz
diff --git a/conf/intel/portage/package.keywords/00-games-simulation.package.keywords b/conf/intel/portage/package.keywords/00-games-simulation.package.keywords
new file mode 100644
index 0000000..8280c48
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-simulation.package.keywords
@@ -0,0 +1 @@
+games-simulation/openttd
diff --git a/conf/intel/portage/package.keywords/00-games-strategy.package.keywords b/conf/intel/portage/package.keywords/00-games-strategy.package.keywords
new file mode 100644
index 0000000..e897ca2
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-strategy.package.keywords
@@ -0,0 +1,4 @@
+games-strategy/0ad
+games-strategy/0ad-data
+games-strategy/warzone2100
+games-strategy/wesnoth
diff --git a/conf/intel/portage/package.keywords/00-games-util.package.keywords b/conf/intel/portage/package.keywords/00-games-util.package.keywords
new file mode 100644
index 0000000..e758487
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-games-util.package.keywords
@@ -0,0 +1,4 @@
+games-util/catcodec
+games-util/grfcodec
+games-util/lutris
+games-util/nml
diff --git a/conf/intel/portage/package.keywords/00-games.package.keywords b/conf/intel/portage/package.keywords/00-games.package.keywords
deleted file mode 100644
index b1bdca3..0000000
--- a/conf/intel/portage/package.keywords/00-games.package.keywords
+++ /dev/null
@@ -1,22 +0,0 @@
-games-action/chromium-bsu
-games-action/supertuxkart
-games-action/teeworlds
-games-emulation/snes9x
-games-emulation/zsnes
-games-fps/urbanterror
-games-fps/urbanterror-data
-games-fps/xonotic
-games-misc/lolcat
-games-misc/opengfx
-games-misc/openmsx
-games-misc/opensfx
-games-puzzle/zaz
-games-simulation/openttd
-games-strategy/0ad
-games-strategy/0ad-data
-games-strategy/warzone2100
-games-strategy/wesnoth
-games-util/catcodec
-games-util/grfcodec
-games-util/lutris
-games-util/nml
diff --git a/conf/intel/portage/package.keywords/00-kde.package.keywords b/conf/intel/portage/package.keywords/00-kde-apps.package.keywords
index d007fe0..d12e4a9 100644
--- a/conf/intel/portage/package.keywords/00-kde.package.keywords
+++ b/conf/intel/portage/package.keywords/00-kde-apps.package.keywords
@@ -202,79 +202,3 @@ kde-apps/sweeper
 kde-apps/thumbnailers
 kde-apps/umbrello
 kde-apps/zeroconf-ioslave
-kde-frameworks/attica
-kde-frameworks/bluez-qt
-kde-frameworks/breeze-icons
-kde-frameworks/extra-cmake-modules
-kde-frameworks/frameworkintegration
-kde-frameworks/kactivities
-kde-frameworks/kactivities-stats
-kde-frameworks/karchive
-kde-frameworks/kauth
-kde-frameworks/kbookmarks
-kde-frameworks/kcmutils
-kde-frameworks/kcodecs
-kde-frameworks/kcompletion
-kde-frameworks/kconfig
-kde-frameworks/kconfigwidgets
-kde-frameworks/kcoreaddons
-kde-frameworks/kcrash
-kde-frameworks/kdbusaddons
-kde-frameworks/kdeclarative
-kde-frameworks/kded
-kde-frameworks/kdelibs4support
-kde-frameworks/kdesignerplugin
-kde-frameworks/kdesu
-kde-frameworks/kdewebkit
-kde-frameworks/kdnssd
-kde-frameworks/kdoctools
-kde-frameworks/kemoticons
-kde-frameworks/kf-env
-kde-frameworks/kfilemetadata
-kde-frameworks/kglobalaccel
-kde-frameworks/kguiaddons
-kde-frameworks/kholidays
-kde-frameworks/khtml
-kde-frameworks/ki18n
-kde-frameworks/kiconthemes
-kde-frameworks/kidletime
-kde-frameworks/kimageformats
-kde-frameworks/kinit
-kde-frameworks/kio
-kde-frameworks/kirigami
-kde-frameworks/kitemmodels
-kde-frameworks/kitemviews
-kde-frameworks/kjobwidgets
-kde-frameworks/kjs
-kde-frameworks/kjsembed
-kde-frameworks/knewstuff
-kde-frameworks/knotifications
-kde-frameworks/knotifyconfig
-kde-frameworks/kpackage
-kde-frameworks/kparts
-kde-frameworks/kpeople
-kde-frameworks/kplotting
-kde-frameworks/kpty
-kde-frameworks/kross
-kde-frameworks/krunner
-kde-frameworks/kservice
-kde-frameworks/ktexteditor
-kde-frameworks/ktextwidgets
-kde-frameworks/kunitconversion
-kde-frameworks/kwallet
-kde-frameworks/kwayland
-kde-frameworks/kwidgetsaddons
-kde-frameworks/kwindowsystem
-kde-frameworks/kxmlgui
-kde-frameworks/kxmlrpcclient
-kde-frameworks/networkmanager-qt
-kde-frameworks/oxygen-icons
-kde-frameworks/plasma
-kde-frameworks/prison
-kde-frameworks/purpose
-kde-frameworks/qqc2-desktop-style
-kde-frameworks/solid
-kde-frameworks/sonnet
-kde-frameworks/syndication
-kde-frameworks/syntax-highlighting
-kde-frameworks/threadweaver
diff --git a/conf/intel/portage/package.keywords/00-kde-frameworks.package.keywords b/conf/intel/portage/package.keywords/00-kde-frameworks.package.keywords
new file mode 100644
index 0000000..8884468
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-kde-frameworks.package.keywords
@@ -0,0 +1,76 @@
+kde-frameworks/attica
+kde-frameworks/bluez-qt
+kde-frameworks/breeze-icons
+kde-frameworks/extra-cmake-modules
+kde-frameworks/frameworkintegration
+kde-frameworks/kactivities
+kde-frameworks/kactivities-stats
+kde-frameworks/karchive
+kde-frameworks/kauth
+kde-frameworks/kbookmarks
+kde-frameworks/kcmutils
+kde-frameworks/kcodecs
+kde-frameworks/kcompletion
+kde-frameworks/kconfig
+kde-frameworks/kconfigwidgets
+kde-frameworks/kcoreaddons
+kde-frameworks/kcrash
+kde-frameworks/kdbusaddons
+kde-frameworks/kdeclarative
+kde-frameworks/kded
+kde-frameworks/kdelibs4support
+kde-frameworks/kdesignerplugin
+kde-frameworks/kdesu
+kde-frameworks/kdewebkit
+kde-frameworks/kdnssd
+kde-frameworks/kdoctools
+kde-frameworks/kemoticons
+kde-frameworks/kf-env
+kde-frameworks/kfilemetadata
+kde-frameworks/kglobalaccel
+kde-frameworks/kguiaddons
+kde-frameworks/kholidays
+kde-frameworks/khtml
+kde-frameworks/ki18n
+kde-frameworks/kiconthemes
+kde-frameworks/kidletime
+kde-frameworks/kimageformats
+kde-frameworks/kinit
+kde-frameworks/kio
+kde-frameworks/kirigami
+kde-frameworks/kitemmodels
+kde-frameworks/kitemviews
+kde-frameworks/kjobwidgets
+kde-frameworks/kjs
+kde-frameworks/kjsembed
+kde-frameworks/knewstuff
+kde-frameworks/knotifications
+kde-frameworks/knotifyconfig
+kde-frameworks/kpackage
+kde-frameworks/kparts
+kde-frameworks/kpeople
+kde-frameworks/kplotting
+kde-frameworks/kpty
+kde-frameworks/kross
+kde-frameworks/krunner
+kde-frameworks/kservice
+kde-frameworks/ktexteditor
+kde-frameworks/ktextwidgets
+kde-frameworks/kunitconversion
+kde-frameworks/kwallet
+kde-frameworks/kwayland
+kde-frameworks/kwidgetsaddons
+kde-frameworks/kwindowsystem
+kde-frameworks/kxmlgui
+kde-frameworks/kxmlrpcclient
+kde-frameworks/networkmanager-qt
+kde-frameworks/oxygen-icons
+kde-frameworks/plasma
+kde-frameworks/prison
+kde-frameworks/purpose
+kde-frameworks/qqc2-desktop-style
+kde-frameworks/solid
+kde-frameworks/sonnet
+kde-frameworks/syndication
+kde-frameworks/syntax-highlighting
+kde-frameworks/threadweaver
diff --git a/conf/intel/portage/package.keywords/00-mail.package.keywords b/conf/intel/portage/package.keywords/00-mail-client.package.keywords
index 1acfdd3..1acfdd3 100644
--- a/conf/intel/portage/package.keywords/00-mail.package.keywords
+++ b/conf/intel/portage/package.keywords/00-mail-client.package.keywords
diff --git a/conf/intel/portage/package.keywords/00-media-gfx.package.keywords b/conf/intel/portage/package.keywords/00-media-gfx.package.keywords
new file mode 100644
index 0000000..223485e
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-gfx.package.keywords
@@ -0,0 +1,4 @@
+media-gfx/darktable
+media-gfx/gimp
+media-gfx/krita
+media-gfx/mypaint-brushes
diff --git a/conf/intel/portage/package.keywords/00-media-libs.package.keywords b/conf/intel/portage/package.keywords/00-media-libs.package.keywords
new file mode 100644
index 0000000..a18c4d7
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-libs.package.keywords
@@ -0,0 +1,8 @@
+media-libs/babl
+media-libs/gegl:0.4
+media-libs/libmypaint
+media-libs/libv4l
+media-libs/mesa
+media-libs/mlt
+media-libs/openimageio
+media-libs/vulkan-loader
diff --git a/conf/intel/portage/package.keywords/00-media-plugins.package.keywords b/conf/intel/portage/package.keywords/00-media-plugins.package.keywords
new file mode 100644
index 0000000..518eb7f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-plugins.package.keywords
@@ -0,0 +1,2 @@
+media-plugins/audacious-plugins
+media-plugins/qmmp-plugin-pack
diff --git a/conf/intel/portage/package.keywords/00-media-sound.package.keywords b/conf/intel/portage/package.keywords/00-media-sound.package.keywords
new file mode 100644
index 0000000..913ac0f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-sound.package.keywords
@@ -0,0 +1,5 @@
+media-sound/audacious
+media-sound/cantata
+media-sound/pavucontrol-qt
+media-sound/qmmp
+media-sound/spotify
diff --git a/conf/intel/portage/package.keywords/00-media-tv.package.keywords b/conf/intel/portage/package.keywords/00-media-tv.package.keywords
new file mode 100644
index 0000000..64b2189
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-tv.package.keywords
@@ -0,0 +1,3 @@
+media-tv/sopcast
+media-tv/tv-maxe
+media-tv/v4l-utils
diff --git a/conf/intel/portage/package.keywords/00-media-video.package.keywords b/conf/intel/portage/package.keywords/00-media-video.package.keywords
new file mode 100644
index 0000000..e781002
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-media-video.package.keywords
@@ -0,0 +1,7 @@
+media-video/ffmpeg
+media-video/handbrake
+media-video/libva-utils
+media-video/obs-studio
+media-video/shotcut
+media-video/smplayer
+media-video/vlc
diff --git a/conf/intel/portage/package.keywords/00-media.package.keywords b/conf/intel/portage/package.keywords/00-media.package.keywords
deleted file mode 100644
index cd1f79b..0000000
--- a/conf/intel/portage/package.keywords/00-media.package.keywords
+++ /dev/null
@@ -1,29 +0,0 @@
-media-gfx/darktable
-media-gfx/gimp
-media-gfx/krita
-media-gfx/mypaint-brushes
-media-libs/babl
-media-libs/gegl:0.4
-media-libs/libmypaint
-media-libs/libv4l
-media-libs/mesa
-media-libs/mlt
-media-libs/openimageio
-media-libs/vulkan-loader
-media-plugins/audacious-plugins
-media-plugins/qmmp-plugin-pack
-media-sound/audacious
-media-sound/cantata
-media-sound/pavucontrol-qt
-media-sound/qmmp
-media-sound/spotify
-media-tv/sopcast
-media-tv/tv-maxe
-media-tv/v4l-utils
-media-video/ffmpeg
-media-video/handbrake
-media-video/libva-utils
-media-video/obs-studio
-media-video/shotcut
-media-video/smplayer
-media-video/vlc
diff --git a/conf/intel/portage/package.keywords/00-net-dns.package.keywords b/conf/intel/portage/package.keywords/00-net-dns.package.keywords
new file mode 100644
index 0000000..7be5ab2
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-dns.package.keywords
@@ -0,0 +1 @@
+net-dns/getdns
diff --git a/conf/intel/portage/package.keywords/00-net-firewall.package.keywords b/conf/intel/portage/package.keywords/00-net-firewall.package.keywords
new file mode 100644
index 0000000..62772d8
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-firewall.package.keywords
@@ -0,0 +1 @@
+net-firewall/ufw-frontends
diff --git a/conf/intel/portage/package.keywords/00-net-im.package.keywords b/conf/intel/portage/package.keywords/00-net-im.package.keywords
new file mode 100644
index 0000000..d0c950f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-im.package.keywords
@@ -0,0 +1,2 @@
+net-im/qtox
+net-im/skypeforlinux
diff --git a/conf/intel/portage/package.keywords/00-net-libs.package.keywords b/conf/intel/portage/package.keywords/00-net-libs.package.keywords
new file mode 100644
index 0000000..ecf1606
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-libs.package.keywords
@@ -0,0 +1,3 @@
+net-libs/gloox
+net-libs/kdav2
+net-libs/kimap2
diff --git a/conf/intel/portage/package.keywords/00-net-misc.package.keywords b/conf/intel/portage/package.keywords/00-net-misc.package.keywords
new file mode 100644
index 0000000..a49f3a3
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-misc.package.keywords
@@ -0,0 +1,6 @@
+net-misc/cmst
+net-misc/grive
+net-misc/meganz-sdk
+net-misc/megasync
+net-misc/owncloud-client
+net-misc/youtube-dl
diff --git a/conf/intel/portage/package.keywords/00-net-print.package.keywords b/conf/intel/portage/package.keywords/00-net-print.package.keywords
new file mode 100644
index 0000000..faf8900
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-print.package.keywords
@@ -0,0 +1,3 @@
+net-print/cnijfilter
+net-print/hplip
+net-print/hplip-plugin
diff --git a/conf/intel/portage/package.keywords/00-net-wireless.package.keywords b/conf/intel/portage/package.keywords/00-net-wireless.package.keywords
new file mode 100644
index 0000000..ec63b3f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-net-wireless.package.keywords
@@ -0,0 +1 @@
+net-wireless/bluemoon
diff --git a/conf/intel/portage/package.keywords/00-net.package.keywords b/conf/intel/portage/package.keywords/00-net.package.keywords
deleted file mode 100644
index 359f561..0000000
--- a/conf/intel/portage/package.keywords/00-net.package.keywords
+++ /dev/null
@@ -1,18 +0,0 @@
-net-dns/getdns
-net-firewall/ufw-frontends
-net-im/qtox
-net-im/skypeforlinux
-net-libs/gloox
-net-libs/kdav2
-net-libs/kimap2
-net-libs/tox
-net-misc/cmst
-net-misc/grive
-net-misc/meganz-sdk
-net-misc/megasync
-net-misc/owncloud-client
-net-misc/youtube-dl
-net-print/cnijfilter
-net-print/hplip
-net-print/hplip-plugin
-net-wireless/bluemoon
diff --git a/conf/intel/portage/package.keywords/00-sec.package.keywords b/conf/intel/portage/package.keywords/00-sec-policy.package.keywords
index a57a852..a57a852 100644
--- a/conf/intel/portage/package.keywords/00-sec.package.keywords
+++ b/conf/intel/portage/package.keywords/00-sec-policy.package.keywords
diff --git a/conf/intel/portage/package.keywords/00-sys-apps.package.keywords b/conf/intel/portage/package.keywords/00-sys-apps.package.keywords
new file mode 100644
index 0000000..4f05483
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-apps.package.keywords
@@ -0,0 +1,5 @@
+sys-apps/apparmor
+sys-apps/apparmor-utils
+sys-apps/crazydiskinfo
+sys-apps/firetools
+sys-apps/inxi
diff --git a/conf/intel/portage/package.keywords/00-sys-auth.package.keywords b/conf/intel/portage/package.keywords/00-sys-auth.package.keywords
new file mode 100644
index 0000000..101dca8
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-auth.package.keywords
@@ -0,0 +1 @@
+sys-auth/ykpers
diff --git a/conf/intel/portage/package.keywords/00-sys-boot.package.keywords b/conf/intel/portage/package.keywords/00-sys-boot.package.keywords
new file mode 100644
index 0000000..cb481e3
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-boot.package.keywords
@@ -0,0 +1 @@
+sys-boot/plymouth-openrc-plugin
diff --git a/conf/intel/portage/package.keywords/00-sys-devel.package.keywords b/conf/intel/portage/package.keywords/00-sys-devel.package.keywords
new file mode 100644
index 0000000..66b40cc
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-devel.package.keywords
@@ -0,0 +1,5 @@
+sys-devel/clang
+sys-devel/clang-common
+sys-devel/clang-runtime
+sys-devel/llvm
+sys-devel/llvm-common
diff --git a/conf/intel/portage/package.keywords/00-sys-firmware.package.keywords b/conf/intel/portage/package.keywords/00-sys-firmware.package.keywords
new file mode 100644
index 0000000..1205044
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-firmware.package.keywords
@@ -0,0 +1,2 @@
+sys-firmware/b43-firmware
+sys-firmware/b43legacy-firmware
diff --git a/conf/intel/portage/package.keywords/00-sys-kernel.package.keywords b/conf/intel/portage/package.keywords/00-sys-kernel.package.keywords
new file mode 100644
index 0000000..59febcc
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-kernel.package.keywords
@@ -0,0 +1 @@
+sys-kernel/linux-firmware **
diff --git a/conf/intel/portage/package.keywords/00-sys-libs.package.keywords b/conf/intel/portage/package.keywords/00-sys-libs.package.keywords
new file mode 100644
index 0000000..095ecf7
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-sys-libs.package.keywords
@@ -0,0 +1,7 @@
+sys-libs/compiler-rt
+sys-libs/compiler-rt-sanitizers
+sys-libs/glibc
+sys-libs/libcxxabi
+sys-libs/libcxx
+sys-libs/libomp
+sys-libs/llvm-libunwind
diff --git a/conf/intel/portage/package.keywords/00-sys.package.keywords b/conf/intel/portage/package.keywords/00-sys.package.keywords
deleted file mode 100644
index 7280154..0000000
--- a/conf/intel/portage/package.keywords/00-sys.package.keywords
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-apps/apparmor
-sys-apps/apparmor-utils
-sys-apps/crazydiskinfo
-sys-apps/firetools
-sys-apps/inxi
-sys-auth/ykpers
-sys-boot/plymouth-openrc-plugin
-sys-devel/clang
-sys-devel/clang-common
-sys-devel/clang-runtime
-sys-devel/llvm
-sys-devel/llvm-common
-sys-firmware/b43-firmware
-sys-firmware/b43legacy-firmware
-sys-kernel/linux-firmware **
-sys-libs/compiler-rt
-sys-libs/compiler-rt-sanitizers
-sys-libs/glibc
-sys-libs/libcxxabi
-sys-libs/libcxx
-sys-libs/libomp
-sys-libs/llvm-libunwind
diff --git a/conf/intel/portage/package.keywords/00-www.package.keywords b/conf/intel/portage/package.keywords/00-www-client.package.keywords
index ed30091..76ea833 100644
--- a/conf/intel/portage/package.keywords/00-www.package.keywords
+++ b/conf/intel/portage/package.keywords/00-www-client.package.keywords
@@ -2,4 +2,3 @@ www-client/falkon
 www-client/firefox
 www-client/opera
 www-client/vivaldi
-www-plugins/google-talkplugin
diff --git a/conf/intel/portage/package.keywords/00-www-plugins.package.keywords b/conf/intel/portage/package.keywords/00-www-plugins.package.keywords
new file mode 100644
index 0000000..e34f963
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-www-plugins.package.keywords
@@ -0,0 +1 @@
+www-plugins/google-talkplugin
diff --git a/conf/intel/portage/package.keywords/00-x11-apps.package.keywords b/conf/intel/portage/package.keywords/00-x11-apps.package.keywords
new file mode 100644
index 0000000..2b58d5c
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-x11-apps.package.keywords
@@ -0,0 +1 @@
+x11-apps/copyq
diff --git a/conf/intel/portage/package.keywords/00-x11.package.keywords b/conf/intel/portage/package.keywords/00-x11-drivers.package.keywords
index 1527a8f..7dbbd74 100644
--- a/conf/intel/portage/package.keywords/00-x11.package.keywords
+++ b/conf/intel/portage/package.keywords/00-x11-drivers.package.keywords
@@ -1,4 +1,3 @@
-x11-apps/copyq
 x11-drivers/xf86-input-joystick
 x11-drivers/xf86-input-keyboard
 x11-drivers/xf86-input-libinput
@@ -12,12 +11,3 @@ x11-drivers/xf86-video-nouveau
 x11-drivers/xf86-video-qxl
 x11-drivers/xf86-video-vesa
 x11-drivers/xf86-video-vmware
-x11-libs/libdrm
-x11-libs/libva
-x11-libs/libva-intel-driver
-x11-misc/obmenu-generator
-x11-misc/primus
-x11-misc/qarma
-x11-misc/redshift-qt
-x11-themes/audacious-themes
-x11-themes/kvantum
diff --git a/conf/intel/portage/package.keywords/00-x11-libs.package.keywords b/conf/intel/portage/package.keywords/00-x11-libs.package.keywords
new file mode 100644
index 0000000..5b1b7d0
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-x11-libs.package.keywords
@@ -0,0 +1,3 @@
+x11-libs/libdrm
+x11-libs/libva
+x11-libs/libva-intel-driver
diff --git a/conf/intel/portage/package.keywords/00-x11-misc.package.keywords b/conf/intel/portage/package.keywords/00-x11-misc.package.keywords
new file mode 100644
index 0000000..caae65f
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-x11-misc.package.keywords
@@ -0,0 +1,4 @@
+x11-misc/obmenu-generator
+x11-misc/primus
+x11-misc/qarma
+x11-misc/redshift-qt
diff --git a/conf/intel/portage/package.keywords/00-x11-themes.package.keywords b/conf/intel/portage/package.keywords/00-x11-themes.package.keywords
new file mode 100644
index 0000000..37061c2
--- /dev/null
+++ b/conf/intel/portage/package.keywords/00-x11-themes.package.keywords
@@ -0,0 +1,2 @@
+x11-themes/audacious-themes
+x11-themes/kvantum