diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index 2bcac447..1b955846 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -8,7 +8,8 @@ hash^MSXBIOSHASHPLACEHOLDER^http://bluemsx.msxblue.com/rel_download/blueMSXv282f
 hash^XEMUHDDHASHPLACEHOLDER^https://github.com/mborgerson/xemu-hdd-image/releases/latest/download/xbox_hdd.qcow2.zip
 hash^VITA3KSHAPLACEHOLDER^https://github.com/Vita3K/Vita3K/releases/download/continuous/ubuntu-latest.zip
 hash^RANIGHTLYCORESPLACEHOLDER^https://buildbot.libretro.com/nightly/linux/x86_64/RetroArch_cores.7z
-#hash^RETRODECKMAMEPLACEHOLDER^
+hash^RETRODECKMAMEPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
+url^RETRODECKMAMEURLPLACEHOLDER^"https://github.com/XargonWan/RetroDECK-MAME/releases/download/$(curl -s https://api.github.com/repos/XargonWan/RetroDECK-MAME/releases/latest | grep -oP '"tag_name": "\K(.*?)(?=")')/RetroDECK-MAME-Artifact.tar.gz"
 latestcommit^UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER^https://github.com/Venomalia/UniversalDynamicInput^main
-outside_info^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
+outside_file^VERSIONPLACEHOLDER^${GITHUB_WORKSPACE}/buildid
 branch^THISBRANCH
diff --git a/automation_tools/pre_build_automation.sh b/automation_tools/pre_build_automation.sh
index 0c47f854..bcca05c4 100755
--- a/automation_tools/pre_build_automation.sh
+++ b/automation_tools/pre_build_automation.sh
@@ -3,15 +3,21 @@
 # For the file paths to work correctly, call this script with this command from the cloned repo folder root:
 # sh automation_tools/pre_build_automation.sh
 # Different actions need different information in the task list file
+# branch: This changes the placeholder text to the currently-detected GIT branch if an automated build was started from a PR environment.
 # hash: Finds the SHA256 hash of a file online and updates the placeholder in the manifest. 
 #     Needs the URL of the file, in this line format: hash^PLACEHOLDERTEXT^url
 # latestcommit: Finds the most recent commit of a git repo and updated the placeholder in the manifest.
 #     Needs the URL of the repo and the branch to find the latest commit from, in this line format: latestcommit^PLACEHOLDERTEXT^url^branch
-# latestappimage: Finds the download URL and SHA256 hash of the latest AppImage release from a git repo
+# latestappimage: Finds the download URL and SHA256 hash of the latest AppImage release from a git repo.
 #     Needs the API URL of the repo, in this line format: latestappimage^PLACEHOLDERTEXT^https://api.github.com/repos/<owner-name>/<repo-name>/releases/latest
 #     As this command updates two different placeholders (one for the URL, one for the file hash) in the manifest, 
 #     the URL that would be used in the above example is "PLACEHOLDERTEXT" and the hash placeholder text would be "HASHPLACEHOLDERTEXT"
 #     The "HASH" prefix of the placeholder text is hardcoded in the script
+# outside_file: Prints the contents of a file from the build environment (such as the buildid file) and replaces the placeholder text with those contents.
+# outside_env_var: Gets the value of an environmental variable from the build environment (the output of "echo $var" from the terminal) and replaces the placeholder text with that value.
+# custom_command: Runs a single command explicitly as written in the $URL field of the task list, including variable and command expansion. This should work the same as if you were runnig the command directly from the terminal.
+#     This command does not need a PLACEHOLDERTEXT field in the task list, so needs to be in this syntax: custom_command^^$COMMAND
+# url: This is used to calculate a dynamic URL and the value to the $caluculated_url environmental variable, for use in other subsequent commands.
 
 rd_manifest=${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml
 automation_task_list=${GITHUB_WORKSPACE}/automation_tools/automation_task_list.cfg
@@ -35,21 +41,28 @@ echo
 while IFS="^" read -r action placeholder url branch
 do
   if [[ ! $action == "#"* ]] && [[ ! -z "$action" ]]; then
-    if [[ "$action" == "branch" ]]; then
+    case "$action" in
+
+    "branch" )
       echo
       echo "Placeholder text: $placeholder"
       echo "Current branch:" "$current_branch"
       echo
       /bin/sed -i 's^'"$placeholder"'^'"$current_branch"'^g' $rd_manifest
-    elif [[ "$action" == "hash" ]]; then
+    ;;
+
+    "hash" )
       echo
       echo "Placeholder text: $placeholder"
-      echo "URL to hash: $url"
+      calculated_url=$(eval echo "$url")  # in case the url has to be calculated from an expression
+      echo "URL to hash: $calculated_url"
       echo
-      hash=$(curl -sL "$url" | sha256sum | cut -d ' ' -f1)
+      hash=$(curl -sL "$calculated_url" | sha256sum | cut -d ' ' -f1)
       echo "Hash found: $hash"
       /bin/sed -i 's^'"$placeholder"'^'"$hash"'^' $rd_manifest
-    elif [[ "$action" == "latestcommit" ]]; then
+    ;;
+
+    "latestcommit" )
       echo
       echo "Placeholder text: $placeholder"
       echo "Repo to get latest commit from: $url branch: $branch"
@@ -57,7 +70,9 @@ do
       commit=$(git ls-remote "$url" "$branch" | cut -f1)
       echo "Commit found: $commit"
       /bin/sed -i 's^'"$placeholder"'^'"$commit"'^' $rd_manifest
-    elif [[ "$action" == "latestappimage" ]]; then
+    ;;
+
+    "latestappimage" )
       echo
       echo "Placeholder text: $placeholder"
       echo "Repo to look for AppImage releases: $url"
@@ -68,7 +83,9 @@ do
       appimagehash=$(curl -sL "$appimageurl" | sha256sum | cut -d ' ' -f1)
       echo "AppImage hash found: $appimagehash"
       /bin/sed -i 's^'"HASHFOR$placeholder"'^'"$appimagehash"'^' $rd_manifest
-    elif [[ "$action" == "outside_info" ]]; then
+    ;;
+
+    "outside_file" )
       if [[ "$url" = \$* ]]; then # If value is a reference to a variable name
         eval url="$url"
       fi
@@ -77,6 +94,36 @@ do
       echo "Information being injected: $(cat $url)"
       echo
       /bin/sed -i 's^'"$placeholder"'^'"$(cat $url)"'^' $rd_manifest
-    fi
+    ;;
+
+    "outside_env_var" )
+      if [[ "$url" = \$* ]]; then # If value is a reference to a variable name
+        eval url="$url"
+      fi
+      echo
+      echo "Placeholder text: $placeholder"
+      echo "Information being injected: $(echo $url)"
+      echo
+      /bin/sed -i 's^'"$placeholder"'^'"$(echo $url)"'^' $rd_manifest
+    ;;
+
+    "custom_command" )
+      echo
+      echo "Command to run: $url"
+      echo
+      eval "$url"
+    ;;
+
+    "url" )
+      # this is used to calculate a dynamic url
+      echo
+      echo "Placeholder text: $placeholder"
+      calculated_url=$(eval echo "$url")
+      echo "Information being injected: $calculated_url"
+      echo
+      /bin/sed -i 's^'"$placeholder"'^'"$calculated_url"'^' $rd_manifest
+    ;;
+
+    esac
   fi
 done < "$automation_task_list"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf
index 179f9d11..222021ab 100755
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic_standard.vdf
@@ -1,7 +1,7 @@
 "controller_mappings"
 {
 	"version"		"3"
-	"revision"		"158"
+	"revision"		"160"
 	"title"		"RetroDECK: Generic - Standard v.1b"
 	"description"		"RetroDECK: Generic - Standard - v.1b"
 	"creator"		""
@@ -12,9 +12,9 @@
 	"controller_caps"		"1573887"
 	"major_revision"		"0"
 	"minor_revision"		"0"
-	"Timestamp"		"-1035996608"
+	"Timestamp"		"-926565536"
 	"actions"
-		{
+	{
 		"Default"
 		{
 			"title"		"RetroDECK - Set"
@@ -911,7 +911,7 @@
 	}
 	"group"
 	{
-		"id"		"19"
+		"id"		"45"
 		"mode"		"radial_menu"
 		"name"		"Global Radial"
 		"description"		""
@@ -925,7 +925,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -985,7 +985,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1005,7 +1005,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1025,7 +1025,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1045,7 +1045,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1058,6 +1058,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1078,7 +1239,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1086,8 +1247,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1099,7 +1260,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1107,8 +1268,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1120,28 +1281,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1162,7 +1302,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf
index aefdfe0f..127f592f 100755
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3_dualshock3.vdf
@@ -1131,7 +1131,7 @@
 		}
 	}
 	"group"
-		{
+	{
 		"id"		"19"
 		"mode"		"radial_menu"
 		"name"		"Global Radial"
@@ -1146,7 +1146,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1206,7 +1206,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1226,7 +1226,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1246,7 +1246,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1266,7 +1266,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1279,6 +1279,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1299,7 +1460,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1307,8 +1468,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1320,7 +1481,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1328,8 +1489,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1341,28 +1502,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1383,7 +1523,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf
old mode 100755
new mode 100644
index 4b9374c7..519bab83
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf
@@ -2,17 +2,17 @@
 {
 	"version"		"3"
 	"revision"		"81"
-	"title"		"RetroDECK: DualShock 4"
+	"title"		"RetroDECK: DualShock 4 v.1b"
 	"description"		"RetroDECK: PS4 - DualShock 4 - v.1b"
 	"creator"		""
 	"progenitor"		""
-	"url"		"workshop://3115335528"
+	"url"		""
 	"export_type"		""
 	"controller_type"		"controller_ps4"
-	"controller_caps"		"35085311"
+	"controller_caps"		""
 	"major_revision"		"0"
 	"minor_revision"		"0"
-	"Timestamp"		"-954028624"
+	"Timestamp"		"1079447734"
 	"actions"
 	{
 		"Default"
@@ -514,7 +514,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"xinput_button SELECT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 					}
 				}
@@ -1134,6 +1134,543 @@
 		}
 	}
 	"group"
+	{
+		"id"		"37"
+		"mode"		"radial_menu"
+		"name"		"Global Radial"
+		"description"		""
+		"inputs"
+		{
+			"touch_menu_button_0"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_1"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, RD-ESC.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_2"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, RD-Enter.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_3"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_4"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_5"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press SPACE, Space, RD-space.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_6"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Wii Sync Button, RD-notification-network-wireless.png, "
+							"binding"		"key_press W, Wii Sync Button, RD-notification-network-wireless.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_16"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_17"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, "
+							"binding"		"key_press W, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_18"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Disc, RD-application-x-iso.png, "
+							"binding"		"key_press D, Swap Disc, RD-application-x-iso.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"touchmenu_button_fire_type"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"38"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, Right Click, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"0"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
+	{
+		"id"		"39"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, Middle Click, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"0"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"41"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"42"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"43"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
 	{
 		"id"		"7"
 		"mode"		"switches"
@@ -1371,8 +1908,8 @@
 			"7"		"switch active"
 			"0"		"button_diamond active"
 			"1"		"left_trackpad inactive"
-			"11"		"left_trackpad inactive"
-			"15"		"left_trackpad active"
+			"11"		"left_trackpad active"
+			"15"		"left_trackpad inactive"
 			"2"		"right_trackpad inactive"
 			"6"		"right_trackpad inactive"
 			"10"		"right_trackpad inactive"
@@ -1382,7 +1919,9 @@
 			"5"		"right_trigger active"
 			"8"		"right_joystick active"
 			"9"		"dpad active"
-			"35"		"center_trackpad active"
+			"35"		"center_trackpad inactive"
+			"43"		"center_trackpad inactive"
+			"41"		"gyro active"
 		}
 	}
 	"preset"
@@ -1393,16 +1932,20 @@
 		{
 			"18"		"switch active"
 			"19"		"button_diamond active"
-			"20"		"left_trackpad active"
+			"20"		"left_trackpad inactive"
+			"38"		"left_trackpad active"
 			"21"		"right_trackpad active"
 			"22"		"joystick inactive"
-			"30"		"joystick active"
+			"30"		"joystick inactive"
+			"37"		"joystick active"
 			"23"		"left_trigger active"
 			"24"		"right_trigger active"
 			"25"		"right_joystick inactive"
 			"29"		"right_joystick active"
 			"26"		"dpad active"
-			"33"		"center_trackpad active"
+			"33"		"center_trackpad inactive"
+			"39"		"center_trackpad inactive"
+			"42"		"gyro active"
 		}
 	}
 	"settings"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf
old mode 100755
new mode 100644
index eecebd74..2f3c6466
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf
@@ -1,18 +1,18 @@
 "controller_mappings"
 {
 	"version"		"3"
-	"revision"		"91"
+	"revision"		"114"
 	"title"		"RetroDECK: DualSense v.1b"
-	"description"		"RetroDECK: PS5 - DualSense v.1b"
+	"description"		"RetroDECK: PS5 - DualSense v.1"
 	"creator"		""
 	"progenitor"		""
-	"url"		""
+	"url"		"f"
 	"export_type"		""
 	"controller_type"		"controller_ps5"
 	"controller_caps"		"35148799"
 	"major_revision"		"0"
 	"minor_revision"		"0"
-	"Timestamp"		"-906587536"
+	"Timestamp"		"-1043740912"
 	"actions"
 	{
 		"Default"
@@ -514,7 +514,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"xinput_button SELECT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 					}
 				}
@@ -1149,7 +1149,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1209,7 +1209,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1229,7 +1229,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1249,7 +1249,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1269,7 +1269,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1282,6 +1282,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1302,7 +1463,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1310,8 +1471,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1323,7 +1484,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1331,8 +1492,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1344,28 +1505,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1386,7 +1526,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
@@ -1434,6 +1574,130 @@
 		}
 	}
 	"group"
+	{
+		"id"		"47"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"0"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"49"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"0"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
+	{
+		"id"		"50"
+		"mode"		"single_button"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"0"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"51"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"52"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
 	{
 		"id"		"7"
 		"mode"		"switches"
@@ -1703,8 +1967,8 @@
 			"7"		"switch active"
 			"0"		"button_diamond active"
 			"1"		"left_trackpad inactive"
-			"11"		"left_trackpad inactive"
-			"26"		"left_trackpad active"
+			"11"		"left_trackpad active"
+			"26"		"left_trackpad inactive"
 			"2"		"right_trackpad inactive"
 			"6"		"right_trackpad inactive"
 			"10"		"right_trackpad inactive"
@@ -1714,7 +1978,9 @@
 			"5"		"right_trigger active"
 			"8"		"right_joystick active"
 			"9"		"dpad active"
-			"41"		"center_trackpad active"
+			"41"		"center_trackpad inactive"
+			"47"		"center_trackpad inactive"
+			"51"		"gyro active"
 		}
 	}
 	"preset"
@@ -1725,7 +1991,8 @@
 		{
 			"29"		"switch active"
 			"30"		"button_diamond active"
-			"31"		"left_trackpad active"
+			"31"		"left_trackpad inactive"
+			"49"		"left_trackpad active"
 			"32"		"right_trackpad active"
 			"33"		"joystick inactive"
 			"42"		"joystick inactive"
@@ -1735,7 +2002,9 @@
 			"36"		"right_joystick inactive"
 			"43"		"right_joystick active"
 			"37"		"dpad active"
-			"40"		"center_trackpad active"
+			"40"		"center_trackpad inactive"
+			"50"		"center_trackpad inactive"
+			"52"		"gyro active"
 		}
 	}
 	"settings"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf
index c712543d..650f049c 100755
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steam_controller_gordon.vdf
@@ -14,7 +14,7 @@
 	"minor_revision"		"0"
 	"Timestamp"		"-596696880"
 	"actions"
-	{
+{
 		"Default"
 		{
 			"title"		"RetroDECK - Set"
@@ -1171,7 +1171,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1231,7 +1231,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1251,7 +1251,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1271,7 +1271,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1291,7 +1291,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1304,6 +1304,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1324,7 +1485,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1332,8 +1493,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1345,7 +1506,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1353,8 +1514,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1366,28 +1527,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1408,7 +1548,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
@@ -1601,7 +1741,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"controller_action CHANGE_PRESET 1 0 0, , "
+							"binding"		"controller_action CHANGE_PRESET 1 0 1, , "
 						}
 					}
 					"Full_Press"
@@ -1707,7 +1847,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"controller_action CHANGE_PRESET 2 0 0, , "
+							"binding"		"controller_action CHANGE_PRESET 2 0 1, , "
 						}
 					}
 				}
@@ -1781,6 +1921,57 @@
 			}
 		}
 	}
+	"group"
+	{
+		"id"		"40"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"41"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"42"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+		"gameactions"
+		{
+		}
+	}
 	"preset"
 	{
 		"id"		"0"
@@ -1798,6 +1989,7 @@
 			"4"		"left_trigger active"
 			"5"		"right_trigger active"
 			"23"		"gyro inactive"
+			"40"		"gyro active"
 		}
 	}
 	"preset"
@@ -1816,6 +2008,7 @@
 			"38"		"joystick active"
 			"15"		"left_trigger active"
 			"16"		"right_trigger active"
+			"41"		"gyro active"
 		}
 	}
 	"preset"
@@ -1832,6 +2025,7 @@
 			"32"		"joystick active"
 			"33"		"left_trigger active"
 			"34"		"right_trigger active"
+			"42"		"gyro active"
 		}
 	}
 	"settings"
@@ -1840,3 +2034,4 @@
 		"right_trackpad_mode"		"0"
 	}
 }
+}
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf
index bbdad3e9..7e3e14ba 100755
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switch_pro.vdf
@@ -14,7 +14,7 @@
 	"minor_revision"		"0"
 	"Timestamp"		"-936017792"
 	"actions"
-		{
+	{
 		"Default"
 		{
 			"title"		"RetroDECK - Set"
@@ -917,7 +917,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -977,7 +977,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -997,7 +997,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1017,7 +1017,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1037,7 +1037,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1050,6 +1050,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1070,7 +1231,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1078,8 +1239,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1091,7 +1252,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1099,8 +1260,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1112,28 +1273,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1154,7 +1294,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
@@ -1456,6 +1596,40 @@
 			}
 		}
 	}
+	"group"
+	{
+		"id"		"24"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+		"gameactions"
+		{
+		}
+	}
+	"group"
+	{
+		"id"		"25"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+		"gameactions"
+		{
+		}
+	}
 	"preset"
 	{
 		"id"		"0"
@@ -1469,6 +1643,7 @@
 			"5"		"right_trigger active"
 			"8"		"right_joystick active"
 			"9"		"dpad active"
+			"24"		"gyro active"
 		}
 	}
 	"preset"
@@ -1487,6 +1662,7 @@
 			"16"		"right_joystick inactive"
 			"20"		"right_joystick active"
 			"17"		"dpad active"
+			"25"		"gyro active"
 		}
 	}
 	"settings"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf
index 6b14cded..2d588454 100644
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf
@@ -1131,7 +1131,7 @@
 		}
 	}
 	"group"
-		{
+	{
 		"id"		"19"
 		"mode"		"radial_menu"
 		"name"		"Global Radial"
@@ -1146,7 +1146,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1206,7 +1206,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1226,7 +1226,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1246,7 +1246,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
 						}
 						"settings"
 						{
@@ -1266,7 +1266,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1279,6 +1279,167 @@
 				}
 			}
 			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1299,7 +1460,7 @@
 				{
 				}
 			}
-			"touch_menu_button_8"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1307,8 +1468,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Dual - Screens, RD-system-switch-user.png, "
-							"binding"		"key_press TAB, Swap Dual - Screens, RD-system-switch-user.png, "
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
 						}
 						"settings"
 						{
@@ -1320,7 +1481,7 @@
 				{
 				}
 			}
-			"touch_menu_button_9"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1328,8 +1489,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
-							"binding"		"key_press L, Change Dual Screen - Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
 						}
 						"settings"
 						{
@@ -1341,28 +1502,7 @@
 				{
 				}
 			}
-			"touch_menu_button_10"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Fullscreen On / Off, RD-zoom-fit-best.png, "
-							"binding"		"key_press RETURN, Fullscreen On / Off, RD-zoom-fit-best.png, "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
-			"touch_menu_button_11"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1383,7 +1523,7 @@
 				{
 				}
 			}
-			"touch_menu_button_12"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf
old mode 100755
new mode 100644
index 70a20a96..692fe9c7
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf
@@ -1,18 +1,18 @@
 "controller_mappings"
 {
 	"version"		"3"
-	"revision"		"93"
-	"title"		"RetroDECK: Official Layout - Xbox One/S/X"
-	"description"		"RetroDECK: Xbox One/S/X"
+	"revision"		"101"
+	"title"		"RetroDECK: Xbox Wireless v.1b"
+	"description"		"RetroDECK: One/S/X - Xbox Wireless v.1b"
 	"creator"		""
 	"progenitor"		""
 	"url"		""
-	"export_type"		""
+	"export_type"		"personal_cloud"
 	"controller_type"		"controller_xboxone"
-	"controller_caps"		"1590271"
+	"controller_caps"		"9978879"
 	"major_revision"		"0"
 	"minor_revision"		"0"
-	"Timestamp"		"-5320"
+	"Timestamp"		"1079645600"
 	"actions"
 	{
 		"Default"
@@ -832,14 +832,6 @@
 			{
 				"activators"
 				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
-							"binding"		"key_press TAB, Swap Screens, , "
-						}
-					}
 				}
 				"disabled_activators"
 				{
@@ -849,13 +841,6 @@
 			{
 				"activators"
 				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press ESCAPE, , "
-						}
-					}
 				}
 				"disabled_activators"
 				{
@@ -865,13 +850,6 @@
 			{
 				"activators"
 				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"key_press RETURN, , "
-						}
-					}
 				}
 				"disabled_activators"
 				{
@@ -881,13 +859,6 @@
 			{
 				"activators"
 				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-					}
 				}
 				"disabled_activators"
 				{
@@ -1224,6 +1195,446 @@
 			}
 		}
 	}
+	"group"
+	{
+		"id"		"20"
+		"mode"		"radial_menu"
+		"name"		"Global Radial"
+		"description"		""
+		"inputs"
+		{
+			"touch_menu_button_0"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_1"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, RD-ESC.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_2"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, RD-Enter.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_3"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press SPACE, Space, RD-space.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_4"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_5"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_6"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_7"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_8"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F1, F1, RD-F1.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_9"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F4, F4, RD-F4.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_10"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F5, F5, RD-F5.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_11"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F12, F12, RD-F12.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Restart / Reset, RD-system-reboot.png, "
+							"binding"		"key_press R, Restart / Reset, RD-system-reboot.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_15"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_ALT, Wii Sync Button, RD-notification-network-wireless.png, "
+							"binding"		"key_press W, Wii Sync Button, RD-notification-network-wireless.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_16"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap - Dual Screens, RD-system-switch-user.png, "
+							"binding"		"key_press TAB, Swap - Dual Screens, RD-system-switch-user.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_17"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+							"binding"		"key_press L, Change - Dual Screen Layout, RD-preferences-system-windows-actions.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_18"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, "
+							"binding"		"key_press W, Widescreen / Aspect Ratio, RD-preferences-desktop-display.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_19"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Disc, RD-application-x-iso.png, "
+							"binding"		"key_press D, Swap Disc, RD-application-x-iso.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"touchmenu_button_fire_type"		"0"
+		}
+	}
 	"preset"
 	{
 		"id"		"0"
@@ -1248,7 +1659,8 @@
 			"10"		"switch active"
 			"11"		"button_diamond active"
 			"12"		"joystick inactive"
-			"19"		"joystick active"
+			"19"		"joystick inactive"
+			"20"		"joystick active"
 			"13"		"left_trigger active"
 			"14"		"right_trigger active"
 			"15"		"right_joystick inactive"
diff --git a/emu-configs/defaults/retrodeck/presets/citra_presets.cfg b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg
index 9211d5c0..05b0d7b0 100644
--- a/emu-configs/defaults/retrodeck/presets/citra_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/citra_presets.cfg
@@ -1,9 +1,7 @@
 config_file_format^citra
-target_file^$citraconf
-defaults_file^$emuconfigs/citra/qt-config.ini
-change^ask_to_exit^confirmClose^true^UI
-change^ask_to_exit^confirmClose\default^true^UI
-change^nintendo_button_layout^profiles\1\button_a^button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls
-change^nintendo_button_layout^profiles\1\button_b^button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls
-change^nintendo_button_layout^profiles\1\button_x^button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls
-change^nintendo_button_layout^profiles\1\button_y^button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls
+change^ask_to_exit^confirmClose^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini
+change^ask_to_exit^confirmClose\default^true^UI^$citraconf^$emuconfigs/citra/qt-config.ini
+change^abxy_button_swap^profiles\1\button_a^button:1,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini
+change^abxy_button_swap^profiles\1\button_b^button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini
+change^abxy_button_swap^profiles\1\button_x^button:3,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini
+change^abxy_button_swap^profiles\1\button_y^button:2,engine:sdl,guid:030079f6de280000ff11000001000000,port:0^Controls^$citraconf^$emuconfigs/citra/qt-config.ini
diff --git a/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg b/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg
index 234012e9..0836e0ca 100644
--- a/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/dolphin_presets.cfg
@@ -1,4 +1,2 @@
 config_file_format^dolphin
-target_file^$dolphinconf
-defaults_file^$emuconfigs/dolphin/Dolphin.ini
-change^ask_to_exit^ConfirmStop^True^Interface
+change^ask_to_exit^ConfirmStop^True^Interface^$dolphinconf^$emuconfigs/dolphin/Dolphin.ini
diff --git a/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg b/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg
index 76c9f926..e4a2e66a 100644
--- a/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/duckstation_presets.cfg
@@ -1,10 +1,8 @@
 config_file_format^duckstation
-target_file^$duckstationconf
-defaults_file^$emuconfigs/duckstation/settings.ini
-change^cheevos^Enabled^true^Cheevos
-change^cheevos^Username^$cheevos_username^Cheevos
-change^cheevos^Token^$cheevos_token^Cheevos
-change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Cheevos
-change^cheevos_hardcore^ChallengeMode^true^Cheevos
-change^savestate_auto_save^SaveStateOnExit^true^Main
-change^ask_to_exit^ConfirmPowerOff^true^Main
+change^cheevos^Enabled^true^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^cheevos^Username^$cheevos_username^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^cheevos^Token^$cheevos_token^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^cheevos_hardcore^ChallengeMode^true^Cheevos^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^savestate_auto_save^SaveStateOnExit^true^Main^$duckstationconf^$emuconfigs/duckstation/settings.ini
+change^ask_to_exit^ConfirmPowerOff^true^Main^$duckstationconf^$emuconfigs/duckstation/settings.ini
diff --git a/emu-configs/defaults/retrodeck/presets/example.txt b/emu-configs/defaults/retrodeck/presets/example.txt
index 53d031a4..3d64330c 100644
--- a/emu-configs/defaults/retrodeck/presets/example.txt
+++ b/emu-configs/defaults/retrodeck/presets/example.txt
@@ -1,9 +1,7 @@
 config_file_format^retroarch # This is the config file format, used in functions like get_setting_value and set_setting_value
-target_file^$examplefile # This is the target file that should be updated. This will be the actively-used config file by whatever emulator is being set up. This can be a variable name as well!
-defaults_file^$emuconfigs/retroarch/retroarch.cfg # This is the file that is referenced when presets are disabled. This should be the "shipped" config file for this emulator
-change^cheevos^Enabled^true^Cheevos # This is a preset configuration line. The syntax is <action>^<preset name (as defined in retrodeck.cfg)>^<setting name>^<setting value when enabled>^<setting section in emulator config file, if there is one>
-change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line
-
+change^cheevos^Enabled^true^Cheevos^$target_file^$defaults_file # This is a preset configuration line. The syntax is <action>^<preset name (as defined in retrodeck.cfg)>^<setting name>^<setting value when enabled>^<setting section in emulator config file, if there is one>^<target file to be changed?^<defaults file for disabling the preset>
+change^borders^overlay_file^/var/config/retroarch/overlays/borders/snes.cfg^^target_file^defaults_file # This is another preset configuration line, for the preset section called "borders" in retrodeck.cfg. Also, there is no defined "setting section" on this line, but there must be an empty field between ^^
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp  # This will remove the ".disabled" suffix from the target file, or add ".disabled" to the suffix of the target file if the preset is being disabled
 
 OTHER NOTES:
 - The name of the presets configuration file for any given system MUST be <system name>_presets.cfg
diff --git a/emu-configs/defaults/retrodeck/presets/gb_presets.cfg b/emu-configs/defaults/retrodeck/presets/gb_presets.cfg
index cc48e4c0..d754c374 100644
--- a/emu-configs/defaults/retrodeck/presets/gb_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/gb_presets.cfg
@@ -1,14 +1,12 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Gambatte/gb.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^aspect_ratio_index^23
-change^borders^custom_viewport_height^576
-change^borders^custom_viewport_width^640
-change^borders^custom_viewport_x^320
-change^borders^custom_viewport_y^20
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gb.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.110000
-change^borders^input_overlay_enable^true
-change^borders^input_overlay_scale_landscape^1.205000
-change^borders^input_overlay_y_offset_landscape^0.005000
-enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gb.rmp
+change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_height^576^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_width^640^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_x^320^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_y^20^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gb.cfg^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_y_offset_landscape^0.005000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gb.rmp
diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg
index 21787a86..b5a4fc03 100644
--- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg
@@ -1,14 +1,12 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/mGBA/gba.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^aspect_ratio_index^23
-change^borders^custom_viewport_height^640
-change^borders^custom_viewport_width^960
-change^borders^custom_viewport_x^160
-change^borders^custom_viewport_y^0
-change^borders^input_overlay_enable^true
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.110000
-change^borders^input_overlay_scale_landscape^1.2150000
-change^borders^input_overlay_y_offset_landscape^0.020000
-enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
+change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_height^640^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_width^960^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_x^160^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_y^0^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.2150000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
diff --git a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg
index cd24b9e7..d6b2e107 100644
--- a/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/gbc_presets.cfg
@@ -1,14 +1,12 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Gambatte/gbc.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^aspect_ratio_index^23
-change^borders^custom_viewport_height^576
-change^borders^custom_viewport_width^640
-change^borders^custom_viewport_x^320
-change^borders^custom_viewport_y^20
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gbc.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.110000
-change^borders^input_overlay_enable^true
-change^borders^input_overlay_scale_landscape^1.205000
-change^borders^input_overlay_y_offset_landscape^-0.040000
-enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
+change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_height^576^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_width^640^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_x^320^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_y^20^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gbc.cfg^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_y_offset_landscape^-0.040000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
diff --git a/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg b/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg
index ef0fbc5b..c566decf 100644
--- a/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/genesis_presets.cfg
@@ -1,8 +1,6 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/genesis.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.100000
-change^borders^input_overlay_enable^true
-change^borders^input_overlay_scale_landscape^1.040000
-change^widescreen^aspect_ratio_index^24
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/genesis.cfg^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.100000^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.040000^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
diff --git a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg
index f6b8529a..2de18ce3 100644
--- a/emu-configs/defaults/retrodeck/presets/gg_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/gg_presets.cfg
@@ -1,13 +1,11 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Genesis Plus GX/gg.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^aspect_ratio_index^23
-change^borders^custom_viewport_width^960
-change^borders^custom_viewport_height^720
-change^borders^custom_viewport_x^160
-change^borders^custom_viewport_y^24
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gg.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.110000
-change^borders^input_overlay_enable^true
-change^borders^input_overlay_scale_landscape^1.350000
-change^borders^input_overlay_y_offset_landscape^0.020000
+change^borders^aspect_ratio_index^23^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_width^960^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_height^720^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_x^160^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^custom_viewport_y^24^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gg.cfg^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.350000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
diff --git a/emu-configs/defaults/retrodeck/presets/n64_presets.cfg b/emu-configs/defaults/retrodeck/presets/n64_presets.cfg
index 542aa841..8a92b041 100644
--- a/emu-configs/defaults/retrodeck/presets/n64_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/n64_presets.cfg
@@ -1,8 +1,6 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/N64.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.145000
-change^borders^input_overlay_enable^true
-change^widescreen^aspect_ratio_index^24
-enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Snes9x/snes.rmp
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/N64.cfg^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.145000^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Mupen64Plus-Next/n64.cfg^$emuconfigs/retroarch/retroarch.cfg
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp
diff --git a/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg b/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg
index ba01d17c..134cd00d 100644
--- a/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/pcsx2_presets.cfg
@@ -1,10 +1,8 @@
 config_file_format^pcsx2
-target_file^$pcsx2conf
-defaults_file^$emuconfigs/PCSX2/PCSX2.ini
-change^cheevos^Enabled^true^Achievements
-change^cheevos^Username^$cheevos_username^Achievements
-change^cheevos^Token^$cheevos_token^Achievements
-change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Achievements
-change^cheevos_hardcore^ChallengeMode^true^Achievements
-change^savestate_auto_save^SaveStateOnShutdown^true^EmuCore
-change^ask_to_exit^ConfirmShutdown^true^UI
+change^cheevos^Enabled^true^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^cheevos^Username^$cheevos_username^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^cheevos^Token^$cheevos_token^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^cheevos^LoginTimestamp^$cheevos_login_timestamp^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^cheevos_hardcore^ChallengeMode^true^Achievements^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^savestate_auto_save^SaveStateOnShutdown^true^EmuCore^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
+change^ask_to_exit^ConfirmShutdown^true^UI^$pcsx2conf^$emuconfigs/PCSX2/PCSX2.ini
diff --git a/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg b/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg
index 90094d5e..061b6dee 100644
--- a/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/ppsspp_presets.cfg
@@ -1,4 +1,5 @@
 config_file_format^ppsspp
-target_file^$ppssppconf
-defaults_file^$emuconfigs/PCSX2/PCSX2.ini
-change^savestate_auto_load^AutoLoadSaveState^2^General
+change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini
+change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini
+change^cheevos^AchievementsUserName^Achievements^$cheevos_username^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini
+change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$emuconfigs/ppssppdl/ppsspp.ini
diff --git a/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg b/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg
index 3abf4ba5..3eb75c36 100644
--- a/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/primehack_presets.cfg
@@ -1,4 +1,2 @@
 config_file_format^primehack
-target_file^$primehackconf
-defaults_file^$emuconfigs/primehack/Dolphin.ini
-change^ask_to_exit^ConfirmStop^True^Interface
+change^ask_to_exit^ConfirmStop^True^Interface^$primehackconf^$emuconfigs/primehack/Dolphin.ini
diff --git a/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg b/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg
index f3aaa96d..f9cffa4f 100644
--- a/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/psx_ra_presets.cfg
@@ -1,8 +1,6 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/SwanStation/psx.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^input_overlay^/var/config/retrodeck/overlays/borders/pegasus/psx.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.120000
-change^borders^input_overlay_enable^true
-change^borders^input_overlay_scale_landscape^1.040000
-change^widescreen^aspect_ratio_index^24
+change^borders^input_overlay^/var/config/retrodeck/overlays/borders/pegasus/psx.cfg^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.120000^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.040000^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/SwanStation/psx.cfg^$emuconfigs/retroarch/retroarch.cfg
diff --git a/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg b/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg
index 7a65546a..4d8c268e 100644
--- a/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/retroarch_presets.cfg
@@ -1,9 +1,7 @@
 config_file_format^retroarch-all
-target_file^$raconf
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^cheevos^cheevos_enable^true
-change^cheevos^cheevos_token^$cheevos_token
-change^cheevos^cheevos_username^$cheevos_username
-change^cheevos_hardcore^cheevos_hardcore_mode_enable^true
-change^savestate_auto_load^savestate_auto_load^true
-change^savestate_auto_save^savestate_auto_save^true
+change^cheevos^cheevos_enable^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg
+change^cheevos^cheevos_token^$cheevos_token^^$raconf^$emuconfigs/retroarch/retroarch.cfg
+change^cheevos^cheevos_username^$cheevos_username^^$raconf^$emuconfigs/retroarch/retroarch.cfg
+change^cheevos_hardcore^cheevos_hardcore_mode_enable^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg
+change^savestate_auto_load^savestate_auto_load^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg
+change^savestate_auto_save^savestate_auto_save^true^^$raconf^$emuconfigs/retroarch/retroarch.cfg
diff --git a/emu-configs/defaults/retrodeck/presets/snes_presets.cfg b/emu-configs/defaults/retrodeck/presets/snes_presets.cfg
index 2d71ed98..06ce7b18 100644
--- a/emu-configs/defaults/retrodeck/presets/snes_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/snes_presets.cfg
@@ -1,9 +1,7 @@
 config_file_format^retroarch
-target_file^/var/config/retroarch/config/Snes9x/snes.cfg
-defaults_file^$emuconfigs/retroarch/retroarch.cfg
-change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/snes87.cfg
-change^borders^input_overlay_aspect_adjust_landscape^0.305000
-change^borders^input_overlay_scale_landscape^1.050000
-change^borders^input_overlay_enable^true
-change^widescreen^aspect_ratio_index^24
-enable^nintendo_button_layout^/var/config/retroarch/config/remaps/Snes9x/snes.rmp
+change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/snes87.cfg^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_aspect_adjust_landscape^0.305000^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_scale_landscape^1.050000^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
+change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
+enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp
diff --git a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg
index bfb46f5e..e03474f1 100644
--- a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg
+++ b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg
@@ -1,9 +1,7 @@
 config_file_format^yuzu
-target_file^$yuzuconf
-defaults_file^$emuconfigs/yuzu/qt-config.ini
-change^ask_to_exit^confirmClose^true^UI
-change^ask_to_exit^confirmClose\default^true^UI
-change^nintendo_button_layout^player_0_button_a^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:0,pad:0"^Controls
-change^nintendo_button_layout^player_0_button_b^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:1,pad:0"^Controls
-change^nintendo_button_layout^player_0_button_x^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:2,pad:0"^Controls
-change^nintendo_button_layout^player_0_button_y^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:3,pad:0"^Controls
+change^ask_to_exit^confirmClose^true^UI^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
+change^ask_to_exit^confirmClose\default^true^UI^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
+change^abxy_button_swap^player_0_button_a^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:0,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
+change^abxy_button_swap^player_0_button_b^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:1,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
+change^abxy_button_swap^player_0_button_x^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:2,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
+change^abxy_button_swap^player_0_button_y^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:3,pad:0"^Controls^$yuzuconf^$emuconfigs/yuzu/qt-config.ini
diff --git a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
index 382abc1d..d1d7d923 100644
--- a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
+++ b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
@@ -6,6 +6,7 @@ megacd
 neogeocd
 pcenginecd
 pcfx
+psp
 psx
 ps2
 saturn
@@ -29,7 +30,13 @@ gba
 gbc
 genesis
 mastersystem
+n64
 nds
 nes
+ngp
+ngpc
+sega32x
+sega32xjp
+sega32xna
 snes
 snesna
diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg
index cf88db79..da64517f 100644
--- a/emu-configs/defaults/retrodeck/retrodeck.cfg
+++ b/emu-configs/defaults/retrodeck/retrodeck.cfg
@@ -54,7 +54,7 @@ n64=false
 psx_ra=false
 snes=false
 
-[nintendo_button_layout]
+[abxy_button_swap]
 citra=false
 gb=false
 gba=false
diff --git a/emu-configs/dolphin/GCPadNew.ini b/emu-configs/dolphin/GCPadNew.ini
index 1882559e..7c2d8a7c 100644
--- a/emu-configs/dolphin/GCPadNew.ini
+++ b/emu-configs/dolphin/GCPadNew.ini
@@ -4,7 +4,7 @@ Buttons/A = SOUTH
 Buttons/B = EAST
 Buttons/X = NORTH
 Buttons/Y = WEST
-Buttons/Z = TR
+Buttons/Z = `TR` | `TL`
 Buttons/Start = START
 Main Stick/Up = `Axis 1-`
 Main Stick/Down = `Axis 1+`
diff --git a/emu-configs/dolphin/Hotkeys.ini b/emu-configs/dolphin/Hotkeys.ini
index d2912ae6..fdf30cae 100644
--- a/emu-configs/dolphin/Hotkeys.ini
+++ b/emu-configs/dolphin/Hotkeys.ini
@@ -21,4 +21,9 @@ Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K)
 Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J)
 General/Toggle Fullscreen = @(Ctrl+Return)
 General/Control NetPlay Golf Mode = @(Alt+H)
-Wii/Press Sync Button = @(Alt+W)
\ No newline at end of file
+Wii/Press Sync Button = @(Alt+W)
+Wii/Connect Wii Remote 1 = @(Alt+W+`1`)
+Wii/Connect Wii Remote 2 = @(Alt+W+`2`)
+Wii/Connect Wii Remote 3 = @(Alt+W+`3`)
+Wii/Connect Wii Remote 4 = @(Alt+W+`4`)
+Wii/Connect Balance Board = @(Alt+W+`5`)
\ No newline at end of file
diff --git a/emu-configs/dolphin/WiimoteNew.ini b/emu-configs/dolphin/WiimoteNew.ini
index 73002a7c..79183554 100644
--- a/emu-configs/dolphin/WiimoteNew.ini
+++ b/emu-configs/dolphin/WiimoteNew.ini
@@ -10,7 +10,7 @@ Drums/Stick/Modifier/Range = 50.0
 Turntable/Stick/Modifier/Range = 50.0
 uDraw/Stylus/Modifier/Range = 50.0
 Drawsome/Stylus/Modifier/Range = 50.0
-Buttons/A = SOUTH
+Buttons/A = `SOUTH` | `Click 1` | `XInput2/0/Virtual core pointer:Click 1`
 Buttons/B = EAST
 Buttons/1 = WEST
 Buttons/2 = NORTH
diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini
index 721182e1..cf608f65 100644
--- a/emu-configs/ppssppsdl/controls.ini
+++ b/emu-configs/ppssppsdl/controls.ini
@@ -18,8 +18,8 @@ An.Right = 1-40,10-4000
 Analog limiter = 1-60
 RapidFire = 1-113:1-48
 Fast-forward = 1-113:1-157
-SpeedToggle = 1-68
-Pause = 1-111
+SpeedToggle = 1-113:1-144
+Pause = 1-113:1-41
 Rewind = 1-113:1-156
 Save State = 1-113:1-47
 Load State = 1-113:1-29
@@ -31,4 +31,6 @@ Toggle Fullscreen = 1-113:1-66
 RightAn.Up = 10-4007
 RightAn.Down = 10-4006
 RightAn.Left = 10-4005
-RightAn.Right = 10-4004
\ No newline at end of file
+RightAn.Right = 10-4004
+Previous Slot = 1-113:1-38
+Exit App = 1-113:1-45
\ No newline at end of file
diff --git a/emu-configs/ppssppsdl/ppsspp.ini b/emu-configs/ppssppsdl/ppsspp.ini
index 64135e0f..e1ba7f86 100644
--- a/emu-configs/ppssppsdl/ppsspp.ini
+++ b/emu-configs/ppssppsdl/ppsspp.ini
@@ -12,7 +12,7 @@ Language = en_US
 ForceLagSync2 = False
 DiscordPresence = True
 UISound = False
-AutoLoadSaveState = 0
+AutoLoadSaveState = 2
 EnableCheats = False
 CwCheatRefreshRate = 77
 CwCheatScrollPosition = 0.000000
@@ -165,6 +165,10 @@ SkipGPUReadbacks = False
 GpuLogProfiler = False
 iShowStatusFlags = 0
 DisplayIntegerScale = False
+VSync = False
+MultiThreading = True
+UberShaderVertex = True
+UberShaderFragment = True
 [Sound]
 Enable = True
 AudioBackend = 0
@@ -332,6 +336,100 @@ Custom6Repeat = False
 Custom7Repeat = False
 Custom8Repeat = False
 Custom9Repeat = False
+Custom10Mapping = 0x0000000000000000
+Custom10Image = 0
+Custom10Shape = 2
+Custom10Toggle = False
+Custom10Repeat = False
+Custom11Mapping = 0x0000000000000000
+Custom11Image = 1
+Custom11Shape = 2
+Custom11Toggle = False
+Custom11Repeat = False
+Custom12Mapping = 0x0000000000000000
+Custom12Image = 2
+Custom12Shape = 2
+Custom12Toggle = False
+Custom12Repeat = False
+Custom13Mapping = 0x0000000000000000
+Custom13Image = 3
+Custom13Shape = 2
+Custom13Toggle = False
+Custom13Repeat = False
+Custom14Mapping = 0x0000000000000000
+Custom14Image = 4
+Custom14Shape = 2
+Custom14Toggle = False
+Custom14Repeat = False
+Custom15Mapping = 0x0000000000000000
+Custom15Image = 0
+Custom15Shape = 9
+Custom15Toggle = False
+Custom15Repeat = False
+Custom16Mapping = 0x0000000000000000
+Custom16Image = 1
+Custom16Shape = 9
+Custom16Toggle = False
+Custom16Repeat = False
+Custom17Mapping = 0x0000000000000000
+Custom17Image = 2
+Custom17Shape = 9
+Custom17Toggle = False
+Custom17Repeat = False
+Custom18Mapping = 0x0000000000000000
+Custom18Image = 3
+Custom18Shape = 9
+Custom18Toggle = False
+Custom18Repeat = False
+Custom19Mapping = 0x0000000000000000
+Custom19Image = 4
+Custom19Shape = 9
+Custom19Toggle = False
+Custom19Repeat = False
+fcombo10X = 0.643378
+fcombo10Y = 0.581952
+comboKeyScale10 = 1.150000
+ShowComboKey10 = False
+fcombo11X = 0.763295
+fcombo11Y = 0.581952
+comboKeyScale11 = 1.150000
+ShowComboKey11 = False
+fcombo12X = 0.883212
+fcombo12Y = 0.581952
+comboKeyScale12 = 1.150000
+ShowComboKey12 = False
+fcombo13X = 0.643378
+fcombo13Y = 0.416206
+comboKeyScale13 = 1.150000
+ShowComboKey13 = False
+fcombo14X = 0.763295
+fcombo14Y = 0.416206
+comboKeyScale14 = 1.150000
+ShowComboKey14 = False
+fcombo15X = 0.355579
+fcombo15Y = 0.581952
+comboKeyScale15 = 1.150000
+ShowComboKey15 = False
+fcombo16X = 0.235662
+fcombo16Y = 0.581952
+comboKeyScale16 = 1.150000
+ShowComboKey16 = False
+fcombo17X = 0.115746
+fcombo17Y = 0.581952
+comboKeyScale17 = 1.150000
+ShowComboKey17 = False
+fcombo18X = 0.355579
+fcombo18Y = 0.416206
+comboKeyScale18 = 1.150000
+ShowComboKey18 = False
+fcombo19X = 0.235662
+fcombo19Y = 0.416206
+comboKeyScale19 = 1.150000
+ShowComboKey19 = False
+AllowMappingCombos = True
+RapidFileInterval = 5
+AnalogGesture = False
+AnalogGestureSensibility = 1.000000
 [Network]
 EnableWlan = False
 EnableAdhocServer = False
@@ -367,6 +465,7 @@ WlanPowerSave = False
 EncryptSave = True
 SavedataUpgradeVersion = True
 MemStickSize = 16
+GameLanguage = -1
 [Debugger]
 DisasmWindowX = -1
 DisasmWindowY = -1
@@ -390,6 +489,7 @@ DrawFrameGraph = False
 GEWindowTabsBL = 0x00000000
 GEWindowTabsBR = 0x00000000
 GEWindowTabsTR = 0x00000000
+SkipFuncHashMap = 
 [Upgrade]
 UpgradeMessage = 
 UpgradeVersion = 
@@ -516,6 +616,8 @@ VRCameraPitch = 0
 VRHeadRotationScale = 5.000000
 VRHeadRotationEnabled = False
 VRHeadRotationSmoothing = False
+VRPassthrough = False
+VRCanvas3DDistance = 3.000000
 [Achievements]
 AchievementsEnable = False
 AchievementsChallengeMode = False
diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml
index 8a0131d0..832d37a9 100644
--- a/es-configs/es_systems.xml
+++ b/es-configs/es_systems.xml
@@ -1129,7 +1129,7 @@
         <platform>msxturbor</platform>
         <theme>msxturbor</theme>
     </system>
-<!--
+
     <system>
         <name>mugen</name>
         <fullname>M.U.G.E.N Game Engine</fullname>
@@ -1139,7 +1139,7 @@
         <platform>mugen</platform>
         <theme>mugen</theme>
     </system>
--->
+
     <system>
         <name>multivision</name>
         <fullname>Othello Multivision</fullname>
@@ -1329,7 +1329,7 @@
         <platform>odyssey2</platform>
         <theme>odyssey2</theme>
     </system>
-<!-- 
+
     <system>
         <name>openbor</name>
         <fullname>OpenBOR Game Engine</fullname>
@@ -1339,7 +1339,7 @@
         <platform>openbor</platform>
         <theme>openbor</theme>
     </system>
--->
+
 <!--
     <system>
         <name>oric</name>
@@ -1471,8 +1471,8 @@
         <fullname>Sony PlayStation 3</fullname>
         <path>%ROMPATH%/ps3</path>
         <extension>.desktop .ps3 .PS3 .ps3dir .PS3DIR</extension>
-        <command label="RPCS3 Directory (Standalone)">%EMULATOR_RPCS3% --no-gui %ROM%</command>
         <command label="RPCS3 Shortcut (Standalone)">%ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM%</command>
+        <command label="RPCS3 Directory (Standalone)">%EMULATOR_RPCS3% --no-gui %ROM%</command>
         <platform>ps3</platform>
         <theme>ps3</theme>
     </system>
diff --git a/functions/functions.sh b/functions/functions.sh
index 3b3719fb..e3456793 100644
--- a/functions/functions.sh
+++ b/functions/functions.sh
@@ -513,7 +513,7 @@ easter_eggs() {
   if [[ ! -z $(cat $easter_egg_checklist) ]]; then
     while IFS="^" read -r start_date end_date start_time end_time splash_file # Read Easter Egg checklist file and separate values
     do
-      if [[ $current_day -ge "$start_date" && $current_day -le "$end_date" && $current_time -ge "$start_time" && $current_time -le "$end_time" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed
+      if [[ "$((10#$current_day))" -ge "$((10#$start_date))" && "$((10#$current_day))" -le "$((10#$end_date))" && "$((10#$current_time))" -ge "$((10#$start_time))" && "$((10#$current_time))" -le "$((10#$end_time))" ]]; then # If current line specified date/time matches current date/time, set $splash_file to be deployed
         new_splash_file="$splashscreen_dir/$splash_file"
         break
       else # When there are no matches, the default splash screen is set to deploy
diff --git a/functions/post_update.sh b/functions/post_update.sh
index bf68a2c2..99b23dac 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -234,6 +234,15 @@ post_update() {
     emulationstation --home /var/config/emulationstation --create-system-dirs
   fi
 
+  if [[ $prev_version -le "080" ]]; then
+    # In version 0.8.0b, the following changes were made that required config file updates/reset or other changes to the filesystem:
+    # - Remove RetroDECK controller profile from existing template location TODO
+    # - Determine if Steam is installed via normal desktop application / Flatpak / SteamOS TODO
+    # - Install RetroDECK controller profile in desired location TODO
+    # - Change section name in retrodeck.cfg for ABXY button swap preset
+    sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names
+  fi
+
   # The following commands are run every time.
 
   if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled
diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index d7352d69..733a5116 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -132,11 +132,11 @@ prepare_emulator() {
       set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "n64" "retrodeck" "widescreen")" "retrodeck" "widescreen"
       set_setting_value "$rd_conf" "psx_ra" "$(get_setting_value "$rd_defaults" "psx_ra" "retrodeck" "widescreen")" "retrodeck" "widescreen"
       set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "snes" "retrodeck" "widescreen")" "retrodeck" "widescreen"
-      set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
-      set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
-      set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
-      set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
-      set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
+      set_setting_value "$rd_conf" "gb" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
+      set_setting_value "$rd_conf" "gba" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
+      set_setting_value "$rd_conf" "gbc" "$(get_setting_value "$rd_defaults" "gbc" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
+      set_setting_value "$rd_conf" "n64" "$(get_setting_value "$rd_defaults" "gb" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
+      set_setting_value "$rd_conf" "snes" "$(get_setting_value "$rd_defaults" "gba" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
       set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_load")" "retrodeck" "savestate_auto_load"
       set_setting_value "$rd_conf" "retroarch" "$(get_setting_value "$rd_defaults" "retroarch" "retrodeck" "savestate_auto_save")" "retrodeck" "savestate_auto_save"
     fi
@@ -215,7 +215,7 @@ prepare_emulator() {
       dir_prep "$texture_packs_folder/Citra" "/var/data/citra-emu/load/textures"
 
       # Reset default preset settings
-      set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
+      set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
       set_setting_value "$rd_conf" "citra" "$(get_setting_value "$rd_defaults" "citra" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
@@ -650,7 +650,7 @@ prepare_emulator() {
       fi
 
       # Reset default preset settings
-      set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "nintendo_button_layout")" "retrodeck" "nintendo_button_layout"
+      set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "abxy_button_swap")" "retrodeck" "abxy_button_swap"
       set_setting_value "$rd_conf" "yuzu" "$(get_setting_value "$rd_defaults" "yuzu" "retrodeck" "ask_to_exit")" "retrodeck" "ask_to_exit"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
diff --git a/functions/presets.sh b/functions/presets.sh
index 664b7893..a086928c 100644
--- a/functions/presets.sh
+++ b/functions/presets.sh
@@ -96,7 +96,7 @@ build_preset_config() {
       local read_system_name=$(get_setting_name "$system_line")
       if [[ "$read_system_name" == "$system_being_changed" ]]; then
         local read_system_enabled=$(get_setting_value "$rd_conf" "$read_system_name" "retrodeck" "$current_preset")
-        while IFS='^' read -r action read_preset read_setting_name new_setting_value section
+        while IFS='^' read -r action read_preset read_setting_name new_setting_value section target_file defaults_file
         do
           case "$action" in
 
@@ -109,22 +109,16 @@ build_preset_config() {
             fi
           ;;
 
-          "target_file" )
-            if [[ "$read_preset" = \$* ]]; then
-              eval read_preset=$read_preset
-            fi
-            local read_target_file="$read_preset"
-          ;;
-
-          "defaults_file" )
-            if [[ "$read_preset" = \$* ]]; then
-              eval read_preset=$read_preset
-            fi
-            local read_defaults_file="$read_preset"
-          ;;
-
           "change" )
             if [[ "$read_preset" == "$current_preset" ]]; then
+              if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
+                declare -g "target_file=$target_file"
+              fi
+              local read_target_file="$target_file"
+              if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
+                declare -g "defaults_file=$defaults_file"
+              fi
+              local read_defaults_file="$defaults_file"
               if [[ "$read_system_enabled" == "true" ]]; then
                 if [[ "$new_setting_value" = \$* ]]; then
                   eval new_setting_value=$new_setting_value
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index db1befa8..019c41ba 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -73,23 +73,28 @@
                <li>Added new system: SOLARUS</li>
                <li>Added new engine: GZDOOM</li>
                <li>Added new emulator: Vita3K - Reset the emulator to grap the lates changes</li>
+               <li>Added new emulator: MAME (Standalone)</li>
+               <li>PPSSPP: added hotkeys</li>
+               <li>DOLPHIN: improved wiimote pointer emulation for controllers</li>
                <li>Added Steam Sync (with BoilR)</li>
                <li>Quit button after emulators reset should act as an actual full quit button</li>
                <li>Created a quit_retrodeck function to ease the quit in the scripts.</li>
                <li>Logs folder is now in retrodeck/logs (previously was .logs)</li>
                <li>The post update script is initializing vita3k, mame and boilr when coming from a version ealrier that 0.8.0, this don't work in cokker and must be resetted manually (for boilr reset RetroDECK)</li>
+               <li>RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE</li>
+               <li>Added controller config for PS4 and PS5</li>
+               <li>Controller config overhaul</li>
             </ul>
             <p>Fixes:</p>
             <ul>
                <li>Fixed DUCKSTATION memory card folder</li>
-               <li>Fixed RPCS3 saves folder (wrong symlink)</li>
+               <li>Fixed RPCS3 saves folder (wrong symlink) - WRN THE USERS TO BACKUP</li>
                <li>Fixed issues that prevents Steam Sync to work correctly</li>
             </ul>
             <p>Issues:</p>
             <ul>
                <li>GZDOOM: the controller for player 2+ is not correctly configured</li>
                <li>quit_retrodeck function seems to not working correctly</li>
-               <li>Added new emulator: MAME (Standalone) -- Removed cause of compiling issues</li>
                <li>MAME (Standalone) paths should be fixed</li>
             </ul>
             <p>Missing:</p>
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 6dfd2de5..125b31ba 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -9,15 +9,6 @@ sdk-extensions:
 # base-version: "6.5"                         # Needed for Yuzu - Disabled as we're using AppImage for Yuzu
 command: retrodeck.sh
 
-add-extensions:
-  org.ppsspp.PPSSPP.Locale:
-    directory: share/locale
-    bundle: true
-    no-autodownload: false
-    subdirectories: false
-    autodelete: true
-    locale-subset: true
-
 finish-args:
   - --socket=fallback-x11
   - --socket=wayland
@@ -678,8 +669,8 @@ modules:
     sources:
       - type: git
         url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
-        tag: v1.16.6
-        commit: ba0ce344937d17e177ec8656ab957f6b82facdda
+        tag: v1.17
+        commit: 493122a2fcf9ff538e242fe2844f019b53afd483
         x-checker-data:
           type: json
           url: https://api.github.com/repos/hrydgard/ppsspp/releases/latest
@@ -687,22 +678,6 @@ modules:
           tag-query: .tag_name
           timestamp-query: .published_at
 
-  - name: ppsspp-localization
-    buildsystem: simple
-    build-commands:
-      - |
-        for LANG_FILE in assets/lang/*.ini; do
-          LANG_FILE_NAME="$(basename "$LANG_FILE")"
-          LANG_PREFIX="${LANG_FILE_NAME:0:2}"
-          LANG_DEST="$FLATPAK_DEST/share/locale/$LANG_PREFIX/ppsspp/$LANG_FILE_NAME";
-          ln -fsr "$LANG_DEST" "$FLATPAK_DEST/share/ppsspp/$LANG_FILE"
-          install -Dm644 "$LANG_FILE" "$LANG_DEST"
-        done
-    sources:
-      - type: shell
-        commands:
-          - cp -a $FLATPAK_DEST/share/ppsspp/assets .
-
   # PPSSPP - END
 
   # Yuzu - START
@@ -718,8 +693,8 @@ modules:
       - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
     sources:
       - type: file
-        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1648/yuzu-mainline-20231211-14c24e64e.AppImage
-        sha256: d40f61c2abf8ddd0bb53098e2d9edf0c47e1cfd89e50cf5856b8cc27dbb25bd6
+        url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1696/yuzu-mainline-20240128-1bd7a09e3.AppImage
+        sha256: d8ca508daa5ba929efda956488f4a9cbc38df9fd672fcb55cb2184625971706d
 
   # Yuzu - END
 
@@ -1323,14 +1298,14 @@ modules:
   
   # MAME - Start
 
-  # - name: retrodeck-mame
-  #   buildsystem: simple
-  #   build-commands:
-  #     - cp -rn files/* /app
-  #   sources:
-  #   - type: archive
-  #     url: 
-  #     sha256: RETRODECKMAMEPLACEHOLDER
+  - name: retrodeck-mame
+    buildsystem: simple
+    build-commands:
+      - cp -rn files/* /app
+    sources:
+    - type: archive
+      url: RETRODECKMAMEURLPLACEHOLDER
+      sha256: RETRODECKMAMEPLACEHOLDER
 
   # MAME - End
 
diff --git a/res/binding_icons/RD-alt.png b/res/binding_icons/RD-alt.png
new file mode 100644
index 00000000..055758a8
Binary files /dev/null and b/res/binding_icons/RD-alt.png differ
diff --git a/res/binding_icons/RD-'.png b/res/binding_icons/RD-apostrophe.png
similarity index 100%
rename from res/binding_icons/RD-'.png
rename to res/binding_icons/RD-apostrophe.png
diff --git a/res/binding_icons/RD-@.png b/res/binding_icons/RD-at.png
similarity index 100%
rename from res/binding_icons/RD-@.png
rename to res/binding_icons/RD-at.png
diff --git "a/res/binding_icons/RD-\\.png" b/res/binding_icons/RD-backslash.png
similarity index 100%
rename from "res/binding_icons/RD-\\.png"
rename to res/binding_icons/RD-backslash.png
diff --git a/res/binding_icons/RD-{.png b/res/binding_icons/RD-bracket-cl.png
similarity index 100%
rename from res/binding_icons/RD-{.png
rename to res/binding_icons/RD-bracket-cl.png
diff --git a/res/binding_icons/RD-}.png b/res/binding_icons/RD-bracket-cr.png
similarity index 100%
rename from res/binding_icons/RD-}.png
rename to res/binding_icons/RD-bracket-cr.png
diff --git a/res/binding_icons/RD-(.png b/res/binding_icons/RD-bracket-pl.png
similarity index 100%
rename from res/binding_icons/RD-(.png
rename to res/binding_icons/RD-bracket-pl.png
diff --git a/res/binding_icons/RD-).png b/res/binding_icons/RD-bracket-pr.png
similarity index 100%
rename from res/binding_icons/RD-).png
rename to res/binding_icons/RD-bracket-pr.png
diff --git a/res/binding_icons/RD-[.png b/res/binding_icons/RD-bracket-sl.png
similarity index 100%
rename from res/binding_icons/RD-[.png
rename to res/binding_icons/RD-bracket-sl.png
diff --git a/res/binding_icons/RD-].png b/res/binding_icons/RD-bracket-sr.png
similarity index 100%
rename from res/binding_icons/RD-].png
rename to res/binding_icons/RD-bracket-sr.png
diff --git a/res/binding_icons/RD-button-+.png b/res/binding_icons/RD-button-+.png
new file mode 100644
index 00000000..6150aaf3
Binary files /dev/null and b/res/binding_icons/RD-button-+.png differ
diff --git a/res/binding_icons/RD-button--.png b/res/binding_icons/RD-button--.png
new file mode 100644
index 00000000..64a2973a
Binary files /dev/null and b/res/binding_icons/RD-button--.png differ
diff --git a/res/binding_icons/RD-L3.png b/res/binding_icons/RD-button-L3.png
similarity index 100%
rename from res/binding_icons/RD-L3.png
rename to res/binding_icons/RD-button-L3.png
diff --git a/res/binding_icons/RD-R3.png b/res/binding_icons/RD-button-R3.png
similarity index 100%
rename from res/binding_icons/RD-R3.png
rename to res/binding_icons/RD-button-R3.png
diff --git a/res/binding_icons/RD-R4.png b/res/binding_icons/RD-button-R4.png
similarity index 100%
rename from res/binding_icons/RD-R4.png
rename to res/binding_icons/RD-button-R4.png
diff --git a/res/binding_icons/RD-R5.png b/res/binding_icons/RD-button-R5.png
similarity index 100%
rename from res/binding_icons/RD-R5.png
rename to res/binding_icons/RD-button-R5.png
diff --git a/res/binding_icons/RD-button-back.png b/res/binding_icons/RD-button-back.png
new file mode 100644
index 00000000..b5c99e28
Binary files /dev/null and b/res/binding_icons/RD-button-back.png differ
diff --git a/res/binding_icons/RD-button-click.png b/res/binding_icons/RD-button-click.png
index c28790e2..73f29be2 100644
Binary files a/res/binding_icons/RD-button-click.png and b/res/binding_icons/RD-button-click.png differ
diff --git a/res/binding_icons/RD-button-forward.png b/res/binding_icons/RD-button-forward.png
new file mode 100644
index 00000000..4c6b8705
Binary files /dev/null and b/res/binding_icons/RD-button-forward.png differ
diff --git a/res/binding_icons/RD-button-ps-select.png b/res/binding_icons/RD-button-ps-select.png
new file mode 100644
index 00000000..0c19d887
Binary files /dev/null and b/res/binding_icons/RD-button-ps-select.png differ
diff --git a/res/binding_icons/RD-button-ps-start.png b/res/binding_icons/RD-button-ps-start.png
new file mode 100644
index 00000000..62874e25
Binary files /dev/null and b/res/binding_icons/RD-button-ps-start.png differ
diff --git a/res/binding_icons/RD-^.png b/res/binding_icons/RD-caret.png
similarity index 100%
rename from res/binding_icons/RD-^.png
rename to res/binding_icons/RD-caret.png
diff --git a/res/binding_icons/RD-€.png b/res/binding_icons/RD-cent.png
similarity index 100%
rename from res/binding_icons/RD-€.png
rename to res/binding_icons/RD-cent.png
diff --git a/res/binding_icons/RD-:.png b/res/binding_icons/RD-colon.png
similarity index 100%
rename from res/binding_icons/RD-:.png
rename to res/binding_icons/RD-colon.png
diff --git a/res/binding_icons/RD-,.png b/res/binding_icons/RD-comma.png
similarity index 100%
rename from res/binding_icons/RD-,.png
rename to res/binding_icons/RD-comma.png
diff --git a/res/binding_icons/RD-corner.png b/res/binding_icons/RD-corner.png
new file mode 100644
index 00000000..c28790e2
Binary files /dev/null and b/res/binding_icons/RD-corner.png differ
diff --git a/res/binding_icons/RD-ctrl.png b/res/binding_icons/RD-ctrl.png
new file mode 100644
index 00000000..926bfbef
Binary files /dev/null and b/res/binding_icons/RD-ctrl.png differ
diff --git a/res/binding_icons/RD-$.png b/res/binding_icons/RD-dollar.png
similarity index 100%
rename from res/binding_icons/RD-$.png
rename to res/binding_icons/RD-dollar.png
diff --git a/res/binding_icons/RD-=.png b/res/binding_icons/RD-equals.png
similarity index 100%
rename from res/binding_icons/RD-=.png
rename to res/binding_icons/RD-equals.png
diff --git a/res/binding_icons/RD-!.png b/res/binding_icons/RD-exclamation-mark .png
similarity index 100%
rename from res/binding_icons/RD-!.png
rename to res/binding_icons/RD-exclamation-mark .png
diff --git a/res/binding_icons/RD-⁄.png b/res/binding_icons/RD-frontslash.png
similarity index 100%
rename from res/binding_icons/RD-⁄.png
rename to res/binding_icons/RD-frontslash.png
diff --git a/res/binding_icons/RD->.png b/res/binding_icons/RD-greater.png
similarity index 100%
rename from res/binding_icons/RD->.png
rename to res/binding_icons/RD-greater.png
diff --git a/res/binding_icons/RD-#.png b/res/binding_icons/RD-hash.png
similarity index 100%
rename from res/binding_icons/RD-#.png
rename to res/binding_icons/RD-hash.png
diff --git a/res/binding_icons/RD--.png b/res/binding_icons/RD-hyphen.png
similarity index 100%
rename from res/binding_icons/RD--.png
rename to res/binding_icons/RD-hyphen.png
diff --git a/res/binding_icons/RD-<.png b/res/binding_icons/RD-less.png
similarity index 100%
rename from res/binding_icons/RD-<.png
rename to res/binding_icons/RD-less.png
diff --git a/res/binding_icons/RD-%.png b/res/binding_icons/RD-percent.png
similarity index 100%
rename from res/binding_icons/RD-%.png
rename to res/binding_icons/RD-percent.png
diff --git a/res/binding_icons/RD-..png b/res/binding_icons/RD-period.png
similarity index 100%
rename from res/binding_icons/RD-..png
rename to res/binding_icons/RD-period.png
diff --git a/res/binding_icons/RD-+.png b/res/binding_icons/RD-plus.png
similarity index 100%
rename from res/binding_icons/RD-+.png
rename to res/binding_icons/RD-plus.png
diff --git a/res/binding_icons/RD-?.png b/res/binding_icons/RD-question-mark.png
similarity index 100%
rename from res/binding_icons/RD-?.png
rename to res/binding_icons/RD-question-mark.png
diff --git "a/res/binding_icons/RD-\".png" b/res/binding_icons/RD-quotation-mark.png
similarity index 100%
rename from "res/binding_icons/RD-\".png"
rename to res/binding_icons/RD-quotation-mark.png
diff --git a/res/binding_icons/RD-;.png b/res/binding_icons/RD-semicolon.png
similarity index 100%
rename from res/binding_icons/RD-;.png
rename to res/binding_icons/RD-semicolon.png
diff --git a/res/binding_icons/RD-shift.png b/res/binding_icons/RD-shift.png
new file mode 100644
index 00000000..1b7e0fd6
Binary files /dev/null and b/res/binding_icons/RD-shift.png differ
diff --git a/res/binding_icons/RD-~.png b/res/binding_icons/RD-tilde.png
similarity index 100%
rename from res/binding_icons/RD-~.png
rename to res/binding_icons/RD-tilde.png
diff --git a/res/binding_icons/RD-_.png b/res/binding_icons/RD-underscore.png
similarity index 100%
rename from res/binding_icons/RD-_.png
rename to res/binding_icons/RD-underscore.png
diff --git a/tools/configurator.sh b/tools/configurator.sh
index cebebeab..e781711d 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -242,7 +242,7 @@ configurator_global_presets_and_settings_dialog() {
   ;;
 
   "Swap A/B and X/Y Buttons" )
-    change_preset_dialog "nintendo_button_layout"
+    change_preset_dialog "abxy_button_swap"
     configurator_global_presets_and_settings_dialog
   ;;