diff --git a/Source/Android/app/src/main/assets/GCPadNew.ini b/Source/Android/app/src/main/assets/GCPadNew.ini
index cdd12f148e..393fe930b0 100644
--- a/Source/Android/app/src/main/assets/GCPadNew.ini
+++ b/Source/Android/app/src/main/assets/GCPadNew.ini
@@ -2,103 +2,99 @@
 Device = Android/0/Touchscreen
 Buttons/A = `Button 0`
 Buttons/B = `Button 1`
+Buttons/Start = `Button 2`
 Buttons/X = `Button 3`
 Buttons/Y = `Button 4`
 Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
 D-Pad/Up = `Button 6`
 D-Pad/Down = `Button 7`
 D-Pad/Left = `Button 8`
 D-Pad/Right = `Button 9`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Radius = 100,000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Radius = 100,000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+Triggers/Threshold = 90,000000
 [GCPad2]
 Device = Android/1/Touchscreen
 Buttons/A = `Button 0`
 Buttons/B = `Button 1`
+Buttons/Start = `Button 2`
 Buttons/X = `Button 3`
 Buttons/Y = `Button 4`
 Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
 D-Pad/Up = `Button 6`
 D-Pad/Down = `Button 7`
 D-Pad/Left = `Button 8`
 D-Pad/Right = `Button 9`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Radius = 100,000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Radius = 100,000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+Triggers/Threshold = 90,000000
 [GCPad3]
 Device = Android/2/Touchscreen
 Buttons/A = `Button 0`
 Buttons/B = `Button 1`
+Buttons/Start = `Button 2`
 Buttons/X = `Button 3`
 Buttons/Y = `Button 4`
 Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
-Main Stick/Up = `Axis 11`
-Main Stick/Down = `Axis 12`
-Main Stick/Left = `Axis 13`
-Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
-C-Stick/Up = `Axis 16`
-C-Stick/Down = `Axis 17`
-C-Stick/Left = `Axis 18`
-C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
-Triggers/L = `Axis 20`
-Triggers/R = `Axis 21`
 D-Pad/Up = `Button 6`
 D-Pad/Down = `Button 7`
 D-Pad/Left = `Button 8`
 D-Pad/Right = `Button 9`
-[GCPad4]
-Device = Android/3/Touchscreen
-Buttons/A = `Button 0`
-Buttons/B = `Button 1`
-Buttons/X = `Button 3`
-Buttons/Y = `Button 4`
-Buttons/Z = `Button 5`
-Buttons/Start = `Button 2`
 Main Stick/Up = `Axis 11`
 Main Stick/Down = `Axis 12`
 Main Stick/Left = `Axis 13`
 Main Stick/Right = `Axis 14`
-Main Stick/Modifier = Shift_L
-Main Stick/Modifier/Range = 50.000000
+Main Stick/Radius = 100,000000
 C-Stick/Up = `Axis 16`
 C-Stick/Down = `Axis 17`
 C-Stick/Left = `Axis 18`
 C-Stick/Right = `Axis 19`
-C-Stick/Modifier = Control_L
-C-Stick/Modifier/Range = 50.000000
+C-Stick/Radius = 100,000000
 Triggers/L = `Axis 20`
 Triggers/R = `Axis 21`
+Triggers/Threshold = 90,000000
+[GCPad4]
+Device = Android/3/Touchscreen
+Buttons/A = `Button 0`
+Buttons/B = `Button 1`
+Buttons/Start = `Button 2`
+Buttons/X = `Button 3`
+Buttons/Y = `Button 4`
+Buttons/Z = `Button 5`
 D-Pad/Up = `Button 6`
 D-Pad/Down = `Button 7`
 D-Pad/Left = `Button 8`
-D-Pad/Right = `Button 9`
\ No newline at end of file
+D-Pad/Right = `Button 9`
+Main Stick/Up = `Axis 11`
+Main Stick/Down = `Axis 12`
+Main Stick/Left = `Axis 13`
+Main Stick/Right = `Axis 14`
+Main Stick/Radius = 100,000000
+C-Stick/Up = `Axis 16`
+C-Stick/Down = `Axis 17`
+C-Stick/Left = `Axis 18`
+C-Stick/Right = `Axis 19`
+C-Stick/Radius = 100,000000
+Triggers/L = `Axis 20`
+Triggers/R = `Axis 21`
+Triggers/Threshold = 90,000000
diff --git a/Source/Android/app/src/main/assets/WiimoteNew.ini b/Source/Android/app/src/main/assets/WiimoteNew.ini
index 41d6f821b3..abead1e196 100644
--- a/Source/Android/app/src/main/assets/WiimoteNew.ini
+++ b/Source/Android/app/src/main/assets/WiimoteNew.ini
@@ -28,6 +28,8 @@ Tilt/Forward = `Axis 127`
 Tilt/Backward = `Axis 128`
 Tilt/Left = `Axis 129`
 Tilt/Right = `Axis 130`
+Tilt/Modifier = `Button 131`
+Tilt/Modifier/Range = 50,000000
 Shake/X = `Button 132`
 Shake/Y = `Button 133`
 Shake/Z = `Button 134`
@@ -38,6 +40,7 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Stick/Radius = 100,000000
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -49,6 +52,7 @@ Nunchuk/Tilt/Backward = `Axis 216`
 Nunchuk/Tilt/Left = `Axis 217`
 Nunchuk/Tilt/Right = `Axis 218`
 Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Tilt/Modifier/Range = 50,000000
 Nunchuk/Shake/X = `Button 220`
 Nunchuk/Shake/Y = `Button 221`
 Nunchuk/Shake/Z = `Button 222`
@@ -69,12 +73,15 @@ 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/Left Stick/Radius = 100,000000
 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/Right Stick/Radius = 100,000000
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
+Classic/Triggers/Threshold = 90,000000
 Guitar/Buttons/- = `Button 400`
 Guitar/Buttons/+ = `Button 401`
 Guitar/Frets/Green = `Button 402`
@@ -88,6 +95,7 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
+Guitar/Stick/Radius = 100,000000
 Guitar/Whammy/Bar = `Axis = 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -101,6 +109,7 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
+Drums/Stick/Radius = 100,000000
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -119,6 +128,7 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
+Turntable/Stick/Radius = 100,000000
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -153,6 +163,8 @@ Tilt/Forward = `Axis 127`
 Tilt/Backward = `Axis 128`
 Tilt/Left = `Axis 129`
 Tilt/Right = `Axis 130`
+Tilt/Modifier = `Button 131`
+Tilt/Modifier/Range = 50,000000
 Shake/X = `Button 132`
 Shake/Y = `Button 133`
 Shake/Z = `Button 134`
@@ -163,6 +175,7 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Stick/Radius = 100,000000
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -174,6 +187,7 @@ Nunchuk/Tilt/Backward = `Axis 216`
 Nunchuk/Tilt/Left = `Axis 217`
 Nunchuk/Tilt/Right = `Axis 218`
 Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Tilt/Modifier/Range = 50,000000
 Nunchuk/Shake/X = `Button 220`
 Nunchuk/Shake/Y = `Button 221`
 Nunchuk/Shake/Z = `Button 222`
@@ -194,12 +208,15 @@ 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/Left Stick/Radius = 100,000000
 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/Right Stick/Radius = 100,000000
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
+Classic/Triggers/Threshold = 90,000000
 Guitar/Buttons/- = `Button 400`
 Guitar/Buttons/+ = `Button 401`
 Guitar/Frets/Green = `Button 402`
@@ -213,6 +230,7 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
+Guitar/Stick/Radius = 100,000000
 Guitar/Whammy/Bar = `Axis = 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -226,6 +244,7 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
+Drums/Stick/Radius = 100,000000
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -244,6 +263,7 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
+Turntable/Stick/Radius = 100,000000
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -278,6 +298,8 @@ Tilt/Forward = `Axis 127`
 Tilt/Backward = `Axis 128`
 Tilt/Left = `Axis 129`
 Tilt/Right = `Axis 130`
+Tilt/Modifier = `Button 131`
+Tilt/Modifier/Range = 50,000000
 Shake/X = `Button 132`
 Shake/Y = `Button 133`
 Shake/Z = `Button 134`
@@ -288,6 +310,7 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Stick/Radius = 100,000000
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -299,6 +322,7 @@ Nunchuk/Tilt/Backward = `Axis 216`
 Nunchuk/Tilt/Left = `Axis 217`
 Nunchuk/Tilt/Right = `Axis 218`
 Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Tilt/Modifier/Range = 50,000000
 Nunchuk/Shake/X = `Button 220`
 Nunchuk/Shake/Y = `Button 221`
 Nunchuk/Shake/Z = `Button 222`
@@ -319,12 +343,15 @@ 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/Left Stick/Radius = 100,000000
 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/Right Stick/Radius = 100,000000
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
+Classic/Triggers/Threshold = 90,000000
 Guitar/Buttons/- = `Button 400`
 Guitar/Buttons/+ = `Button 401`
 Guitar/Frets/Green = `Button 402`
@@ -338,6 +365,7 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
+Guitar/Stick/Radius = 100,000000
 Guitar/Whammy/Bar = `Axis = 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -351,6 +379,7 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
+Drums/Stick/Radius = 100,000000
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -369,6 +398,7 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
+Turntable/Stick/Radius = 100,000000
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
@@ -403,6 +433,8 @@ Tilt/Forward = `Axis 127`
 Tilt/Backward = `Axis 128`
 Tilt/Left = `Axis 129`
 Tilt/Right = `Axis 130`
+Tilt/Modifier = `Button 131`
+Tilt/Modifier/Range = 50,000000
 Shake/X = `Button 132`
 Shake/Y = `Button 133`
 Shake/Z = `Button 134`
@@ -413,6 +445,7 @@ Nunchuk/Stick/Up = `Axis 203`
 Nunchuk/Stick/Down = `Axis 204`
 Nunchuk/Stick/Left = `Axis 205`
 Nunchuk/Stick/Right = `Axis 206`
+Nunchuk/Stick/Radius = 100,000000
 Nunchuk/Swing/Up = `Axis 208`
 Nunchuk/Swing/Down = `Axis 209`
 Nunchuk/Swing/Left = `Axis 210`
@@ -424,6 +457,7 @@ Nunchuk/Tilt/Backward = `Axis 216`
 Nunchuk/Tilt/Left = `Axis 217`
 Nunchuk/Tilt/Right = `Axis 218`
 Nunchuk/Tilt/Modifier = `Button 219`
+Nunchuk/Tilt/Modifier/Range = 50,000000
 Nunchuk/Shake/X = `Button 220`
 Nunchuk/Shake/Y = `Button 221`
 Nunchuk/Shake/Z = `Button 222`
@@ -444,12 +478,15 @@ 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/Left Stick/Radius = 100,000000
 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/Right Stick/Radius = 100,000000
 Classic/Triggers/L = `Axis 323`
 Classic/Triggers/R = `Axis 324`
+Classic/Triggers/Threshold = 90,000000
 Guitar/Buttons/- = `Button 400`
 Guitar/Buttons/+ = `Button 401`
 Guitar/Frets/Green = `Button 402`
@@ -463,6 +500,7 @@ Guitar/Stick/Up = `Axis 410`
 Guitar/Stick/Down = `Axis 411`
 Guitar/Stick/Left = `Axis 412`
 Guitar/Stick/Right = `Axis 413`
+Guitar/Stick/Radius = 100,000000
 Guitar/Whammy/Bar = `Axis = 414`
 Drums/Buttons/- = `Button 500`
 Drums/Buttons/+ = `Button 501`
@@ -476,6 +514,7 @@ Drums/Stick/Up = `Axis 509`
 Drums/Stick/Down = `Axis 510`
 Drums/Stick/Left = `Axis 511`
 Drums/Stick/Right = `Axis 512`
+Drums/Stick/Radius = 100,000000
 Turntable/Buttons/Green Left = `Button 600`
 Turntable/Buttons/Red Left = `Button 601`
 Turntable/Buttons/Blue Left = `Button 602`
@@ -494,6 +533,7 @@ Turntable/Stick/Up = `Axis 617`
 Turntable/Stick/Down = `Axis 618`
 Turntable/Stick/Left = `Axis 619`
 Turntable/Stick/Right = `Axis 620`
+Turntable/Stick/Radius = 100,000000
 Turntable/Effect/Dial = `Axis 621`
 Turntable/Crossfade/Left = `Axis 623`
 Turntable/Crossfade/Right = `Axis 624`
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 9904d24c0b..71fbbd93e6 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
@@ -78,6 +78,7 @@ public final class NativeLibrary
 		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_TILT_MODIFIER        = 131;
 		public static final int WIIMOTE_SHAKE_X              = 132;
 		public static final int WIIMOTE_SHAKE_Y              = 133;
 		public static final int WIIMOTE_SHAKE_Z              = 134;
@@ -100,6 +101,7 @@ public final class NativeLibrary
 		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_TILT_MODIFIER        = 219;
 		public static final int NUNCHUK_SHAKE_X              = 220;
 		public static final int NUNCHUK_SHAKE_Y              = 221;
 		public static final int NUNCHUK_SHAKE_Z              = 222;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
index d1c5e92600..ea7201710b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
@@ -49,10 +49,67 @@ public final class UserPreferences
 		editor.putBoolean("OverclockEnable", getConfig("Dolphin.ini", "Core", "OverclockEnable", "False").equals("True"));
 		editor.putString("Overclock", getConfig("Dolphin.ini", "Core", "Overclock", "100"));
 
-		editor.putString("WiimoteExtension_4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None"));
-		editor.putString("WiimoteExtension_5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None"));
-		editor.putString("WiimoteExtension_6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None"));
-		editor.putString("WiimoteExtension_7", getConfig("WiimoteNew.ini", "Wiimote4", "Extension", "None"));
+		// Load analog ranges from GCPadNew.ini and WiimoteNew.ini
+		editor.putString("mainRadius0", getConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", "100,000000"));
+		editor.putString("cStickRadius0", getConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", "100,000000"));
+		editor.putString("inputThres0", getConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", "90,000000"));
+		editor.putString("mainRadius1", getConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", "100,000000"));
+		editor.putString("cStickRadius1", getConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", "100,000000"));
+		editor.putString("inputThres1", getConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", "90,000000"));
+		editor.putString("mainRadius2", getConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", "100,000000"));
+		editor.putString("cStickRadius2", getConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", "100,000000"));
+		editor.putString("inputThres2", getConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", "90,000000"));
+		editor.putString("mainRadius3", getConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", "100,000000"));
+		editor.putString("cStickRadius3", getConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", "100,000000"));
+		editor.putString("inputThres3", getConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", "90,000000"));
+
+		editor.putString("tiltRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", "50,00000"));
+		editor.putString("tiltRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", "50,00000"));
+		editor.putString("tiltRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", "50,00000"));
+		editor.putString("tiltRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", "50,00000"));
+
+		editor.putString("nunchukRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", "100,000000"));
+		editor.putString("nunchukRange4", getConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
+		editor.putString("nunchukRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", "100,000000"));
+		editor.putString("nunchukRange5", getConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
+		editor.putString("nunchukRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", "100,000000"));
+		editor.putString("nunchukRange6", getConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
+		editor.putString("nunchukRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", "100,000000"));
+		editor.putString("nunchukRange7", getConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Tilt/Modifier/Range", "50,00000"));
+
+		editor.putString("classicLRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", "100,000000"));
+		editor.putString("classicRRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", "100,000000"));
+		editor.putString("classicThres4", getConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", "90,000000"));
+		editor.putString("classicLRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", "100,000000"));
+		editor.putString("classicRRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", "100,000000"));
+		editor.putString("classicThres5", getConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", "90,000000"));
+		editor.putString("classicLRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", "100,000000"));
+		editor.putString("classicRRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", "100,000000"));
+		editor.putString("classicThres6", getConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", "90,000000"));
+		editor.putString("classicLRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", "100,000000"));
+		editor.putString("classicRRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", "100,000000"));
+		editor.putString("classicThres7", getConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", "90,000000"));
+
+		editor.putString("guitarRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", "100,000000"));
+		editor.putString("guitarRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", "100,000000"));
+		editor.putString("guitarRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", "100,000000"));
+		editor.putString("guitarRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", "100,000000"));
+
+		editor.putString("drumsRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", "100,000000"));
+		editor.putString("drumsRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", "100,000000"));
+		editor.putString("drumsRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", "100,000000"));
+		editor.putString("drumsRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", "100,000000"));
+
+		editor.putString("turntableRadius4", getConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", "100,000000"));
+		editor.putString("turntableRadius5", getConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", "100,000000"));
+		editor.putString("turntableRadius6", getConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", "100,000000"));
+		editor.putString("turntableRadius7", getConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", "100,000000"));
+
+		// Load Wiimote Extension settings from WiimoteNew.ini
+		editor.putString("wiimoteExtension4", getConfig("WiimoteNew.ini", "Wiimote1", "Extension", "None"));
+		editor.putString("wiimoteExtension5", getConfig("WiimoteNew.ini", "Wiimote2", "Extension", "None"));
+		editor.putString("wiimoteExtension6", getConfig("WiimoteNew.ini", "Wiimote3", "Extension", "None"));
+		editor.putString("wiimoteExtension7", getConfig("WiimoteNew.ini", "Wiimote4", "Extension", "None"));
 
 		editor.putString("gpuPref",               getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL"));
 		editor.putBoolean("showFPS",              getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
@@ -147,11 +204,73 @@ public final class UserPreferences
 		boolean overclockEnabled = prefs.getBoolean("OverclockEnable", false);
 		String overclockSetting =  prefs.getString("Overclock", "100");
 
+		// Current GC analog range setup. Falls back to default upon error.
+		String currentMainRadius0 = prefs.getString("mainRadius0", "100,000000");
+		String currentCStickRadius0 = prefs.getString("cStickRadius0", "100,000000");
+		String currentInputThres0 = prefs.getString("inputThres0", "90,000000");
+		String currentMainRadius1 = prefs.getString("mainRadius1", "100,000000");
+		String currentCStickRadius1 = prefs.getString("cStickRadius1", "100,000000");
+		String currentInputThres1 = prefs.getString("inputThres1", "90,000000");
+		String currentMainRadius2 = prefs.getString("mainRadius2", "100,000000");
+		String currentCStickRadius2 = prefs.getString("cStickRadius2", "100,000000");
+		String currentInputThres2 = prefs.getString("inputThres2", "90,000000");
+		String currentMainRadius3 = prefs.getString("mainRadius3", "100,000000");
+		String currentCStickRadius3 = prefs.getString("cStickRadius3", "100,000000");
+		String currentInputThres3 = prefs.getString("inputThres3", "90,000000");
+
+		// Current Wii analog range setup. Falls back to default on error.
+		String currentTiltRange4 = prefs.getString("tiltRange4", "50,000000");
+		String currentTiltRange5 = prefs.getString("tiltRange5", "50,000000");
+		String currentTiltRange6 = prefs.getString("tiltRange6", "50,000000");
+		String currentTiltRange7 = prefs.getString("tiltRange7", "50,000000");
+
+		// Current Nunchuk analog range setup. Falls back to default upon error.
+		String currentNunchukRadius4 = prefs.getString("nunchukRadius4", "100,000000");
+		String currentNunchukRange4 = prefs.getString("nunchukRange4", "50,000000");
+		String currentNunchukRadius5 = prefs.getString("nunchukRadius5", "100,000000");
+		String currentNunchukRange5 = prefs.getString("nunchukRange5", "50,000000");
+		String currentNunchukRadius6 = prefs.getString("nunchukRadius6", "100,000000");
+		String currentNunchukRange6 = prefs.getString("nunchukRange6", "50,000000");
+		String currentNunchukRadius7 = prefs.getString("nunchukRadius7", "100,000000");
+		String currentNunchukRange7 = prefs.getString("nunchukRange7", "50,000000");
+
+		// Current Classic analog range setup. Falls back to 100,000000 upon error.
+		String currentClassicLRadius4 = prefs.getString("classicLRadius4", "100,000000");
+		String currentClassicRRadius4 = prefs.getString("classicRRadius4", "100,000000");
+		String currentClassicThres4 = prefs.getString("classicThres4", "90,000000");
+		String currentClassicLRadius5 = prefs.getString("classicLRadius5", "100,000000");
+		String currentClassicRRadius5 = prefs.getString("classicRRadius5", "100,000000");
+		String currentClassicThres5 = prefs.getString("classicThres5", "90,000000");
+		String currentClassicLRadius6 = prefs.getString("classicLRadius6", "100,000000");
+		String currentClassicRRadius6 = prefs.getString("classicRRadius6", "100,000000");
+		String currentClassicThres6 = prefs.getString("classicThres6", "90,000000");
+		String currentClassicLRadius7 = prefs.getString("classicLRadius7", "100,000000");
+		String currentClassicRRadius7 = prefs.getString("classicRRadius7", "100,000000");
+		String currentClassicThres7 = prefs.getString("classicThres7", "90,000000");
+
+		// Current Guitar analog range setup. Falls back to default upon error.
+		String currentGuitarRadius4 = prefs.getString("guitarRadius4", "100,000000");
+		String currentGuitarRadius5 = prefs.getString("guitarRadius5", "100,000000");
+		String currentGuitarRadius6 = prefs.getString("guitarRadius6", "100,000000");
+		String currentGuitarRadius7 = prefs.getString("guitarRadius7", "100,000000");
+
+		// Current Drums modifier Radius setup. Falls back to default upon error.
+		String currentDrumsRadius4 = prefs.getString("drumsRadius4", "100,000000");
+		String currentDrumsRadius5 = prefs.getString("drumsRadius5", "100,000000");
+		String currentDrumsRadius6 = prefs.getString("drumsRadius6", "100,000000");
+		String currentDrumsRadius7 = prefs.getString("drumsRadius7", "100,000000");
+
+		// Current Turntable analog range setup. Falls back to default upon error.
+		String currentTurntableRadius4 = prefs.getString("turntableRadius4", "100,000000");
+		String currentTurntableRadius5 = prefs.getString("turntableRadius5", "100,000000");
+		String currentTurntableRadius6 = prefs.getString("turntableRadius6", "100,000000");
+		String currentTurntableRadius7 = prefs.getString("turntableRadius7", "100,000000");
+
 		// Current wiimote extension setup. Falls back to no extension upon error.
-		String WiimoteExtension_4 = prefs.getString("WiimoteExtension_4", "None");
-		String WiimoteExtension_5 = prefs.getString("WiimoteExtension_5", "None");
-		String WiimoteExtension_6 = prefs.getString("WiimoteExtension_6", "None");
-		String WiimoteExtension_7 = prefs.getString("WiimoteExtension_7", "None");
+		String currentWiimoteExtension4 = prefs.getString("wiimoteExtension4", "None");
+		String currentWiimoteExtension5 = prefs.getString("wiimoteExtension5", "None");
+		String currentWiimoteExtension6 = prefs.getString("wiimoteExtension6", "None");
+		String currentWiimoteExtension7 = prefs.getString("wiimoteExtension7", "None");
 
 		// Current video backend being used. Falls back to software rendering upon error.
 		String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
@@ -233,11 +352,73 @@ public final class UserPreferences
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "OverclockEnable", overclockEnabled ? "True" : "False");
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "Overclock", overclockSetting);
 
+		// GameCube analog ranges Setup
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Main Stick/Radius", currentMainRadius0);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "C-Stick/Radius", currentCStickRadius0);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad1", "Triggers/Threshold", currentInputThres0);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Main Stick/Radius", currentMainRadius1);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "C-Stick/Radius", currentCStickRadius1);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad2", "Triggers/Threshold", currentInputThres1);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Main Stick/Radius", currentMainRadius2);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "C-Stick/Radius", currentCStickRadius2);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad3", "Triggers/Threshold", currentInputThres2);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Main Stick/Radius", currentMainRadius3);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "C-Stick/Radius", currentCStickRadius3);
+		NativeLibrary.SetConfig("GCPadNew.ini", "GCPad4", "Triggers/Threshold", currentInputThres3);
+
+		// Wiimote analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Tilt/Modifier/Range", currentTiltRange4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Tilt/Modifier/Range", currentTiltRange5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Tilt/Modifier/Range", currentTiltRange6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Tilt/Modifier/Range", currentTiltRange7);
+
+		// Nunchuk analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Nunchuk/Stick/Radius", currentNunchukRange4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Nunchuk/Stick/Radius", currentNunchukRange5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Nunchuk/Stick/Radius", currentNunchukRange6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRadius7);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Nunchuk/Stick/Radius", currentNunchukRange7);
+
+		// Classic analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Left Stick/Radius", currentClassicLRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Right Stick/Radius", currentClassicRRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Classic/Triggers/Threshold", currentClassicThres4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Left Stick/Radius", currentClassicLRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Right Stick/Radius", currentClassicRRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Classic/Triggers/Threshold", currentClassicThres5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Left Stick/Radius", currentClassicLRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Right Stick/Radius", currentClassicRRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Classic/Triggers/Threshold", currentClassicThres6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Left Stick/Radius", currentClassicLRadius7);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Right Stick/Radius", currentClassicRRadius7);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Classic/Triggers/Threshold", currentClassicThres7);
+
+		// Guitar analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Guitar/Stick/Radius", currentGuitarRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Guitar/Stick/Radius", currentGuitarRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Guitar/Stick/Radius", currentGuitarRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Guitar/Stick/Radius", currentGuitarRadius7);
+
+		// Drums analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Drums/Stick/Radius", currentDrumsRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Drums/Stick/Radius", currentDrumsRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Drums/Stick/Radius", currentDrumsRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Drums/Stick/Radius", currentDrumsRadius7);
+
+		// Turntable analog ranges Setup
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Turntable/Stick/Radius", currentTurntableRadius4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Turntable/Stick/Radius", currentTurntableRadius5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Turntable/Stick/Radius", currentTurntableRadius6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Turntable/Stick/Radius", currentTurntableRadius7);
+
 		// Wiimote Extension Settings
-		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", WiimoteExtension_4);
-		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", WiimoteExtension_5);
-		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", WiimoteExtension_6);
-		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", WiimoteExtension_7);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension", currentWiimoteExtension4);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote2", "Extension", currentWiimoteExtension5);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote3", "Extension", currentWiimoteExtension6);
+		NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote4", "Extension", currentWiimoteExtension7);
 
 		// General Video Settings
 		NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 3472015096..1bb6a6b004 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -14,7 +14,7 @@
         <item>1</item>
         <item>2</item>
     </string-array>
-    
+
     <!-- CPU core selection - ARM -->
     <string-array name="emuCoreEntriesARM" translatable="false">
         <item>@string/interpreter</item>
@@ -34,7 +34,7 @@
         <item>0</item>
         <item>4</item>
     </string-array>
-    
+
     <!-- CPU core selection - Other -->
     <string-array name="emuCoreEntriesOther" translatable="false">
         <item>@string/interpreter</item>
@@ -52,7 +52,7 @@
         <item>0</item>
         <item>5</item>
     </string-array>
-    
+
     <!-- Video Backend Selection - Supports OpenGL ES 3 -->
     <string-array name="videoBackendEntriesGLES3" translatable="false">
         <item>@string/software_renderer</item>
@@ -72,7 +72,7 @@
         <item>Software Renderer</item>
         <item>OGL</item>
     </string-array>
-    
+
     <!-- Video Backend Selection - No OpenGL ES 3 support -->
     <string-array name="videoBackendEntriesNoGLES3" translatable="false">
         <item>@string/software_renderer</item>
@@ -112,7 +112,7 @@
         <item>RAM (cached)</item>
         <item>RAM (uncached)</item>
     </string-array>
-    
+
     <!-- Texture Cache Accuracy Preference -->
     <string-array name="textureCacheAccuracyEntries" translatable="false">
         <item>@string/texture_cache_accuracy_low</item>
@@ -124,7 +124,33 @@
         <item>512</item>
         <item>0</item>
     </string-array>
-    
+
+    <!-- Analog Modifier ranges -->
+    <string-array name="analogRangesEntries" translatable="false">
+        <item>100</item>
+        <item>90</item>
+        <item>80</item>
+        <item>70</item>
+        <item>60</item>
+        <item>50</item>
+        <item>40</item>
+        <item>30</item>
+        <item>20</item>
+        <item>10</item>
+    </string-array>
+    <string-array name="analogRangesValues" translatable="false">
+        <item>100,000000</item>
+        <item>90,000000</item>
+        <item>80,000000</item>
+        <item>70,000000</item>
+        <item>60,000000</item>
+        <item>50,000000</item>
+        <item>40,000000</item>
+        <item>30,000000</item>
+        <item>20,000000</item>
+        <item>10,000000</item>
+    </string-array>
+
     <!-- External Frame Buffer Preference -->
     <string-array name="externalFrameBufferEntries" translatable="false">
         <item>@string/disabled</item>
@@ -136,7 +162,7 @@
         <item>Virtual</item>
         <item>Real</item>
     </string-array>
-    
+
     <!-- Internal Resolution Preference -->
     <string-array name="internalResolutionEntries" translatable="false">
         <item>1x Native (640x528)</item>
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index 9714743b3d..7819de79cc 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -88,6 +88,9 @@
     <string name="controller_main">Main Stick Navigation</string>
     <string name="controller_c">C-Stick Navigation</string>
     <string name="controller_trig">Analog Triggers</string>
+	<string name="modifier_range">Modifier Range</string>
+    <string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
+    <string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
     <string name="wiimote_0">Wiimote 1</string>
     <string name="wiimote_1">Wiimote 2</string>
     <string name="wiimote_2">Wiimote 3</string>
@@ -157,6 +160,7 @@
     <string name="tilt_backward">Tilt Backward</string>
     <string name="tilt_left">Tilt Left</string>
     <string name="tilt_right">Tilt Right</string>
+	<string name="tilt_modifier">Tilt Modifier</string>
     <string name="shake_x">Shake X</string>
     <string name="shake_y">Shake Y</string>
     <string name="shake_z">Shake Z</string>
diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml
index 183ad6cf21..3a5bc32422 100644
--- a/Source/Android/app/src/main/res/xml/preferences.xml
+++ b/Source/Android/app/src/main/res/xml/preferences.xml
@@ -182,6 +182,15 @@
                             android:summary="%s"
                             android:title="@string/main_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController1"
+                            android:key="mainRadius0"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -212,6 +221,15 @@
                             android:summary="%s"
                             android:title="@string/c_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController1"
+                            android:key="cStickRadius0"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -230,6 +248,15 @@
                             android:summary="%s"
                             android:title="@string/trigger_right"/>
 
+                        <ListPreference
+                            android:defaultValue="90,000000"
+                            android:dependency="enableController1"
+                            android:key="inputThres0"
+                            android:summary="%s"
+                            android:title="@string/analog_threshold"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                 </PreferenceScreen>
@@ -343,6 +370,15 @@
                             android:summary="%s"
                             android:title="@string/main_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController2"
+                            android:key="mainRadius1"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -373,6 +409,15 @@
                             android:summary="%s"
                             android:title="@string/c_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController2"
+                            android:key="cStickRadius1"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -391,6 +436,15 @@
                             android:summary="%s"
                             android:title="@string/trigger_right"/>
 
+                        <ListPreference
+                            android:defaultValue="90,000000"
+                            android:dependency="enableController2"
+                            android:key="inputThres1"
+                            android:summary="%s"
+                            android:title="@string/analog_threshold"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                 </PreferenceScreen>
@@ -504,6 +558,15 @@
                             android:summary="%s"
                             android:title="@string/main_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController3"
+                            android:key="mainRadius2"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -534,6 +597,15 @@
                             android:summary="%s"
                             android:title="@string/c_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController3"
+                            android:key="cStickRadius2"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -552,6 +624,15 @@
                             android:summary="%s"
                             android:title="@string/trigger_right"/>
 
+                        <ListPreference
+                            android:defaultValue="90,000000"
+                            android:dependency="enableController3"
+                            android:key="inputThres2"
+                            android:summary="%s"
+                            android:title="@string/analog_threshold"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                 </PreferenceScreen>
@@ -665,6 +746,15 @@
                             android:summary="%s"
                             android:title="@string/main_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController4"
+                            android:key="mainRadius3"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -695,6 +785,15 @@
                             android:summary="%s"
                             android:title="@string/c_stick_right"/>
 
+                        <ListPreference
+                            android:defaultValue="100,000000"
+                            android:dependency="enableController4"
+                            android:key="cStickRadius3"
+                            android:summary="%s"
+                            android:title="@string/analog_radius"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -713,6 +812,15 @@
                             android:summary="%s"
                             android:title="@string/trigger_right"/>
 
+                        <ListPreference
+                            android:defaultValue="90,000000"
+                            android:dependency="enableController4"
+                            android:key="inputThres3"
+                            android:summary="%s"
+                            android:title="@string/analog_threshold"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                 </PreferenceScreen>
@@ -737,7 +845,7 @@
                         android:defaultValue="None"
                         android:entries="@array/wiimoteExtEntries"
                         android:entryValues="@array/wiimoteExtValues"
-                        android:key="WiimoteExtension_4"
+                        android:key="wiimoteExtension4"
                         android:summary="@string/wiimote_extensions_descrip"
                         android:title="@string/wiimote_extensions"/>
 
@@ -937,6 +1045,21 @@
                             android:summary="%s"
                             android:title="@string/tilt_right"/>
 
+                        <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                            android:dependency="enableWiimote1"
+                            android:key="TiltModifier_4"
+                            android:summary="%s"
+                            android:title="@string/tilt_modifier"/>
+
+                        <ListPreference
+                            android:dependency="enableWiimote1"
+                            android:defaultValue="50,000000"
+                            android:key="tiltRange4"
+                            android:summary="%s"
+                            android:title="@string/modifier_range"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -1013,6 +1136,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="nunchukRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1075,6 +1206,19 @@
                                     android:summary="%s"
                                     android:title="@string/tilt_right"/>
 
+                                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                                    android:key="NunchukModifier_4"
+                                    android:summary="%s"
+                                    android:title="@string/tilt_modifier"/>
+
+                                <ListPreference
+                                    android:defaultValue="50,000000"
+                                    android:key="nunchukRange4"
+                                    android:summary="%s"
+                                    android:title="@string/modifier_range"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1207,6 +1351,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_left_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicLRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1233,6 +1385,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_right_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicRRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1249,6 +1409,14 @@
                                     android:summary="%s"
                                     android:title="@string/trigger_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="90,000000"
+                                    android:key="classicThres4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_threshold"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -1340,6 +1508,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="guitarRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1437,6 +1613,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="drumsRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -1559,6 +1743,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="turntableRadius4"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1608,7 +1800,7 @@
                         android:defaultValue="None"
                         android:entries="@array/wiimoteExtEntries"
                         android:entryValues="@array/wiimoteExtValues"
-                        android:key="WiimoteExtension_5"
+                        android:key="wiimoteExtension5"
                         android:summary="@string/wiimote_extensions_descrip"
                         android:title="@string/wiimote_extensions"/>
 
@@ -1808,6 +2000,21 @@
                             android:summary="%s"
                             android:title="@string/tilt_right"/>
 
+                        <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                            android:dependency="enableWiimote2"
+                            android:key="TiltModifier_5"
+                            android:summary="%s"
+                            android:title="@string/tilt_modifier"/>
+
+                        <ListPreference
+                            android:dependency="enableWiimote2"
+                            android:defaultValue="50,000000"
+                            android:key="tiltRange5"
+                            android:summary="%s"
+                            android:title="@string/modifier_range"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -1884,6 +2091,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="nunchukRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -1946,6 +2161,19 @@
                                     android:summary="%s"
                                     android:title="@string/tilt_right"/>
 
+                                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                                    android:key="NunchukModifier_5"
+                                    android:summary="%s"
+                                    android:title="@string/tilt_modifier"/>
+
+                                <ListPreference
+                                    android:defaultValue="50,000000"
+                                    android:key="nunchukRange5"
+                                    android:summary="%s"
+                                    android:title="@string/modifier_range"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2078,6 +2306,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_left_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicLRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2104,6 +2340,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_right_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicRRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2120,6 +2364,14 @@
                                     android:summary="%s"
                                     android:title="@string/trigger_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="90,000000"
+                                    android:key="classicThres5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_threshold"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -2211,6 +2463,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="guitarRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2308,6 +2568,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="drumsRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -2430,6 +2698,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="turntableRadius5"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2479,7 +2755,7 @@
                         android:defaultValue="None"
                         android:entries="@array/wiimoteExtEntries"
                         android:entryValues="@array/wiimoteExtValues"
-                        android:key="WiimoteExtension_6"
+                        android:key="wiimoteExtension6"
                         android:summary="@string/wiimote_extensions_descrip"
                         android:title="@string/wiimote_extensions"/>
 
@@ -2679,6 +2955,20 @@
                             android:summary="%s"
                             android:title="@string/tilt_right"/>
 
+                        <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                            android:dependency="enableWiimote3"
+                            android:key="TiltModifier_6"
+                            android:summary="%s"
+                            android:title="@string/tilt_modifier"/>
+
+                        <ListPreference
+                            android:defaultValue="50,000000"
+                            android:key="tiltRange6"
+                            android:summary="%s"
+                            android:title="@string/modifier_range"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -2755,6 +3045,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="nunchukRadius6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2817,6 +3115,19 @@
                                     android:summary="%s"
                                     android:title="@string/tilt_right"/>
 
+                                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                                    android:key="NunchukModifier_6"
+                                    android:summary="%s"
+                                    android:title="@string/tilt_modifier"/>
+
+                                <ListPreference
+                                    android:defaultValue="50,000000"
+                                    android:key="nunchukRange6"
+                                    android:summary="%s"
+                                    android:title="@string/modifier_range"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2949,6 +3260,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_left_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicLRadius6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2975,6 +3294,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_right_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicRRadius6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -2991,6 +3318,14 @@
                                     android:summary="%s"
                                     android:title="@string/trigger_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="90,000000"
+                                    android:key="classicThres6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_threshold"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -3082,6 +3417,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="guitarRadius6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3179,6 +3522,13 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="drumsRadius6"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -3301,6 +3651,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="turntableRadius6"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3350,7 +3708,7 @@
                         android:defaultValue="None"
                         android:entries="@array/wiimoteExtEntries"
                         android:entryValues="@array/wiimoteExtValues"
-                        android:key="WiimoteExtension_7"
+                        android:key="wiimoteExtension7"
                         android:summary="@string/wiimote_extensions_descrip"
                         android:title="@string/wiimote_extensions"/>
 
@@ -3550,6 +3908,20 @@
                             android:summary="%s"
                             android:title="@string/tilt_right"/>
 
+                        <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                            android:dependency="enableWiimote4"
+                            android:key="TiltModifier_7"
+                            android:summary="%s"
+                            android:title="@string/tilt_modifier"/>
+
+                        <ListPreference
+                            android:defaultValue="50,000000"
+                            android:key="tiltRange7"
+                            android:summary="%s"
+                            android:title="@string/modifier_range"
+                            android:entries="@array/analogRangesEntries"
+                            android:entryValues="@array/analogRangesValues"/>
+
                     </PreferenceCategory>
 
                     <PreferenceCategory
@@ -3626,6 +3998,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="nunchukRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3688,6 +4068,19 @@
                                     android:summary="%s"
                                     android:title="@string/tilt_right"/>
 
+                                <org.dolphinemu.dolphinemu.utils.InputBindingPreference
+                                    android:key="NunchukModifier_7"
+                                    android:summary="%s"
+                                    android:title="@string/tilt_modifier"/>
+
+                                <ListPreference
+                                    android:defaultValue="50,000000"
+                                    android:key="nunchukRange7"
+                                    android:summary="%s"
+                                    android:title="@string/modifier_range"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3820,6 +4213,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_left_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicLRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3846,6 +4247,14 @@
                                     android:summary="%s"
                                     android:title="@string/classic_stick_right_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="classicRRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -3862,6 +4271,14 @@
                                     android:summary="%s"
                                     android:title="@string/trigger_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="90,000000"
+                                    android:key="classicThres7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_threshold"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -3953,6 +4370,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="guitarRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
@@ -4050,6 +4475,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="drumsRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                         </PreferenceScreen>
@@ -4172,6 +4605,14 @@
                                     android:summary="%s"
                                     android:title="@string/stick_right"/>
 
+                                <ListPreference
+                                    android:defaultValue="100,000000"
+                                    android:key="turntableRadius7"
+                                    android:summary="%s"
+                                    android:title="@string/analog_radius"
+                                    android:entries="@array/analogRangesEntries"
+                                    android:entryValues="@array/analogRangesValues"/>
+
                             </PreferenceCategory>
 
                             <PreferenceCategory
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index 244171b12c..803eeb062f 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -64,6 +64,7 @@ namespace ButtonManager
 		"TiltBackward",
 		"TiltLeft",
 		"TiltRight",
+		"TiltModifier"
 		"ShakeX",
 		"ShakeY",
 		"ShakeZ",
@@ -84,6 +85,7 @@ namespace ButtonManager
 		"NunchukTiltBackward",
 		"NunchukTiltLeft",
 		"NunchukTiltRight",
+		"NunchukTiltModifier",
 		"NunchukShakeX",
 		"NunchukShakeY",
 		"NunchukShakeZ",
@@ -213,6 +215,7 @@ namespace ButtonManager
 		WIIMOTE_TILT_BACKWARD,
 		WIIMOTE_TILT_LEFT,
 		WIIMOTE_TILT_RIGHT,
+		WIIMOTE_TILT_MODIFIER,
 		WIIMOTE_SHAKE_X,
 		WIIMOTE_SHAKE_Y,
 		WIIMOTE_SHAKE_Z,
@@ -233,6 +236,7 @@ namespace ButtonManager
 		NUNCHUK_TILT_BACKWARD,
 		NUNCHUK_TILT_LEFT,
 		NUNCHUK_TILT_RIGHT,
+		NUNCHUK_TILT_MODIFIER,
 		NUNCHUK_SHAKE_X,
 		NUNCHUK_SHAKE_Y,
 		NUNCHUK_SHAKE_Z,
@@ -365,6 +369,7 @@ namespace ButtonManager
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_LEFT, BIND_BUTTON, WIIMOTE_LEFT, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_RIGHT, BIND_BUTTON, WIIMOTE_RIGHT, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_IR_HIDE, BIND_BUTTON, WIIMOTE_IR_HIDE, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, WIIMOTE_TILT_MODIFIER, BIND_BUTTON, WIIMOTE_TILT_MODIFIER, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_X, BIND_BUTTON, WIIMOTE_SHAKE_X, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Y, BIND_BUTTON, WIIMOTE_SHAKE_Y, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, WIIMOTE_SHAKE_Z, BIND_BUTTON, WIIMOTE_SHAKE_Z, 1.0f));
@@ -389,6 +394,7 @@ namespace ButtonManager
 			// Wii: Nunchuk
 			AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_C, BIND_BUTTON, NUNCHUK_BUTTON_C, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, NUNCHUK_BUTTON_Z, BIND_BUTTON, NUNCHUK_BUTTON_Z, 1.0f));
+			AddBind(touchScreenKey, new sBind(a, NUNCHUK_TILT_MODIFIER, BIND_BUTTON, NUNCHUK_TILT_MODIFIER, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_X, BIND_BUTTON, NUNCHUK_SHAKE_X, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Y, BIND_BUTTON, NUNCHUK_SHAKE_Y, 1.0f));
 			AddBind(touchScreenKey, new sBind(a, NUNCHUK_SHAKE_Z, BIND_BUTTON, NUNCHUK_SHAKE_Z, 1.0f));
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.h b/Source/Core/DolphinWX/Android/ButtonManager.h
index 73c01c0892..575ef1c4dd 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.h
+++ b/Source/Core/DolphinWX/Android/ButtonManager.h
@@ -66,6 +66,7 @@ namespace ButtonManager
 		WIIMOTE_TILT_BACKWARD = 128,
 		WIIMOTE_TILT_LEFT = 129,
 		WIIMOTE_TILT_RIGHT = 130,
+		WIIMOTE_TILT_MODIFIER = 131,
 		WIIMOTE_SHAKE_X = 132,
 		WIIMOTE_SHAKE_Y = 133,
 		WIIMOTE_SHAKE_Z = 134,
@@ -89,6 +90,7 @@ namespace ButtonManager
 		NUNCHUK_TILT_BACKWARD = 216,
 		NUNCHUK_TILT_LEFT = 217,
 		NUNCHUK_TILT_RIGHT = 218,
+		NUNCHUK_TILT_MODIFIER = 219,
 		NUNCHUK_SHAKE_X = 220,
 		NUNCHUK_SHAKE_Y = 221,
 		NUNCHUK_SHAKE_Z = 222,
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 9b4d434996..c70f0cc3ed 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -72,6 +72,7 @@ Touchscreen::Touchscreen(int padID)
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_LEFT));
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_RIGHT));
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_IR_HIDE));
+	AddInput(new Button(_padID, ButtonManager::WIIMOTE_TILT_MODIFIER));
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_X));
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Y));
 	AddInput(new Button(_padID, ButtonManager::WIIMOTE_SHAKE_Z));
@@ -87,6 +88,7 @@ Touchscreen::Touchscreen(int padID)
 	//Wii ext: Nunchuk
 	AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_C));
 	AddInput(new Button(_padID, ButtonManager::NUNCHUK_BUTTON_Z));
+	AddInput(new Button(_padID, ButtonManager::NUNCHUK_TILT_MODIFIER));
 	AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_X));
 	AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Y));
 	AddInput(new Button(_padID, ButtonManager::NUNCHUK_SHAKE_Z));