diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
new file mode 100644
index 0000000..0eff9f0
--- /dev/null
+++ b/.github/workflows/ci_tests.yml
@@ -0,0 +1,39 @@
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+name: CI
+
+jobs:
+  rustfmt:
+    name: Rustfmt
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+          components: rustfmt
+      - name: Create blank versions of configured file
+        run: echo -e "" >> src/config.rs
+      - name: Run cargo fmt
+        run: cargo fmt --all -- --check
+
+  flatpak:
+    name: Flatpak
+    runs-on: ubuntu-20.04
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-42
+      options: --privileged
+    steps:
+    - uses: actions/checkout@v2
+    - uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v4
+      with:
+        bundle: gtk-rust-template.flatpak
+        manifest-path: org.kuchelmeister.toolbxtuner.dev.json
+        run-tests: true
+        cache-key: flatpak-builder-${{ github.sha }}
+
diff --git a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in b/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
index 0b14aef..a4892d2 100644
--- a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
+++ b/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
@@ -11,16 +11,15 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <caption>Main application window showing multiple toolboxes. The toolboxes are shown as a list. Each toolbox has a start/stop button, an open in terminal button and a settings button.</caption>
-      <image type="source" width="1441" height="857">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_light.png</image>
+      <caption>Main application window showing multiple toolboxes</caption>
+      <image type="source" width="1633" height="971">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_light.png</image>
     </screenshot>
      <screenshot>
-      <caption>Main application window in dark mode.</caption>
-      <image type="source" width="1441" height="857">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_dark.png</image>
+      <caption>Main application window in dark mode</caption>
+      <image type="source" width="1633" height="971">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_dark.png</image>
     </screenshot>
-
   </screenshots>
-
+  <content_rating type="oars-1.0" />
   <url type="homepage">https://github.com/13hannes11/toolbx-tuner</url>
   <url type="bugtracker">https://github.com/13hannes11/toolbx-tuner/issues/</url>
   <update_contact>hannes_AT_kuchelmeister.org</update_contact>