diff --git a/data/icons/meson.build b/data/icons/meson.build
index f65f4a5..2ab86e9 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,13 +1,10 @@
-application_id = 'org.kuchelmeister.toolbxtuner'
-
-scalable_dir = join_paths('hicolor', 'scalable', 'apps')
 install_data(
-  join_paths(scalable_dir, ('@0@.svg').format(application_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', scalable_dir)
+  '@0@.svg'.format(application_id),
+  install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps'
 )
 
-symbolic_dir = join_paths('hicolor', 'symbolic', 'apps')
 install_data(
-  join_paths(symbolic_dir, ('@0@-symbolic.svg').format(application_id)),
-  install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
+  '@0@-symbolic.svg'.format(base_id),
+  install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps',
+  rename: '@0@-symbolic.svg'.format(application_id)
 )
diff --git a/data/icons/hicolor/symbolic/apps/org.kuchelmeister.toolbxtuner-symbolic.svg b/data/icons/org.kuchelmeister.ToolbxTuner-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/org.kuchelmeister.toolbxtuner-symbolic.svg
rename to data/icons/org.kuchelmeister.ToolbxTuner-symbolic.svg
diff --git a/data/icons/hicolor/scalable/apps/org.kuchelmeister.toolbxtuner.devel.svg b/data/icons/org.kuchelmeister.ToolbxTuner.Devel.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/org.kuchelmeister.toolbxtuner.devel.svg
rename to data/icons/org.kuchelmeister.ToolbxTuner.Devel.svg
diff --git a/data/icons/org.kuchelmeister.toolbxtuner.Source.svg b/data/icons/org.kuchelmeister.ToolbxTuner.Source.svg
similarity index 100%
rename from data/icons/org.kuchelmeister.toolbxtuner.Source.svg
rename to data/icons/org.kuchelmeister.ToolbxTuner.Source.svg
diff --git a/data/icons/hicolor/scalable/apps/org.kuchelmeister.toolbxtuner.svg b/data/icons/org.kuchelmeister.ToolbxTuner.svg
similarity index 100%
rename from data/icons/hicolor/scalable/apps/org.kuchelmeister.toolbxtuner.svg
rename to data/icons/org.kuchelmeister.ToolbxTuner.svg
diff --git a/data/meson.build b/data/meson.build
index 3d4dcce..5643b60 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,43 +1,76 @@
-desktop_file = i18n.merge_file(
-  input: 'org.kuchelmeister.toolbxtuner.desktop.in',
-  output: 'org.kuchelmeister.toolbxtuner.desktop',
-  type: 'desktop',
-  po_dir: '../po',
-  install: true,
-  install_dir: join_paths(get_option('datadir'), 'applications')
-)
-
-desktop_utils = find_program('desktop-file-validate', required: false)
-if desktop_utils.found()
-  test('Validate desktop file', desktop_utils,
-    args: [desktop_file]
-  )
-endif
-
-appstream_file = i18n.merge_file(
-  input: 'org.kuchelmeister.toolbxtuner.appdata.xml.in',
-  output: 'org.kuchelmeister.toolbxtuner.appdata.xml',
-  po_dir: '../po',
-  install: true,
-  install_dir: join_paths(get_option('datadir'), 'appdata')
-)
-
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('Validate appstream file', appstream_util,
-    args: ['validate', appstream_file]
-  )
-endif
-
-install_data('org.kuchelmeister.toolbxtuner.gschema.xml',
-  install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
-)
-
-compile_schemas = find_program('glib-compile-schemas', required: false)
-if compile_schemas.found()
-  test('Validate schema file', compile_schemas,
-    args: ['--strict', '--dry-run', meson.current_source_dir()]
-  )
-endif
-
 subdir('icons')
+subdir('resources')
+# Desktop file
+desktop_conf = configuration_data()
+desktop_conf.set('icon', application_id)
+desktop_file = i18n.merge_file(
+  type: 'desktop',
+  input: configure_file(
+    input: '@0@.desktop.in.in'.format(base_id),
+    output: '@BASENAME@',
+    configuration: desktop_conf
+  ),
+  output: '@0@.desktop'.format(application_id),
+  po_dir: podir,
+  install: true,
+  install_dir: datadir / 'applications'
+)
+# Validate Desktop file
+if desktop_file_validate.found()
+  test(
+    'validate-desktop',
+    desktop_file_validate,
+    args: [
+      desktop_file.full_path()
+    ],
+    depends: desktop_file,
+  )
+endif
+
+# Appdata
+appdata_conf = configuration_data()
+appdata_conf.set('app-id', application_id)
+appdata_conf.set('gettext-package', gettext_package)
+appdata_file = i18n.merge_file(
+  input: configure_file(
+    input: '@0@.metainfo.xml.in.in'.format(base_id),
+    output: '@BASENAME@',
+    configuration: appdata_conf
+  ),
+  output: '@0@.metainfo.xml'.format(application_id),
+  po_dir: podir,
+  install: true,
+  install_dir: datadir / 'metainfo'
+)
+# Validate Appdata
+if appstream_util.found()
+  test(
+    'validate-appdata', appstream_util,
+    args: [
+      'validate', '--nonet', appdata_file.full_path()
+    ],
+    depends: appdata_file,
+  )
+endif
+
+# GSchema
+gschema_conf = configuration_data()
+gschema_conf.set('app-id', application_id)
+gschema_conf.set('gettext-package', gettext_package)
+configure_file(
+  input: '@0@.gschema.xml.in'.format(base_id),
+  output: '@0@.gschema.xml'.format(application_id),
+  configuration: gschema_conf,
+  install: true,
+  install_dir: datadir / 'glib-2.0' / 'schemas'
+)
+
+# Validata GSchema
+if glib_compile_schemas.found()
+  test(
+    'validate-gschema', glib_compile_schemas,
+    args: [
+      '--strict', '--dry-run', meson.current_build_dir()
+    ],
+  )
+endif
diff --git a/data/org.kuchelmeister.toolbxtuner.desktop.in b/data/org.kuchelmeister.ToolbxTuner.desktop.in.in
similarity index 82%
rename from data/org.kuchelmeister.toolbxtuner.desktop.in
rename to data/org.kuchelmeister.ToolbxTuner.desktop.in.in
index cbba8b9..99423e5 100644
--- a/data/org.kuchelmeister.toolbxtuner.desktop.in
+++ b/data/org.kuchelmeister.ToolbxTuner.desktop.in.in
@@ -6,7 +6,7 @@ Terminal=false
 Type=Application
 Categories=GTK;
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=Gnome;GTK;Container;Toolbx;Podman;Toolbox;
+Keywords=Gnome;GTK;Container;Toolbx;Podman;Toolbox;Fedora;Silvervblue
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.kuchelmeister.toolbxtuner
+Icon=@icon@
 StartupNotify=true
diff --git a/data/org.kuchelmeister.ToolbxTuner.gschema.xml.in b/data/org.kuchelmeister.ToolbxTuner.gschema.xml.in
new file mode 100644
index 0000000..e6418dc
--- /dev/null
+++ b/data/org.kuchelmeister.ToolbxTuner.gschema.xml.in
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schemalist>
+  <schema path="/org/kuchelmeister/ToolbxTuner/" id="@app-id@" gettext-domain="@gettext-package@">
+  </schema>
+</schemalist>
+
diff --git a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in b/data/org.kuchelmeister.ToolbxTuner.metainfo.xml.in.in
similarity index 78%
rename from data/org.kuchelmeister.toolbxtuner.appdata.xml.in
rename to data/org.kuchelmeister.ToolbxTuner.metainfo.xml.in.in
index f64fd3c..726ff30 100644
--- a/data/org.kuchelmeister.toolbxtuner.appdata.xml.in
+++ b/data/org.kuchelmeister.ToolbxTuner.metainfo.xml.in.in
@@ -1,34 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Hannes Kuchelmeister 2019 <hannes@kuchelmeister.org> -->
 <component type="desktop-application">
-
-  <id>org.kuchelmeister.toolbxtuner</id>
-  <metadata_license>CC0-1.0</metadata_license>
+  <id>@app-id@</id>
+  <metadata_license>CC0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
-  <content_rating type="oars-1.0" />
   <name>Toolbx Tuner</name>
   <summary>Manage and enhance your toolbxes (containertoolboxes)</summary>
   <description>
     <p>An application to manage and enhance your containertoolboxes.</p>
   </description>
-  <screenshots>
+<screenshots>
     <screenshot type="default">
       <caption>Main application window showing multiple toolboxes</caption>
-      <image type="source" width="1200" height="800">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_light.png</image>
+      <image type="source" width="1200" height="800">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/resources/screenshots/main_light.png</image>
     </screenshot>
      <screenshot>
       <caption>Main application window in dark mode</caption>
-      <image type="source" width="1200" height="800">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/screenshots/main_dark.png</image>
+      <image type="source" width="1200" height="800">https://media.githubusercontent.com/media/13hannes11/toolbx-tuner/main/data/resources/screenshots/main_dark.png</image>
     </screenshot>
   </screenshots>
-
-  <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>
-  <developer_name>Hannes Kuchelmeister</developer_name>
-  <launchable type="desktop-id">org.kuchelmeister.toolbxtuner.desktop</launchable>
+  <content_rating type="oars-1.0" />
   <releases>
     <release version="0.0.0" type="development" date="2022-04-18" />
   </releases>
-
+  <url type="homepage">https://github.com/13hannes11/toolbx-tuner</url>
+  <url type="bugtracker">https://github.com/13hannes11/toolbx-tuner/issues/</url>
+  <developer_name>Hannes Kuchelmeister</developer_name>
+  <update_contact>hannes_AT_kuchelmeister.org</update_contact>
+  <translation type="gettext">@gettext-package@</translation>
+  <launchable type="desktop-id">@app-id@.desktop</launchable>
 </component>
-
diff --git a/data/org.kuchelmeister.toolbxtuner.gschema.xml b/data/org.kuchelmeister.toolbxtuner.gschema.xml
deleted file mode 100644
index 5c76897..0000000
--- a/data/org.kuchelmeister.toolbxtuner.gschema.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist gettext-domain="toolbx-tuner">
-	<schema id="org.kuchelmeister.toolbxtuner" path="/org/kuchelmeister/toolbxtuner/">
-	</schema>
-</schemalist>
diff --git a/data/resources/meson.build b/data/resources/meson.build
new file mode 100644
index 0000000..604e1b2
--- /dev/null
+++ b/data/resources/meson.build
@@ -0,0 +1,9 @@
+# Resources
+resources = gnome.compile_resources(
+  'resources',
+  'resources.gresource.xml',
+  gresource_bundle: true,
+  source_dir: meson.current_build_dir(),
+  install: true,
+  install_dir: pkgdatadir,
+)
diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
new file mode 100644
index 0000000..7bc4c8a
--- /dev/null
+++ b/data/resources/resources.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/kuchelmeister/ToolbxTuner/">
+    <!-- see https://gtk-rs.org/gtk4-rs/git/docs/gtk4/struct.Application.html#automatic-resources -->
+  </gresource>
+</gresources>
diff --git a/data/resources/resources/.gitignore b/data/resources/resources/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/data/screenshots/main_dark.png b/data/resources/screenshots/main_dark.png
similarity index 100%
rename from data/screenshots/main_dark.png
rename to data/resources/screenshots/main_dark.png
diff --git a/data/screenshots/main_light.png b/data/resources/screenshots/main_light.png
similarity index 100%
rename from data/screenshots/main_light.png
rename to data/resources/screenshots/main_light.png
diff --git a/data/resources/style.css b/data/resources/style.css
new file mode 100644
index 0000000..e69de29