diff --git a/src/bin/clapper-app/data/glib-2.0/schemas/com.github.rafostar.Clapper.gschema.xml b/src/bin/clapper-app/data/glib-2.0/schemas/com.github.rafostar.Clapper.gschema.xml
index 6acfb3ab..a73d1d55 100644
--- a/src/bin/clapper-app/data/glib-2.0/schemas/com.github.rafostar.Clapper.gschema.xml
+++ b/src/bin/clapper-app/data/glib-2.0/schemas/com.github.rafostar.Clapper.gschema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="com.github.rafostar.Clapper">
+<schemalist gettext-domain="clapper-app">
   <schema id="com.github.rafostar.Clapper" path="/com/github/rafostar/Clapper/">
     <!-- General -->
     <key name="seek-method" type="i">
diff --git a/src/bin/clapper-app/data/metainfo/com.github.rafostar.Clapper.metainfo.xml b/src/bin/clapper-app/data/metainfo/com.github.rafostar.Clapper.metainfo.xml
index c98ab6e0..d64036a5 100644
--- a/src/bin/clapper-app/data/metainfo/com.github.rafostar.Clapper.metainfo.xml
+++ b/src/bin/clapper-app/data/metainfo/com.github.rafostar.Clapper.metainfo.xml
@@ -1,50 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2024 Rafał Dzięgiel -->
 <component type="desktop-application">
   <id>com.github.rafostar.Clapper</id>
+  <name>Clapper</name>
+  <summary>Simple and modern media player</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
-  <name>Clapper</name>
-  <summary>Simple and modern GNOME media player</summary>
-  <translation type="gettext">com.github.rafostar.Clapper</translation>
+  <developer id="com.github.rafostar">
+    <name>Rafał Dzięgiel</name>
+  </developer>
+  <translation type="gettext">clapper-app</translation>
   <launchable type="desktop-id">com.github.rafostar.Clapper.desktop</launchable>
-  <description>
-    <p>
-      Clapper is a GNOME media player built using GJS with GTK4 toolkit.
-      The media player is using GStreamer as a media backend and renders
-      everything via OpenGL. Player works natively on both Xorg and Wayland.
-      It also supports hardware acceleration through VA-API on AMD/Intel GPUs,
-      NVDEC on Nvidia and V4L2 on mobile devices.
-    </p>
-    <p>
-      The media player has an adaptive GUI. When viewing videos in "Windowed Mode",
-      Clapper will use mostly unmodified GTK widgets to match your OS look nicely.
-      When player enters "Fullscreen Mode" all GUI elements will become darker, bigger
-      and semi-transparent for your viewing comfort. It also has a "Floating Mode" which
-      displays only video on top of all other windows for a PiP-like viewing experience.
-      Mobile friendly transitions are also supported.
-    </p>
-  </description>
-  <developer_name>Rafał Dzięgiel</developer_name>
   <url type="homepage">https://rafostar.github.io/clapper</url>
   <url type="bugtracker">https://github.com/Rafostar/clapper/issues</url>
   <url type="donation">https://liberapay.com/Clapper</url>
   <url type="help">https://github.com/Rafostar/clapper/wiki</url>
-  <categories>
-    <category>AudioVideo</category>
-    <category>Video</category>
-  </categories>
+  <description>
+    <p>
+      Clapper is a modern media player designed for simplicity and ease of use.
+      Powered by GStreamer and built for the GNOME desktop environment using
+      GTK4 toolkit, it has a clean and stylish interface that lets you focus
+      on enjoying your favorite videos.
+    </p>
+    <p>
+      Clapper uses a playback queue where you can add multiple media files.
+      Think of it like a playlist that you can build. You can easily reorder
+      items or remove them from the queue with a simple drag and drop operation.
+    </p>
+  </description>
   <screenshots>
     <screenshot type="default">
-      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot-windowed.png</image>
+      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot_01.png</image>
     </screenshot>
     <screenshot>
-      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot-fullscreen.png</image>
+      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot_02.png</image>
     </screenshot>
     <screenshot>
-      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot-floating.png</image>
+      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot_03.png</image>
     </screenshot>
     <screenshot>
-      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot-mobile.png</image>
+      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot_04.png</image>
+    </screenshot>
+    <screenshot>
+      <image type="source">https://raw.githubusercontent.com/wiki/Rafostar/clapper/media/screenshot_05.png</image>
     </screenshot>
   </screenshots>
   <releases>
@@ -231,10 +229,6 @@
     <control>touch</control>
   </recommends>
   <requires>
-    <display_length compare="ge">small</display_length>
+    <display_length compare="ge">360</display_length>
   </requires>
-  <custom>
-    <value key="Purism::form_factor">workstation</value>
-    <value key="Purism::form_factor">mobile</value>
-  </custom>
 </component>
diff --git a/src/bin/clapper-app/po/clapper-app.pot b/src/bin/clapper-app/po/clapper-app.pot
index d7aea4a3..e79cecda 100644
--- a/src/bin/clapper-app/po/clapper-app.pot
+++ b/src/bin/clapper-app/po/clapper-app.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: clapper-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-05 20:50+0200\n"
+"POT-Creation-Date: 2024-04-21 20:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,6 +44,22 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
+#: src/bin/clapper-app/ui/clapper-app-headerbar.ui:183
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:80
+msgid "Preferences"
+msgstr ""
+
+#: src/bin/clapper-app/ui/clapper-app-headerbar.ui:187
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:84
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#. TRANSLATORS: Please do not translate application name
+#: src/bin/clapper-app/ui/clapper-app-headerbar.ui:194
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:91
+msgid "About Clapper"
+msgstr ""
+
 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:10
 #: src/bin/clapper-app/ui/clapper-app-preferences-window.ui:11
 msgid "General"
@@ -75,13 +91,13 @@ msgid "Media"
 msgstr ""
 
 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:43
-#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:30
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:55
 #: src/bin/clapper-app/ui/clapper-app-queue-list.ui:178
 msgid "Add Files…"
 msgstr ""
 
 #: src/bin/clapper-app/ui/clapper-app-help-overlay.ui:49
-#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:40
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:65
 #: src/bin/clapper-app/ui/clapper-app-queue-list.ui:182
 msgid "Add URI…"
 msgstr ""
@@ -248,7 +264,7 @@ msgstr ""
 msgid "Subtitle Streams"
 msgstr ""
 
-#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:21
+#: src/bin/clapper-app/ui/clapper-app-initial-state.ui:46
 msgid "Start by adding media to playback queue"
 msgstr ""
 
@@ -405,19 +421,6 @@ msgstr ""
 msgid "Pixel Format"
 msgstr ""
 
-#: src/bin/clapper-app/ui/clapper-app-window-state-buttons.ui:57
-msgid "Preferences"
-msgstr ""
-
-#: src/bin/clapper-app/ui/clapper-app-window-state-buttons.ui:61
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#. TRANSLATORS: Please do not translate application name
-#: src/bin/clapper-app/ui/clapper-app-window-state-buttons.ui:68
-msgid "About Clapper"
-msgstr ""
-
 #. TRANSLATORS: Put your name(s) here for credits or leave untranslated
 #: src/bin/clapper-app/clapper-app-about-window.c:43
 msgid "translator-credits"
@@ -463,6 +466,6 @@ msgstr ""
 msgid "Shuffle"
 msgstr ""
 
-#: src/bin/clapper-app/clapper-app-window.c:824
+#: src/bin/clapper-app/clapper-app-window.c:828
 msgid "Drop on title bar to play now or anywhere else to enqueue."
 msgstr ""