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 222021ab..7e6100aa 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
@@ -911,7 +911,7 @@
 	}
 	"group"
 	{
-		"id"		"45"
+		"id"		"19"
 		"mode"		"radial_menu"
 		"name"		"Global Radial"
 		"description"		""
@@ -925,7 +925,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -985,7 +985,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1005,7 +1005,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1025,7 +1025,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1045,7 +1045,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1145,7 +1145,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1165,7 +1165,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1185,7 +1185,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1247,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"
 						{
@@ -1268,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"
 						{
@@ -1323,26 +1323,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"settings"
 		{
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 127f592f..d9eb5f66 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
@@ -14,7 +14,7 @@
 	"minor_revision"		"0"
 	"Timestamp"		"-925476208"
 	"actions"
-	{
+		{
 		"Default"
 		{
 			"title"		"RetroDECK - Set"
@@ -1134,7 +1134,7 @@
 	{
 		"id"		"19"
 		"mode"		"radial_menu"
-		"name"		"Global Radial"
+		"name"		"dial"
 		"description"		""
 		"inputs"
 		{
@@ -1146,7 +1146,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1206,7 +1206,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1226,7 +1226,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1246,7 +1246,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1266,7 +1266,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1366,7 +1366,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1386,7 +1386,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1406,7 +1406,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1468,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"
 						{
@@ -1489,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"
 						{
@@ -1544,26 +1544,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"settings"
 		{
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 100644
new mode 100755
index 519bab83..479ce25d
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps4_dualshock4.vdf
@@ -1149,7 +1149,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1269,7 +1269,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1289,7 +1289,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F1, F1, RD-F1.png, "
+							"binding"		"key_press LEFT_ALT, Alt, RD-alt.png, "
 						}
 						"settings"
 						{
@@ -1309,7 +1309,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F4, F4, RD-F4.png, "
+							"binding"		"key_press F1, F1, RD-F1.png, "
 						}
 						"settings"
 						{
@@ -1329,7 +1329,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F5, F5, RD-F5.png, "
+							"binding"		"key_press F4, F4, RD-F4.png, "
 						}
 						"settings"
 						{
@@ -1349,7 +1349,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F5, F5, RD-F5.png, "
 						}
 						"settings"
 						{
@@ -1369,7 +1369,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1389,7 +1389,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1402,6 +1402,26 @@
 				}
 			}
 			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_14"
 			{
 				"activators"
 				{
@@ -1422,7 +1442,7 @@
 				{
 				}
 			}
-			"touch_menu_button_14"
+			"touch_menu_button_15"
 			{
 				"activators"
 				{
@@ -1443,7 +1463,7 @@
 				{
 				}
 			}
-			"touch_menu_button_15"
+			"touch_menu_button_16"
 			{
 				"activators"
 				{
@@ -1464,7 +1484,7 @@
 				{
 				}
 			}
-			"touch_menu_button_16"
+			"touch_menu_button_17"
 			{
 				"activators"
 				{
@@ -1485,7 +1505,7 @@
 				{
 				}
 			}
-			"touch_menu_button_17"
+			"touch_menu_button_18"
 			{
 				"activators"
 				{
@@ -1506,7 +1526,7 @@
 				{
 				}
 			}
-			"touch_menu_button_18"
+			"touch_menu_button_19"
 			{
 				"activators"
 				{
@@ -1527,26 +1547,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"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 100644
new mode 100755
index 2f3c6466..58797a73
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_ps5_dualsense.vdf
@@ -1149,7 +1149,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1209,7 +1209,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1229,7 +1229,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1249,7 +1249,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1269,7 +1269,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1369,7 +1369,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1389,7 +1389,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1409,7 +1409,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1471,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"
 						{
@@ -1492,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"
 						{
@@ -1547,26 +1547,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"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 650f049c..dfb479ca 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
@@ -1171,7 +1171,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1231,7 +1231,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1251,7 +1251,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1271,7 +1271,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1291,7 +1291,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1391,7 +1391,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1411,7 +1411,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1431,7 +1431,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1493,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"
 						{
@@ -1514,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"
 						{
@@ -1569,26 +1569,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"settings"
 		{
@@ -2034,4 +2014,3 @@
 		"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 7e3e14ba..c4c07a17 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
@@ -917,7 +917,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -977,7 +977,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -997,7 +997,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1017,7 +1017,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1037,7 +1037,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1137,7 +1137,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1157,7 +1157,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1177,7 +1177,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1239,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"
 						{
@@ -1260,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"
 						{
@@ -1315,26 +1315,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"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
old mode 100644
new mode 100755
index 2d588454..d41448c8
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xbox360.vdf
@@ -1134,7 +1134,7 @@
 	{
 		"id"		"19"
 		"mode"		"radial_menu"
-		"name"		"Global Radial"
+		"name"		"dial"
 		"description"		""
 		"inputs"
 		{
@@ -1146,7 +1146,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press FORWARD_SLASH, RetroDECK, RD-icon_circle_2_180x180.png, "
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
 						}
 						"settings"
 						{
@@ -1206,7 +1206,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press SPACE, Space, RD-space.png, "
+							"binding"		"key_press TAB, Tab, RD-Tab.png, "
 						}
 						"settings"
 						{
@@ -1226,7 +1226,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press TAB, Tab, RD-Tab.png, "
+							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
 						}
 						"settings"
 						{
@@ -1246,7 +1246,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_SHIFT, Shift, RD-shift.png, "
+							"binding"		"key_press SPACE, Space, RD-space.png, "
 						}
 						"settings"
 						{
@@ -1266,7 +1266,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press LEFT_CONTROL, Control, RD-ctrl.png, "
+							"binding"		"key_press FORWARD_SLASH, /, RD-frontslash.png, "
 						}
 						"settings"
 						{
@@ -1366,7 +1366,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F8, F8, RD-F8.png, "
+							"binding"		"key_press F7, F7, RD-F7.png, "
 						}
 						"settings"
 						{
@@ -1386,7 +1386,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F10, F10, RD-F10.png, "
+							"binding"		"key_press F8, F8, RD-F8.png, "
 						}
 						"settings"
 						{
@@ -1406,7 +1406,7 @@
 					{
 						"bindings"
 						{
-							"binding"		"key_press F12, F12, RD-F12.png, "
+							"binding"		"key_press F10, F10, RD-F10.png, "
 						}
 						"settings"
 						{
@@ -1468,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"
 						{
@@ -1489,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"
 						{
@@ -1544,26 +1544,6 @@
 				{
 				}
 			}
-			"click"
-			{
-				"activators"
-				{
-					"Full_Press"
-					{
-						"bindings"
-						{
-							"binding"		"mouse_button RIGHT, , "
-						}
-						"settings"
-						{
-							"haptic_intensity"		"2"
-						}
-					}
-				}
-				"disabled_activators"
-				{
-				}
-			}
 		}
 		"settings"
 		{
@@ -1609,3 +1589,4 @@
 		"right_trackpad_mode"		"0"
 	}
 }
+
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 100644
new mode 100755
index 692fe9c7..68f537b7
--- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf
+++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_xboxone.vdf
@@ -828,37 +828,421 @@
 		"description"		""
 		"inputs"
 		{
-			"dpad_north"
+		}
+		"settings"
+		{
+			"requires_click"		"0"
+		}
+	}
+	"group"
+	{
+		"id"		"20"
+		"mode"		"radial_menu"
+		"name"		"Global Radial"
+		"description"		""
+		"inputs"
+		{
+			"touch_menu_button_0"
 			{
 				"activators"
 				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"mouse_button RIGHT, RetroDECK, RD-icon_circle_2_180x180.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
 				}
 				"disabled_activators"
 				{
 				}
 			}
-			"dpad_south"
+			"touch_menu_button_1"
 			{
 				"activators"
 				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press ESCAPE, Escape, RD-ESC.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
 				}
 				"disabled_activators"
 				{
 				}
 			}
-			"dpad_east"
+			"touch_menu_button_2"
 			{
 				"activators"
 				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press RETURN, Enter, RD-Enter.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
 				}
 				"disabled_activators"
 				{
 				}
 			}
-			"click"
+			"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 FORWARD_SLASH, /, RD-frontslash.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 F7, F7, RD-F7.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_12"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F8, F8, RD-F8.png, "
+						}
+						"settings"
+						{
+							"haptic_intensity"		"2"
+						}
+					}
+				}
+				"disabled_activators"
+				{
+				}
+			}
+			"touch_menu_button_13"
+			{
+				"activators"
+				{
+					"Full_Press"
+					{
+						"bindings"
+						{
+							"binding"		"key_press F10, F10, RD-F10.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"
 				{
@@ -867,7 +1251,7 @@
 		}
 		"settings"
 		{
-			"requires_click"		"0"
+			"touchmenu_button_fire_type"		"0"
 		}
 	}
 	"group"
@@ -1195,446 +1579,6 @@
 			}
 		}
 	}
-	"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"