diff --git a/container.yaml b/container.yaml
index 9f6bafb..d2f5447 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,14 +1,13 @@
 compose:
     modules:
-        - eog:master
+    - eog:master
 flatpak:
     id: org.gnome.eog
     branch: stable
     command: eog
-    tags: ["Viewer"]
     rename-appdata-file: eog.appdata.xml
     rename-desktop-file: eog.desktop
-    finish-args: >
+    finish-args: |-
         --share=ipc
         --socket=x11
         --socket=wayland
diff --git a/eog.yaml b/eog.yaml
index 39a2e5f..8b54c54 100644
--- a/eog.yaml
+++ b/eog.yaml
@@ -1,34 +1,39 @@
+---
 document: modulemd
 version: 2
 data:
-    summary: Eye of GNOME Application Module
-    description: >
-        The Eye of GNOME image viewer (eog) is the official image viewer for the
-        GNOME desktop. It can view single image files in a variety of formats, as
-        well as large image collections.
-    license:
-        module: [ MIT ]
-    dependencies:
-    - buildrequires:
-          flatpak-common: [f31]
-          flatpak-runtime: [f31]
-          platform: [f31]
-      requires:
-          flatpak-common: [f31]
-          flatpak-runtime: [f31]
-          platform: [f31]
-    profiles:
-        default:
-            rpms:
-                - eog
+  summary: Eye of GNOME image viewer
+  description: >-
+    The Eye of GNOME image viewer (eog) is the official image viewer for the GNOME
+    desktop. It can view single image files in a variety of formats, as well as large
+    image collections.
+
+    eog is extensible through a plugin system.
+  license:
+    module:
+    - MIT
+  dependencies:
+  - buildrequires:
+      flatpak-common: [f31]
+      flatpak-runtime: [f31]
+      platform: [f31]
+    requires:
+      flatpak-common: [f31]
+      flatpak-runtime: [f31]
+      platform: [f31]
+  profiles:
+    default:
+      rpms:
+      - eog
 # If we wanted support for Python plugins
-#                - libpeas-loader-python3
-    components:
-        rpms:
-            eog:
-                rationale: Application package
-                ref: f31
-                buildorder: 1
-            exempi:
-                rationale: Runtime dependency.
-                ref: f31
+#     - libpeas-loader-python3
+  components:
+    rpms:
+      eog:
+        rationale: Application package
+        ref: f31
+        buildorder: 10
+      exempi:
+        rationale: Runtime dependency
+        ref: f31
+...