diff --git a/switchpro.ini b/switchpro.ini
index 87e11ea..d2e3788 100644
--- a/switchpro.ini
+++ b/switchpro.ini
@@ -1,51 +1,35 @@
 [vid=0x57e,pid=0x2009]
-VPAD_BUTTON_A = 0x00,0x02
-VPAD_BUTTON_B = 0x00,0x01
-VPAD_BUTTON_X = 0x00,0x08
-VPAD_BUTTON_Y = 0x00,0x04
+[IgnoreDefault] //Ignoring the built in default values
+VPAD_BUTTON_A = SWITCH_PRO_BUTTON_A
+VPAD_BUTTON_B = SWITCH_PRO_BUTTON_B
+VPAD_BUTTON_X = SWITCH_PRO_BUTTON_X
+VPAD_BUTTON_Y = SWITCH_PRO_BUTTON_Y
 
-VPAD_BUTTON_PLUS = 0x01,0x02
-VPAD_BUTTON_MINUS = 0x01,0x01
-VPAD_BUTTON_HOME = 0x01,0x10
+VPAD_BUTTON_PLUS = SWITCH_PRO_BUTTON_PLUS
+VPAD_BUTTON_MINUS = SWITCH_PRO_BUTTON_MINUS
+VPAD_BUTTON_HOME = SWITCH_PRO_BUTTON_HOME
 
-VPAD_BUTTON_L = 0x00,0x10
-VPAD_BUTTON_R = 0x00,0x20
+VPAD_BUTTON_L = SWITCH_PRO_BUTTON_L
+VPAD_BUTTON_R = SWITCH_PRO_BUTTON_R
 
-VPAD_BUTTON_STICK_L = 0x01,0x04
-VPAD_BUTTON_STICK_R = 0x01,0x08
+VPAD_BUTTON_STICK_L = SWITCH_PRO_BUTTON_STICK_L
+VPAD_BUTTON_STICK_R = SWITCH_PRO_BUTTON_STICK_R
 
-//The "value" is a deadzone in this case
-VPAD_BUTTON_ZL = 0x00,0x40
-VPAD_BUTTON_ZR = 0x00,0x80
+VPAD_BUTTON_ZL = SWITCH_PRO_BUTTON_ZL
+VPAD_BUTTON_ZR = SWITCH_PRO_BUTTON_ZR
 
+DPAD_MODE                   =   SWITCH_PRO_DPAD_MODE
+VPAD_BUTTON_DPAD_N          =   SWITCH_PRO_BUTTON_DPAD_N
+VPAD_BUTTON_DPAD_NE         =   SWITCH_PRO_BUTTON_DPAD_NE
+VPAD_BUTTON_DPAD_E          =   SWITCH_PRO_BUTTON_DPAD_E
+VPAD_BUTTON_DPAD_SE         =   SWITCH_PRO_BUTTON_DPAD_SE
+VPAD_BUTTON_DPAD_S          =   SWITCH_PRO_BUTTON_DPAD_S
+VPAD_BUTTON_DPAD_SW         =   SWITCH_PRO_BUTTON_DPAD_SW
+VPAD_BUTTON_DPAD_W          =   SWITCH_PRO_BUTTON_DPAD_W
+VPAD_BUTTON_DPAD_NW         =   SWITCH_PRO_BUTTON_DPAD_NW
+VPAD_BUTTON_DPAD_Neutral    =   SWITCH_PRO_BUTTON_DPAD_NEUTRAL
 
-DPAD_MODE = DPAD_HAT
-DPad_MASK = 0x0F
-VPAD_BUTTON_DPAD_N          =   0x02,0x00 // postion: 0x05, value: 0x00
-VPAD_BUTTON_DPAD_NE         =   0x02,0x01 // postion: 0x05, value: 0x01
-VPAD_BUTTON_DPAD_E          =   0x02,0x02 // postion: 0x05, value: 0x02
-VPAD_BUTTON_DPAD_SE         =   0x02,0x03 // postion: 0x05, value: 0x03
-VPAD_BUTTON_DPAD_S          =   0x02,0x04 // postion: 0x05, value: 0x04
-VPAD_BUTTON_DPAD_SW         =   0x02,0x05 // postion: 0x05, value: 0x05
-VPAD_BUTTON_DPAD_W          =   0x02,0x06 // postion: 0x05, value: 0x06
-VPAD_BUTTON_DPAD_NW         =   0x02,0x07 // postion: 0x05, value: 0x07
-VPAD_BUTTON_DPAD_Neutral    =   0x02,0x08 // postion: 0x05, value: 0x08
-
-VPAD_L_STICK_X = 0x04,0x80
-VPAD_L_STICK_X_MINMAX = 0x28,0xDF
-VPAD_L_STICK_X_DEADZONE = 0x01
-
-
-VPAD_L_STICK_Y = 0x06,0x80
-VPAD_L_STICK_Y_MINMAX = 0x16,0xD7
-VPAD_L_STICK_Y_DEADZONE = 0x06
-VPad_L_Stick_Y_Invert   =   true
-
-VPAD_R_STICK_X = 0x08,0x80
-VPAD_R_STICK_X_MINMAX = 0x29,0xE2
-VPAD_R_STICK_X_DEADZONE = 0x04
-
-VPAD_R_STICK_Y = 0x0A,0x80
-VPAD_R_STICK_Y_MINMAX = 0x22,0xe4
-VPAD_R_STICK_Y_DEADZONE = 0x08
-VPad_R_Stick_Y_Invert   =   true
+VPAD_L_STICK_X = SWITCH_PRO_STICK_L_X
+VPAD_L_STICK_Y = SWITCH_PRO_STICK_L_Y
+VPAD_R_STICK_X = SWITCH_PRO_STICK_R_X
+VPAD_R_STICK_Y = SWITCH_PRO_STICK_R_Y
diff --git a/xinput.ini b/xinput.ini
index 5ff768e..7c69e38 100644
--- a/xinput.ini
+++ b/xinput.ini
@@ -1,30 +1,31 @@
 [vid=0x7331,pid=0x1337]
-VPAD_BUTTON_A = XINPUT_BUTTON_B
-VPAD_BUTTON_B = XINPUT_BUTTON_A
-VPAD_BUTTON_X = XINPUT_BUTTON_Y
-VPAD_BUTTON_Y = XINPUT_BUTTON_X
+[IgnoreDefault] //Ignoring the built in default values
+VPAD_BUTTON_A       = XINPUT_BUTTON_B
+VPAD_BUTTON_B       = XINPUT_BUTTON_A
+VPAD_BUTTON_X       = XINPUT_BUTTON_Y
+VPAD_BUTTON_Y       = XINPUT_BUTTON_X
 
-VPAD_BUTTON_PLUS = XINPUT_BUTTON_START
-VPAD_BUTTON_MINUS = XINPUT_BUTTON_BACK
-VPAD_BUTTON_HOME = XINPUT_BUTTON_GUIDE
+VPAD_BUTTON_PLUS    = XINPUT_BUTTON_START
+VPAD_BUTTON_MINUS   = XINPUT_BUTTON_BACK
+VPAD_BUTTON_HOME    = XINPUT_BUTTON_GUIDE
 
-VPAD_BUTTON_L = XINPUT_BUTTON_LB
-VPAD_BUTTON_R = XINPUT_BUTTON_RB
+VPAD_BUTTON_L       = XINPUT_BUTTON_LB
+VPAD_BUTTON_R       = XINPUT_BUTTON_RB
 
 VPAD_BUTTON_STICK_L = XINPUT_BUTTON_L3
 VPAD_BUTTON_STICK_R = XINPUT_BUTTON_R3
 
-VPAD_BUTTON_ZL = XINPUT_BUTTON_LT
-VPAD_BUTTON_ZR = XINPUT_BUTTON_RT
+VPAD_BUTTON_ZL      = XINPUT_BUTTON_LT
+VPAD_BUTTON_ZR      = XINPUT_BUTTON_RT
 
+DPAD_MODE           = XINPUT_DPAD_MODE
+VPAD_BUTTON_UP      = XINPUT_BUTTON_DPAD_UP
+VPAD_BUTTON_DOWN    = XINPUT_BUTTON_DPAD_DOWN
+VPAD_BUTTON_LEFT    = XINPUT_BUTTON_DPAD_LEFT
+VPAD_BUTTON_RIGHT   = XINPUT_BUTTON_DPAD_RIGHT
 
-DPAD_MODE = XINPUT_DPAD_MODE
-VPAD_BUTTON_UP =    XINPUT_BUTTON_DPAD_UP
-VPAD_BUTTON_DOWN =  XINPUT_BUTTON_DPAD_DOWN
-VPAD_BUTTON_LEFT =  XINPUT_BUTTON_DPAD_LEFT
-VPAD_BUTTON_RIGHT = XINPUT_BUTTON_DPAD_RIGHT
-
-VPAD_L_STICK_X =   XINPUT_STICK_L_X
-VPAD_L_STICK_Y =   XINPUT_STICK_L_Y
-VPAD_R_STICK_X =   XINPUT_STICK_R_X
-VPAD_R_STICK_Y =   XINPUT_STICK_R_Y
+VPAD_L_STICK_X      =   XINPUT_STICK_L_X
+VPAD_L_STICK_Y      =   XINPUT_STICK_L_Y
+VPAD_R_STICK_X      =   XINPUT_STICK_R_X
+VPAD_R_STICK_Y      =   XINPUT_STICK_R_Y
+PAD_COUNT           =   0x01