diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 7d69b0f5..936271f3 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -1863,7 +1863,7 @@
         <platform>zxspectrum</platform>
         <theme>zxspectrum</theme>
     </system>
-    <system>
+    <!-- <system>
         <name>tools</name>
         <fullname>RetroDECK Tools</fullname>
         <path>/app/tools</path>
@@ -1871,5 +1871,5 @@
         <command>bash %ROM%</command>
         <platform>tools</platform>
         <theme>tools</theme>
-    </system>
-</systemList>
\ No newline at end of file
+    </system> -->
+</systemList>
diff --git a/functions.sh b/functions.sh
index ac037314..99b6f82e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -1802,7 +1802,7 @@ install_retrodeck_controller_profile() {
   # NOTE: These files need to be stored in shared locations for Steam, outside of the normal RetroDECK folders and should always be an optional user choice
   # USAGE: install_retrodeck_controller_profile
   rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/"
-  cp -f "$emuconfigs/retrodeck/defaults/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
+  cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf"
 }
 
 create_lock() {
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 24f89cad..705ee651 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1104,7 +1104,7 @@ modules:
       - mkdir -p /app/tools
       - cp tools/configurator.sh /app/tools/configurator.sh
       - chmod +x /app/tools/configurator.sh
-      - cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml
+      #- cp es-configs/tools-gamelist.xml /app/retrodeck/tools-gamelist.xml
       - cp tools/retrodeck_function_wrapper.sh /app/tools/retrodeck_function_wrapper.sh
       - chmod +x /app/tools/retrodeck_function_wrapper.sh
 
@@ -1137,4 +1137,4 @@ modules:
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git
-        branch: cooker-0.7.0b
\ No newline at end of file
+        branch: cooker-0.7.0b
diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules
index a337dd0c..a2441b96 160000
--- a/rd-submodules/shared-modules
+++ b/rd-submodules/shared-modules
@@ -1 +1 @@
-Subproject commit a337dd0c6b7209a316dc6fa142323972e128c85d
+Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42