diff --git a/Src/Prefs.cpp b/Src/Prefs.cpp
index a0a81d1..78370a9 100644
--- a/Src/Prefs.cpp
+++ b/Src/Prefs.cpp
@@ -153,11 +153,11 @@ void Prefs::SetupJoystickDefaults()
 			this->JoystickAxes[2] = JOY_HORIZ;
 			this->JoystickAxes[3] = JOY_VERT;
 
-			/* Wiimote 1, Nunchuk Z, classic a, b as fire */
+			/* Wiimote 2, Nunchuk Z, classic a, b as fire */
 			this->JoystickButtons[3] = 0x50;
-			this->JoystickButtons[7] = 0x50;
-			this->JoystickButtons[9] = 0x50;
-			this->JoystickButtons[10] = 0x50;
+//			this->JoystickButtons[7] = 0x50;
+//			this->JoystickButtons[9] = 0x50;
+//			this->JoystickButtons[10] = 0x50;
 
 			this->MenuJoystickButtons[3] = KEY_SELECT;
 			this->MenuJoystickButtons[7] = KEY_SELECT;
@@ -173,25 +173,26 @@ void Prefs::SetupJoystickDefaults()
 			/* +/- as 1 and 2 */
 			this->JoystickButtons[4] = (7 << 3) | 0;
 			this->JoystickButtons[5] = (7 << 3) | 3;
-			this->JoystickButtons[17] = (7 << 3) | 0;
-			this->JoystickButtons[18] = (7 << 3) | 3;
+//			this->JoystickButtons[17] = (7 << 3) | 0;
+//			this->JoystickButtons[18] = (7 << 3) | 3;
 
-			/* Wiimote A, Nunchuk C, Classic Zr, Zl as space */
-			this->JoystickButtons[0] = (7 << 3) | 4;
-			this->JoystickButtons[8] = (7 << 3) | 4;
-			this->JoystickButtons[15] = (7 << 3) | 4;
-			this->JoystickButtons[16] = (7 << 3) | 4;
+			/* Wiimote B, Nunchuk C, Classic Zr, Zl as space */
+			this->JoystickButtons[1] = (7 << 3) | 4;
+//			this->JoystickButtons[8] = (7 << 3) | 4;
+//			this->JoystickButtons[15] = (7 << 3) | 4;
+//			this->JoystickButtons[16] = (7 << 3) | 4;
+
+			/* Wiimote A and Classic L as F1 */
+			this->JoystickButtons[0] = (0 << 3) | 4;
+//			this->JoystickButtons[13] = (0 << 3) | 4;
 
-			/* Wiimote B and Classic L as F1 */
-			this->JoystickButtons[1] = (0 << 3) | 4;
-			this->JoystickButtons[13] = (0 << 3) | 4;
 			/* Classic R as F3 */
 			this->JoystickButtons[16] = (0 << 3) | 5;
 
 			/* Wiimote 1 as R/S, classic X/Y */
 			this->JoystickButtons[2] = (7 << 3) | 7;
-			this->JoystickButtons[11] = (7 << 3) | 7;
-			this->JoystickButtons[12] = (7 << 3) | 7;
+//			this->JoystickButtons[11] = (7 << 3) | 7;
+//			this->JoystickButtons[12] = (7 << 3) | 7;
 
 			/* Wiimote 1, classic x, y as menu escape */
 			this->MenuJoystickButtons[2] = KEY_ESCAPE;