diff --git a/components.xml b/components.xml
index 02a0ff60f3..cfcaad9477 100644
--- a/components.xml
+++ b/components.xml
@@ -885,7 +885,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>xfce.desktop.lookandfeel</Group>
+            <Group>xfce.desktop</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -896,7 +896,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>xfce.desktop.addon</Group>
+            <Group>xfce.desktop</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -907,7 +907,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>xfce.desktop.base</Group>
+            <Group>xfce.desktop</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -962,7 +962,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>gnome.desktop.addons</Group>
+            <Group>gnome.desktop</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -973,7 +973,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>gnome.desktop.apps</Group>
+            <Group>gnome.desktop</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -1134,7 +1134,7 @@
             </Maintainer>
         </Component>
 	<Component>
-            <Name>desktop.kde.application</Name>
+            <Name>desktop.kde.applications</Name>
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
@@ -1310,15 +1310,15 @@
             </Maintainer>
         </Component>
         <Component>
-           <Name>desktop.lumina</Name>
-           <LocalName xml:lang="en">FIXME</LocalName>
-           <Summary xml:lang="en">FIXME</Summary>
-           <Description xml:lang="en">FIXME</Description>
-           <Group>lumina.desktop</Group>
-           <Maintainer>
-               <Name>PisiLinux Community</Name>
-               <Email>admins@pisilinux.org</Email>
-           </Maintainer>
+            <Name>desktop.lumina</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>lumina.desktop</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
         </Component>
         <Component>
             <Name>kernel</Name>
@@ -1336,7 +1336,7 @@
             <LocalName xml:lang="en">FIXME</LocalName>
             <Summary xml:lang="en">FIXME</Summary>
             <Description xml:lang="en">FIXME</Description>
-            <Group>system</Group>
+            <Group>kernel</Group>
             <Maintainer>
                 <Name>PisiLinux Community</Name>
                 <Email>admins@pisilinux.org</Email>
@@ -2035,6 +2035,17 @@
                 <Email>admins@pisilinux.org</Email>
             </Maintainer>
         </Component>
+	<Component>
+            <Name>multimedia.videoplayer</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>multimedia</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
         <Component>
             <Name>server</Name>
             <LocalName xml:lang="en">FIXME</LocalName>
@@ -2167,6 +2178,17 @@
                 <Email>admins@pisilinux.org</Email>
             </Maintainer>
         </Component>
+        <Component>
+            <Name>util.dock</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>accessories</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
         <Component>
             <Name>util.antivirus</Name>
             <LocalName xml:lang="en">FIXME</LocalName>
@@ -2387,5 +2409,148 @@
                 <Email>admins@pisilinux.org</Email>
             </Maintainer>
         </Component>
+        <Component>
+            <Name>desktop.kde.porting-aids</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>desktop.kde.phonon</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>hardware.scannner</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>accessibility</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>game.logic</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>programming.php</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>programming.language.python3</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>desktop.pisilinux</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>x11.vulkan</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>editor.discount</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>editor.tex</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>multimedia.sound.speech-dispatcher</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
+        <Component>
+            <Name>multimedia.sound.timidity-shompatches</Name>
+            <LocalName xml:lang="en">FIXME</LocalName>
+            <Summary xml:lang="en">FIXME</Summary>
+            <Description xml:lang="en">FIXME</Description>
+            <Group>FIXME</Group>
+            <Maintainer>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Maintainer>
+        </Component>
     </Components>
-</PISI>
\ No newline at end of file
+</PISI>
diff --git a/pisi-index.xml b/pisi-index.xml
index 259a5338de..fcdb08e447 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -43438,7 +43438,7 @@ complete albums that you have purchased from Amazon.</Description>
             <Update release="12">
                 <Date>2021-06-17</Date>
                 <Version>6.26.1</Version>
-                <Comment>Version bump.</Comment>
+                <Comment>Version bump</Comment>
                 <Name>Mustafa Cinasal</Name>
                 <Email>muscnsl@gmail.com</Email>
             </Update>
@@ -311690,7 +311690,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>xfce.desktop.lookandfeel</Group>
+        <Group>xfce.desktop</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -311701,7 +311701,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>xfce.desktop.addon</Group>
+        <Group>xfce.desktop</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -311712,7 +311712,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>xfce.desktop.base</Group>
+        <Group>xfce.desktop</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -311767,7 +311767,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>gnome.desktop.addons</Group>
+        <Group>gnome.desktop</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -311778,7 +311778,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>gnome.desktop.apps</Group>
+        <Group>gnome.desktop</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -311939,7 +311939,7 @@ contacts, tasks, and calendar information.</Summary>
         </Maintainer>
     </Component>
     <Component>
-        <Name>desktop.kde.application</Name>
+        <Name>desktop.kde.applications</Name>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
@@ -312141,7 +312141,7 @@ contacts, tasks, and calendar information.</Summary>
         <LocalName xml:lang="en">FIXME</LocalName>
         <Summary xml:lang="en">FIXME</Summary>
         <Description xml:lang="en">FIXME</Description>
-        <Group>system</Group>
+        <Group>kernel</Group>
         <Maintainer>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -312840,6 +312840,17 @@ contacts, tasks, and calendar information.</Summary>
             <Email>admins@pisilinux.org</Email>
         </Maintainer>
     </Component>
+    <Component>
+        <Name>multimedia.videoplayer</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>multimedia</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
     <Component>
         <Name>server</Name>
         <LocalName xml:lang="en">FIXME</LocalName>
@@ -312972,6 +312983,17 @@ contacts, tasks, and calendar information.</Summary>
             <Email>admins@pisilinux.org</Email>
         </Maintainer>
     </Component>
+    <Component>
+        <Name>util.dock</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>accessories</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
     <Component>
         <Name>util.antivirus</Name>
         <LocalName xml:lang="en">FIXME</LocalName>
@@ -313192,4 +313214,147 @@ contacts, tasks, and calendar information.</Summary>
             <Email>admins@pisilinux.org</Email>
         </Maintainer>
     </Component>
+    <Component>
+        <Name>desktop.kde.porting-aids</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>desktop.kde.phonon</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>hardware.scannner</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>accessibility</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>game.logic</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>programming.php</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>programming.language.python3</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>desktop.pisilinux</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>x11.vulkan</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>editor.discount</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>editor.tex</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>multimedia.sound.speech-dispatcher</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
+    <Component>
+        <Name>multimedia.sound.timidity-shompatches</Name>
+        <LocalName xml:lang="en">FIXME</LocalName>
+        <Summary xml:lang="en">FIXME</Summary>
+        <Description xml:lang="en">FIXME</Description>
+        <Group>FIXME</Group>
+        <Maintainer>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Maintainer>
+    </Component>
 </PISI>
\ No newline at end of file
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index cf88f032b2..56003de1df 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-41024453b14ba80f492318db24e44af40e4b6ea4
\ No newline at end of file
+e422eb464725994e5748e2ed85ce73450a2dc415
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 8581e1ce4c..5ac83bd761 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 62b7d50a6b..949082b65e 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-262029d76c34f0d5b68ea29af8ce4dffad8d8eea
\ No newline at end of file
+b3f2733e6c905952a23e77c8544c0025072bd2fc
\ No newline at end of file