diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 2f02d2f5..2ff1fc8e 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -128,21 +128,24 @@ modules:
   # - name: dolphin
   # - name: arduboy
 
-  #- name: freeimage
-  #  no-autogen: true
-  #  build-options:
-  #    #C++17 is not supported
-  #    cxxflags: -std=c++14
-  #  make-args:
-  #  - DESTDIR=/app
-  #  sources:
-  #  - type: archive
-  #    url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip
-  #    sha256: f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd
-  #  - type: shell
-  #    commands:
-  #    - sed -i 's|-o root -g root ||' ./Makefile.gnu
-  #    - sed -i 's|/usr|/app|' ./Makefile.gnu
+  # Needed for building EmulationStation
+  - name: freeimage
+    no-autogen: true
+    post-install:
+      - ls -ln /app
+    build-options:
+      #C++17 is not supported
+      cxxflags: -std=c++14
+    make-args:
+    - DESTDIR=/app
+    sources:
+    - type: archive
+      url: http://downloads.sourceforge.net/freeimage/FreeImage3180.zip
+      sha256: f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd
+    - type: shell
+      commands:
+      - sed -i 's|-o root -g root ||' ./Makefile.gnu
+      - sed -i 's|/usr|/app|' ./Makefile.gnu
 
   #- name: 351elec-emulationstation
   #  buildsystem: simple
@@ -152,7 +155,7 @@ modules:
   #    - cd /app/emulationstation
   #    - cmake -DENABLE_EMUELEC=1 -DGLES2=0 -DDISABLE_KODI=1 -DENABLE_FILEMANAGER=0 -DCEC=0 -DRG552=1
   #    - make -j$(nproc)
-  #    - ln -s emulationstation /app/usr/bin/emulationstation
+  #    - ln -s emulationstation /app/bin/emulationstation
   ##   make-args:
   ##     - -DENABLE_EMUELEC=1
   ##     - -DGLES2=0
@@ -224,17 +227,36 @@ modules:
   #    #  path: libc.so.6
   #    #- type: file
   #    #  path: libcurl.so.4
-  
-  - name: emulationstation-de
+
+  - name: 351elec-emulationstation
     buildsystem: simple
     build-commands:
-      - unappimage download
-      - rsync -avr --ignore-existing --remove-source-files ./squashfs-root/usr/ /app/
-      - ln -s /app/share/emulationstation /app/emulationstation
+      #- install -Dm755 Splash.h -t /app/emulationstation/es-core/src/
+      #- install -Dm755 GuiMenu.cpp -t /app/emulationstation/es-app/src/guis/
+      - ls -ln
+      - cmake . -DDISABLE_KODI=1
+      - make
+      - ln -s emulationstation /app/bin/emulationstation
+  #   cleanup: ['*']
     sources:
-      - type: file
-        url: https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/32296532/download
-        sha256: 1fd3e437539d54e90d0a17b4577a8c91a1987943470fcfbf3badba99d8dac879
+      - type: git
+        url: https://github.com/batocera-linux/batocera-emulationstation.git
+        branch: 779548e217311edb15d21a5316033292d2b452fc
+      #- type: file
+      #  path: patches/Splash.h
+      #- type: file
+      #  path: patches/GuiMenu.cpp
+  
+  #- name: emulationstation-de
+  #  buildsystem: simple
+  #  build-commands:
+  #    - unappimage download
+  #    - rsync -avr --ignore-existing --remove-source-files ./squashfs-root/usr/ /app/
+  #    - ln -s /app/share/emulationstation /app/emulationstation
+  #  sources:
+  #    - type: file
+  #      url: https://gitlab.com/leonstyhre/emulationstation-de/-/package_files/32296532/download
+  #      sha256: 1fd3e437539d54e90d0a17b4577a8c91a1987943470fcfbf3badba99d8dac879
 
   - name: art-book-next
     buildsystem: simple