diff --git a/data/com.jeffser.Alpaca.desktop.in b/data/com.jeffser.Alpaca.desktop.in
index 4a980e1..c0e32f4 100644
--- a/data/com.jeffser.Alpaca.desktop.in
+++ b/data/com.jeffser.Alpaca.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=alpaca
+Name=Alpaca
 Exec=alpaca
 Icon=com.jeffser.Alpaca
 Terminal=false
diff --git a/data/com.jeffser.Alpaca.metainfo.xml.in b/data/com.jeffser.Alpaca.metainfo.xml.in
index 9ed7e59..6980a1d 100644
--- a/data/com.jeffser.Alpaca.metainfo.xml.in
+++ b/data/com.jeffser.Alpaca.metainfo.xml.in
@@ -1,9 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-	<id>com.jeffser.Alpaca.desktop</id>
+	<id>com.jeffser.Alpaca</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0-or-later</project_license>
+  <launchable type="desktop-id">com.jeffser.Alpaca.desktop</launchable>
+  <name>Alpaca</name>
+  <summary>An Ollama client</summary>
 	<description>
-	  <p>No description</p>
+	  <p>Made with GTK4 and Adwaita.</p>
+    <p>Features</p>
+	  <ul>
+	    <li>Talk to multiple models in the same conversation</li>
+	    <li>Pull and delete models from the app</li>
+	  </ul>
 	</description>
+  <developer id="tld.vendor">
+    <name>Jeffry Samuel Eduarte Rojas</name>
+  </developer>
+  <provides>
+    <binary>alpaca</binary>
+  </provides>
+  <icon type="stock">com.jeffser.Alpaca</icon>
+  <branding>
+    <color type="primary" scheme_preference="light">#ff00ff</color>
+    <color type="primary" scheme_preference="dark">#993d3d</color>
+  </branding>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://jeffser.com/images/alpaca/screenie1.png</image>
+      <caption>Login into an Ollama instance</caption>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://jeffser.com/images/alpaca/screenie2.png</image>
+      <caption>A conversation involving multiple models</caption>
+    </screenshot>
+    <screenshot type="default">
+      <image>https://jeffser.com/images/alpaca/screenie3.png</image>
+      <caption>Managing models</caption>
+    </screenshot>
+  </screenshots>
+  <content_rating type="oars-1.1">
+    <content_attribute id="money-purchasing">mild</content_attribute>
+  </content_rating>
+  <url type="bugtracker">https://github.com/Jeffser/Alpaca/issues</url>
+  <url type="homepage">https://github.com/Jeffser/Alpaca</url>
+  <url type="donation">https://github.com/sponsors/Jeffser</url>
 </component>
diff --git a/data/icons/hicolor/512x512/apps/com.jeffser.Alpaca.png b/data/icons/hicolor/512x512/apps/com.jeffser.Alpaca.png
new file mode 100644
index 0000000..2b40ffa
Binary files /dev/null and b/data/icons/hicolor/512x512/apps/com.jeffser.Alpaca.png differ
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 7cdcca8..a874fe0 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -11,3 +11,9 @@ install_data(
   symbolic_dir / ('@0@-symbolic.svg').format(application_id),
   install_dir: get_option('datadir') / 'icons' / symbolic_dir
 )
+
+png_dir = 'hicolor' / '512x512' / 'apps'
+install_data(
+  png_dir / ('@0@.png').format(application_id),
+  install_dir: get_option('datadir') / 'icons' / png_dir
+)
\ No newline at end of file
diff --git a/data/meson.build b/data/meson.build
index defedd0..6cdfd06 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ desktop_file = i18n.merge_file(
   install_dir: get_option('datadir') / 'applications'
 )
 
-desktop_utils = find_program('desktop-file-validate', required: false)
+desktop_utils = find_program('desktop-file-validate', required: true)
 if desktop_utils.found()
   test('Validate desktop file', desktop_utils, args: [desktop_file])
 endif
@@ -20,7 +20,7 @@ appstream_file = i18n.merge_file(
   install_dir: get_option('datadir') / 'metainfo'
 )
 
-appstreamcli = find_program('appstreamcli', required: false, disabler: true)
+appstreamcli = find_program('appstreamcli', required: true, disabler: true)
 test('Validate appstream file', appstreamcli,
      args: ['validate', '--no-net', '--explain', appstream_file])
 
@@ -28,7 +28,7 @@ install_data('com.jeffser.Alpaca.gschema.xml',
   install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 
-compile_schemas = find_program('glib-compile-schemas', required: false, disabler: true)
+compile_schemas = find_program('glib-compile-schemas', required: true, disabler: true)
 test('Validate schema file',
      compile_schemas,
      args: ['--strict', '--dry-run', meson.current_source_dir()])
diff --git a/src/window.py b/src/window.py
index 1efd3be..6be807e 100644
--- a/src/window.py
+++ b/src/window.py
@@ -67,6 +67,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
             margin_bottom=12,
             margin_start=12,
             margin_end=12,
+            css_classes=["flat"]
         )
         message_buffer = message_text.get_buffer()
         message_buffer.insert(message_buffer.get_end_iter(), msg)