diff --git a/comps.xml b/comps.xml
index f6c751a..f116f7d 100644
--- a/comps.xml
+++ b/comps.xml
@@ -2193,7 +2193,6 @@
       <packagereq variant="OS" type="default">gnome-shell-extension-drive-menu</packagereq>
       <packagereq variant="OS" type="default">gnome-shell-extension-places-menu</packagereq>
       <packagereq variant="OS" type="default">gnome-tweaks</packagereq>
-      <packagereq variant="OS" type="mandatory">celluloid</packagereq>
       <packagereq variant="OS" type="default">NetworkManager-l2tp-gnome</packagereq>
       <packagereq variant="OS" type="default">NetworkManager-openconnect-gnome</packagereq>
       <packagereq variant="OS" type="default">NetworkManager-openvpn-gnome</packagereq>
@@ -2202,7 +2201,6 @@
       <packagereq variant="OS" type="default">sphere-desktop-selector</packagereq>
       <packagereq variant="OS" type="default">file-roller</packagereq>
       <packagereq variant="OS" type="default">file-roller-nautilus</packagereq>
-      <packagereq variant="OS" type="default">gnome-calendar</packagereq>
       <packagereq variant="OS" type="default">gnome-epub-thumbnailer</packagereq>
       <packagereq variant="OS" type="default">gnome-kiosk</packagereq>
       <packagereq variant="OS" type="default">gnome-shell-extension-appindicator</packagereq>
@@ -2221,7 +2219,6 @@
       <packagereq variant="OS" type="default">hardinfo</packagereq>
       <packagereq variant="OS" type="default">kora-icon-theme</packagereq>
       <packagereq variant="OS" type="default">libheif</packagereq>
-      <packagereq variant="OS" type="default">simple-scan</packagereq>
       <packagereq variant="OS" type="optional">gedit-plugins</packagereq>
       <packagereq variant="OS" type="optional">gnome-backgrounds</packagereq>
       <packagereq variant="OS" type="optional">gnome-shell-extension-apps-menu</packagereq>
@@ -3737,6 +3734,7 @@
     <packagelist>
       <packagereq variant="OS" type="mandatory">alsa-ucm</packagereq>
       <packagereq variant="OS" type="mandatory">alsa-utils</packagereq>
+      <packagereq variant="OS" type="mandatory">celluloid</packagereq>
       <packagereq variant="OS" type="mandatory">deadbeef-plugins</packagereq>
       <packagereq variant="OS" type="mandatory">deadbeef</packagereq>
       <packagereq variant="OS" type="mandatory">gstreamer1-plugin-libav</packagereq>
@@ -6479,6 +6477,8 @@
       <packagereq variant="OS" type="mandatory">words</packagereq>
       <packagereq variant="OS" type="mandatory">xorg-x11-drv-libinput</packagereq>
       <packagereq variant="OS" type="mandatory">zip</packagereq>
+      <packagereq variant="OS" type="default">gnome-calendar</packagereq>
+      <packagereq variant="OS" type="default">simple-scan</packagereq>
     </packagelist>
   </group>
   <environment variant="OS">
@@ -6533,7 +6533,6 @@
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-browser-chromium</groupid>
-      <groupid>multimedia</groupid>
       <groupid>networkmanager-submodules</groupid>
       <groupid>security-tools</groupid>
       <groupid>server-product</groupid>