diff --git a/com.xargon.retrodeck.yml b/com.xargon.retrodeck.yml
index 7b22be00..026a3987 100644
--- a/com.xargon.retrodeck.yml
+++ b/com.xargon.retrodeck.yml
@@ -496,8 +496,10 @@ modules:
         - rm -f /app/share/emulationstation/resources/graphics/splash.svg
         - cp splash.svg /app/share/emulationstation/resources/graphics/splash.svg
 
-        #- find / -iname es_settings.xml #debug
-        #- BREAK #debug
+        # Tools
+        - mkdir -p ${FLATPAK_DEST}/retrodeck/tools/
+        - cp start-retroarch.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
@@ -518,6 +520,10 @@ modules:
         path: retrodeck.sh
       - type: file
         path: retrodeck-retroarch.cfg
+      - type: file
+        path: tools-gamelist.xml
       - type: file
         path: res/splash.svg
+      - type: dir
+        path: tools
     # create desktop entry
\ No newline at end of file
diff --git a/es_settings.xml b/es_settings.xml
index 376b7395..faee5d05 100644
--- a/es_settings.xml
+++ b/es_settings.xml
@@ -92,7 +92,7 @@
 <int name="SoundVolumeNavigation" value="70" />
 <int name="SoundVolumeVideos" value="80" />
 <string name="ApplicationVersion" value="1.2.0" />
-<string name="CollectionSystemsAuto" value="" />
+<string name="CollectionSystemsAuto" value="all" />
 <string name="CollectionSystemsCustom" value="" />
 <string name="DefaultSortOrder" value="filename, ascending" />
 <string name="ExitButtonCombo" value="F4" />
@@ -103,7 +103,7 @@
 <string name="MenuOpeningEffect" value="scale-up" />
 <string name="MiximageBoxSize" value="medium" />
 <string name="MiximagePhysicalMediaSize" value="medium" />
-<string name="MiximageResolution" value="1280x960" />
+<string name="MiximageResolution" value="1280x800" />
 <string name="MiximageScreenshotScaling" value="sharp" />
 <string name="ROMDirectory" value="~/roms" />
 <string name="SaveGamelistsMode" value="always" />
diff --git a/es_systems.xml b/es_systems.xml
index 94b0abf9..8b1f0026 100644
--- a/es_systems.xml
+++ b/es_systems.xml
@@ -1418,4 +1418,13 @@
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>
+    <system>
+        <name>tools</name>
+        <fullname>RetroDECK Tools</fullname>
+        <path>%ROMPATH%/../tools/</path>
+        <extension>.sh .SH</extension>
+        <command>./%ROM%</command>
+        <platform>tools</platform>
+        <theme>tools</theme>
+    </system>
 </systemList>
\ No newline at end of file
diff --git a/retrodeck.sh b/retrodeck.sh
index 33a6fc4d..5255ba83 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -7,13 +7,20 @@ then
     mkdir -p ~/retrodeck/saves
     mkdir -p ~/retrodeck/states
     mkdir -p ~/retrodeck/screenshots
+    mkdir -p ~/retrodeck/tools
     mkdir -p /var/config/retroarch/system
+    
     ln -s ~/.var/app/com.xargon.retrodeck/config/retroarch/system/ ~/retrodeck/bios
     rm -rf ~/retrodeck/.emulationstation/es_settings.xml
     rm -rf ~/retrodeck/.emulationstation/es_input.xml
     cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_settings.xml
     cp /app/retrodeck/es_settings.xml ~/retrodeck/.emulationstation/es_input.xml
     cp /app/retrodeck/retrodeck-retroarch.cfg /var/config/retroarch/retroarch.cfg
+    cp -r /app/retrodeck/tools/* ~/retrodeck/tools/
+
+    mkdir -p ~/retrodeck/.emulationstation/gamelists/tools/
+    cp /app/retrodeck/tools-gamelist.xml ~/retrodeck/.emulationstation/gamelists/tools/gamelist.xml
+    
     touch ~/retrodeck/.lock
 fi
 
diff --git a/tools-gamelist.xml b/tools-gamelist.xml
new file mode 100644
index 00000000..eda35c81
--- /dev/null
+++ b/tools-gamelist.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<gameList>
+	<game>
+		<path>./start-retroarch.sh</path>
+		<name>Start RetroArch</name>
+		<sortname>RetroArch</sortname>
+		<desc>RetroArch is a frontend for emulators, game engines and media players.
+
+It enables you to run classic games on a wide range of computers and consoles through its slick graphical interface. Settings are also unified so configuration is done once and for all.
+
+In addition to this, you are able to run original game discs (CDs) from RetroArch.
+
+RetroArch has advanced features like shaders, netplay, rewinding, next-frame response times, runahead, machine translation, blind accessibility features, and more!</desc>
+		<releasedate>19990101T000000</releasedate>
+		<developer>Libretro</developer>
+		<publisher>Libretro</publisher>
+		<genre>Emulator</genre>
+		<nogamecount>true</nogamecount>
+		<nomultiscrape>true</nomultiscrape>
+	</game>
+</gameList>
diff --git a/tools/start-retroarch.sh b/tools/start-retroarch.sh
new file mode 100644
index 00000000..df2f7a9a
--- /dev/null
+++ b/tools/start-retroarch.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+retroarch
\ No newline at end of file