Changing the TRINITY_MODULE_TYPE variable in ebuilds

Signed-off-by: ormorph <roma251078@mail.ru>

77 files changed, 77 insertions, 77 deletions

diff --git a/trinity-apps/abakus/abakus-9999.ebuild b/trinity-apps/abakus/abakus-9999.ebuild
index b245cd72..b80cc389 100644
--- a/trinity-apps/abakus/abakus-9999.ebuild
+++ b/trinity-apps/abakus/abakus-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de it nl pt sk"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A complex calculator for TDE"
diff --git a/trinity-apps/amarok/amarok-9999.ebuild b/trinity-apps/amarok/amarok-9999.ebuild
index 9c3df559..e5485a1e 100644
--- a/trinity-apps/amarok/amarok-9999.ebuild
+++ b/trinity-apps/amarok/amarok-9999.ebuild
@@ -13,7 +13,7 @@ TRINITY_LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es
 	ss sv ta tg th tr uk uz uz@cyrillic zh_CN zh_TW"
 
 TRINITY_DOC_LANGS="da de es et fr it nl pl pt pt_BR ru sv"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/multimedia"
 inherit trinity-base-2
 
 DESCRIPTION="Advanced music player for TDE"
diff --git a/trinity-apps/basket/basket-9999.ebuild b/trinity-apps/basket/basket-9999.ebuild
index 34709f6b..7da8954f 100644
--- a/trinity-apps/basket/basket-9999.ebuild
+++ b/trinity-apps/basket/basket-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs da de es fr it ja nl nn pl_PL pt ru sk tr zh_CN zh_TW"
 TRINITY_NEED_ARTS="optional"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/office"
 inherit trinity-base-2
 
 DESCRIPTION="Multi-purpose note-taking application for TDE"
diff --git a/trinity-apps/digikam/digikam-9999.ebuild b/trinity-apps/digikam/digikam-9999.ebuild
index 8a154770..e7fe0b54 100644
--- a/trinity-apps/digikam/digikam-9999.ebuild
+++ b/trinity-apps/digikam/digikam-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/graphics"
 TRINITY_BUILD_ADMIN="yes"
 TRINITY_LANGS="ar bg br ca cs cy da de el en_GB es et fa fi fr gl he hu is it ja ka lt
 		mk ms mt nb nds nl nn pa pl pt pt_BR ro ru rw sk sl sr sr@Latn sv ta th
diff --git a/trinity-apps/dolphin/dolphin-9999.ebuild b/trinity-apps/dolphin/dolphin-9999.ebuild
index c841ee8e..c248bb83 100644
--- a/trinity-apps/dolphin/dolphin-9999.ebuild
+++ b/trinity-apps/dolphin/dolphin-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de el es et fr he it nl pl ru sk"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="File manager for TDE"
diff --git a/trinity-apps/filelight/filelight-9999.ebuild b/trinity-apps/filelight/filelight-9999.ebuild
index fba766fb..15fd0b5a 100644
--- a/trinity-apps/filelight/filelight-9999.ebuild
+++ b/trinity-apps/filelight/filelight-9999.ebuild
@@ -13,7 +13,7 @@ TRINITY_LANGS="az bg br ca cs cy da de el en_GB es
 
 TRINITY_DOC_LANGS="da es et it pt ru sv"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
diff --git a/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild b/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild
index 951167d9..0a93b2a0 100644
--- a/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild
+++ b/trinity-apps/gtk-qt-engine/gtk-qt-engine-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="bg de es fr it nl nn ru sv tr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Theme engine using TQt for GTK+2"
diff --git a/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild b/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild
index ae91cc68..7268345f 100644
--- a/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild
+++ b/trinity-apps/gwenview-i18n/gwenview-i18n-9999.ebuild
@@ -11,7 +11,7 @@ TRINITY_LANGS="ar br cy el et fo he is ka ms nl pl ro sk sv th ve zh_CN
 	bg cs de es fi gl hu ja lt nds pa pt_BR rw sr@Latn uk xh zu"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/graphics"
 inherit trinity-base-2
 
 DESCRIPTION="Internationalization support for Gwenview [Trinity]"
diff --git a/trinity-apps/gwenview/gwenview-9999.ebuild b/trinity-apps/gwenview/gwenview-9999.ebuild
index f8644336..b55a2376 100644
--- a/trinity-apps/gwenview/gwenview-9999.ebuild
+++ b/trinity-apps/gwenview/gwenview-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_BUILD_ADMIN="yes"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/graphics"
 inherit trinity-base-2
 
 DESCRIPTION="Image viewer for TDE"
diff --git a/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild b/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild
index f95809c9..a501bbe7 100644
--- a/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild
+++ b/trinity-apps/k3b-i18n/k3b-i18n-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/multimedia"
 inherit trinity-base-2
 
 DESCRIPTION="K3b - internationalization translations"
diff --git a/trinity-apps/k3b/k3b-9999.ebuild b/trinity-apps/k3b/k3b-9999.ebuild
index dadeee22..eab89db6 100644
--- a/trinity-apps/k3b/k3b-9999.ebuild
+++ b/trinity-apps/k3b/k3b-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_NEED_ARTS="optional"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/multimedia"
 inherit trinity-base-2
 
 DESCRIPTION="A CD/DVD burning application for Trinity"
diff --git a/trinity-apps/kaffeine/kaffeine-9999.ebuild b/trinity-apps/kaffeine/kaffeine-9999.ebuild
index 7725ad43..9448086b 100644
--- a/trinity-apps/kaffeine/kaffeine-9999.ebuild
+++ b/trinity-apps/kaffeine/kaffeine-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="ar bg bn br ca cs da de el es et fi fr ga gl he
 	hu it ja ka km lt mk nb nl nn pa pl pt pt_BR ru se sk sr
 	sr@Latn sv tg tr uk uz zh_CN zh_TW"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/multimedia"
 inherit trinity-base-2
 
 DESCRIPTION="Media player for TDE using Xine and GStreamer backends."
diff --git a/trinity-apps/kasablanca/kasablanca-9999.ebuild b/trinity-apps/kasablanca/kasablanca-9999.ebuild
index 56716a04..b1186cbd 100644
--- a/trinity-apps/kasablanca/kasablanca-9999.ebuild
+++ b/trinity-apps/kasablanca/kasablanca-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de pl"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="FTP client for TDE"
diff --git a/trinity-apps/katapult/katapult-9999.ebuild b/trinity-apps/katapult/katapult-9999.ebuild
index 9f720076..2a60db1a 100644
--- a/trinity-apps/katapult/katapult-9999.ebuild
+++ b/trinity-apps/katapult/katapult-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ar bg br ca cs de el es et fr ga
 gl hu it ja nb nl pl pt pt_BR ru sk sv tr uk"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A general purpose launcher for TDE"
diff --git a/trinity-apps/kbarcode/kbarcode-9999.ebuild b/trinity-apps/kbarcode/kbarcode-9999.ebuild
index 8c31f4ef..c5725f06 100644
--- a/trinity-apps/kbarcode/kbarcode-9999.ebuild
+++ b/trinity-apps/kbarcode/kbarcode-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de el es fi fr hu it nl pl sv tr"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="Barcode and label printing application for TDE"
diff --git a/trinity-apps/kbfx/kbfx-9999.ebuild b/trinity-apps/kbfx/kbfx-9999.ebuild
index 3b609a20..f7ae2cb1 100644
--- a/trinity-apps/kbfx/kbfx-9999.ebuild
+++ b/trinity-apps/kbfx/kbfx-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="bg de hu it nl"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="An alternative to the TDE-Menu"
diff --git a/trinity-apps/kbibtex/kbibtex-9999.ebuild b/trinity-apps/kbibtex/kbibtex-9999.ebuild
index b6bef278..ee56e126 100644
--- a/trinity-apps/kbibtex/kbibtex-9999.ebuild
+++ b/trinity-apps/kbibtex/kbibtex-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de fr it pl ru"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/office"
 inherit trinity-base-2
 
 DESCRIPTION="Bibliography editor for TDE"
diff --git a/trinity-apps/kbiff/kbiff-9999.ebuild b/trinity-apps/kbiff/kbiff-9999.ebuild
index fd8590a6..7604ab99 100644
--- a/trinity-apps/kbiff/kbiff-9999.ebuild
+++ b/trinity-apps/kbiff/kbiff-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="br cs da de el es et fi fr he hr hu is it ja
 	nb nl nn pl pt pt_BR ro ru sk sl sv tr uk zh_TW"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="Email notification utility for TDE"
diff --git a/trinity-apps/kbookreader/kbookreader-9999.ebuild b/trinity-apps/kbookreader/kbookreader-9999.ebuild
index 9d3c3b1e..5b91a964 100644
--- a/trinity-apps/kbookreader/kbookreader-9999.ebuild
+++ b/trinity-apps/kbookreader/kbookreader-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de nl"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/office"
 inherit trinity-base-2
 
 DESCRIPTION="eBook reader for TDE"
diff --git a/trinity-apps/kcmautostart/kcmautostart-9999.ebuild b/trinity-apps/kcmautostart/kcmautostart-9999.ebuild
index 2f998872..bd8c312b 100644
--- a/trinity-apps/kcmautostart/kcmautostart-9999.ebuild
+++ b/trinity-apps/kcmautostart/kcmautostart-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ca de es fr nl tr"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="Autostart module for KControl "
diff --git a/trinity-apps/kcpuload/kcpuload-9999.ebuild b/trinity-apps/kcpuload/kcpuload-9999.ebuild
index dbf9db4b..3d8a6a30 100644
--- a/trinity-apps/kcpuload/kcpuload-9999.ebuild
+++ b/trinity-apps/kcpuload/kcpuload-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A small CPU meter for Kicker"
diff --git a/trinity-apps/kdiff3/kdiff3-9999.ebuild b/trinity-apps/kdiff3/kdiff3-9999.ebuild
index a2d31132..a65ecb01 100644
--- a/trinity-apps/kdiff3/kdiff3-9999.ebuild
+++ b/trinity-apps/kdiff3/kdiff3-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ar az bg br ca cs cy da de el es et fr ga gl hi hu is it ja
 	ka lt nb nl pl pt pt_BR ro ru rw sk sr sr@Latn sv ta tg tr uk zh_CN"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/development"
 inherit trinity-base-2
 
 DESCRIPTION="A diff and merge program for TDE"
diff --git a/trinity-apps/kdirstat/kdirstat-9999.ebuild b/trinity-apps/kdirstat/kdirstat-9999.ebuild
index a8ccae04..d05f5296 100644
--- a/trinity-apps/kdirstat/kdirstat-9999.ebuild
+++ b/trinity-apps/kdirstat/kdirstat-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de fr hu it ja"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="Graphical disk usage utility for TDE"
diff --git a/trinity-apps/keep/keep-9999.ebuild b/trinity-apps/keep/keep-9999.ebuild
index 457f6065..75ac3d95 100644
--- a/trinity-apps/keep/keep-9999.ebuild
+++ b/trinity-apps/keep/keep-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="bg br cs da de el es ga gl it ja
 		ka lt nl pl pt ru sk sr sr@Latn sv tr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A simple backup system for TDE."
diff --git a/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
index d331cd64..dc0b4429 100644
--- a/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
+++ b/trinity-apps/kgtk-qt3/kgtk-qt3-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de es en_GB fr nl pl pt_BR ru zh_CN"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="TDE dialogs in GTK 2.x applications"
diff --git a/trinity-apps/kima/kima-9999.ebuild b/trinity-apps/kima/kima-9999.ebuild
index bf9e8237..43991e8b 100644
--- a/trinity-apps/kima/kima-9999.ebuild
+++ b/trinity-apps/kima/kima-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de es et hu id nl sv tr"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="A Kicker monitoring applet"
diff --git a/trinity-apps/kiosktool/kiosktool-9999.ebuild b/trinity-apps/kiosktool/kiosktool-9999.ebuild
index c310dc48..fb1a6b97 100644
--- a/trinity-apps/kiosktool/kiosktool-9999.ebuild
+++ b/trinity-apps/kiosktool/kiosktool-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="bg br ca cs cy da de en_GB es et fr ga is
 	it lt mt nl pt pt_BR ro ru sr sr@Latn sv ta tr"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="Tool to configure the TDE kiosk framework "
diff --git a/trinity-apps/kkbswitch/kkbswitch-9999.ebuild b/trinity-apps/kkbswitch/kkbswitch-9999.ebuild
index e7c2ba86..292da976 100644
--- a/trinity-apps/kkbswitch/kkbswitch-9999.ebuild
+++ b/trinity-apps/kkbswitch/kkbswitch-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_HANDBOOK="optional"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="Keyboard layout indicator for TDE"
diff --git a/trinity-apps/klcddimmer/klcddimmer-9999.ebuild b/trinity-apps/klcddimmer/klcddimmer-9999.ebuild
index 7bafd09d..a0844c5b 100644
--- a/trinity-apps/klcddimmer/klcddimmer-9999.ebuild
+++ b/trinity-apps/klcddimmer/klcddimmer-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de nl"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="Applet to adjust LCD brightness"
diff --git a/trinity-apps/knemo/knemo-9999.ebuild b/trinity-apps/knemo/knemo-9999.ebuild
index 0c5dba58..68d872fb 100644
--- a/trinity-apps/knemo/knemo-9999.ebuild
+++ b/trinity-apps/knemo/knemo-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ar bg cs cy da de el es et fr ga gl hu it
 	ja ka lt nl pl pt pt_BR ru rw sk sr sr@Latn sv tr"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="Network interfaces monitor for the TDE systray"
diff --git a/trinity-apps/knetload/knetload-9999.ebuild b/trinity-apps/knetload/knetload-9999.ebuild
index e9c9a81c..76df0072 100644
--- a/trinity-apps/knetload/knetload-9999.ebuild
+++ b/trinity-apps/knetload/knetload-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="ar bs ca cs da de en_GB es et fr is it ja nb nl pt pt_BR
 	ro sr sv ta tr zh_CN zh_TW"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A network meter for Kicker"
diff --git a/trinity-apps/knetstats/knetstats-9999.ebuild b/trinity-apps/knetstats/knetstats-9999.ebuild
index 92e80bc4..fa7672bd 100644
--- a/trinity-apps/knetstats/knetstats-9999.ebuild
+++ b/trinity-apps/knetstats/knetstats-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="bg br cs da de el es et fr ga gl
 	it ja ka nl pl pt pt_BR ru sk sv tr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="Network interfaces monitor for TDE"
diff --git a/trinity-apps/knmap/knmap-9999.ebuild b/trinity-apps/knmap/knmap-9999.ebuild
index 7094fddd..edc1969a 100644
--- a/trinity-apps/knmap/knmap-9999.ebuild
+++ b/trinity-apps/knmap/knmap-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="Nmap graphical interface for TDE"
diff --git a/trinity-apps/knowit/knowit-9999.ebuild b/trinity-apps/knowit/knowit-9999.ebuild
index 0485ed02..defc7471 100644
--- a/trinity-apps/knowit/knowit-9999.ebuild
+++ b/trinity-apps/knowit/knowit-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de es fr hu nl pl ru sk zh_CN"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/office"
 inherit trinity-base-2
 
 DESCRIPTION="Tool for managing notes"
diff --git a/trinity-apps/knutclient/knutclient-9999.ebuild b/trinity-apps/knutclient/knutclient-9999.ebuild
index e5f2d290..c546f4de 100644
--- a/trinity-apps/knutclient/knutclient-9999.ebuild
+++ b/trinity-apps/knutclient/knutclient-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="cs de es fr it pl pt_BR ru uk"
 TRINITY_DOC_LANGS="cs"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A TDE GUI client for UPS system NUT"
diff --git a/trinity-apps/koffice-i18n/koffice-i18n-9999.ebuild b/trinity-apps/koffice-i18n/koffice-i18n-9999.ebuild
index e854e93a..2c06be95 100644
--- a/trinity-apps/koffice-i18n/koffice-i18n-9999.ebuild
+++ b/trinity-apps/koffice-i18n/koffice-i18n-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/office"
 TRINITY_BUILD_ADMIN="yes"
 
 inherit trinity-base-2
diff --git a/trinity-apps/konversation/konversation-9999.ebuild b/trinity-apps/konversation/konversation-9999.ebuild
index b1794103..7bb75da3 100644
--- a/trinity-apps/konversation/konversation-9999.ebuild
+++ b/trinity-apps/konversation/konversation-9999.ebuild
@@ -12,7 +12,7 @@ TRINITY_LANGS="ar bg ca da de el en_GB es et fi fr gl he
 
 TRINITY_DOC_LANGS="da es et it pt ru sv"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="A user friendly IRC Client for Trinity"
diff --git a/trinity-apps/kooldock/kooldock-9999.ebuild b/trinity-apps/kooldock/kooldock-9999.ebuild
index c9d9d632..64d39a01 100644
--- a/trinity-apps/kooldock/kooldock-9999.ebuild
+++ b/trinity-apps/kooldock/kooldock-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de es fr it nl pl sv"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A dock for TDE, which attemps to resemble the Mac OSX dock"
diff --git a/trinity-apps/kpicosim/kpicosim-9999.ebuild b/trinity-apps/kpicosim/kpicosim-9999.ebuild
index e114be71..f1087a73 100644
--- a/trinity-apps/kpicosim/kpicosim-9999.ebuild
+++ b/trinity-apps/kpicosim/kpicosim-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/development"
 inherit trinity-base-2
 
 DESCRIPTION="IDE and simulator for the Xilinx PicoBlaze-3"
diff --git a/trinity-apps/krename/krename-9999.ebuild b/trinity-apps/krename/krename-9999.ebuild
index 22f58e4b..5f94b531 100644
--- a/trinity-apps/krename/krename-9999.ebuild
+++ b/trinity-apps/krename/krename-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="bs de es fr hu it ja nl
 	pl pt_BR ru sl sv tr zh_CN zh_TW"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A powerful batch file renamer for TDE"
diff --git a/trinity-apps/kscope/kscope-9999.ebuild b/trinity-apps/kscope/kscope-9999.ebuild
index c610c49a..4480fe1e 100644
--- a/trinity-apps/kscope/kscope-9999.ebuild
+++ b/trinity-apps/kscope/kscope-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de zh_CN"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/development"
 inherit trinity-base-2
 
 DESCRIPTION="TDE front-end to Cscope"
diff --git a/trinity-apps/ksensors/ksensors-9999.ebuild b/trinity-apps/ksensors/ksensors-9999.ebuild
index c31de6a0..f30973ae 100644
--- a/trinity-apps/ksensors/ksensors-9999.ebuild
+++ b/trinity-apps/ksensors/ksensors-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de es fr nb nl pl sv"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/utilities"
 inherit trinity-base-2
 
 DESCRIPTION="A TDE GUI frontend to LM-Sensors"
diff --git a/trinity-apps/kshowmail/kshowmail-9999.ebuild b/trinity-apps/kshowmail/kshowmail-9999.ebuild
index 5a9cb3e4..8b1b9315 100644
--- a/trinity-apps/kshowmail/kshowmail-9999.ebuild
+++ b/trinity-apps/kshowmail/kshowmail-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="cs de es fr hu it ru sv"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="Show mails on a POP3 server "
diff --git a/trinity-apps/kshutdown/kshutdown-9999.ebuild b/trinity-apps/kshutdown/kshutdown-9999.ebuild
index f7c96392..6852a8d5 100644
--- a/trinity-apps/kshutdown/kshutdown-9999.ebuild
+++ b/trinity-apps/kshutdown/kshutdown-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_HANDBOOK="optional"
 TRINITY_LANGS="ar bg cs de es fr hu it nl pl pt_BR ru sk sv tr zh_CN"
 
 TRINITY_DOC_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A graphical shutdown utility for TDE"
diff --git a/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild b/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild
index 6fcfeea8..bc803b75 100644
--- a/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild
+++ b/trinity-apps/ksplash-engine-moodin/ksplash-engine-moodin-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="KSplash engine Moodin"
diff --git a/trinity-apps/kstreamripper/kstreamripper-9999.ebuild b/trinity-apps/kstreamripper/kstreamripper-9999.ebuild
index adc38eae..35953d95 100644
--- a/trinity-apps/kstreamripper/kstreamripper-9999.ebuild
+++ b/trinity-apps/kstreamripper/kstreamripper-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="TDE frontend for streamripper"
diff --git a/trinity-apps/kvkbd/kvkbd-9999.ebuild b/trinity-apps/kvkbd/kvkbd-9999.ebuild
index f9e7c3ae..92b671f2 100644
--- a/trinity-apps/kvkbd/kvkbd-9999.ebuild
+++ b/trinity-apps/kvkbd/kvkbd-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A virtual keyboard for TDE"
diff --git a/trinity-apps/kvpnc/kvpnc-9999.ebuild b/trinity-apps/kvpnc/kvpnc-9999.ebuild
index 3e03160f..01080696 100644
--- a/trinity-apps/kvpnc/kvpnc-9999.ebuild
+++ b/trinity-apps/kvpnc/kvpnc-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="bg ca da de es fr hu it ja nl pl pt_BR ru sk sv tr zh_CN"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/internet"
 inherit trinity-base-2
 
 DESCRIPTION="VPN clients frontend for TDE"
diff --git a/trinity-apps/kxmleditor/kxmleditor-9999.ebuild b/trinity-apps/kxmleditor/kxmleditor-9999.ebuild
index a997d2d4..c16bb478 100644
--- a/trinity-apps/kxmleditor/kxmleditor-9999.ebuild
+++ b/trinity-apps/kxmleditor/kxmleditor-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de fr pl"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/development"
 inherit trinity-base-2
 
 DESCRIPTION="XML editor for TDE"
diff --git a/trinity-apps/libkdcraw/libkdcraw-9999.ebuild b/trinity-apps/libkdcraw/libkdcraw-9999.ebuild
index af7ab419..eb556092 100644
--- a/trinity-apps/libkdcraw/libkdcraw-9999.ebuild
+++ b/trinity-apps/libkdcraw/libkdcraw-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="libraries"
 TRINITY_BUILD_ADMIN="yes"
 TRINITY_LANGS="ca da de el es et is it ja ms nds nl pa pt pt_BR sk sr sr@Latn sv th uk"
 inherit trinity-base-2
diff --git a/trinity-apps/libkexiv2/libkexiv2-9999.ebuild b/trinity-apps/libkexiv2/libkexiv2-9999.ebuild
index 1361512e..7025dff5 100644
--- a/trinity-apps/libkexiv2/libkexiv2-9999.ebuild
+++ b/trinity-apps/libkexiv2/libkexiv2-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="libraries"
 inherit trinity-base-2
 
 DESCRIPTION="Wrapper around exiv2 library [Trinity]"
diff --git a/trinity-apps/libkipi/libkipi-9999.ebuild b/trinity-apps/libkipi/libkipi-9999.ebuild
index fa5c46d7..538f37bf 100644
--- a/trinity-apps/libkipi/libkipi-9999.ebuild
+++ b/trinity-apps/libkipi/libkipi-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="7"
 
 TRINITY_EXTRAGEAR_PACKAGING="yes"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="libraries"
 TRINITY_LANGS="ar br ca cs cy da de el en_GB es et fi fr ga gl is it ja lt mt
 		nb nl pa pl pt pt_BR ru rw sk sl sr sr@Latn ta tr tr uk zh_CN"
 inherit trinity-base-2
diff --git a/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild b/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
index 95437dae..8099a4e5 100644
--- a/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
+++ b/trinity-apps/mplayerthumbs/mplayerthumbs-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/multimedia"
 inherit trinity-base-2
 
 DESCRIPTION="MPlayer based thumbnail generator for TDE"
diff --git a/trinity-apps/potracegui/potracegui-9999.ebuild b/trinity-apps/potracegui/potracegui-9999.ebuild
index eac44873..fca796cf 100644
--- a/trinity-apps/potracegui/potracegui-9999.ebuild
+++ b/trinity-apps/potracegui/potracegui-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/graphics"
 inherit trinity-base-2
 
 DESCRIPTION="TDE frontend for potrace"
diff --git a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild
index 5d5a53dd..49c5746f 100644
--- a/trinity-apps/smartcardauth/smartcardauth-9999.ebuild
+++ b/trinity-apps/smartcardauth/smartcardauth-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="SmartCard login and LUKS decrypt"
diff --git a/trinity-apps/tastymenu/tastymenu-9999.ebuild b/trinity-apps/tastymenu/tastymenu-9999.ebuild
index db6335f5..fe8bb66d 100644
--- a/trinity-apps/tastymenu/tastymenu-9999.ebuild
+++ b/trinity-apps/tastymenu/tastymenu-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de es fi fr it nl pl pt_BR ru sl uk"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="TDE-Menu replacement"
diff --git a/trinity-apps/tde-style-baghira/tde-style-baghira-9999.ebuild b/trinity-apps/tde-style-baghira/tde-style-baghira-9999.ebuild
index 0f1f448e..bac30fc4 100644
--- a/trinity-apps/tde-style-baghira/tde-style-baghira-9999.ebuild
+++ b/trinity-apps/tde-style-baghira/tde-style-baghira-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Baghira widget style for TDE"
diff --git a/trinity-apps/tde-style-domino/tde-style-domino-9999.ebuild b/trinity-apps/tde-style-domino/tde-style-domino-9999.ebuild
index 28fb8862..b885fd75 100644
--- a/trinity-apps/tde-style-domino/tde-style-domino-9999.ebuild
+++ b/trinity-apps/tde-style-domino/tde-style-domino-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS="de nl"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Domino widget style for TDE"
diff --git a/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild b/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild
index cf4f2a98..b343b1a4 100644
--- a/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild
+++ b/trinity-apps/tde-style-ia-ora/tde-style-ia-ora-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 
 TRINITY_EXTRAGEAR_PACKAGING="no"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Ia Ora widget style for TDE"
diff --git a/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild b/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild
index ff88193e..da25be6e 100644
--- a/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild
+++ b/trinity-apps/tde-style-lipstik/tde-style-lipstik-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Lipstik widget style for TDE"
diff --git a/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild b/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild
index ce96772a..212edb8c 100644
--- a/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild
+++ b/trinity-apps/tde-style-qtcurve/tde-style-qtcurve-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS="de tr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="QtCurve widget style for TDE"
diff --git a/trinity-apps/tdedocker/tdedocker-9999.ebuild b/trinity-apps/tdedocker/tdedocker-9999.ebuild
index 129269fd..aee997e2 100644
--- a/trinity-apps/tdedocker/tdedocker-9999.ebuild
+++ b/trinity-apps/tdedocker/tdedocker-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="bg cs de es fr hu id it ja nl pl pt_BR ru sv"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="Minimize applications to the TDE system tray"
diff --git a/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild b/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild
index c002e0f6..fac644de 100644
--- a/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild
+++ b/trinity-apps/tdeio-ftps/tdeio-ftps-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/tdeio"
 inherit trinity-base-2
 
 DESCRIPTION="TDEIO slave for FTPS protocol"
diff --git a/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild b/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild
index b948f9e2..13360fd8 100644
--- a/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild
+++ b/trinity-apps/tdeio-gopher/tdeio-gopher-9999.ebuild
@@ -11,7 +11,7 @@ TRINITY_LANGS="ar bg br bs ca ca@valencia cs cy da de el en_GB eo
 	es et fi fr ga gl hr hu is it ja ka km lt lv ms nb nds nl nn
 	pa pl pt pt_BR ro ru rw sk sv ta tr ug uk zh_CN zh_TW"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/tdeio"
 inherit trinity-base-2
 
 DESCRIPTION="TDEIO slave for gopher protocol"
diff --git a/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild b/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild
index a6471940..d8771a9a 100644
--- a/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild
+++ b/trinity-apps/tdeio-locate/tdeio-locate-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de fr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/tdeio"
 inherit trinity-base-2
 
 DESCRIPTION="Locate TDEIO plugin"
diff --git a/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild b/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild
index 6d170ac3..df20bcb8 100644
--- a/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild
+++ b/trinity-apps/tdeio-sword/tdeio-sword-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/tdeio"
 inherit trinity-base-2
 
 DESCRIPTION="Sword TDEIO plugin"
diff --git a/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild b/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild
index 7adf1df4..fd2f03cd 100644
--- a/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild
+++ b/trinity-apps/tdeio-umountwrapper/tdeio-umountwrapper-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS="de"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/tdeio"
 inherit trinity-base-2
 
 DESCRIPTION="Progress dialog for safely removing devices"
diff --git a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
index 53436c4b..d601b244 100644
--- a/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
+++ b/trinity-apps/tdepowersave/tdepowersave-9999.ebuild
@@ -12,7 +12,7 @@ TRINITY_LANGS="ar bg cs da de el es fi fr hi hu it ja km lt
 
 TRINITY_DOC_LANGS="cs de fi hu nb"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A TDE frontend for power management"
diff --git a/trinity-apps/tdesudo/tdesudo-9999.ebuild b/trinity-apps/tdesudo/tdesudo-9999.ebuild
index c39a1ee6..c349f302 100644
--- a/trinity-apps/tdesudo/tdesudo-9999.ebuild
+++ b/trinity-apps/tdesudo/tdesudo-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de fr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="Sudo frontend for TDE"
diff --git a/trinity-apps/tdesvn/tdesvn-9999.ebuild b/trinity-apps/tdesvn/tdesvn-9999.ebuild
index c8b153fc..f748e87c 100644
--- a/trinity-apps/tdesvn/tdesvn-9999.ebuild
+++ b/trinity-apps/tdesvn/tdesvn-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ca cs de es fr gl it ja lt nl pa ru sv"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/developmen"
 inherit trinity-base-2
 
 DESCRIPTION="Subversion client with tight TDE integration"
diff --git a/trinity-apps/tdmtheme/tdmtheme-9999.ebuild b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
index e88ba29b..15617f98 100644
--- a/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
+++ b/trinity-apps/tdmtheme/tdmtheme-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="A theme manager for TDM"
diff --git a/trinity-apps/twin-style-crystal/twin-style-crystal-9999.ebuild b/trinity-apps/twin-style-crystal/twin-style-crystal-9999.ebuild
index 086ae5e6..f8e7f0b9 100644
--- a/trinity-apps/twin-style-crystal/twin-style-crystal-9999.ebuild
+++ b/trinity-apps/twin-style-crystal/twin-style-crystal-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS=""
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="Crystal style for TWin"
diff --git a/trinity-apps/twin-style-dekorator/twin-style-dekorator-9999.ebuild b/trinity-apps/twin-style-dekorator/twin-style-dekorator-9999.ebuild
index ce3cb6b3..90f2c17d 100644
--- a/trinity-apps/twin-style-dekorator/twin-style-dekorator-9999.ebuild
+++ b/trinity-apps/twin-style-dekorator/twin-style-dekorator-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_HANDBOOK="never"
 
 TRINITY_LANGS=""
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="DeKorator 0.3 is a pixmap-based theme engine for TWin with its own themes"
diff --git a/trinity-apps/twin-style-suse2/twin-style-suse2-9999.ebuild b/trinity-apps/twin-style-suse2/twin-style-suse2-9999.ebuild
index a0dc2628..31f59229 100644
--- a/trinity-apps/twin-style-suse2/twin-style-suse2-9999.ebuild
+++ b/trinity-apps/twin-style-suse2/twin-style-suse2-9999.ebuild
@@ -10,7 +10,7 @@ TRINITY_LANGS="bg bs cs cy da de el en_GB en_US es et fi fr
 		he hi hr hu id it ja km ko lo lt nb nl pa pl
 		pt_BR pt ro ru sk sl sr sv ta tr uk zh_CN zh_TW"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/themes"
 inherit trinity-base-2
 
 DESCRIPTION="TWin decoration theme from SUSE 9.3/10.0/10.1"
diff --git a/trinity-apps/wlassistant/wlassistant-9999.ebuild b/trinity-apps/wlassistant/wlassistant-9999.ebuild
index 73a7736a..c36b3fd7 100644
--- a/trinity-apps/wlassistant/wlassistant-9999.ebuild
+++ b/trinity-apps/wlassistant/wlassistant-9999.ebuild
@@ -8,7 +8,7 @@ TRINITY_EXTRAGEAR_PACKAGING="yes"
 TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="ar ca de es fr nb pl pt_BR sv zh_CN zh_TW"
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/settings"
 inherit trinity-base-2
 
 DESCRIPTION="User friendly TDE frontend for wireless network connection"
diff --git a/trinity-apps/yakuake/yakuake-9999.ebuild b/trinity-apps/yakuake/yakuake-9999.ebuild
index 91d6d23a..9964baac 100644
--- a/trinity-apps/yakuake/yakuake-9999.ebuild
+++ b/trinity-apps/yakuake/yakuake-9999.ebuild
@@ -9,7 +9,7 @@ TRINITY_HANDBOOK="optional"
 
 TRINITY_LANGS="de el es et fr hu it ja nl pl pt pt_BR ru sv tr"
 
-TRINITY_MODULE_TYPE="applications"
+TRINITY_MODULE_TYPE="applications/system"
 inherit trinity-base-2
 
 DESCRIPTION="A Quake-style terminal emulator for TDE"
diff --git a/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild b/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
index 36d85ce3..f53cab66 100644
--- a/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
+++ b/trinity-base/trinity-cmake/trinity-cmake-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="7"
 
-TRINITY_MODULE_TYPE="dependencies"
+TRINITY_MODULE_TYPE="common"
 TRINITY_MODULE_NAME="tde-common-cmake"
 inherit trinity-base-2