diff --git a/apply_extra.sh b/apply_extra.sh
new file mode 100644
index 0000000..3b1bf71
--- /dev/null
+++ b/apply_extra.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+FLATPAK_ID=gg.guilded.Guilded
+
+mkdir -p export/share deb-package
+
+ar p Guilded-Linux.deb data.tar.xz | tar -xJf - -C deb-package
+
+mv deb-package/opt/Guilded guilded
+mv deb-package/usr/share/{icons,applications} export/share/
+
+rename "guilded" "${FLATPAK_ID}" export/share/{icons/hicolor/*/apps,applications}/guilded.*
+desktop-file-edit --set-key="Exec" --set-value="guilded %U" \
+	--set-key="Icon" --set-value="${FLATPAK_ID}" \
+	--set-key="X-Flatpak-RenamedFrom" --set-value="guilded.desktop;" \
+	"export/share/applications/${FLATPAK_ID}.desktop"
+
+sed -i 's|Icon=guilded|Icon=${FLATPAK_ID}|' export/share/applications/${FLATPAK_ID}.desktop
+sed -i 's|Exec=/opt/Guilded/guilded|Exec=guilded|' export/share/applications/${FLATPAK_ID}.desktop
+
+rm -r Guilded-Linux.deb deb-package
diff --git a/gg.guilded.Guilded.yml b/gg.guilded.Guilded.yml
index 71675e2..430c09e 100644
--- a/gg.guilded.Guilded.yml
+++ b/gg.guilded.Guilded.yml
@@ -28,24 +28,20 @@ modules:
   - name: guilded
     buildsystem: simple
     build-commands:
-      - ar x Guilded-Linux.deb data.tar.xz
-      - tar -xf data.tar.xz
-      - mv opt/Guilded /app/guilded
-      - sed -i 's|Icon=guilded|Icon=gg.guilded.Guilded|' usr/share/applications/guilded.desktop
-      - sed -i 's|Exec=/opt/Guilded/guilded|Exec=guilded|' usr/share/applications/guilded.desktop
-      - install -Dm644 usr/share/applications/guilded.desktop /app/share/applications/gg.guilded.Guilded.desktop
-      - install -Dm644 usr/share/icons/hicolor/16x16/apps/guilded.png /app/share/icons/hicolor/16x16/apps/gg.guilded.Guilded.png
-      - install -Dm644 usr/share/icons/hicolor/32x32/apps/guilded.png /app/share/icons/hicolor/32x32/apps/gg.guilded.Guilded.png
-      - install -Dm644 usr/share/icons/hicolor/48x48/apps/guilded.png /app/share/icons/hicolor/48x48/apps/gg.guilded.Guilded.png
-      - install -Dm644 usr/share/icons/hicolor/128x128/apps/guilded.png /app/share/icons/hicolor/128x128/apps/gg.guilded.Guilded.png
-      - install -Dm644 usr/share/icons/hicolor/256x256/apps/guilded.png /app/share/icons/hicolor/256x256/apps/gg.guilded.Guilded.png
-      - install -Dm644 usr/share/icons/hicolor/512x512/apps/guilded.png /app/share/icons/hicolor/512x512/apps/gg.guilded.Guilded.png
       - install -Dm644 gg.guilded.Guilded.appdata.xml /app/share/appdata/gg.guilded.Guilded.appdata.xml
       - install -Dm755 guilded.sh /app/bin/guilded
+      - install -Dm755 apply_extra.sh /app/bin/apply_extra
+      - install -Dm755 /usr/bin/ar -t /app/bin/
+      - install -Dm755 /usr/lib/$(gcc -print-multiarch)/libbfd-*.so -t /app/lib/
+      - install -Dm755 /usr/bin/desktop-file-edit -t /app/bin/
     sources:
-      - type: file
+      - type: extra-data
+        filename: Guilded-Linux.deb
         url: https://www.guilded.gg/downloads/Guilded-Linux.deb
         sha256: f9c64bae1ae6a478c42a87240e3734c82659f9f2a6a360f5f07769f0346040f7
+        size: 66776582
+      - type: file
+        path: apply_extra.sh
       - type: file
         path: guilded.sh
       - type: file
diff --git a/guilded.sh b/guilded.sh
index 5754ee6..0dbe5f0 100644
--- a/guilded.sh
+++ b/guilded.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-env TMPDIR=$XDG_CACHE_HOME zypak-wrapper /app/guilded/guilded "$@"
+env TMPDIR=$XDG_CACHE_HOME zypak-wrapper /app/extra/guilded/guilded "$@"