diff --git a/data/fonts/meson.build b/data/fonts/meson.build
new file mode 100644
index 00000000..878e8f49
--- /dev/null
+++ b/data/fonts/meson.build
@@ -0,0 +1,17 @@
+#
+#   FONTS
+#
+
+# CAREFUL HERE: In the flatpak, the apps cant find it 
+target_font_dir = get_option('datadir') / 'fonts'
+
+install_data(
+    'RedactedScript-Regular.ttf',
+    install_dir: target_font_dir,
+)
+
+# You want to call fc-cache on install unless DESTDIR is set;
+# distro packages (and flatpak) rebuild the fontconfig cache themselves in bulk, and they set DESTDIR when running meson install
+#fontconfig = find_program('fc-cache', required: true)
+#meson.add_install_script(fontconfig, target_font_dir)
+
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 2ccfa7c3..5347e64d 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,4 +1,6 @@
-
+#
+#   ICONS
+#
 
 # Override only default 
 if development_build and variant == 'default'
diff --git a/data/meson.build b/data/meson.build
index f385411a..1c87e869 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,6 @@
+#
+#   METADATA
+#
 
 #========================
 # GRESOURCE
@@ -43,6 +46,12 @@ if not windows_build
     # ICONS
     subdir('icons')
 
+
+    #========================
+    # FONTS
+    subdir('fonts')
+
+
     #========================
     # DESKTOP
     # Inject some variables into the desktop file before merging in the translations
diff --git a/io.github.ellie_commons.jorts.flathub.yml b/io.github.ellie_commons.jorts.flathub.yml
index 3d1e77d5..4865cbeb 100644
--- a/io.github.ellie_commons.jorts.flathub.yml
+++ b/io.github.ellie_commons.jorts.flathub.yml
@@ -8,10 +8,10 @@ sdk: org.gnome.Sdk
 command: io.github.ellie_commons.jorts
 
 finish-args:
+  - '--socket=wayland'
+  - '--socket=fallback-x11'
   - '--share=ipc'
   - '--device=dri'
-  - '--socket=fallback-x11'
-  - '--socket=wayland'
 
 cleanup:
   - /include
@@ -25,17 +25,6 @@ cleanup-commands:
   - /app/cleanup-BaseApp.sh
 
 modules:
-  # Needed for the Scribbly mode
-  # It should be present by default on elementary OS, but better not assume it is the case
-  - name: RedactedScript
-    buildsystem: simple
-    build-commands:
-      - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts
-    sources:
-      - type: file
-        url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf
-        sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d
-
   - name: jorts
     buildsystem: meson
     config-opts:
diff --git a/io.github.elly_code.jorts.devel.yml b/io.github.elly_code.jorts.devel.yml
index e2119f01..658bc759 100644
--- a/io.github.elly_code.jorts.devel.yml
+++ b/io.github.elly_code.jorts.devel.yml
@@ -14,23 +14,12 @@ tags: ['devel']
 desktop-file-name-suffix: ' (Development)'
 
 finish-args:
+  - '--socket=wayland'
+  - '--socket=fallback-x11'
   - '--share=ipc'
   - '--device=dri'
-  - '--socket=fallback-x11'
-  - '--socket=wayland'
 
 modules:
-  # Needed for the Scribbly mode
-  # It should be present by default on elementary OS, but better not assume it is the case
-  - name: RedactedScript
-    buildsystem: simple
-    build-commands:
-      - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts
-    sources:
-      - type: file
-        url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf
-        sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d
-
   - name: jorts
     buildsystem: meson
     config-opts:
diff --git a/io.github.elly_code.jorts.yml b/io.github.elly_code.jorts.yml
index 43bd0e0e..c5309391 100644
--- a/io.github.elly_code.jorts.yml
+++ b/io.github.elly_code.jorts.yml
@@ -5,10 +5,10 @@ sdk: io.elementary.Sdk
 command: io.github.elly_code.jorts
 
 finish-args:
+  - '--socket=wayland'
+  - '--socket=fallback-x11'
   - '--share=ipc'
   - '--device=dri'
-  - '--socket=fallback-x11'
-  - '--socket=wayland'
 
 cleanup:
   - /include
@@ -18,17 +18,6 @@ cleanup:
   - /share/vala
 
 modules:
-  # Needed for the Scribbly mode
-  # It should be present by default on elementary OS, but better not assume it is the case
-  - name: RedactedScript
-    buildsystem: simple
-    build-commands:
-      - install -Dm0644 RedactedScript-Regular.ttf -t ${FLATPAK_DEST}/share/fonts
-    sources:
-      - type: file
-        url: https://github.com/christiannaths/redacted-font/raw/63e542017bab347ba9be54d7d99b99d4754c3d97/RedactedScript/fonts/ttf/RedactedScript-Regular.ttf
-        sha256: 1ebaab9642a2f43fa33f449760469903143fd1d08b2433eb6c15e28602d9360d
-
   - name: jorts
     buildsystem: meson
     config-opts: