diff --git a/README.md b/README.md
index 2495e81..d25a6b7 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Sequeler is a native Linux SQL client built in Vala and Gtk. It allows you to connect to your local and remote databases, write SQL in a handy text editor with language recognition, and visualize SELECT results in a Gtk.Grid Widget.
 
-![](data/assets/screenshots/sequeler-screenshot.png)
+![Database view in the light mode](data/assets/screenshots/database-light.png#gh-light-mode-only) ![Database view in the dark mode](data/assets/screenshots/database-dark.png#gh-dark-mode-only)
 
 ## Supported Databases
 - PostgreSQL
diff --git a/data/assets/screenshots/database-dark.png b/data/assets/screenshots/database-dark.png
new file mode 100644
index 0000000..d1e0c10
Binary files /dev/null and b/data/assets/screenshots/database-dark.png differ
diff --git a/data/assets/screenshots/database-light.png b/data/assets/screenshots/database-light.png
new file mode 100644
index 0000000..8492413
Binary files /dev/null and b/data/assets/screenshots/database-light.png differ
diff --git a/data/assets/screenshots/new-connection-dark.png b/data/assets/screenshots/new-connection-dark.png
new file mode 100644
index 0000000..1304fa6
Binary files /dev/null and b/data/assets/screenshots/new-connection-dark.png differ
diff --git a/data/assets/screenshots/new-connection-light.png b/data/assets/screenshots/new-connection-light.png
new file mode 100644
index 0000000..bda5de8
Binary files /dev/null and b/data/assets/screenshots/new-connection-light.png differ
diff --git a/data/assets/screenshots/sequeler-screenshot.png b/data/assets/screenshots/sequeler-screenshot.png
deleted file mode 100644
index 807fbe1..0000000
Binary files a/data/assets/screenshots/sequeler-screenshot.png and /dev/null differ
diff --git a/data/assets/screenshots/sequeler-screenshot1.png b/data/assets/screenshots/sequeler-screenshot1.png
deleted file mode 100644
index d201f2b..0000000
Binary files a/data/assets/screenshots/sequeler-screenshot1.png and /dev/null differ
diff --git a/data/assets/screenshots/sequeler-screenshot2.png b/data/assets/screenshots/sequeler-screenshot2.png
deleted file mode 100644
index 95b767e..0000000
Binary files a/data/assets/screenshots/sequeler-screenshot2.png and /dev/null differ
diff --git a/data/io.github.ellie_commons.sequeler.appdata.xml.in.in b/data/io.github.ellie_commons.sequeler.metainfo.xml.in.in
similarity index 95%
rename from data/io.github.ellie_commons.sequeler.appdata.xml.in.in
rename to data/io.github.ellie_commons.sequeler.metainfo.xml.in.in
index 0ecd51e..60befcc 100644
--- a/data/io.github.ellie_commons.sequeler.appdata.xml.in.in
+++ b/data/io.github.ellie_commons.sequeler.metainfo.xml.in.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2017 Alessandro Castellani (https://github.com/Alecaddd) -->
-<component type="desktop">
+<component type="desktop-application">
   <id>@appid@</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
@@ -500,20 +500,28 @@
     </release>
   </releases>
   <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/sequeler-screenshot.png</image>
+    <screenshot type="default" environment="pantheon">
+      <caption>Database view</caption>
+      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/database-light.png</image>
     </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/sequeler-screenshot1.png</image>
+    <screenshot environment="pantheon:dark">
+      <caption>Database view</caption>
+      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/database-dark.png</image>
     </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/sequeler-screenshot2.png</image>
+    <screenshot environment="pantheon">
+      <caption>New connection dialog</caption>
+      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/new-connection-light.png</image>
+    </screenshot>
+    <screenshot environment="pantheon:dark">
+      <caption>New connection dialog</caption>
+      <image>https://raw.githubusercontent.com/ellie-commons/sequeler/v@version@/data/assets/screenshots/new-connection-dark.png</image>
     </screenshot>
   </screenshots>
   <developer id="io.github.ellie-commons">
     <name>Alessandro Castellani</name>
   </developer>
   <launchable type="desktop-id">@appid@.desktop</launchable>
+  <translation type="gettext">@appid@</translation>
   <url type="homepage">https://github.com/ellie-commons/sequeler</url>
   <url type="donation">https://www.paypal.me/alecaddd</url>
   <url type="bugtracker">https://github.com/ellie-commons/sequeler/issues</url>
@@ -521,9 +529,10 @@
   <url type="translate">https://hosted.weblate.org/projects/sequeler</url>
   <update_contact>castellani.ale@gmail.com</update_contact>
   <content_rating type="oars-1.1" />
+  <branding>
+    <color type="primary">#3f3f3f</color>
+  </branding>
   <custom>
-    <value key="x-appcenter-color-primary">#3f3f3f</value>
-    <value key="x-appcenter-color-primary-text">#ffffff</value>
     <value key="x-appcenter-suggested-price">25</value>
     <value key="x-appcenter-stripe">pk_live_Arrxw947rfYpLQK7VcSv4766</value>
   </custom>
diff --git a/data/meson.build b/data/meson.build
index 7299934..4a46937 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -81,30 +81,30 @@ if desktop_file_validate.found()
 	)
 endif
 
-# Install the AppData file
-appdata_conf = configuration_data()
-appdata_conf.set('appid', application_id)
-appdata_conf.set('version', meson.project_version())
+# Install the MetaInfo file
+metainfo_conf = configuration_data()
+metainfo_conf.set('appid', application_id)
+metainfo_conf.set('version', meson.project_version())
 
-appdata_file = i18n.merge_file(
+metainfo_file = i18n.merge_file(
 		input: configure_file(
-			input: '@0@.appdata.xml.in.in'.format(meson.project_name()),
-			output: '@0@.appdata.xml.in'.format(application_id),
-			configuration: appdata_conf
+			input: '@0@.metainfo.xml.in.in'.format(meson.project_name()),
+			output: '@0@.metainfo.xml.in'.format(application_id),
+			configuration: metainfo_conf
 		),
-		output: '@0@.appdata.xml'.format(application_id),
+		output: '@0@.metainfo.xml'.format(application_id),
 		po_dir: join_paths(meson.source_root(), 'po'),
 		install: true,
 		install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
 
-# Validate AppData file
+# Validate MetaInfo file
 appstream_util = find_program('appstream-util', required: false)
 if appstream_util.found()
 	test(
-		'validate-appdata', appstream_util,
+		'validate', appstream_util,
 		args: [
-			'validate-relax', appdata_file.full_path()
+			'validate-relax', metainfo_file.full_path()
 		]
 	)
 endif
diff --git a/po/extra/POTFILES b/po/extra/POTFILES
index 6325834..a38db04 100644
--- a/po/extra/POTFILES
+++ b/po/extra/POTFILES
@@ -1,2 +1,2 @@
 data/io.github.ellie_commons.sequeler.desktop.in.in
-data/io.github.ellie_commons.sequeler.appdata.xml.in.in
+data/io.github.ellie_commons.sequeler.metainfo.xml.in.in