diff --git a/comps-epel7.xml.in b/comps-epel7.xml.in
index c881b404..53f0359a 100644
--- a/comps-epel7.xml.in
+++ b/comps-epel7.xml.in
@@ -1360,9 +1360,9 @@
       <packagereq type="default">NetworkManager-pptp</packagereq>
       <packagereq type="default">NetworkManager-vpnc</packagereq>
       <packagereq type="default">NetworkManager-vpnc-gnome</packagereq>
-      <packagereq type="default">pluma</packagereq>
       <packagereq type="default">p7zip</packagereq>
       <packagereq type="default">p7zip-plugins</packagereq>
+      <packagereq type="default">pluma</packagereq>
       <packagereq type="default">rhythmbox</packagereq>
       <packagereq type="default">seahorse</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
@@ -2241,7 +2241,6 @@
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">orage</packagereq>
       <packagereq type="default">polkit-gnome</packagereq>
-      <packagereq type="default">xfce4-terminal</packagereq>
       <packagereq type="default">thunar-archive-plugin</packagereq>
       <packagereq type="default">thunar-volman</packagereq>
       <packagereq type="default">tumbler</packagereq>
@@ -2250,6 +2249,7 @@
       <packagereq type="default">xfce4-mixer</packagereq>
       <packagereq type="default">xfce4-power-manager</packagereq>
       <packagereq type="default">xfce4-session-engines</packagereq>
+      <packagereq type="default">xfce4-terminal</packagereq>
       <packagereq type="default">xfwm4-theme-nodoka</packagereq>
       <packagereq type="optional">xfwm4-themes</packagereq>
     </packagelist>
diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 8a6eca8d..ff583318 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -3095,13 +3095,13 @@
       <packagereq>hawaii-workspace</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>otter-browser</packagereq>
       <packagereq>pcmanfm-qt</packagereq>
       <packagereq>qt5-qdbusviewer</packagereq>
       <packagereq>qt5-qtbase-gui</packagereq>
       <packagereq>qt5-qtdeclarative</packagereq>
       <packagereq>qt5-qtwayland</packagereq>
       <packagereq>qterminal-qt5</packagereq>
-      <packagereq>otter-browser</packagereq>
       <packagereq>sddm</packagereq>
       <packagereq>sddm-theme-hawaii</packagereq>
       <packagereq>upower</packagereq>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index 7696924e..36d2ff70 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -143,8 +143,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>fedora-arm-installer</packagereq>
       <packagereq>cloud-utils-growpart</packagereq>
+      <packagereq>fedora-arm-installer</packagereq>
       <packagereq>uboot-images-armv7</packagereq>
     </packagelist>
   </group>
@@ -756,8 +756,8 @@
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">createrepo</packagereq>
       <packagereq type="mandatory">dash</packagereq>
-      <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
@@ -937,8 +937,8 @@
       <packagereq type="default">font-manager</packagereq>
       <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
-      <packagereq type="default">google-roboto-fonts</packagereq>
       <packagereq type="default">google-roboto-condensed-fonts</packagereq>
+      <packagereq type="default">google-roboto-fonts</packagereq>
       <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gpick</packagereq>
       <packagereq type="default">GraphicsMagick</packagereq>
@@ -965,13 +965,13 @@
       <packagereq type="default">typetype-molot-fonts</packagereq>
       <packagereq type="default">xournal</packagereq>
       <packagereq type="optional">calligra-karbon</packagereq>
+      <packagereq type="optional">geeqie</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
       <packagereq type="optional">LuxRender</packagereq>
-      <packagereq type="optional">geeqie</packagereq>
       <packagereq type="optional">openclipart</packagereq>
       <packagereq type="optional">pencil</packagereq>
-      <packagereq type="optional">rapid-photo-downloader</packagereq>
       <packagereq type="optional">pngcrush</packagereq>
+      <packagereq type="optional">rapid-photo-downloader</packagereq>
       <packagereq type="optional">YafaRay</packagereq>
     </packagelist>
   </group>
@@ -1386,8 +1386,8 @@
       <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gpsim</packagereq>
       <packagereq type="default">gputils</packagereq>
-      <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gr-osmosdr</packagereq>
+      <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gsim85</packagereq>
       <packagereq type="default">gspiceui</packagereq>
       <packagereq type="default">gtkterm</packagereq>
@@ -1722,8 +1722,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>firefox</packagereq>
       <packagereq>fedora-bookmarks</packagereq>
+      <packagereq>firefox</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3109,13 +3109,13 @@
       <packagereq>hawaii-workspace</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>otter-browser</packagereq>
       <packagereq>pcmanfm-qt</packagereq>
       <packagereq>qt5-qdbusviewer</packagereq>
       <packagereq>qt5-qtbase-gui</packagereq>
       <packagereq>qt5-qtdeclarative</packagereq>
       <packagereq>qt5-qtwayland</packagereq>
       <packagereq>qterminal-qt5</packagereq>
-      <packagereq>otter-browser</packagereq>
       <packagereq>sddm</packagereq>
       <packagereq>sddm-theme-hawaii</packagereq>
       <packagereq>upower</packagereq>
diff --git a/comps-f26.xml.in b/comps-f26.xml.in
index d0ffaaa6..a8a5760f 100644
--- a/comps-f26.xml.in
+++ b/comps-f26.xml.in
@@ -143,8 +143,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>fedora-arm-installer</packagereq>
       <packagereq>cloud-utils-growpart</packagereq>
+      <packagereq>fedora-arm-installer</packagereq>
       <packagereq>uboot-images-armv7</packagereq>
     </packagelist>
   </group>
@@ -756,8 +756,8 @@
       <packagereq type="mandatory">anaconda</packagereq>
       <packagereq type="mandatory">createrepo</packagereq>
       <packagereq type="mandatory">dash</packagereq>
-      <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">dracut</packagereq>
       <packagereq type="mandatory">gcc-c++</packagereq>
       <packagereq type="mandatory">initial-setup</packagereq>
       <!-- 'kernel' is listed because we need to ensure that kernel
@@ -937,8 +937,8 @@
       <packagereq type="default">font-manager</packagereq>
       <packagereq type="default">fontforge</packagereq>
       <packagereq type="default">gimp</packagereq>
-      <packagereq type="default">google-roboto-fonts</packagereq>
       <packagereq type="default">google-roboto-condensed-fonts</packagereq>
+      <packagereq type="default">google-roboto-fonts</packagereq>
       <packagereq type="default">google-roboto-slab-fonts</packagereq>
       <packagereq type="default">gpick</packagereq>
       <packagereq type="default">GraphicsMagick</packagereq>
@@ -1386,8 +1386,8 @@
       <packagereq type="default">gplcver</packagereq>
       <packagereq type="default">gpsim</packagereq>
       <packagereq type="default">gputils</packagereq>
-      <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gr-osmosdr</packagereq>
+      <packagereq type="default">gresistor</packagereq>
       <packagereq type="default">gsim85</packagereq>
       <packagereq type="default">gspiceui</packagereq>
       <packagereq type="default">gtkterm</packagereq>
@@ -1725,8 +1725,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>firefox</packagereq>
       <packagereq>fedora-bookmarks</packagereq>
+      <packagereq>firefox</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3111,13 +3111,13 @@
       <packagereq>hawaii-workspace</packagereq>
       <packagereq>initial-setup-gui</packagereq>
       <packagereq>mesa-dri-drivers</packagereq>
+      <packagereq>otter-browser</packagereq>
       <packagereq>pcmanfm-qt</packagereq>
       <packagereq>qt5-qdbusviewer</packagereq>
       <packagereq>qt5-qtbase-gui</packagereq>
       <packagereq>qt5-qtdeclarative</packagereq>
       <packagereq>qt5-qtwayland</packagereq>
       <packagereq>qterminal-qt5</packagereq>
-      <packagereq>otter-browser</packagereq>
       <packagereq>sddm</packagereq>
       <packagereq>sddm-theme-hawaii</packagereq>
       <packagereq>upower</packagereq>