diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini
index de39cd4a59..41d6f821b3 100644
--- a/Source/Android/app/src/main/assets/WiimoteNew.ini
+++ b/Source/Android/app/src/main/assets/WiimoteNew.ini
@@ -1,540 +1,500 @@
 [Wiimote1]
 Device = Android/4/Touchscreen
-Buttons/A = `Button 22`
-Buttons/B = `Button 23`
-Buttons/1 = `Button 27`
-Buttons/2 = `Button 28`
-Buttons/- = `Button 24`
-Buttons/+ = `Button 25`
-Buttons/Home = `Button 26`
-D-Pad/Up = `Button 29`
-D-Pad/Down = `Button 30`
-D-Pad/Left = `Button 31`
-D-Pad/Right = `Button 32`
-IR/Up = `Axis 33`
-IR/Down = `Axis 34`
-IR/Left = `Axis 35`
-IR/Right = `Axis 36`
-IR/Forward = `Axis 37`
-IR/Backward = `Axis 38`
-IR/Hide = `Button 39`
-Swing/Up = `Axis 40`
-Swing/Down = `Axis 41`
-Swing/Left = `Axis 42`
-Swing/Right = `Axis 43`
-Swing/Forward = `Axis 44`
-Swing/Backward = `Axis 45`
-Tilt/Forward = `Axis 46`
-Tilt/Backward = `Axis 47`
-Tilt/Left = `Axis 48`
-Tilt/Right = `Axis 49`
-Tilt/Modifier = `Button 50`
-Shake/X = `Button 51`
-Shake/Y = `Button 52`
-Shake/Z = `Button 53`
+Buttons/A = `Button 100`
+Buttons/B = `Button 101`
+Buttons/- = `Button 102`
+Buttons/+ = `Button 103`
+Buttons/Home = `Button 104`
+Buttons/1 = `Button 105`
+Buttons/2 = `Button 106`
+D-Pad/Up = `Button 107`
+D-Pad/Down = `Button 108`
+D-Pad/Left = `Button 109`
+D-Pad/Right = `Button 110`
+IR/Up = `Axis 112`
+IR/Down = `Axis 113`
+IR/Left = `Axis 114`
+IR/Right = `Axis 115`
+IR/Forward = `Axis 116`
+IR/Backward = `Axis 117`
+IR/Hide = `Button 118`
+Swing/Up = `Axis 120`
+Swing/Down = `Axis 121`
+Swing/Left = `Axis 122`
+Swing/Right = `Axis 123`
+Swing/Forward = `Axis 124`
+Swing/Backward = `Axis 125`
+Tilt/Forward = `Axis 127`
+Tilt/Backward = `Axis 128`
+Tilt/Left = `Axis 129`
+Tilt/Right = `Axis 130`
+Shake/X = `Button 132`
+Shake/Y = `Button 133`
+Shake/Z = `Button 134`
 Extension = None
-Nunchuk/Buttons/C = `Button 54`
-Nunchuk/Buttons/Z = `Button 55`
-Nunchuk/Stick/Up = `Axis 57`
-Nunchuk/Stick/Down = `Axis 58`
-Nunchuk/Stick/Left = `Axis 59`
-Nunchuk/Stick/Right = `Axis 60`
-Nunchuk/Stick/Modifier = Shift_R
-Nunchuk/Stick/Modifier/Range = 50.000000
-Nunchuk/Swing/Up = `Axis 61`
-Nunchuk/Swing/Down = `Axis 62`
-Nunchuk/Swing/Left = `Axis 63`
-Nunchuk/Swing/Right = `Axis 64`
-Nunchuk/Swing/Forward = `Axis 65`
-Nunchuk/Swing/Backward = `Axis 66`
-Nunchuk/Tilt/Forward = `Axis 67`
-Nunchuk/Tilt/Backward = `Axis 68`
-Nunchuk/Tilt/Left = `Axis 69`
-Nunchuk/Tilt/Right = `Axis 70`
-Nunchuk/Tilt/Modifier = `Button 71`
-Nunchuk/Shake/X = `Button 72`
-Nunchuk/Shake/Y = `Button 73`
-Nunchuk/Shake/Z = `Button 74`
-Classic/Buttons/A = `Button 75`
-Classic/Buttons/B = `Button 76`
-Classic/Buttons/X = `Button 77`
-Classic/Buttons/Y = `Button 78`
-Classic/Buttons/- = `Button 79`
-Classic/Buttons/+ = `Button 80`
-Classic/Buttons/Home = `Button 81`
-Classic/Buttons/ZL = `Button 82`
-Classic/Buttons/ZR = `Button 83`
-Classic/D-Pad/Up = `Button 84`
-Classic/D-Pad/Down = `Button 85`
-Classic/D-Pad/Left = `Button 86`
-Classic/D-Pad/Right = `Button 87`
-Classic/Left Stick/Up = `Axis 89`
-Classic/Left Stick/Down = `Axis 90`
-Classic/Left Stick/Left = `Axis 91`
-Classic/Left Stick/Right = `Axis 92`
-Classic/Left Stick/Modifier/Range = 50.000000
-Classic/Right Stick/Up = `Axis 94`
-Classic/Right Stick/Down = `Axis 95`
-Classic/Right Stick/Left = `Axis 96`
-Classic/Right Stick/Right = `Axis 97`
-Classic/Right Stick/Modifier/Range = 50.000000
-Classic/Trigger/L = `Axis 98`
-Classic/Trigger/L/Modifier/Range = 50.000000
-Classic/Trigger/R = `Axis 99`
-Classic/Trigger/R/Modifier/Range = 50.000000
-Guitar/Buttons/- = `Button 100`
-Guitar/Buttons/+ = `Button 101`
-Guitar/Frets/Green = `Button 102`
-Guitar/Frets/Red = `Button 103`
-Guitar/Frets/Yellow = `Button 104`
-Guitar/Frets/Blue = `Button 105`
-Guitar/Frets/Orange = `Button 106`
-Guitar/Strum/Up = `Button 107`
-Guitar/Strum/Down = `Button 108`
-Guitar/Stick/Up = `Axis 110`
-Guitar/Stick/Down = `Axis 111`
-Guitar/Stick/Left = `Axis 112`
-Guitar/Stick/Right = `Axis 113`
-Guitar/Stick/Modifier/Range = 50.000000
-Guitar/Whammy/Bar = `Axis = 114`
-Drums/Buttons/- = `Button 115`
-Drums/Buttons/+ = `Button 116`
-Drums/Pads/Red = `Button 117`
-Drums/Pads/Yellow = `Button 118`
-Drums/Pads/Blue = `Button 119`
-Drums/Pads/Green = `Button 120`
-Drums/Pads/Orange = `Button 121`
-Drums/Pads/Bass = `Button 122`
-Drums/Stick/Up = `Axis 124`
-Drums/Stick/Down = `Axis 125`
-Drums/Stick/Left = `Axis 126`
-Drums/Stick/Right = `Axis 127`
-Drums/Stick/Modifier/Range = 50.000000
-Turntable/Buttons/Green Left = `Button 128`
-Turntable/Buttons/Red Left = `Button 129`
-Turntable/Buttons/Blue Left = `Button 130`
-Turntable/Buttons/Green Right = `Button 131`
-Turntable/Buttons/Red Right = `Button 132`
-Turntable/Buttons/Blue Right = `Button 133`
-Turntable/Buttons/- = `Button 134`
-Turntable/Buttons/+ = `Button 135`
-Turntable/Buttons/Home = `Button 136`
-Turntable/Buttons/Euphoria = `Button 137`
-Turntable/Table Left/Left = `Axis 138`
-Turntable/Table Left/Right = `Axis 139`
-Turntable/Table Right/Left = `Axis 140`
-Turntable/Table Right/Right = `Axis 141`
-Turntable/Stick/Up = `Axis 143`
-Turntable/Stick/Down = `Axis 144`
-Turntable/Stick/Left = `Axis 145`
-Turntable/Stick/Right = `Axis 146`
-Turntable/Stick/Modifier/Range = 50.000000
-Turntable/Effect/Dial = `Axis 147`
-Turntable/Crossfade/Left = `Axis 148`
-Turntable/Crossfade/Right = `Axis 149`
+Nunchuk/Buttons/C = `Button 200`
+Nunchuk/Buttons/Z = `Button 201`
+Nunchuk/Stick/Up = `Axis 203`
+Nunchuk/Stick/Down = `Axis 204`
+Nunchuk/Stick/Left = `Axis 205`
+Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Swing/Up = `Axis 208`
+Nunchuk/Swing/Down = `Axis 209`
+Nunchuk/Swing/Left = `Axis 210`
+Nunchuk/Swing/Right = `Axis 211`
+Nunchuk/Swing/Forward = `Axis 212`
+Nunchuk/Swing/Backward = `Axis 213`
+Nunchuk/Tilt/Forward = `Axis 215`
+Nunchuk/Tilt/Backward = `Axis 216`
+Nunchuk/Tilt/Left = `Axis 217`
+Nunchuk/Tilt/Right = `Axis 218`
+Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Shake/X = `Button 220`
+Nunchuk/Shake/Y = `Button 221`
+Nunchuk/Shake/Z = `Button 222`
+Classic/Buttons/A = `Button 300`
+Classic/Buttons/B = `Button 301`
+Classic/Buttons/X = `Button 302`
+Classic/Buttons/Y = `Button 303`
+Classic/Buttons/- = `Button 304`
+Classic/Buttons/+ = `Button 305`
+Classic/Buttons/Home = `Button 306`
+Classic/Buttons/ZL = `Button 307`
+Classic/Buttons/ZR = `Button 308`
+Classic/D-Pad/Up = `Button 309`
+Classic/D-Pad/Down = `Button 310`
+Classic/D-Pad/Left = `Button 311`
+Classic/D-Pad/Right = `Button 312`
+Classic/Left Stick/Up = `Axis 314`
+Classic/Left Stick/Down = `Axis 315`
+Classic/Left Stick/Left = `Axis 316`
+Classic/Left Stick/Right = `Axis 317`
+Classic/Right Stick/Up = `Axis 319`
+Classic/Right Stick/Down = `Axis 320`
+Classic/Right Stick/Left = `Axis 321`
+Classic/Right Stick/Right = `Axis 322`
+Classic/Triggers/L = `Axis 323`
+Classic/Triggers/R = `Axis 324`
+Guitar/Buttons/- = `Button 400`
+Guitar/Buttons/+ = `Button 401`
+Guitar/Frets/Green = `Button 402`
+Guitar/Frets/Red = `Button 403`
+Guitar/Frets/Yellow = `Button 404`
+Guitar/Frets/Blue = `Button 405`
+Guitar/Frets/Orange = `Button 406`
+Guitar/Strum/Up = `Button 407`
+Guitar/Strum/Down = `Button 408`
+Guitar/Stick/Up = `Axis 410`
+Guitar/Stick/Down = `Axis 411`
+Guitar/Stick/Left = `Axis 412`
+Guitar/Stick/Right = `Axis 413`
+Guitar/Whammy/Bar = `Axis = 414`
+Drums/Buttons/- = `Button 500`
+Drums/Buttons/+ = `Button 501`
+Drums/Pads/Red = `Button 502`
+Drums/Pads/Yellow = `Button 503`
+Drums/Pads/Blue = `Button 504`
+Drums/Pads/Green = `Button 505`
+Drums/Pads/Orange = `Button 506`
+Drums/Pads/Bass = `Button 507`
+Drums/Stick/Up = `Axis 509`
+Drums/Stick/Down = `Axis 510`
+Drums/Stick/Left = `Axis 511`
+Drums/Stick/Right = `Axis 512`
+Turntable/Buttons/Green Left = `Button 600`
+Turntable/Buttons/Red Left = `Button 601`
+Turntable/Buttons/Blue Left = `Button 602`
+Turntable/Buttons/Green Right = `Button 603`
+Turntable/Buttons/Red Right = `Button 604`
+Turntable/Buttons/Blue Right = `Button 605`
+Turntable/Buttons/- = `Button 606`
+Turntable/Buttons/+ = `Button 607`
+Turntable/Buttons/Home = `Button 608`
+Turntable/Buttons/Euphoria = `Button 609`
+Turntable/Table Left/Left = `Axis 611`
+Turntable/Table Left/Right = `Axis 612`
+Turntable/Table Right/Left = `Axis 614`
+Turntable/Table Right/Right = `Axis 615`
+Turntable/Stick/Up = `Axis 617`
+Turntable/Stick/Down = `Axis 618`
+Turntable/Stick/Left = `Axis 619`
+Turntable/Stick/Right = `Axis 620`
+Turntable/Effect/Dial = `Axis 621`
+Turntable/Crossfade/Left = `Axis 623`
+Turntable/Crossfade/Right = `Axis 624`
 Source = 1
 [Wiimote2]
 Device = Android/5/Touchscreen
-Buttons/A = `Button 22`
-Buttons/B = `Button 23`
-Buttons/1 = `Button 27`
-Buttons/2 = `Button 28`
-Buttons/- = `Button 24`
-Buttons/+ = `Button 25`
-Buttons/Home = `Button 26`
-D-Pad/Up = `Button 29`
-D-Pad/Down = `Button 30`
-D-Pad/Left = `Button 31`
-D-Pad/Right = `Button 32`
-IR/Up = `Axis 33`
-IR/Down = `Axis 34`
-IR/Left = `Axis 35`
-IR/Right = `Axis 36`
-IR/Forward = `Axis 37`
-IR/Backward = `Axis 38`
-IR/Hide = `Button 39`
-Swing/Up = `Axis 40`
-Swing/Down = `Axis 41`
-Swing/Left = `Axis 42`
-Swing/Right = `Axis 43`
-Swing/Forward = `Axis 44`
-Swing/Backward = `Axis 45`
-Tilt/Forward = `Axis 46`
-Tilt/Backward = `Axis 47`
-Tilt/Left = `Axis 48`
-Tilt/Right = `Axis 49`
-Tilt/Modifier = `Button 50`
-Shake/X = `Button 51`
-Shake/Y = `Button 52`
-Shake/Z = `Button 53`
+Buttons/A = `Button 100`
+Buttons/B = `Button 101`
+Buttons/- = `Button 102`
+Buttons/+ = `Button 103`
+Buttons/Home = `Button 104`
+Buttons/1 = `Button 105`
+Buttons/2 = `Button 106`
+D-Pad/Up = `Button 107`
+D-Pad/Down = `Button 108`
+D-Pad/Left = `Button 109`
+D-Pad/Right = `Button 110`
+IR/Up = `Axis 112`
+IR/Down = `Axis 113`
+IR/Left = `Axis 114`
+IR/Right = `Axis 115`
+IR/Forward = `Axis 116`
+IR/Backward = `Axis 117`
+IR/Hide = `Button 118`
+Swing/Up = `Axis 120`
+Swing/Down = `Axis 121`
+Swing/Left = `Axis 122`
+Swing/Right = `Axis 123`
+Swing/Forward = `Axis 124`
+Swing/Backward = `Axis 125`
+Tilt/Forward = `Axis 127`
+Tilt/Backward = `Axis 128`
+Tilt/Left = `Axis 129`
+Tilt/Right = `Axis 130`
+Shake/X = `Button 132`
+Shake/Y = `Button 133`
+Shake/Z = `Button 134`
 Extension = None
-Nunchuk/Buttons/C = `Button 54`
-Nunchuk/Buttons/Z = `Button 55`
-Nunchuk/Stick/Up = `Axis 57`
-Nunchuk/Stick/Down = `Axis 58`
-Nunchuk/Stick/Left = `Axis 59`
-Nunchuk/Stick/Right = `Axis 60`
-Nunchuk/Stick/Modifier = Shift_R
-Nunchuk/Stick/Modifier/Range = 50.000000
-Nunchuk/Swing/Up = `Axis 61`
-Nunchuk/Swing/Down = `Axis 62`
-Nunchuk/Swing/Left = `Axis 63`
-Nunchuk/Swing/Right = `Axis 64`
-Nunchuk/Swing/Forward = `Axis 65`
-Nunchuk/Swing/Backward = `Axis 66`
-Nunchuk/Tilt/Forward = `Axis 67`
-Nunchuk/Tilt/Backward = `Axis 68`
-Nunchuk/Tilt/Left = `Axis 69`
-Nunchuk/Tilt/Right = `Axis 70`
-Nunchuk/Tilt/Modifier = `Button 71`
-Nunchuk/Shake/X = `Button 72`
-Nunchuk/Shake/Y = `Button 73`
-Nunchuk/Shake/Z = `Button 74`
-Classic/Buttons/A = `Button 75`
-Classic/Buttons/B = `Button 76`
-Classic/Buttons/X = `Button 77`
-Classic/Buttons/Y = `Button 78`
-Classic/Buttons/- = `Button 79`
-Classic/Buttons/+ = `Button 80`
-Classic/Buttons/Home = `Button 81`
-Classic/Buttons/ZL = `Button 82`
-Classic/Buttons/ZR = `Button 83`
-Classic/D-Pad/Up = `Button 84`
-Classic/D-Pad/Down = `Button 85`
-Classic/D-Pad/Left = `Button 86`
-Classic/D-Pad/Right = `Button 87`
-Classic/Left Stick/Up = `Axis 89`
-Classic/Left Stick/Down = `Axis 90`
-Classic/Left Stick/Left = `Axis 91`
-Classic/Left Stick/Right = `Axis 92`
-Classic/Left Stick/Modifier/Range = 50.000000
-Classic/Right Stick/Up = `Axis 94`
-Classic/Right Stick/Down = `Axis 95`
-Classic/Right Stick/Left = `Axis 96`
-Classic/Right Stick/Right = `Axis 97`
-Classic/Right Stick/Modifier/Range = 50.000000
-Classic/Trigger/L = `Axis 98`
-Classic/Trigger/L/Modifier/Range = 50.000000
-Classic/Trigger/R = `Axis 99`
-Classic/Trigger/R/Modifier/Range = 50.000000
-Guitar/Buttons/- = `Button 100`
-Guitar/Buttons/+ = `Button 101`
-Guitar/Frets/Green = `Button 102`
-Guitar/Frets/Red = `Button 103`
-Guitar/Frets/Yellow = `Button 104`
-Guitar/Frets/Blue = `Button 105`
-Guitar/Frets/Orange = `Button 106`
-Guitar/Strum/Up = `Button 107`
-Guitar/Strum/Down = `Button 108`
-Guitar/Stick/Up = `Axis 110`
-Guitar/Stick/Down = `Axis 111`
-Guitar/Stick/Left = `Axis 112`
-Guitar/Stick/Right = `Axis 113`
-Guitar/Stick/Modifier/Range = 50.000000
-Guitar/Whammy/Bar = `Axis = 114`
-Drums/Buttons/- = `Button 115`
-Drums/Buttons/+ = `Button 116`
-Drums/Pads/Red = `Button 117`
-Drums/Pads/Yellow = `Button 118`
-Drums/Pads/Blue = `Button 119`
-Drums/Pads/Green = `Button 120`
-Drums/Pads/Orange = `Button 121`
-Drums/Pads/Bass = `Button 122`
-Drums/Stick/Up = `Axis 124`
-Drums/Stick/Down = `Axis 125`
-Drums/Stick/Left = `Axis 126`
-Drums/Stick/Right = `Axis 127`
-Drums/Stick/Modifier/Range = 50.000000
-Turntable/Buttons/Green Left = `Button 128`
-Turntable/Buttons/Red Left = `Button 129`
-Turntable/Buttons/Blue Left = `Button 130`
-Turntable/Buttons/Green Right = `Button 131`
-Turntable/Buttons/Red Right = `Button 132`
-Turntable/Buttons/Blue Right = `Button 133`
-Turntable/Buttons/- = `Button 134`
-Turntable/Buttons/+ = `Button 135`
-Turntable/Buttons/Home = `Button 136`
-Turntable/Buttons/Euphoria = `Button 137`
-Turntable/Table Left/Left = `Axis 138`
-Turntable/Table Left/Right = `Axis 139`
-Turntable/Table Right/Left = `Axis 140`
-Turntable/Table Right/Right = `Axis 141`
-Turntable/Stick/Up = `Axis 143`
-Turntable/Stick/Down = `Axis 144`
-Turntable/Stick/Left = `Axis 145`
-Turntable/Stick/Right = `Axis 146`
-Turntable/Stick/Modifier/Range = 50.000000 
-Turntable/Effect/Dial = `Axis 147`
-Turntable/Crossfade/Left = `Axis 148`
-Turntable/Crossfade/Right = `Axis 149`
+Nunchuk/Buttons/C = `Button 200`
+Nunchuk/Buttons/Z = `Button 201`
+Nunchuk/Stick/Up = `Axis 203`
+Nunchuk/Stick/Down = `Axis 204`
+Nunchuk/Stick/Left = `Axis 205`
+Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Swing/Up = `Axis 208`
+Nunchuk/Swing/Down = `Axis 209`
+Nunchuk/Swing/Left = `Axis 210`
+Nunchuk/Swing/Right = `Axis 211`
+Nunchuk/Swing/Forward = `Axis 212`
+Nunchuk/Swing/Backward = `Axis 213`
+Nunchuk/Tilt/Forward = `Axis 215`
+Nunchuk/Tilt/Backward = `Axis 216`
+Nunchuk/Tilt/Left = `Axis 217`
+Nunchuk/Tilt/Right = `Axis 218`
+Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Shake/X = `Button 220`
+Nunchuk/Shake/Y = `Button 221`
+Nunchuk/Shake/Z = `Button 222`
+Classic/Buttons/A = `Button 300`
+Classic/Buttons/B = `Button 301`
+Classic/Buttons/X = `Button 302`
+Classic/Buttons/Y = `Button 303`
+Classic/Buttons/- = `Button 304`
+Classic/Buttons/+ = `Button 305`
+Classic/Buttons/Home = `Button 306`
+Classic/Buttons/ZL = `Button 307`
+Classic/Buttons/ZR = `Button 308`
+Classic/D-Pad/Up = `Button 309`
+Classic/D-Pad/Down = `Button 310`
+Classic/D-Pad/Left = `Button 311`
+Classic/D-Pad/Right = `Button 312`
+Classic/Left Stick/Up = `Axis 314`
+Classic/Left Stick/Down = `Axis 315`
+Classic/Left Stick/Left = `Axis 316`
+Classic/Left Stick/Right = `Axis 317`
+Classic/Right Stick/Up = `Axis 319`
+Classic/Right Stick/Down = `Axis 320`
+Classic/Right Stick/Left = `Axis 321`
+Classic/Right Stick/Right = `Axis 322`
+Classic/Triggers/L = `Axis 323`
+Classic/Triggers/R = `Axis 324`
+Guitar/Buttons/- = `Button 400`
+Guitar/Buttons/+ = `Button 401`
+Guitar/Frets/Green = `Button 402`
+Guitar/Frets/Red = `Button 403`
+Guitar/Frets/Yellow = `Button 404`
+Guitar/Frets/Blue = `Button 405`
+Guitar/Frets/Orange = `Button 406`
+Guitar/Strum/Up = `Button 407`
+Guitar/Strum/Down = `Button 408`
+Guitar/Stick/Up = `Axis 410`
+Guitar/Stick/Down = `Axis 411`
+Guitar/Stick/Left = `Axis 412`
+Guitar/Stick/Right = `Axis 413`
+Guitar/Whammy/Bar = `Axis = 414`
+Drums/Buttons/- = `Button 500`
+Drums/Buttons/+ = `Button 501`
+Drums/Pads/Red = `Button 502`
+Drums/Pads/Yellow = `Button 503`
+Drums/Pads/Blue = `Button 504`
+Drums/Pads/Green = `Button 505`
+Drums/Pads/Orange = `Button 506`
+Drums/Pads/Bass = `Button 507`
+Drums/Stick/Up = `Axis 509`
+Drums/Stick/Down = `Axis 510`
+Drums/Stick/Left = `Axis 511`
+Drums/Stick/Right = `Axis 512`
+Turntable/Buttons/Green Left = `Button 600`
+Turntable/Buttons/Red Left = `Button 601`
+Turntable/Buttons/Blue Left = `Button 602`
+Turntable/Buttons/Green Right = `Button 603`
+Turntable/Buttons/Red Right = `Button 604`
+Turntable/Buttons/Blue Right = `Button 605`
+Turntable/Buttons/- = `Button 606`
+Turntable/Buttons/+ = `Button 607`
+Turntable/Buttons/Home = `Button 608`
+Turntable/Buttons/Euphoria = `Button 609`
+Turntable/Table Left/Left = `Axis 611`
+Turntable/Table Left/Right = `Axis 612`
+Turntable/Table Right/Left = `Axis 614`
+Turntable/Table Right/Right = `Axis 615`
+Turntable/Stick/Up = `Axis 617`
+Turntable/Stick/Down = `Axis 618`
+Turntable/Stick/Left = `Axis 619`
+Turntable/Stick/Right = `Axis 620`
+Turntable/Effect/Dial = `Axis 621`
+Turntable/Crossfade/Left = `Axis 623`
+Turntable/Crossfade/Right = `Axis 624`
 Source = 1
 [Wiimote3]
 Device = Android/6/Touchscreen
-Buttons/A = `Button 22`
-Buttons/B = `Button 23`
-Buttons/1 = `Button 27`
-Buttons/2 = `Button 28`
-Buttons/- = `Button 24`
-Buttons/+ = `Button 25`
-Buttons/Home = `Button 26`
-D-Pad/Up = `Button 29`
-D-Pad/Down = `Button 30`
-D-Pad/Left = `Button 31`
-D-Pad/Right = `Button 32`
-IR/Up = `Axis 33`
-IR/Down = `Axis 34`
-IR/Left = `Axis 35`
-IR/Right = `Axis 36`
-IR/Forward = `Axis 37`
-IR/Backward = `Axis 38`
-IR/Hide = `Button 39`
-Swing/Up = `Axis 40`
-Swing/Down = `Axis 41`
-Swing/Left = `Axis 42`
-Swing/Right = `Axis 43`
-Swing/Forward = `Axis 44`
-Swing/Backward = `Axis 45`
-Tilt/Forward = `Axis 46`
-Tilt/Backward = `Axis 47`
-Tilt/Left = `Axis 48`
-Tilt/Right = `Axis 49`
-Tilt/Modifier = `Button 50`
-Shake/X = `Button 51`
-Shake/Y = `Button 52`
-Shake/Z = `Button 53`
+Buttons/A = `Button 100`
+Buttons/B = `Button 101`
+Buttons/- = `Button 102`
+Buttons/+ = `Button 103`
+Buttons/Home = `Button 104`
+Buttons/1 = `Button 105`
+Buttons/2 = `Button 106`
+D-Pad/Up = `Button 107`
+D-Pad/Down = `Button 108`
+D-Pad/Left = `Button 109`
+D-Pad/Right = `Button 110`
+IR/Up = `Axis 112`
+IR/Down = `Axis 113`
+IR/Left = `Axis 114`
+IR/Right = `Axis 115`
+IR/Forward = `Axis 116`
+IR/Backward = `Axis 117`
+IR/Hide = `Button 118`
+Swing/Up = `Axis 120`
+Swing/Down = `Axis 121`
+Swing/Left = `Axis 122`
+Swing/Right = `Axis 123`
+Swing/Forward = `Axis 124`
+Swing/Backward = `Axis 125`
+Tilt/Forward = `Axis 127`
+Tilt/Backward = `Axis 128`
+Tilt/Left = `Axis 129`
+Tilt/Right = `Axis 130`
+Shake/X = `Button 132`
+Shake/Y = `Button 133`
+Shake/Z = `Button 134`
 Extension = None
-Nunchuk/Buttons/C = `Button 54`
-Nunchuk/Buttons/Z = `Button 55`
-Nunchuk/Stick/Up = `Axis 57`
-Nunchuk/Stick/Down = `Axis 58`
-Nunchuk/Stick/Left = `Axis 59`
-Nunchuk/Stick/Right = `Axis 60`
-Nunchuk/Stick/Modifier = Shift_R
-Nunchuk/Stick/Modifier/Range = 50.000000
-Nunchuk/Swing/Up = `Axis 61`
-Nunchuk/Swing/Down = `Axis 62`
-Nunchuk/Swing/Left = `Axis 63`
-Nunchuk/Swing/Right = `Axis 64`
-Nunchuk/Swing/Forward = `Axis 65`
-Nunchuk/Swing/Backward = `Axis 66`
-Nunchuk/Tilt/Forward = `Axis 67`
-Nunchuk/Tilt/Backward = `Axis 68`
-Nunchuk/Tilt/Left = `Axis 69`
-Nunchuk/Tilt/Right = `Axis 70`
-Nunchuk/Tilt/Modifier = `Button 71`
-Nunchuk/Shake/X = `Button 72`
-Nunchuk/Shake/Y = `Button 73`
-Nunchuk/Shake/Z = `Button 74`
-Classic/Buttons/A = `Button 75`
-Classic/Buttons/B = `Button 76`
-Classic/Buttons/X = `Button 77`
-Classic/Buttons/Y = `Button 78`
-Classic/Buttons/- = `Button 79`
-Classic/Buttons/+ = `Button 80`
-Classic/Buttons/Home = `Button 81`
-Classic/Buttons/ZL = `Button 82`
-Classic/Buttons/ZR = `Button 83`
-Classic/D-Pad/Up = `Button 84`
-Classic/D-Pad/Down = `Button 85`
-Classic/D-Pad/Left = `Button 86`
-Classic/D-Pad/Right = `Button 87`
-Classic/Left Stick/Up = `Axis 89`
-Classic/Left Stick/Down = `Axis 90`
-Classic/Left Stick/Left = `Axis 91`
-Classic/Left Stick/Right = `Axis 92`
-Classic/Left Stick/Modifier/Range = 50.000000
-Classic/Right Stick/Up = `Axis 94`
-Classic/Right Stick/Down = `Axis 95`
-Classic/Right Stick/Left = `Axis 96`
-Classic/Right Stick/Right = `Axis 97`
-Classic/Right Stick/Modifier/Range = 50.000000
-Classic/Trigger/L = `Axis 98`
-Classic/Trigger/L/Modifier/Range = 50.000000
-Classic/Trigger/R = `Axis 99`
-Classic/Trigger/R/Modifier/Range = 50.000000
-Guitar/Buttons/- = `Button 100`
-Guitar/Buttons/+ = `Button 101`
-Guitar/Frets/Green = `Button 102`
-Guitar/Frets/Red = `Button 103`
-Guitar/Frets/Yellow = `Button 104`
-Guitar/Frets/Blue = `Button 105`
-Guitar/Frets/Orange = `Button 106`
-Guitar/Strum/Up = `Button 107`
-Guitar/Strum/Down = `Button 108`
-Guitar/Stick/Up = `Axis 110`
-Guitar/Stick/Down = `Axis 111`
-Guitar/Stick/Left = `Axis 112`
-Guitar/Stick/Right = `Axis 113`
-Guitar/Stick/Modifier/Range = 50.000000
-Guitar/Whammy/Bar = `Axis = 114`
-Drums/Buttons/- = `Button 115`
-Drums/Buttons/+ = `Button 116`
-Drums/Pads/Red = `Button 117`
-Drums/Pads/Yellow = `Button 118`
-Drums/Pads/Blue = `Button 119`
-Drums/Pads/Green = `Button 120`
-Drums/Pads/Orange = `Button 121`
-Drums/Pads/Bass = `Button 122`
-Drums/Stick/Up = `Axis 124`
-Drums/Stick/Down = `Axis 125`
-Drums/Stick/Left = `Axis 126`
-Drums/Stick/Right = `Axis 127`
-Drums/Stick/Modifier/Range = 50.000000
-Turntable/Buttons/Green Left = `Button 128`
-Turntable/Buttons/Red Left = `Button 129`
-Turntable/Buttons/Blue Left = `Button 130`
-Turntable/Buttons/Green Right = `Button 131`
-Turntable/Buttons/Red Right = `Button 132`
-Turntable/Buttons/Blue Right = `Button 133`
-Turntable/Buttons/- = `Button 134`
-Turntable/Buttons/+ = `Button 135`
-Turntable/Buttons/Home = `Button 136`
-Turntable/Buttons/Euphoria = `Button 137`
-Turntable/Table Left/Left = `Axis 138`
-Turntable/Table Left/Right = `Axis 139`
-Turntable/Table Right/Left = `Axis 140`
-Turntable/Table Right/Right = `Axis 141`
-Turntable/Stick/Up = `Axis 143`
-Turntable/Stick/Down = `Axis 144`
-Turntable/Stick/Left = `Axis 145`
-Turntable/Stick/Right = `Axis 146`
-Turntable/Stick/Modifier/Range = 50.000000
-Turntable/Effect/Dial = `Axis 147`
-Turntable/Crossfade/Left = `Axis 148`
-Turntable/Crossfade/Right = `Axis 149`
+Nunchuk/Buttons/C = `Button 200`
+Nunchuk/Buttons/Z = `Button 201`
+Nunchuk/Stick/Up = `Axis 203`
+Nunchuk/Stick/Down = `Axis 204`
+Nunchuk/Stick/Left = `Axis 205`
+Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Swing/Up = `Axis 208`
+Nunchuk/Swing/Down = `Axis 209`
+Nunchuk/Swing/Left = `Axis 210`
+Nunchuk/Swing/Right = `Axis 211`
+Nunchuk/Swing/Forward = `Axis 212`
+Nunchuk/Swing/Backward = `Axis 213`
+Nunchuk/Tilt/Forward = `Axis 215`
+Nunchuk/Tilt/Backward = `Axis 216`
+Nunchuk/Tilt/Left = `Axis 217`
+Nunchuk/Tilt/Right = `Axis 218`
+Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Shake/X = `Button 220`
+Nunchuk/Shake/Y = `Button 221`
+Nunchuk/Shake/Z = `Button 222`
+Classic/Buttons/A = `Button 300`
+Classic/Buttons/B = `Button 301`
+Classic/Buttons/X = `Button 302`
+Classic/Buttons/Y = `Button 303`
+Classic/Buttons/- = `Button 304`
+Classic/Buttons/+ = `Button 305`
+Classic/Buttons/Home = `Button 306`
+Classic/Buttons/ZL = `Button 307`
+Classic/Buttons/ZR = `Button 308`
+Classic/D-Pad/Up = `Button 309`
+Classic/D-Pad/Down = `Button 310`
+Classic/D-Pad/Left = `Button 311`
+Classic/D-Pad/Right = `Button 312`
+Classic/Left Stick/Up = `Axis 314`
+Classic/Left Stick/Down = `Axis 315`
+Classic/Left Stick/Left = `Axis 316`
+Classic/Left Stick/Right = `Axis 317`
+Classic/Right Stick/Up = `Axis 319`
+Classic/Right Stick/Down = `Axis 320`
+Classic/Right Stick/Left = `Axis 321`
+Classic/Right Stick/Right = `Axis 322`
+Classic/Triggers/L = `Axis 323`
+Classic/Triggers/R = `Axis 324`
+Guitar/Buttons/- = `Button 400`
+Guitar/Buttons/+ = `Button 401`
+Guitar/Frets/Green = `Button 402`
+Guitar/Frets/Red = `Button 403`
+Guitar/Frets/Yellow = `Button 404`
+Guitar/Frets/Blue = `Button 405`
+Guitar/Frets/Orange = `Button 406`
+Guitar/Strum/Up = `Button 407`
+Guitar/Strum/Down = `Button 408`
+Guitar/Stick/Up = `Axis 410`
+Guitar/Stick/Down = `Axis 411`
+Guitar/Stick/Left = `Axis 412`
+Guitar/Stick/Right = `Axis 413`
+Guitar/Whammy/Bar = `Axis = 414`
+Drums/Buttons/- = `Button 500`
+Drums/Buttons/+ = `Button 501`
+Drums/Pads/Red = `Button 502`
+Drums/Pads/Yellow = `Button 503`
+Drums/Pads/Blue = `Button 504`
+Drums/Pads/Green = `Button 505`
+Drums/Pads/Orange = `Button 506`
+Drums/Pads/Bass = `Button 507`
+Drums/Stick/Up = `Axis 509`
+Drums/Stick/Down = `Axis 510`
+Drums/Stick/Left = `Axis 511`
+Drums/Stick/Right = `Axis 512`
+Turntable/Buttons/Green Left = `Button 600`
+Turntable/Buttons/Red Left = `Button 601`
+Turntable/Buttons/Blue Left = `Button 602`
+Turntable/Buttons/Green Right = `Button 603`
+Turntable/Buttons/Red Right = `Button 604`
+Turntable/Buttons/Blue Right = `Button 605`
+Turntable/Buttons/- = `Button 606`
+Turntable/Buttons/+ = `Button 607`
+Turntable/Buttons/Home = `Button 608`
+Turntable/Buttons/Euphoria = `Button 609`
+Turntable/Table Left/Left = `Axis 611`
+Turntable/Table Left/Right = `Axis 612`
+Turntable/Table Right/Left = `Axis 614`
+Turntable/Table Right/Right = `Axis 615`
+Turntable/Stick/Up = `Axis 617`
+Turntable/Stick/Down = `Axis 618`
+Turntable/Stick/Left = `Axis 619`
+Turntable/Stick/Right = `Axis 620`
+Turntable/Effect/Dial = `Axis 621`
+Turntable/Crossfade/Left = `Axis 623`
+Turntable/Crossfade/Right = `Axis 624`
 Source = 1
 [Wiimote4]
 Device = Android/7/Touchscreen
-Buttons/A = `Button 22`
-Buttons/B = `Button 23`
-Buttons/1 = `Button 27`
-Buttons/2 = `Button 28`
-Buttons/- = `Button 24`
-Buttons/+ = `Button 25`
-Buttons/Home = `Button 26`
-D-Pad/Up = `Button 29`
-D-Pad/Down = `Button 30`
-D-Pad/Left = `Button 31`
-D-Pad/Right = `Button 32`
-IR/Up = `Axis 33`
-IR/Down = `Axis 34`
-IR/Left = `Axis 35`
-IR/Right = `Axis 36`
-IR/Forward = `Axis 37`
-IR/Backward = `Axis 38`
-IR/Hide = `Button 39`
-Swing/Up = `Axis 40`
-Swing/Down = `Axis 41`
-Swing/Left = `Axis 42`
-Swing/Right = `Axis 43`
-Swing/Forward = `Axis 44`
-Swing/Backward = `Axis 45`
-Tilt/Forward = `Axis 46`
-Tilt/Backward = `Axis 47`
-Tilt/Left = `Axis 48`
-Tilt/Right = `Axis 49`
-Tilt/Modifier = `Button 50`
-Shake/X = `Button 51`
-Shake/Y = `Button 52`
-Shake/Z = `Button 53`
+Buttons/A = `Button 100`
+Buttons/B = `Button 101`
+Buttons/- = `Button 102`
+Buttons/+ = `Button 103`
+Buttons/Home = `Button 104`
+Buttons/1 = `Button 105`
+Buttons/2 = `Button 106`
+D-Pad/Up = `Button 107`
+D-Pad/Down = `Button 108`
+D-Pad/Left = `Button 109`
+D-Pad/Right = `Button 110`
+IR/Up = `Axis 112`
+IR/Down = `Axis 113`
+IR/Left = `Axis 114`
+IR/Right = `Axis 115`
+IR/Forward = `Axis 116`
+IR/Backward = `Axis 117`
+IR/Hide = `Button 118`
+Swing/Up = `Axis 120`
+Swing/Down = `Axis 121`
+Swing/Left = `Axis 122`
+Swing/Right = `Axis 123`
+Swing/Forward = `Axis 124`
+Swing/Backward = `Axis 125`
+Tilt/Forward = `Axis 127`
+Tilt/Backward = `Axis 128`
+Tilt/Left = `Axis 129`
+Tilt/Right = `Axis 130`
+Shake/X = `Button 132`
+Shake/Y = `Button 133`
+Shake/Z = `Button 134`
 Extension = None
-Nunchuk/Buttons/C = `Button 54`
-Nunchuk/Buttons/Z = `Button 55`
-Nunchuk/Stick/Up = `Axis 57`
-Nunchuk/Stick/Down = `Axis 58`
-Nunchuk/Stick/Left = `Axis 59`
-Nunchuk/Stick/Right = `Axis 60`
-Nunchuk/Stick/Modifier = Shift_R
-Nunchuk/Stick/Modifier/Range = 50.000000
-Nunchuk/Swing/Up = `Axis 61`
-Nunchuk/Swing/Down = `Axis 62`
-Nunchuk/Swing/Left = `Axis 63`
-Nunchuk/Swing/Right = `Axis 64`
-Nunchuk/Swing/Forward = `Axis 65`
-Nunchuk/Swing/Backward = `Axis 66`
-Nunchuk/Tilt/Forward = `Axis 67`
-Nunchuk/Tilt/Backward = `Axis 68`
-Nunchuk/Tilt/Left = `Axis 69`
-Nunchuk/Tilt/Right = `Axis 70`
-Nunchuk/Tilt/Modifier = `Button 71`
-Nunchuk/Shake/X = `Button 72`
-Nunchuk/Shake/Y = `Button 73`
-Nunchuk/Shake/Z = `Button 74`
-Classic/Buttons/A = `Button 75`
-Classic/Buttons/B = `Button 76`
-Classic/Buttons/X = `Button 77`
-Classic/Buttons/Y = `Button 78`
-Classic/Buttons/- = `Button 79`
-Classic/Buttons/+ = `Button 80`
-Classic/Buttons/Home = `Button 81`
-Classic/Buttons/ZL = `Button 82`
-Classic/Buttons/ZR = `Button 83`
-Classic/D-Pad/Up = `Button 84`
-Classic/D-Pad/Down = `Button 85`
-Classic/D-Pad/Left = `Button 86`
-Classic/D-Pad/Right = `Button 87`
-Classic/Left Stick/Up = `Axis 89`
-Classic/Left Stick/Down = `Axis 90`
-Classic/Left Stick/Left = `Axis 91`
-Classic/Left Stick/Right = `Axis 92`
-Classic/Left Stick/Modifier/Range = 50.000000
-Classic/Right Stick/Up = `Axis 94`
-Classic/Right Stick/Down = `Axis 95`
-Classic/Right Stick/Left = `Axis 96`
-Classic/Right Stick/Right = `Axis 97`
-Classic/Right Stick/Modifier/Range = 50.000000
-Classic/Trigger/L = `Axis 98`
-Classic/Trigger/L/Modifier/Range = 50.000000
-Classic/Trigger/R = `Axis 99`
-Classic/Trigger/R/Modifier/Range = 50.000000
-Guitar/Buttons/- = `Button 100`
-Guitar/Buttons/+ = `Button 101`
-Guitar/Frets/Green = `Button 102`
-Guitar/Frets/Red = `Button 103`
-Guitar/Frets/Yellow = `Button 104`
-Guitar/Frets/Blue = `Button 105`
-Guitar/Frets/Orange = `Button 106`
-Guitar/Strum/Up = `Button 107`
-Guitar/Strum/Down = `Button 108`
-Guitar/Stick/Up = `Axis 110`
-Guitar/Stick/Down = `Axis 111`
-Guitar/Stick/Left = `Axis 112`
-Guitar/Stick/Right = `Axis 113`
-Guitar/Stick/Modifier/Range = 50.000000
-Guitar/Whammy/Bar = `Axis = 114`
-Drums/Buttons/- = `Button 115`
-Drums/Buttons/+ = `Button 116`
-Drums/Pads/Red = `Button 117`
-Drums/Pads/Yellow = `Button 118`
-Drums/Pads/Blue = `Button 119`
-Drums/Pads/Green = `Button 120`
-Drums/Pads/Orange = `Button 121`
-Drums/Pads/Bass = `Button 122`
-Drums/Stick/Up = `Axis 124`
-Drums/Stick/Down = `Axis 125`
-Drums/Stick/Left = `Axis 126`
-Drums/Stick/Right = `Axis 127`
-Drums/Stick/Modifier/Range = 50.000000
-Turntable/Buttons/Green Left = `Button 128`
-Turntable/Buttons/Red Left = `Button 129`
-Turntable/Buttons/Blue Left = `Button 130`
-Turntable/Buttons/Green Right = `Button 131`
-Turntable/Buttons/Red Right = `Button 132`
-Turntable/Buttons/Blue Right = `Button 133`
-Turntable/Buttons/- = `Button 134`
-Turntable/Buttons/+ = `Button 135`
-Turntable/Buttons/Home = `Button 136`
-Turntable/Buttons/Euphoria = `Button 137`
-Turntable/Table Left/Left = `Axis 138`
-Turntable/Table Left/Right = `Axis 139`
-Turntable/Table Right/Left = `Axis 140`
-Turntable/Table Right/Right = `Axis 141`
-Turntable/Stick/Up = `Axis 143`
-Turntable/Stick/Down = `Axis 144`
-Turntable/Stick/Left = `Axis 145`
-Turntable/Stick/Right = `Axis 146`
-Turntable/Stick/Modifier/Range = 50.000000
-Turntable/Effect/Dial = `Axis 147`
-Turntable/Crossfade/Left = `Axis 148`
-Turntable/Crossfade/Right = `Axis 149`
+Nunchuk/Buttons/C = `Button 200`
+Nunchuk/Buttons/Z = `Button 201`
+Nunchuk/Stick/Up = `Axis 203`
+Nunchuk/Stick/Down = `Axis 204`
+Nunchuk/Stick/Left = `Axis 205`
+Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Swing/Up = `Axis 208`
+Nunchuk/Swing/Down = `Axis 209`
+Nunchuk/Swing/Left = `Axis 210`
+Nunchuk/Swing/Right = `Axis 211`
+Nunchuk/Swing/Forward = `Axis 212`
+Nunchuk/Swing/Backward = `Axis 213`
+Nunchuk/Tilt/Forward = `Axis 215`
+Nunchuk/Tilt/Backward = `Axis 216`
+Nunchuk/Tilt/Left = `Axis 217`
+Nunchuk/Tilt/Right = `Axis 218`
+Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Shake/X = `Button 220`
+Nunchuk/Shake/Y = `Button 221`
+Nunchuk/Shake/Z = `Button 222`
+Classic/Buttons/A = `Button 300`
+Classic/Buttons/B = `Button 301`
+Classic/Buttons/X = `Button 302`
+Classic/Buttons/Y = `Button 303`
+Classic/Buttons/- = `Button 304`
+Classic/Buttons/+ = `Button 305`
+Classic/Buttons/Home = `Button 306`
+Classic/Buttons/ZL = `Button 307`
+Classic/Buttons/ZR = `Button 308`
+Classic/D-Pad/Up = `Button 309`
+Classic/D-Pad/Down = `Button 310`
+Classic/D-Pad/Left = `Button 311`
+Classic/D-Pad/Right = `Button 312`
+Classic/Left Stick/Up = `Axis 314`
+Classic/Left Stick/Down = `Axis 315`
+Classic/Left Stick/Left = `Axis 316`
+Classic/Left Stick/Right = `Axis 317`
+Classic/Right Stick/Up = `Axis 319`
+Classic/Right Stick/Down = `Axis 320`
+Classic/Right Stick/Left = `Axis 321`
+Classic/Right Stick/Right = `Axis 322`
+Classic/Triggers/L = `Axis 323`
+Classic/Triggers/R = `Axis 324`
+Guitar/Buttons/- = `Button 400`
+Guitar/Buttons/+ = `Button 401`
+Guitar/Frets/Green = `Button 402`
+Guitar/Frets/Red = `Button 403`
+Guitar/Frets/Yellow = `Button 404`
+Guitar/Frets/Blue = `Button 405`
+Guitar/Frets/Orange = `Button 406`
+Guitar/Strum/Up = `Button 407`
+Guitar/Strum/Down = `Button 408`
+Guitar/Stick/Up = `Axis 410`
+Guitar/Stick/Down = `Axis 411`
+Guitar/Stick/Left = `Axis 412`
+Guitar/Stick/Right = `Axis 413`
+Guitar/Whammy/Bar = `Axis = 414`
+Drums/Buttons/- = `Button 500`
+Drums/Buttons/+ = `Button 501`
+Drums/Pads/Red = `Button 502`
+Drums/Pads/Yellow = `Button 503`
+Drums/Pads/Blue = `Button 504`
+Drums/Pads/Green = `Button 505`
+Drums/Pads/Orange = `Button 506`
+Drums/Pads/Bass = `Button 507`
+Drums/Stick/Up = `Axis 509`
+Drums/Stick/Down = `Axis 510`
+Drums/Stick/Left = `Axis 511`
+Drums/Stick/Right = `Axis 512`
+Turntable/Buttons/Green Left = `Button 600`
+Turntable/Buttons/Red Left = `Button 601`
+Turntable/Buttons/Blue Left = `Button 602`
+Turntable/Buttons/Green Right = `Button 603`
+Turntable/Buttons/Red Right = `Button 604`
+Turntable/Buttons/Blue Right = `Button 605`
+Turntable/Buttons/- = `Button 606`
+Turntable/Buttons/+ = `Button 607`
+Turntable/Buttons/Home = `Button 608`
+Turntable/Buttons/Euphoria = `Button 609`
+Turntable/Table Left/Left = `Axis 611`
+Turntable/Table Left/Right = `Axis 612`
+Turntable/Table Right/Left = `Axis 614`
+Turntable/Table Right/Right = `Axis 615`
+Turntable/Stick/Up = `Axis 617`
+Turntable/Stick/Down = `Axis 618`
+Turntable/Stick/Left = `Axis 619`
+Turntable/Stick/Right = `Axis 620`
+Turntable/Effect/Dial = `Axis 621`
+Turntable/Crossfade/Left = `Axis 623`
+Turntable/Crossfade/Right = `Axis 624`
 Source = 1
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 5ea0ad74ae..9904d24c0b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -47,134 +47,140 @@ public final class NativeLibrary
 		public static final int STICK_C_RIGHT                =  19;
 		public static final int TRIGGER_L                    =  20;
 		public static final int TRIGGER_R                    =  21;
-		public static final int WIIMOTE_BUTTON_A             =  22;
-		public static final int WIIMOTE_BUTTON_B             =  23;
-		public static final int WIIMOTE_BUTTON_MINUS         =  24;
-		public static final int WIIMOTE_BUTTON_PLUS          =  25;
-		public static final int WIIMOTE_BUTTON_HOME          =  26;
-		public static final int WIIMOTE_BUTTON_1             =  27;
-		public static final int WIIMOTE_BUTTON_2             =  28;
-		public static final int WIIMOTE_UP                   =  29;
-		public static final int WIIMOTE_DOWN                 =  30;
-		public static final int WIIMOTE_LEFT                 =  31;
-		public static final int WIIMOTE_RIGHT                =  32;
-		public static final int WIIMOTE_IR_UP                =  33;
-		public static final int WIIMOTE_IR_DOWN              =  34;
-		public static final int WIIMOTE_IR_LEFT              =  35;
-		public static final int WIIMOTE_IR_RIGHT             =  36;
-		public static final int WIIMOTE_IR_FORWARD           =  37;
-		public static final int WIIMOTE_IR_BACKWARD          =  38;
-		public static final int WIIMOTE_IR_HIDE              =  39;
-		public static final int WIIMOTE_SWING_UP             =  40;
-		public static final int WIIMOTE_SWING_DOWN           =  41;
-		public static final int WIIMOTE_SWING_LEFT           =  42;
-		public static final int WIIMOTE_SWING_RIGHT          =  43;
-		public static final int WIIMOTE_SWING_FORWARD        =  44;
-		public static final int WIIMOTE_SWING_BACKWARD       =  45;
-		public static final int WIIMOTE_TILT_FORWARD         =  46;
-		public static final int WIIMOTE_TILT_BACKWARD        =  47;
-		public static final int WIIMOTE_TILT_LEFT            =  48;
-		public static final int WIIMOTE_TILT_RIGHT           =  49;
-		public static final int WIIMOTE_TILT_MODIFIER        =  50;
-		public static final int WIIMOTE_SHAKE_X              =  51;
-		public static final int WIIMOTE_SHAKE_Y              =  52;
-		public static final int WIIMOTE_SHAKE_Z              =  53;
-		public static final int NUNCHUK_BUTTON_C             =  54;
-		public static final int NUNCHUK_BUTTON_Z             =  55;
-		public static final int NUNCHUK_STICK                =  56;
-		public static final int NUNCHUK_STICK_UP             =  57;
-		public static final int NUNCHUK_STICK_DOWN           =  58;
-		public static final int NUNCHUK_STICK_LEFT           =  59;
-		public static final int NUNCHUK_STICK_RIGHT          =  60;
-		public static final int NUNCHUK_SWING_UP             =  61;
-		public static final int NUNCHUK_SWING_DOWN           =  62;
-		public static final int NUNCHUK_SWING_LEFT           =  63;
-		public static final int NUNCHUK_SWING_RIGHT          =  64;
-		public static final int NUNCHUK_SWING_FORWARD        =  65;
-		public static final int NUNCHUK_SWING_BACKWARD       =  66;
-		public static final int NUNCHUK_TILT_FORWARD         =  67;
-		public static final int NUNCHUK_TILT_BACKWARD        =  68;
-		public static final int NUNCHUK_TILT_LEFT            =  69;
-		public static final int NUNCHUK_TILT_RIGHT           =  70;
-		public static final int NUNCHUK_TILT_MODIFIER        =  71;
-		public static final int NUNCHUK_SHAKE_X              =  72;
-		public static final int NUNCHUK_SHAKE_Y              =  73;
-		public static final int NUNCHUK_SHAKE_Z              =  74;
-		public static final int CLASSIC_BUTTON_A             =  75;
-		public static final int CLASSIC_BUTTON_B             =  76;
-		public static final int CLASSIC_BUTTON_X             =  77;
-		public static final int CLASSIC_BUTTON_Y             =  78;
-		public static final int CLASSIC_BUTTON_MINUS         =  79;
-		public static final int CLASSIC_BUTTON_PLUS          =  80;
-		public static final int CLASSIC_BUTTON_HOME          =  81;
-		public static final int CLASSIC_BUTTON_ZL            =  82;
-		public static final int CLASSIC_BUTTON_ZR            =  83;
-		public static final int CLASSIC_DPAD_UP              =  84;
-		public static final int CLASSIC_DPAD_DOWN            =  85;
-		public static final int CLASSIC_DPAD_LEFT            =  86;
-		public static final int CLASSIC_DPADON_RIGHT         =  87;
-		public static final int CLASSIC_STICK_LEFT           =  88;
-		public static final int CLASSIC_STICK_LEFT_UP        =  89;
-		public static final int CLASSIC_STICK_LEFT_DOWN      =  90;
-		public static final int CLASSIC_STICK_LEFT_LEFT      =  91;
-		public static final int CLASSIC_STICK_LEFT_RIGHT     =  92;
-		public static final int CLASSIC_STICK_RIGHT          =  93;
-		public static final int CLASSIC_STICK_RIGHT_UP       =  94;
-		public static final int CLASSIC_STICK_RIGHT_DOWN     =  95;
-		public static final int CLASSIC_STICK_RIGHT_LEFT     =  96;
-		public static final int CLASSIC_STICK_RIGHT_RIGHT    =  97;
-		public static final int CLASSIC_TRIGGER_L            =  98;
-		public static final int CLASSIC_TRIGGER_R            =  99;
-		public static final int GUITAR_BUTTON_MINUS          = 100;
-		public static final int GUITAR_BUTTON_PLUS           = 101;
-		public static final int GUITAR_FRET_GREEN            = 102;
-		public static final int GUITAR_FRET_RED              = 103;
-		public static final int GUITAR_FRET_YELLOW           = 104;
-		public static final int GUITAR_FRET_BLUE             = 105;
-		public static final int GUITAR_FRET_ORANGE           = 106;
-		public static final int GUITAR_STRUM_UP              = 107;
-		public static final int GUITAR_STRUM_DOWN            = 108;
-		public static final int GUITAR_STICK                 = 109;
-		public static final int GUITAR_STICK_UP              = 110;
-		public static final int GUITAR_STICK_DOWN            = 111;
-		public static final int GUITAR_STICK_LEFT            = 112;
-		public static final int GUITAR_STOCK_RIGHT           = 113;
-		public static final int GUITAR_WHAMMY_BAR            = 114;
-		public static final int DRUMS_BUTTON_MINUS           = 115;
-		public static final int DRUMS_BUTTON_PLUS            = 116;
-		public static final int DRUMS_PAD_RED                = 117;
-		public static final int DRUMS_PAD_YELLOW             = 118;
-		public static final int DRUMS_PAD_BLUE               = 119;
-		public static final int DRUMS_PAD_GREEN              = 120;
-		public static final int DRUMS_PAD_ORANGE             = 121;
-		public static final int DRUMS_PAD_BASS               = 122;
-		public static final int DRUMS_STICK                  = 123;
-		public static final int DRUMS_STICK_UP               = 124;
-		public static final int DRUMS_STICK_DOWN             = 125;
-		public static final int DRUMS_STICK_LEFT             = 126;
-		public static final int DRUMS_STICK_RIGHT            = 127;
-		public static final int TURNTABLE_BUTTON_GREEN_LEFT  = 128;
-		public static final int TURNTABLE_BUTTON_RED_LEFT    = 129;
-		public static final int TURNTABLE_BUTTON_BLUE_LEFT   = 130;
-		public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 131;
-		public static final int TURNTABLE_BUTTON_RED_RIGHT   = 132;
-		public static final int TURNTABLE_BUTTON_BLUE_RIGHT  = 133;
-		public static final int TURNTABLE_BUTTON_MINUS       = 134;
-		public static final int TURNTABLE_BUTTON_PLUS        = 135;
-		public static final int TURNTABLE_BUTTON_HOME        = 136;
-		public static final int TURNTABLE_BUTTON_EUPHORIA    = 137;
-		public static final int TURNTABLE_TABLE_LEFT_LEFT    = 138;
-		public static final int TURNTABLE_TABLE_LEFT_RIGHT   = 139;
-		public static final int TURNTABLE_TABLE_RIGHT_LEFT   = 140;
-		public static final int TURNTABLE_TABLE_RIGHT_RIGHT  = 141;
-		public static final int TURNTABLE_STICK              = 142;
-		public static final int TURNTABLE_STICK_UP           = 143;
-		public static final int TURNTABLE_STICK_DOWN         = 144;
-		public static final int TURNTABLE_STICK_LEFT         = 145;
-		public static final int TURNTABLE_STICK_RIGHT        = 146;
-		public static final int TURNTABLE_EFFECT_DIAL        = 147;
-		public static final int TURNTABLE_CROSSFADE_LEFT     = 148;
-		public static final int TURNTABLE_CROSSFADE_RIGHT    = 149;
+		public static final int WIIMOTE_BUTTON_A             = 100;
+		public static final int WIIMOTE_BUTTON_B             = 101;
+		public static final int WIIMOTE_BUTTON_MINUS         = 102;
+		public static final int WIIMOTE_BUTTON_PLUS          = 103;
+		public static final int WIIMOTE_BUTTON_HOME          = 104;
+		public static final int WIIMOTE_BUTTON_1             = 105;
+		public static final int WIIMOTE_BUTTON_2             = 106;
+		public static final int WIIMOTE_UP                   = 107;
+		public static final int WIIMOTE_DOWN                 = 108;
+		public static final int WIIMOTE_LEFT                 = 119;
+		public static final int WIIMOTE_RIGHT                = 110;
+		public static final int WIIMOTE_IR                   = 111;
+		public static final int WIIMOTE_IR_UP                = 112;
+		public static final int WIIMOTE_IR_DOWN              = 113;
+		public static final int WIIMOTE_IR_LEFT              = 114;
+		public static final int WIIMOTE_IR_RIGHT             = 115;
+		public static final int WIIMOTE_IR_FORWARD           = 116;
+		public static final int WIIMOTE_IR_BACKWARD          = 117;
+		public static final int WIIMOTE_IR_HIDE              = 118;
+		public static final int WIIMOTE_SWING                = 119;
+		public static final int WIIMOTE_SWING_UP             = 120;
+		public static final int WIIMOTE_SWING_DOWN           = 121;
+		public static final int WIIMOTE_SWING_LEFT           = 122;
+		public static final int WIIMOTE_SWING_RIGHT          = 123;
+		public static final int WIIMOTE_SWING_FORWARD        = 124;
+		public static final int WIIMOTE_SWING_BACKWARD       = 125;
+		public static final int WIIMOTE_TILT                 = 126;
+		public static final int WIIMOTE_TILT_FORWARD         = 127;
+		public static final int WIIMOTE_TILT_BACKWARD        = 128;
+		public static final int WIIMOTE_TILT_LEFT            = 129;
+		public static final int WIIMOTE_TILT_RIGHT           = 130;
+		public static final int WIIMOTE_SHAKE_X              = 132;
+		public static final int WIIMOTE_SHAKE_Y              = 133;
+		public static final int WIIMOTE_SHAKE_Z              = 134;
+		public static final int NUNCHUK_BUTTON_C             = 200;
+		public static final int NUNCHUK_BUTTON_Z             = 201;
+		public static final int NUNCHUK_STICK                = 202;
+		public static final int NUNCHUK_STICK_UP             = 203;
+		public static final int NUNCHUK_STICK_DOWN           = 204;
+		public static final int NUNCHUK_STICK_LEFT           = 205;
+		public static final int NUNCHUK_STICK_RIGHT          = 206;
+		public static final int NUNCHUK_SWING                = 207;
+		public static final int NUNCHUK_SWING_UP             = 208;
+		public static final int NUNCHUK_SWING_DOWN           = 209;
+		public static final int NUNCHUK_SWING_LEFT           = 210;
+		public static final int NUNCHUK_SWING_RIGHT          = 221;
+		public static final int NUNCHUK_SWING_FORWARD        = 212;
+		public static final int NUNCHUK_SWING_BACKWARD       = 213;
+		public static final int NUNCHUK_TILT                 = 214;
+		public static final int NUNCHUK_TILT_FORWARD         = 215;
+		public static final int NUNCHUK_TILT_BACKWARD        = 216;
+		public static final int NUNCHUK_TILT_LEFT            = 217;
+		public static final int NUNCHUK_TILT_RIGHT           = 218;
+		public static final int NUNCHUK_SHAKE_X              = 220;
+		public static final int NUNCHUK_SHAKE_Y              = 221;
+		public static final int NUNCHUK_SHAKE_Z              = 222;
+		public static final int CLASSIC_BUTTON_A             = 300;
+		public static final int CLASSIC_BUTTON_B             = 301;
+		public static final int CLASSIC_BUTTON_X             = 302;
+		public static final int CLASSIC_BUTTON_Y             = 303;
+		public static final int CLASSIC_BUTTON_MINUS         = 304;
+		public static final int CLASSIC_BUTTON_PLUS          = 305;
+		public static final int CLASSIC_BUTTON_HOME          = 306;
+		public static final int CLASSIC_BUTTON_ZL            = 307;
+		public static final int CLASSIC_BUTTON_ZR            = 308;
+		public static final int CLASSIC_DPAD_UP              = 309;
+		public static final int CLASSIC_DPAD_DOWN            = 310;
+		public static final int CLASSIC_DPAD_LEFT            = 311;
+		public static final int CLASSIC_DPADON_RIGHT         = 312;
+		public static final int CLASSIC_STICK_LEFT           = 313;
+		public static final int CLASSIC_STICK_LEFT_UP        = 314;
+		public static final int CLASSIC_STICK_LEFT_DOWN      = 315;
+		public static final int CLASSIC_STICK_LEFT_LEFT      = 316;
+		public static final int CLASSIC_STICK_LEFT_RIGHT     = 317;
+		public static final int CLASSIC_STICK_RIGHT          = 318;
+		public static final int CLASSIC_STICK_RIGHT_UP       = 319;
+		public static final int CLASSIC_STICK_RIGHT_DOWN     = 100;
+		public static final int CLASSIC_STICK_RIGHT_LEFT     = 321;
+		public static final int CLASSIC_STICK_RIGHT_RIGHT    = 322;
+		public static final int CLASSIC_TRIGGER_L            = 323;
+		public static final int CLASSIC_TRIGGER_R            = 324;
+		public static final int GUITAR_BUTTON_MINUS          = 400;
+		public static final int GUITAR_BUTTON_PLUS           = 401;
+		public static final int GUITAR_FRET_GREEN            = 402;
+		public static final int GUITAR_FRET_RED              = 403;
+		public static final int GUITAR_FRET_YELLOW           = 404;
+		public static final int GUITAR_FRET_BLUE             = 405;
+		public static final int GUITAR_FRET_ORANGE           = 406;
+		public static final int GUITAR_STRUM_UP              = 407;
+		public static final int GUITAR_STRUM_DOWN            = 408;
+		public static final int GUITAR_STICK                 = 409;
+		public static final int GUITAR_STICK_UP              = 410;
+		public static final int GUITAR_STICK_DOWN            = 411;
+		public static final int GUITAR_STICK_LEFT            = 412;
+		public static final int GUITAR_STICK_RIGHT           = 413;
+		public static final int GUITAR_WHAMMY_BAR            = 414;
+		public static final int DRUMS_BUTTON_MINUS           = 500;
+		public static final int DRUMS_BUTTON_PLUS            = 501;
+		public static final int DRUMS_PAD_RED                = 502;
+		public static final int DRUMS_PAD_YELLOW             = 503;
+		public static final int DRUMS_PAD_BLUE               = 504;
+		public static final int DRUMS_PAD_GREEN              = 505;
+		public static final int DRUMS_PAD_ORANGE             = 506;
+		public static final int DRUMS_PAD_BASS               = 507;
+		public static final int DRUMS_STICK                  = 508;
+		public static final int DRUMS_STICK_UP               = 509;
+		public static final int DRUMS_STICK_DOWN             = 510;
+		public static final int DRUMS_STICK_LEFT             = 511;
+		public static final int DRUMS_STICK_RIGHT            = 512;
+		public static final int TURNTABLE_BUTTON_GREEN_LEFT  = 600;
+		public static final int TURNTABLE_BUTTON_RED_LEFT    = 601;
+		public static final int TURNTABLE_BUTTON_BLUE_LEFT   = 602;
+		public static final int TURNTABLE_BUTTON_GREEN_RIGHT = 603;
+		public static final int TURNTABLE_BUTTON_RED_RIGHT   = 604;
+		public static final int TURNTABLE_BUTTON_BLUE_RIGHT  = 605;
+		public static final int TURNTABLE_BUTTON_MINUS       = 606;
+		public static final int TURNTABLE_BUTTON_PLUS        = 607;
+		public static final int TURNTABLE_BUTTON_HOME        = 608;
+		public static final int TURNTABLE_BUTTON_EUPHORIA    = 609;
+		public static final int TURNTABLE_TABLE_LEFT         = 610;
+		public static final int TURNTABLE_TABLE_LEFT_LEFT    = 611;
+		public static final int TURNTABLE_TABLE_LEFT_RIGHT   = 612;
+		public static final int TURNTABLE_TABLE_RIGHT        = 613;
+		public static final int TURNTABLE_TABLE_RIGHT_LEFT   = 614;
+		public static final int TURNTABLE_TABLE_RIGHT_RIGHT  = 615;
+		public static final int TURNTABLE_STICK              = 616;
+		public static final int TURNTABLE_STICK_UP           = 617;
+		public static final int TURNTABLE_STICK_DOWN         = 618;
+		public static final int TURNTABLE_STICK_LEFT         = 619;
+		public static final int TURNTABLE_STICK_RIGHT        = 620;
+		public static final int TURNTABLE_EFFECT_DIAL        = 621;
+		public static final int TURNTABLE_CROSSFADE          = 622;
+		public static final int TURNTABLE_CROSSFADE_LEFT     = 623;
+		public static final int TURNTABLE_CROSSFADE_RIGHT    = 624;
 	}
 
 	/**
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index a799e7788f..3472015096 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -83,22 +83,22 @@
 
     <!-- Wiimote extensions -->
     <string-array name="wiimoteExtEntries" translatable="false">
-	<item>"None"</item>
-	<item>"Nunchuk"</item>
-	<item>"Classic"</item>
-	<item>"Guitar"</item>
-	<item>"Drums"</item>
-	<item>"Turntable"</item>
+        <item>"None"</item>
+        <item>"Nunchuk"</item>
+        <item>"Classic"</item>
+        <item>"Guitar"</item>
+        <item>"Drums"</item>
+        <item>"Turntable"</item>
     </string-array>
     <string-array name="wiimoteExtValues" translatable="false">
-	<item>None</item>
-	<item>Nunchuk</item>
-	<item>Classic</item>
-	<item>Guitar</item>
-	<item>Drums</item>
-	<item>Turntable</item>
+        <item>None</item>
+        <item>Nunchuk</item>
+        <item>Classic</item>
+        <item>Guitar</item>
+        <item>Drums</item>
+        <item>Turntable</item>
     </string-array>
-    
+
     <!-- EFB Copy Method Preference -->
     <string-array name="efbCopyMethodEntries" translatable="false">
         <item>@string/disabled</item>
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h
index e870afa632..73c01c0892 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.h
+++ b/Source/Core/DolphinWX/Android/ButtonManager.h
@@ -22,12 +22,12 @@ namespace ButtonManager
 		BUTTON_DOWN = 7,
 		BUTTON_LEFT = 8,
 		BUTTON_RIGHT = 9,
-		STICK_MAIN = 10, /* Used on Java Side */
+		STICK_MAIN = 10, // Used on Java Side
 		STICK_MAIN_UP = 11,
 		STICK_MAIN_DOWN = 12,
 		STICK_MAIN_LEFT = 13,
 		STICK_MAIN_RIGHT = 14,
-		STICK_C = 15, /* Used on Java Side */
+		STICK_C = 15, // Used on Java Side
 		STICK_C_UP = 16,
 		STICK_C_DOWN = 17,
 		STICK_C_LEFT = 18,
@@ -35,137 +35,145 @@ namespace ButtonManager
 		TRIGGER_L = 20,
 		TRIGGER_R = 21,
 		// Wiimote
-		WIIMOTE_BUTTON_A = 22,
-		WIIMOTE_BUTTON_B = 23,
-		WIIMOTE_BUTTON_MINUS = 24,
-		WIIMOTE_BUTTON_PLUS = 25,
-		WIIMOTE_BUTTON_HOME = 26,
-		WIIMOTE_BUTTON_1 = 27,
-		WIIMOTE_BUTTON_2 = 28,
-		WIIMOTE_UP = 29,
-		WIIMOTE_DOWN = 30,
-		WIIMOTE_LEFT = 31,
-		WIIMOTE_RIGHT = 32,
-		WIIMOTE_IR_UP = 33,
-		WIIMOTE_IR_DOWN = 34,
-		WIIMOTE_IR_LEFT = 35,
-		WIIMOTE_IR_RIGHT = 36,
-		WIIMOTE_IR_FORWARD = 37,
-		WIIMOTE_IR_BACKWARD = 38,
-		WIIMOTE_IR_HIDE = 39,
-		WIIMOTE_SWING_UP = 40,
-		WIIMOTE_SWING_DOWN = 41,
-		WIIMOTE_SWING_LEFT = 42,
-		WIIMOTE_SWING_RIGHT = 43,
-		WIIMOTE_SWING_FORWARD = 44,
-		WIIMOTE_SWING_BACKWARD = 45,
-		WIIMOTE_TILT_FORWARD = 46,
-		WIIMOTE_TILT_BACKWARD = 47,
-		WIIMOTE_TILT_LEFT = 48,
-		WIIMOTE_TILT_RIGHT = 49,
-		WIIMOTE_SHAKE_X = 51,
-		WIIMOTE_SHAKE_Y = 52,
-		WIIMOTE_SHAKE_Z = 53,
+		WIIMOTE_BUTTON_A = 100,
+		WIIMOTE_BUTTON_B = 101,
+		WIIMOTE_BUTTON_MINUS = 102,
+		WIIMOTE_BUTTON_PLUS = 103,
+		WIIMOTE_BUTTON_HOME = 104,
+		WIIMOTE_BUTTON_1 = 105,
+		WIIMOTE_BUTTON_2 = 106,
+		WIIMOTE_UP = 107,
+		WIIMOTE_DOWN = 108,
+		WIIMOTE_LEFT = 109,
+		WIIMOTE_RIGHT = 110,
+		WIIMOTE_IR = 111, // To Be Used on Java Side
+		WIIMOTE_IR_UP = 112,
+		WIIMOTE_IR_DOWN = 113,
+		WIIMOTE_IR_LEFT = 114,
+		WIIMOTE_IR_RIGHT = 115,
+		WIIMOTE_IR_FORWARD = 116,
+		WIIMOTE_IR_BACKWARD = 117,
+		WIIMOTE_IR_HIDE = 118,
+		WIIMOTE_SWING = 119, // To Be Used on Java Side
+		WIIMOTE_SWING_UP = 120,
+		WIIMOTE_SWING_DOWN = 121,
+		WIIMOTE_SWING_LEFT = 122,
+		WIIMOTE_SWING_RIGHT = 123,
+		WIIMOTE_SWING_FORWARD = 124,
+		WIIMOTE_SWING_BACKWARD = 125,
+		WIIMOTE_TILT = 126, // To Be Used on Java Side
+		WIIMOTE_TILT_FORWARD = 127,
+		WIIMOTE_TILT_BACKWARD = 128,
+		WIIMOTE_TILT_LEFT = 129,
+		WIIMOTE_TILT_RIGHT = 130,
+		WIIMOTE_SHAKE_X = 132,
+		WIIMOTE_SHAKE_Y = 133,
+		WIIMOTE_SHAKE_Z = 134,
 		//Nunchuk
-		NUNCHUK_BUTTON_C = 54,
-		NUNCHUK_BUTTON_Z = 55,
-		NUNCHUK_STICK = 56,
-		NUNCHUK_STICK_UP = 57,
-		NUNCHUK_STICK_DOWN = 58,
-		NUNCHUK_STICK_LEFT = 59,
-		NUNCHUK_STICK_RIGHT = 60,
-		NUNCHUK_SWING_UP = 61,
-		NUNCHUK_SWING_DOWN = 62,
-		NUNCHUK_SWING_LEFT = 63,
-		NUNCHUK_SWING_RIGHT = 64,
-		NUNCHUK_SWING_FORWARD = 65,
-		NUNCHUK_SWING_BACKWARD = 66,
-		NUNCHUK_TILT_FORWARD = 67,
-		NUNCHUK_TILT_BACKWARD = 68,
-		NUNCHUK_TILT_LEFT = 69,
-		NUNCHUK_TILT_RIGHT = 70,
-		NUNCHUK_SHAKE_X = 72,
-		NUNCHUK_SHAKE_Y = 73,
-		NUNCHUK_SHAKE_Z = 74,
+		NUNCHUK_BUTTON_C = 200,
+		NUNCHUK_BUTTON_Z = 201,
+		NUNCHUK_STICK = 202, // To Be Used on Java Side
+		NUNCHUK_STICK_UP = 203,
+		NUNCHUK_STICK_DOWN = 204,
+		NUNCHUK_STICK_LEFT = 205,
+		NUNCHUK_STICK_RIGHT = 206,
+		NUNCHUK_SWING = 207, // To Be Used on Java Side
+		NUNCHUK_SWING_UP = 208,
+		NUNCHUK_SWING_DOWN = 209,
+		NUNCHUK_SWING_LEFT = 210,
+		NUNCHUK_SWING_RIGHT = 211,
+		NUNCHUK_SWING_FORWARD = 212,
+		NUNCHUK_SWING_BACKWARD = 213,
+		NUNCHUK_TILT = 214, // To Be Used on Java Side
+		NUNCHUK_TILT_FORWARD = 215,
+		NUNCHUK_TILT_BACKWARD = 216,
+		NUNCHUK_TILT_LEFT = 217,
+		NUNCHUK_TILT_RIGHT = 218,
+		NUNCHUK_SHAKE_X = 220,
+		NUNCHUK_SHAKE_Y = 221,
+		NUNCHUK_SHAKE_Z = 222,
 		//Classic
-		CLASSIC_BUTTON_A = 75,
-		CLASSIC_BUTTON_B = 76,
-		CLASSIC_BUTTON_X = 77,
-		CLASSIC_BUTTON_Y = 78,
-		CLASSIC_BUTTON_MINUS = 79,
-		CLASSIC_BUTTON_PLUS = 80,
-		CLASSIC_BUTTON_HOME = 81,
-		CLASSIC_BUTTON_ZL = 82,
-		CLASSIC_BUTTON_ZR = 83,
-		CLASSIC_DPAD_UP = 84,
-		CLASSIC_DPAD_DOWN = 85,
-		CLASSIC_DPAD_LEFT = 86,
-		CLASSIC_DPAD_RIGHT = 87,
-		CLASSIC_STICK_LEFT = 88,
-		CLASSIC_STICK_LEFT_UP = 89,
-		CLASSIC_STICK_LEFT_DOWN = 90,
-		CLASSIC_STICK_LEFT_LEFT = 91,
-		CLASSIC_STICK_LEFT_RIGHT = 92,
-		CLASSIC_STICK_RIGHT = 93,
-		CLASSIC_STICK_RIGHT_UP = 94,
-		CLASSIC_STICK_RIGHT_DOWN = 95,
-		CLASSIC_STICK_RIGHT_LEFT = 96,
-		CLASSIC_STICK_RIGHT_RIGHT = 97,
-		CLASSIC_TRIGGER_L = 98,
-		CLASSIC_TRIGGER_R = 99,
+		CLASSIC_BUTTON_A = 300,
+		CLASSIC_BUTTON_B = 301,
+		CLASSIC_BUTTON_X = 302,
+		CLASSIC_BUTTON_Y = 303,
+		CLASSIC_BUTTON_MINUS = 304,
+		CLASSIC_BUTTON_PLUS = 305,
+		CLASSIC_BUTTON_HOME = 306,
+		CLASSIC_BUTTON_ZL = 307,
+		CLASSIC_BUTTON_ZR = 308,
+		CLASSIC_DPAD_UP = 309,
+		CLASSIC_DPAD_DOWN = 310,
+		CLASSIC_DPAD_LEFT = 311,
+		CLASSIC_DPAD_RIGHT = 312,
+		CLASSIC_STICK_LEFT = 313, // To Be Used on Java Side
+		CLASSIC_STICK_LEFT_UP = 314,
+		CLASSIC_STICK_LEFT_DOWN = 315,
+		CLASSIC_STICK_LEFT_LEFT = 316,
+		CLASSIC_STICK_LEFT_RIGHT = 317,
+		CLASSIC_STICK_RIGHT = 318, // To Be Used on Java Side
+		CLASSIC_STICK_RIGHT_UP = 319,
+		CLASSIC_STICK_RIGHT_DOWN = 320,
+		CLASSIC_STICK_RIGHT_LEFT = 321,
+		CLASSIC_STICK_RIGHT_RIGHT = 322,
+		CLASSIC_TRIGGER_L = 323,
+		CLASSIC_TRIGGER_R = 324,
 		//Guitar
-		GUITAR_BUTTON_MINUS = 100,
-		GUITAR_BUTTON_PLUS = 101,
-		GUITAR_FRET_GREEN = 102,
-		GUITAR_FRET_RED = 103,
-		GUITAR_FRET_YELLOW = 104,
-		GUITAR_FRET_BLUE = 105,
-		GUITAR_FRET_ORANGE = 106,
-		GUITAR_STRUM_UP = 107,
-		GUITAR_STRUM_DOWN = 108,
-		GUITAR_STICK = 109,
-		GUITAR_STICK_UP = 110,
-		GUITAR_STICK_DOWN = 111,
-		GUITAR_STICK_LEFT = 112,
-		GUITAR_STICK_RIGHT = 113,
-		GUITAR_WHAMMY_BAR = 114,
+		GUITAR_BUTTON_MINUS = 400,
+		GUITAR_BUTTON_PLUS = 401,
+		GUITAR_FRET_GREEN = 402,
+		GUITAR_FRET_RED = 403,
+		GUITAR_FRET_YELLOW = 404,
+		GUITAR_FRET_BLUE = 405,
+		GUITAR_FRET_ORANGE = 406,
+		GUITAR_STRUM_UP = 407,
+		GUITAR_STRUM_DOWN = 408,
+		GUITAR_STICK = 409, // To Be Used on Java Side
+		GUITAR_STICK_UP = 410,
+		GUITAR_STICK_DOWN = 411,
+		GUITAR_STICK_LEFT = 412,
+		GUITAR_STICK_RIGHT = 413,
+		GUITAR_WHAMMY_BAR = 414,
 		//Drums
-		DRUMS_BUTTON_MINUS = 115,
-		DRUMS_BUTTON_PLUS = 116,
-		DRUMS_PAD_RED = 117,
-		DRUMS_PAD_YELLOW = 118,
-		DRUMS_PAD_BLUE = 119,
-		DRUMS_PAD_GREEN	 = 120,
-		DRUMS_PAD_ORANGE = 121,
-		DRUMS_PAD_BASS = 122,
-		DRUMS_STICK = 123,
-		DRUMS_STICK_UP = 124,
-		DRUMS_STICK_DOWN = 125,
-		DRUMS_STICK_LEFT = 126,
-		DRUMS_STICK_RIGHT = 127,
+		DRUMS_BUTTON_MINUS = 500,
+		DRUMS_BUTTON_PLUS = 501,
+		DRUMS_PAD_RED = 502,
+		DRUMS_PAD_YELLOW = 503,
+		DRUMS_PAD_BLUE = 504,
+		DRUMS_PAD_GREEN	 = 505,
+		DRUMS_PAD_ORANGE = 506,
+		DRUMS_PAD_BASS = 507,
+		DRUMS_STICK = 508, // To Be Used on Java Side
+		DRUMS_STICK_UP = 509,
+		DRUMS_STICK_DOWN = 510,
+		DRUMS_STICK_LEFT = 511,
+		DRUMS_STICK_RIGHT = 512,
 		//Turntable
-		TURNTABLE_BUTTON_GREEN_LEFT = 128,
-		TURNTABLE_BUTTON_RED_LEFT = 129,
-		TURNTABLE_BUTTON_BLUE_LEFT = 130,
-		TURNTABLE_BUTTON_GREEN_RIGHT = 131,
-		TURNTABLE_BUTTON_RED_RIGHT = 132,
-		TURNTABLE_BUTTON_BLUE_RIGHT = 133,
-		TURNTABLE_BUTTON_MINUS = 134,
-		TURNTABLE_BUTTON_PLUS = 135,
-		TURNTABLE_BUTTON_HOME = 136,
-		TURNTABLE_BUTTON_EUPHORIA = 137,
-		TURNTABLE_TABLE_LEFT_LEFT = 138,
-		TURNTABLE_TABLE_LEFT_RIGHT = 139,
-		TURNTABLE_TABLE_RIGHT_LEFT = 140,
-		TURNTABLE_TABLE_RIGHT_RIGHT = 141,
-		TURNTABLE_STICK = 142,
-		TURNTABLE_STICK_UP = 143,
-		TURNTABLE_STICK_DOWN = 144,
-		TURNTABLE_STICK_LEFT = 145,
-		TURNTABLE_STICK_RIGHT = 146,
-		TURNTABLE_EFFECT_DIAL = 147,
-		TURNTABLE_CROSSFADE_LEFT = 148,
-		TURNTABLE_CROSSFADE_RIGHT = 149,
+		TURNTABLE_BUTTON_GREEN_LEFT = 600,
+		TURNTABLE_BUTTON_RED_LEFT = 601,
+		TURNTABLE_BUTTON_BLUE_LEFT = 602,
+		TURNTABLE_BUTTON_GREEN_RIGHT = 603,
+		TURNTABLE_BUTTON_RED_RIGHT = 604,
+		TURNTABLE_BUTTON_BLUE_RIGHT = 605,
+		TURNTABLE_BUTTON_MINUS = 606,
+		TURNTABLE_BUTTON_PLUS = 607,
+		TURNTABLE_BUTTON_HOME = 608,
+		TURNTABLE_BUTTON_EUPHORIA = 609,
+		TURNTABLE_TABLE_LEFT = 610, // To Be Used on Java Side
+		TURNTABLE_TABLE_LEFT_LEFT = 611,
+		TURNTABLE_TABLE_LEFT_RIGHT = 612,
+		TURNTABLE_TABLE_RIGHT = 613, // To Be Used on Java Side
+		TURNTABLE_TABLE_RIGHT_LEFT = 614,
+		TURNTABLE_TABLE_RIGHT_RIGHT = 615,
+		TURNTABLE_STICK = 616, // To Be Used on Java Side
+		TURNTABLE_STICK_UP = 617,
+		TURNTABLE_STICK_DOWN = 618,
+		TURNTABLE_STICK_LEFT = 619,
+		TURNTABLE_STICK_RIGHT = 620,
+		TURNTABLE_EFFECT_DIAL = 621,
+		TURNTABLE_CROSSFADE = 622, // To Be Used on Java Side
+		TURNTABLE_CROSSFADE_LEFT = 623,
+		TURNTABLE_CROSSFADE_RIGHT = 624,
 	};
 	enum ButtonState
 	{