diff --git a/docs/source/_static/novelwriter-dark.png b/docs/source/_static/umbraedit-dark.png
similarity index 100%
rename from docs/source/_static/novelwriter-dark.png
rename to docs/source/_static/umbraedit-dark.png
diff --git a/docs/source/_static/novelwriter-light.png b/docs/source/_static/umbraedit-light.png
similarity index 100%
rename from docs/source/_static/novelwriter-light.png
rename to docs/source/_static/umbraedit-light.png
diff --git a/docs/source/_static/novelwriter-pdf.png b/docs/source/_static/umbraedit-pdf.png
similarity index 100%
rename from docs/source/_static/novelwriter-pdf.png
rename to docs/source/_static/umbraedit-pdf.png
diff --git a/setup/data/hicolor/128x128/apps/novelwriter.png b/setup/data/hicolor/128x128/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/128x128/apps/novelwriter.png
rename to setup/data/hicolor/128x128/apps/umbraedit.png
diff --git a/setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/128x128/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/128x128/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/128x128/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/16x16/apps/novelwriter.png b/setup/data/hicolor/16x16/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/16x16/apps/novelwriter.png
rename to setup/data/hicolor/16x16/apps/umbraedit.png
diff --git a/setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/16x16/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/16x16/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/16x16/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/24x24/apps/novelwriter.png b/setup/data/hicolor/24x24/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/24x24/apps/novelwriter.png
rename to setup/data/hicolor/24x24/apps/umbraedit.png
diff --git a/setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/24x24/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/24x24/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/24x24/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/256x256/apps/novelwriter.png b/setup/data/hicolor/256x256/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/256x256/apps/novelwriter.png
rename to setup/data/hicolor/256x256/apps/umbraedit.png
diff --git a/setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/256x256/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/256x256/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/256x256/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/32x32/apps/novelwriter.png b/setup/data/hicolor/32x32/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/32x32/apps/novelwriter.png
rename to setup/data/hicolor/32x32/apps/umbraedit.png
diff --git a/setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/32x32/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/32x32/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/32x32/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/48x48/apps/novelwriter.png b/setup/data/hicolor/48x48/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/48x48/apps/novelwriter.png
rename to setup/data/hicolor/48x48/apps/umbraedit.png
diff --git a/setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/48x48/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/48x48/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/48x48/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/512x512/apps/novelwriter.png b/setup/data/hicolor/512x512/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/512x512/apps/novelwriter.png
rename to setup/data/hicolor/512x512/apps/umbraedit.png
diff --git a/setup/data/hicolor/512x512/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/512x512/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/512x512/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/512x512/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/64x64/apps/novelwriter.png b/setup/data/hicolor/64x64/apps/umbraedit.png
similarity index 100%
rename from setup/data/hicolor/64x64/apps/novelwriter.png
rename to setup/data/hicolor/64x64/apps/umbraedit.png
diff --git a/setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png b/setup/data/hicolor/64x64/mimetypes/application-x-umbraedit-project.png
similarity index 100%
rename from setup/data/hicolor/64x64/mimetypes/application-x-novelwriter-project.png
rename to setup/data/hicolor/64x64/mimetypes/application-x-umbraedit-project.png
diff --git a/setup/data/hicolor/scalable/apps/novelwriter.svg b/setup/data/hicolor/scalable/apps/umbraedit.svg
similarity index 100%
rename from setup/data/hicolor/scalable/apps/novelwriter.svg
rename to setup/data/hicolor/scalable/apps/umbraedit.svg
diff --git a/setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg b/setup/data/hicolor/scalable/mimetypes/application-x-umbraedit-project.svg
similarity index 100%
rename from setup/data/hicolor/scalable/mimetypes/application-x-novelwriter-project.svg
rename to setup/data/hicolor/scalable/mimetypes/application-x-umbraedit-project.svg
diff --git a/setup/data/novelwriter.desktop b/setup/data/umbraedit.desktop
similarity index 100%
rename from setup/data/novelwriter.desktop
rename to setup/data/umbraedit.desktop
diff --git a/setup/data/novelwriter.png b/setup/data/umbraedit.png
similarity index 100%
rename from setup/data/novelwriter.png
rename to setup/data/umbraedit.png
diff --git a/setup/flatpak/io.umbraedit.umbraedit.yml b/setup/flatpak/io.umbraedit.umbraedit.yml
new file mode 100644
index 000000000..cfc1eecf3
--- /dev/null
+++ b/setup/flatpak/io.umbraedit.umbraedit.yml
@@ -0,0 +1,81 @@
+app-id: io.umbraedit.umbraedit
+runtime: org.kde.Platform
+runtime-version: "@QT_VERSION@"
+sdk: org.kde.Sdk
+base: com.riverbankcomputing.PyQt.BaseApp
+base-version: "@QT_VERSION@"
+cleanup-commands:
+  - /app/cleanup-BaseApp.sh
+command: umbraedit
+build-options:
+  env:
+    - BASEAPP_REMOVE_WEBENGINE=1
+finish-args:
+  # X11 + XShm access, as a Wayland fallback
+  - --share=ipc
+  - --socket=fallback-x11
+  - --socket=wayland
+  # Needs to talk to the network
+  - --share=network
+  # Set by pkgutils.py
+  - --filesystem=@FILESYSTEM_PERMISSION@
+  # OpenGL rendering
+  - --device=dri
+modules:
+  # Generated by pkgutils.py
+  - pypi-deps.json
+  - enchant.json
+
+  - name: UmbraEdit
+    buildsystem: simple
+    build-commands:
+      # Set by pkgutils.py, must run before the wheel is built
+      - install -Dm644 -T meta.toml umbraedit/assets/meta.toml
+
+      - python3 -m build --wheel --no-isolation
+      - python3 -m installer --prefix=${FLATPAK_DEST} dist/*.whl
+
+      # XDG Files
+      - install -Dm644 setup/data/umbraedit.desktop -T ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
+      - sed -i "s/Icon=umbraedit/Icon=${FLATPAK_ID}/" ${FLATPAK_DEST}/share/applications/${FLATPAK_ID}.desktop
+      - for size in 16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512; do
+        install -Dm644 -T setup/data/hicolor/$size/apps/umbraedit.png ${FLATPAK_DEST}/share/icons/hicolor/$size/apps/${FLATPAK_ID}.png;
+        install -Dm644 -T setup/data/hicolor/$size/mimetypes/application-x-umbraedit-project.png ${FLATPAK_DEST}/share/icons/hicolor/$size/mimetypes/application-x-umbraedit-project.png;
+        done
+      - install -Dm644 -T setup/data/hicolor/scalable/apps/umbraedit.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/${FLATPAK_ID}.svg;
+      - install -Dm644 -T setup/data/hicolor/scalable/mimetypes/application-x-umbraedit-project.svg ${FLATPAK_DEST}/share/icons/hicolor/scalable/mimetypes/application-x-umbraedit-project.svg;
+      - install -Dm644 -T umbraedit.appdata.xml ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - sed -i "s/umbraedit.desktop/${FLATPAK_ID}.desktop/" ${FLATPAK_DEST}/share/metainfo/${FLATPAK_ID}.metainfo.xml
+
+      # License Files
+      - install -Dm644 -T LICENSE.md ${FLATPAK_DEST}/share/licenses/${FLATPAK_ID}/LICENSE.md
+      - install -Dm644 -T setup/LICENSE-Apache-2.0.txt ${FLATPAK_DEST}/share/licenses/${FLATPAK_ID}/LICENSE-Apache-2.0.txt
+    sources:
+      - type: file
+        path: ../pyproject.toml
+
+      - type: file
+        path: ../LICENSE.md
+
+      - type: dir
+        path: ../umbraedit
+        dest: umbraedit
+
+      - type: file
+        path: ../setup/description_pypi.md
+        dest: setup
+
+      - type: file
+        path: ../setup/LICENSE-Apache-2.0.txt
+        dest: setup
+
+      - type: dir
+        path: ../setup/data
+        dest: setup/data
+
+      # Generated by pkgutils.py
+      - type: file
+        path: umbraedit.appdata.xml
+
+      - type: file
+        path: meta.toml
diff --git a/setup/icons/novelwriter.ico b/setup/icons/umbraedit.ico
similarity index 100%
rename from setup/icons/novelwriter.ico
rename to setup/icons/umbraedit.ico
diff --git a/setup/icons/novelwriter.png b/setup/icons/umbraedit.png
similarity index 100%
rename from setup/icons/novelwriter.png
rename to setup/icons/umbraedit.png
diff --git a/setup/icons/novelwriter.svg b/setup/icons/umbraedit.svg
similarity index 100%
rename from setup/icons/novelwriter.svg
rename to setup/icons/umbraedit.svg
diff --git a/setup/icons/x-novelwriter-project.ico b/setup/icons/x-umbraedit-project.ico
similarity index 100%
rename from setup/icons/x-novelwriter-project.ico
rename to setup/icons/x-umbraedit-project.ico
diff --git a/setup/icons/x-novelwriter-project.svg b/setup/icons/x-umbraedit-project.svg
similarity index 100%
rename from setup/icons/x-novelwriter-project.svg
rename to setup/icons/x-umbraedit-project.svg
diff --git a/setup/umbraedit_readme.png b/setup/umbraedit_readme.png
new file mode 100644
index 000000000..a4bd8da48
Binary files /dev/null and b/setup/umbraedit_readme.png differ
diff --git a/setup/umbraedit_text.png b/setup/umbraedit_text.png
new file mode 100644
index 000000000..084ffbf29
Binary files /dev/null and b/setup/umbraedit_text.png differ