diff --git a/README.md b/README.md
index f498cba..c1565ad 100644
--- a/README.md
+++ b/README.md
@@ -59,10 +59,10 @@ mappings are shown below:
 
 | Joy-Con Button     | Xbox Button    |
 |--------------------|----------------|
-| A                  | A              |
-| B                  | B              |
-| X                  | X              |
-| Y                  | Y              |
+| A                  | B              |
+| B                  | A              |
+| X                  | Y              |
+| Y                  | X              |
 | Left Trigger       | Left Trigger   |
 | Right Trigger      | Right Trigger  |
 | Left Shoulder      | Left Shoulder  |
diff --git a/XJoy/XJoy.cpp b/XJoy/XJoy.cpp
index a4b63c5..3e20210 100644
--- a/XJoy/XJoy.cpp
+++ b/XJoy/XJoy.cpp
@@ -389,16 +389,16 @@ void process_button(JOYCON_REGION region, JOYCON_BUTTON button) {
     case RIGHT_BUTTONS:
       switch(button) {
         case R_BUT_A:
-          right_buttons = right_buttons | XUSB_GAMEPAD_A;
+          right_buttons = right_buttons | XUSB_GAMEPAD_B;
           break;
         case R_BUT_B:
-          right_buttons = right_buttons | XUSB_GAMEPAD_B;
+          right_buttons = right_buttons | XUSB_GAMEPAD_A;
           break;
         case R_BUT_X:
-          right_buttons = right_buttons | XUSB_GAMEPAD_X;
+          right_buttons = right_buttons | XUSB_GAMEPAD_Y;
           break;
         case R_BUT_Y:
-          right_buttons = right_buttons | XUSB_GAMEPAD_Y;
+          right_buttons = right_buttons | XUSB_GAMEPAD_X;
           break;
         case R_BUT_SL:
           right_buttons = right_buttons | XUSB_GAMEPAD_B;