diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 47b6e5f4..5d142507 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -8,6 +8,9 @@ base-version: 5.15-21.08
 # /Needed for Yuzu
 command: retrodeck.sh
 
+# WORKING ON RetroDECK branch:
+# 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
+
 finish-args:
    - --socket=x11
    - --socket=wayland
@@ -203,6 +206,9 @@ modules:
     make-args:
       - GLOBAL_CONFIG_DIR=${FLATPAK_DEST}/etc
     sources:
+      - type: git
+        url: https://github.com/XargonWan/RetroDECK.git
+        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/libretro/RetroArch.git
         branch: de4e56ecf28a09057734f8624af6d62f3088734f
@@ -478,6 +484,9 @@ modules:
         sed 's/yuzu/org.yuzu_emu.yuzu/g' -i
         /app/share/mime/packages/org.yuzu_emu.yuzu.xml
     sources:
+      - type: git
+        url: https://github.com/XargonWan/RetroDECK.git
+        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/yuzu-emu/yuzu-mainline.git
         tag: mainline-0-969
@@ -618,6 +627,9 @@ modules:
         install -Dm644 ../net.pcsx2.PCSX2.metainfo.xml
         /app/share/metainfo/net.pcsx2.PCSX2.metainfo.xml
     sources:
+      - type: git
+        url: https://github.com/XargonWan/RetroDECK.git
+        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
       - type: git
         url: https://github.com/PCSX2/pcsx2.git
         tag: v1.7.2554
@@ -660,14 +672,19 @@ modules:
 
         # Logo, res
         - rm -f /app/share/emulationstation/resources/graphics/splash.svg
-        - cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
-        - cp icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
+        #- cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+        - cp res/splash.svg /app/share/emulationstation/resources/graphics/splash.svg
+        #- cp icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
+        - cp res/icon.svg /app/share/icons/hicolor/scalable/apps/com.xargon.retrodeck.svg
 
         # Tools
         - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
-        - cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
-        - cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
+        #- cp start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
+        #- cp move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
+        - cp tools/start-retroarch.sh ${FLATPAK_DEST}/retrodeck/tools/
+        - cp tools/move-roms.sh ${FLATPAK_DEST}/retrodeck/tools/
         - cp tools-gamelist.xml ${FLATPAK_DEST}/retrodeck/
+
         
         - cp retrodeck.sh /app/bin/retrodeck.sh
         - chmod +x /app/bin/retrodeck.sh
@@ -677,21 +694,24 @@ modules:
 
     #cleanup: ['*']
     sources:
-      - type: file
-        path: es_find_rules.xml
-      - type: file
-        path: es_settings.xml
-      - type: file
-        path: es_systems.xml
-      - type: file
-        path: retrodeck.sh
-      - type: file
-        path: retrodeck-retroarch.cfg
-      - type: file
-        path: tools-gamelist.xml
-      - type: dir
-        path: res
-      - type: dir
-        path: tools
-      - type: file
-        path: desktop_entry
\ No newline at end of file
+      - type: git
+        url: https://github.com/XargonWan/RetroDECK.git
+        branch: 9d8b5ad985c5b29980810fdf05e1a534d2070ce2
+      #- type: file
+      #  path: es_find_rules.xml
+      #- type: file
+      #  path: es_settings.xml
+      #- type: file
+      #  path: es_systems.xml
+      #- type: file
+      #  path: retrodeck.sh
+      #- type: file
+      #  path: retrodeck-retroarch.cfg
+      #- type: file
+      #  path: tools-gamelist.xml
+      #- type: dir
+      #  path: res
+      #- type: dir
+      #  path: tools
+      #- type: file
+      #  path: desktop_entry
\ No newline at end of file