diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic.vdf
old mode 100755
new mode 100644
index 2fae5080..4f5e4dd8
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_generic.vdf
@@ -29,9 +29,6 @@
 	"action_layers"
 	{
 	}
-	"localization"
-	{
-	}
 	"group"
 	{
 		"id"		"0"
@@ -780,6 +777,115 @@
 		}
 	}
 	"group"
+	{
+		"id"		"17"
+		"mode"		"joystick_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button LEFT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"output_joystick"		"2"
+		}
+	}
+	"group"
+	{
+		"id"		"18"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"dpad_north"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
+							"binding"		"key_press TAB, Swap Screens, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_south"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_east"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
 	{
 		"id"		"10"
 		"mode"		"switches"
@@ -1031,10 +1137,12 @@
 		{
 			"10"		"switch active"
 			"11"		"button_diamond active"
-			"12"		"joystick active"
+			"12"		"joystick inactive"
+			"18"		"joystick active"
 			"13"		"left_trigger active"
 			"14"		"right_trigger active"
-			"15"		"right_joystick active"
+			"15"		"right_joystick inactive"
+			"17"		"right_joystick active"
 			"16"		"dpad active"
 		}
 	}
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3.vdf
old mode 100755
new mode 100644
index 12000605..6cd8052f
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps3.vdf
@@ -29,9 +29,6 @@
 	"action_layers"
 	{
 	}
-	"localization"
-	{
-	}
 	"group"
 	{
 		"id"		"0"
@@ -780,6 +777,115 @@
 		}
 	}
 	"group"
+	{
+		"id"		"17"
+		"mode"		"joystick_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button LEFT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"output_joystick"		"2"
+		}
+	}
+	"group"
+	{
+		"id"		"18"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"dpad_north"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
+							"binding"		"key_press TAB, Swap Screens, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_south"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_east"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
 	{
 		"id"		"10"
 		"mode"		"switches"
@@ -1031,10 +1137,12 @@
 		{
 			"10"		"switch active"
 			"11"		"button_diamond active"
-			"12"		"joystick active"
+			"12"		"joystick inactive"
+			"18"		"joystick active"
 			"13"		"left_trigger active"
 			"14"		"right_trigger active"
-			"15"		"right_joystick active"
+			"15"		"right_joystick inactive"
+			"17"		"right_joystick active"
 			"16"		"dpad active"
 		}
 	}
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4.vdf
old mode 100755
new mode 100644
index 332e5690..79e44094
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4.vdf
@@ -29,9 +29,6 @@
 	"action_layers"
 	{
 	}
-	"localization"
-	{
-	}
 	"group"
 	{
 		"id"		"0"
@@ -543,7 +540,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button RIGHT, , "
+							"binding"		"mouse_button LEFT, , "
 						}
 						"settings"
 						{
@@ -573,7 +570,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button LEFT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 						"settings"
 						{
@@ -681,7 +678,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button LEFT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 						"settings"
 						{
@@ -711,7 +708,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button RIGHT, , "
+							"binding"		"mouse_button LEFT, , "
 						}
 						"settings"
 						{
@@ -952,6 +949,175 @@
 		}
 	}
 	"group"
+	{
+		"id"		"29"
+		"mode"		"joystick_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button LEFT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"output_joystick"		"2"
+		}
+	}
+	"group"
+	{
+		"id"		"30"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"dpad_north"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
+							"binding"		"key_press TAB, Swap Screens, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_south"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Esacpe, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_east"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"33"
+		"mode"		"absolute_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"1"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
+	{
+		"id"		"35"
+		"mode"		"absolute_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"1"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
 	{
 		"id"		"7"
 		"mode"		"switches"
@@ -1200,6 +1366,7 @@
 			"5"		"right_trigger active"
 			"8"		"right_joystick active"
 			"9"		"dpad active"
+			"35"		"center_trackpad active"
 		}
 	}
 	"preset"
@@ -1212,11 +1379,14 @@
 			"19"		"button_diamond active"
 			"20"		"left_trackpad active"
 			"21"		"right_trackpad active"
-			"22"		"joystick active"
+			"22"		"joystick inactive"
+			"30"		"joystick active"
 			"23"		"left_trigger active"
 			"24"		"right_trigger active"
-			"25"		"right_joystick active"
+			"25"		"right_joystick inactive"
+			"29"		"right_joystick active"
 			"26"		"dpad active"
+			"33"		"center_trackpad active"
 		}
 	}
 	"settings"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5.vdf
old mode 100755
new mode 100644
index d4f039bb..4aa48205
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5.vdf
@@ -540,7 +540,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button RIGHT, , "
+							"binding"		"mouse_button LEFT, , "
 						}
 						"settings"
 						{
@@ -570,7 +570,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button LEFT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 						"settings"
 						{
@@ -678,7 +678,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button LEFT, , "
+							"binding"		"mouse_button RIGHT, , "
 						}
 						"settings"
 						{
@@ -708,7 +708,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"mouse_button RIGHT, , "
+							"binding"		"mouse_button LEFT, , "
 						}
 						"settings"
 						{
@@ -738,8 +738,8 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
-							"binding"		"key_press TAB, Swap Screens, , "
+							"binding"		"mouse_button RIGHT, Swap Screens, , "
+							"binding"		"controller_action empty_sub_command, Swap Screens, , "
 						}
 						"settings"
 						{
@@ -839,7 +839,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press ESCAPE, Escape, , "
+							"binding"		"mouse_button LEFT, Escape, , "
 						}
 					}
 				}
@@ -949,6 +949,175 @@
 		}
 	}
 	"group"
+	{
+		"id"		"40"
+		"mode"		"absolute_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"1"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
+	{
+		"id"		"41"
+		"mode"		"absolute_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button MIDDLE, , "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"1"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+	}
+	"group"
+	{
+		"id"		"42"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"dpad_north"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
+							"binding"		"key_press TAB, Swap Screens, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_south"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_east"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"43"
+		"mode"		"joystick_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button LEFT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"output_joystick"		"2"
+		}
+	}
+	"group"
 	{
 		"id"		"7"
 		"mode"		"switches"
@@ -1229,6 +1398,7 @@
 			"5"		"right_trigger active"
 			"8"		"right_joystick active"
 			"9"		"dpad active"
+			"41"		"center_trackpad active"
 		}
 	}
 	"preset"
@@ -1241,11 +1411,14 @@
 			"30"		"button_diamond active"
 			"31"		"left_trackpad active"
 			"32"		"right_trackpad active"
-			"33"		"joystick active"
+			"33"		"joystick inactive"
+			"42"		"joystick active"
 			"34"		"left_trigger active"
 			"35"		"right_trigger active"
-			"36"		"right_joystick active"
+			"36"		"right_joystick inactive"
+			"43"		"right_joystick active"
 			"37"		"dpad active"
+			"40"		"center_trackpad active"
 		}
 	}
 	"settings"
diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switchpro.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switchpro.vdf
old mode 100755
new mode 100644
index 463316d1..62bcdd2f
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switchpro.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_switchpro.vdf
@@ -14,7 +14,7 @@
 	"minor_revision"		"0"
 	"Timestamp"		"-643537072"
 	"actions"
-	{
+{
 		"Default"
 		{
 			"title"		"RetroDECK - Set"
@@ -29,9 +29,6 @@
 	"action_layers"
 	{
 	}
-	"localization"
-	{
-	}
 	"group"
 	{
 		"id"		"0"
@@ -780,6 +777,115 @@
 		}
 	}
 	"group"
+	{
+		"id"		"19"
+		"mode"		"dpad"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"dpad_north"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press LEFT_CONTROL, Swap Screens, , "
+							"binding"		"key_press TAB, Swap Screens, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_south"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"dpad_east"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"20"
+		"mode"		"joystick_mouse"
+		"name"		""
+		"description"		""
+		"inputs"
+		{
+			"click"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button LEFT, , "
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+		}
+		"settings"
+		{
+			"output_joystick"		"2"
+		}
+	}
+	"group"
 	{
 		"id"		"7"
 		"mode"		"switches"
@@ -1057,10 +1163,12 @@
 		{
 			"11"		"switch active"
 			"12"		"button_diamond active"
-			"13"		"joystick active"
+			"13"		"joystick inactive"
+			"19"		"joystick active"
 			"14"		"left_trigger active"
 			"15"		"right_trigger active"
-			"16"		"right_joystick active"
+			"16"		"right_joystick inactive"
+			"20"		"right_joystick active"
 			"17"		"dpad active"
 		}
 	}