diff --git a/README.MD b/README.MD
index 420e108..c3622d9 100644
--- a/README.MD
+++ b/README.MD
@@ -4,6 +4,7 @@ Changes in this Version
 
 - stop hotkeys from affecting game controls in some cases
 - always allow left stick to control on screen keyboard
+- allow mapping of stick and dpad independently
 
 Description
 =====
@@ -289,6 +290,7 @@ CHANGELOG
 
 - stop hotkeys from affecting game controls in some cases
 - always allow left stick to control on screen keyboard
+- allow mapping of stick and dpad independently
 
 1.82
 
diff --git a/src/gp2x/menu/menu_config.cpp b/src/gp2x/menu/menu_config.cpp
index b3da4de..6f8a635 100755
--- a/src/gp2x/menu/menu_config.cpp
+++ b/src/gp2x/menu/menu_config.cpp
@@ -83,6 +83,10 @@ int mainMenu_custom_up[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_down[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_left[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_stickup[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_stickdown[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_stickleft[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom_stickright[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_A[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_B[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom_X[MAX_NUM_CONTROLLERS] = { };
@@ -101,6 +105,10 @@ int mainMenu_custom1_up[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_down[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_left[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_stickup[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_stickdown[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_stickleft[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom1_stickright[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_A[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_B[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom1_X[MAX_NUM_CONTROLLERS] = { };
@@ -117,6 +125,10 @@ int mainMenu_custom2_up[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_down[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_left[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_stickup[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_stickdown[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_stickleft[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom2_stickright[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_A[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_B[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom2_X[MAX_NUM_CONTROLLERS] = { };
@@ -133,6 +145,10 @@ int mainMenu_custom3_up[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_down[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_left[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_right[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_stickup[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_stickdown[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_stickleft[MAX_NUM_CONTROLLERS] = { };
+int mainMenu_custom3_stickright[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_A[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_B[MAX_NUM_CONTROLLERS] = { };
 int mainMenu_custom3_X[MAX_NUM_CONTROLLERS] = { };
@@ -279,7 +295,7 @@ void SetDefaultMenuSettings(int general)
     mainMenu_stylusOffset = 0;
     mainMenu_tapDelay = 10;
     mainMenu_customControls = 0;
-	 mainMenu_custom_currentlyEditingControllerNr = 0;
+	mainMenu_custom_currentlyEditingControllerNr = 0;
     mainMenu_custom_dpad = 0;
 	 for (int i=0; i<MAX_NUM_CONTROLLERS; i++) 
 	 {
@@ -287,6 +303,10 @@ void SetDefaultMenuSettings(int general)
 		 mainMenu_custom_down[i] = 0;
 		 mainMenu_custom_left[i] = 0;
 		 mainMenu_custom_right[i] = 0;
+		 mainMenu_custom_stickup[i] = 0;
+		 mainMenu_custom_stickdown[i] = 0;
+		 mainMenu_custom_stickleft[i] = 0;
+		 mainMenu_custom_stickright[i] = 0;
 		 mainMenu_custom_A[i] = 0;
 		 mainMenu_custom_B[i] = 0;
 		 mainMenu_custom_X[i] = 0;
@@ -308,6 +328,10 @@ void SetDefaultMenuSettings(int general)
 		 mainMenu_custom1_down[i] = 0;
 		 mainMenu_custom1_left[i] = 0;
 		 mainMenu_custom1_right[i] = 0;
+		 mainMenu_custom1_stickup[i] = 0;
+		 mainMenu_custom1_stickdown[i] = 0;
+		 mainMenu_custom1_stickleft[i] = 0;
+		 mainMenu_custom1_stickright[i] = 0;
 		 mainMenu_custom1_A[i] = 0;
 		 mainMenu_custom1_B[i] = 0;
 		 mainMenu_custom1_X[i] = 0;
@@ -324,6 +348,10 @@ void SetDefaultMenuSettings(int general)
 		 mainMenu_custom2_down[i] = 0;
 		 mainMenu_custom2_left[i] = 0;
 		 mainMenu_custom2_right[i] = 0;
+		 mainMenu_custom2_stickup[i] = 0;
+		 mainMenu_custom2_stickdown[i] = 0;
+		 mainMenu_custom2_stickleft[i] = 0;
+		 mainMenu_custom2_stickright[i] = 0;
 		 mainMenu_custom2_A[i] = 0;
 		 mainMenu_custom2_B[i] = 0;
 		 mainMenu_custom2_X[i] = 0;
@@ -340,6 +368,10 @@ void SetDefaultMenuSettings(int general)
 		 mainMenu_custom3_down[i] = 0;
 		 mainMenu_custom3_left[i] = 0;
 		 mainMenu_custom3_right[i] = 0;
+		 mainMenu_custom3_stickup[i] = 0;
+		 mainMenu_custom3_stickdown[i] = 0;
+		 mainMenu_custom3_stickleft[i] = 0;
+		 mainMenu_custom3_stickright[i] = 0;
 		 mainMenu_custom3_A[i] = 0;
 		 mainMenu_custom3_B[i] = 0;
 		 mainMenu_custom3_X[i] = 0;
@@ -365,6 +397,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom1_down[0] = -6; // ply1 joy down
 	mainMenu_custom1_left[0] = -7; // ply1 joy left
 	mainMenu_custom1_right[0] = -8; // ply1 joy right
+	mainMenu_custom1_stickup[0] = -5; // ply1 joy up
+	mainMenu_custom1_stickdown[0] = -6; // ply1 joy down
+	mainMenu_custom1_stickleft[0] = -7; // ply1 joy left
+	mainMenu_custom1_stickright[0] = -8; // ply1 joy right
 	mainMenu_custom1_X[0] = -5; // ply1 joy up (jump)
 	mainMenu_custom1_B[0] = 23; // space
 	mainMenu_custom1_A[0] = -3; // ply1 fire 1
@@ -382,6 +418,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom1_down[1] = -10; // ply2 joy down
 	mainMenu_custom1_left[1] = -11; // ply2 joy left
 	mainMenu_custom1_right[1] = -12; // ply2 joy right
+	mainMenu_custom1_stickup[1] = -9; // ply2 joy up
+	mainMenu_custom1_stickdown[1] = -10; // ply2 joy down
+	mainMenu_custom1_stickleft[1] = -11; // ply2 joy left
+	mainMenu_custom1_stickright[1] = -12; // ply2 joy right
 	mainMenu_custom1_X[1] = -9; // ply2 joy up (jump)
 	mainMenu_custom1_B[1] = 0;
 	mainMenu_custom1_A[1] = -1; // left mouse (ply2 fire 1)
@@ -399,6 +439,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom1_down[2] = -16; // ply3 joy down
 	mainMenu_custom1_left[2] = -17; // ply3 joy left
 	mainMenu_custom1_right[2] = -18; // ply3 joy right
+	mainMenu_custom1_stickup[2] = -15; // ply3 joy up
+	mainMenu_custom1_stickdown[2] = -16; // ply3 joy down
+	mainMenu_custom1_stickleft[2] = -17; // ply3 joy left
+	mainMenu_custom1_stickright[2] = -18; // ply3 joy right
 	mainMenu_custom1_X[2] = -15; // ply3 joy up (jump)
 	mainMenu_custom1_B[2] = 0;
 	mainMenu_custom1_A[2] = -13; // ply3 fire 1
@@ -416,6 +460,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom1_down[3] = -22; // ply4 joy down
 	mainMenu_custom1_left[3] = -23; // ply4 joy left
 	mainMenu_custom1_right[3] = -24; // ply4 joy right
+	mainMenu_custom1_stickup[3] = -21; // ply4 joy up
+	mainMenu_custom1_stickdown[3] = -22; // ply4 joy down
+	mainMenu_custom1_stickleft[3] = -23; // ply4 joy left
+	mainMenu_custom1_stickright[3] = -24; // ply4 joy right
 	mainMenu_custom1_X[3] = -21; // ply4 joy up (jump)
 	mainMenu_custom1_B[3] = 0;
 	mainMenu_custom1_A[3] = -19; // ply4 fire 1
@@ -435,6 +483,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom2_down[0] = 2; // arrow down (spring launch ball)
 	mainMenu_custom2_left[0] = 33; // left alt (left flipper)
 	mainMenu_custom2_right[0] = 30; // right shift (magna saver)
+	mainMenu_custom2_stickup[0] = 0;
+	mainMenu_custom2_stickdown[0] = 2; // arrow down (spring launch ball)
+	mainMenu_custom2_stickleft[0] = 33; // left alt (left flipper)
+	mainMenu_custom2_stickright[0] = 30; // right shift (magna saver)
 	mainMenu_custom2_X[0] = 23; // space (nudge center)
 	mainMenu_custom2_B[0] = 34; // right alt (right flipper)
 	mainMenu_custom2_A[0] = 26; // return (launch ball)
@@ -453,6 +505,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom2_down[1] = 2; // arrow down (spring launch ball)
 	mainMenu_custom2_left[1] = 33; // left alt (left flipper)
 	mainMenu_custom2_right[1] = 30; // right shift (magna saver)
+	mainMenu_custom2_stickup[1] = 0;
+	mainMenu_custom2_stickdown[1] = 2; // arrow down (spring launch ball)
+	mainMenu_custom2_stickleft[1] = 33; // left alt (left flipper)
+	mainMenu_custom2_stickright[1] = 30; // right shift (magna saver)
 	mainMenu_custom2_X[1] = 23; // space (nudge center)
 	mainMenu_custom2_B[1] = 34; // right alt (right flipper)
 	mainMenu_custom2_A[1] = 26; // return (launch ball)
@@ -471,6 +527,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom2_down[2] = 2; // arrow down (spring launch ball)
 	mainMenu_custom2_left[2] = 33; // left alt (left flipper)
 	mainMenu_custom2_right[2] = 30; // right shift (magna saver)
+	mainMenu_custom2_stickup[2] = 0;
+	mainMenu_custom2_stickdown[2] = 2; // arrow down (spring launch ball)
+	mainMenu_custom2_stickleft[2] = 33; // left alt (left flipper)
+	mainMenu_custom2_stickright[2] = 30; // right shift (magna saver)
 	mainMenu_custom2_X[2] = 23; // space (nudge center)
 	mainMenu_custom2_B[2] = 34; // right alt (right flipper)
 	mainMenu_custom2_A[2] = 26; // return (launch ball)
@@ -489,6 +549,10 @@ void SetDefaultMenuSettings(int general)
 	mainMenu_custom2_down[3] = 2; // arrow down (spring launch ball)
 	mainMenu_custom2_left[3] = 33; // left alt (left flipper)
 	mainMenu_custom2_right[3] = 30; // right shift (magna saver)
+	mainMenu_custom2_stickup[3] = 0;
+	mainMenu_custom2_stickdown[3] = 2; // arrow down (spring launch ball)
+	mainMenu_custom2_stickleft[3] = 33; // left alt (left flipper)
+	mainMenu_custom2_stickright[3] = 30; // right shift (magna saver)
 	mainMenu_custom2_X[3] = 23; // space (nudge center)
 	mainMenu_custom2_B[3] = 34; // right alt (right flipper)
 	mainMenu_custom2_A[3] = 26; // return (launch ball)
@@ -1280,6 +1344,14 @@ int saveconfig(int general)
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom1_right_Ply%d=%d\n",i,mainMenu_custom1_right[i]);
 		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom1_stickup_Ply%d=%d\n",i,mainMenu_custom1_stickup[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom1_stickdown_Ply%d=%d\n",i,mainMenu_custom1_stickdown[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom1_stickleft_Ply%d=%d\n",i,mainMenu_custom1_stickleft[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom1_stickright_Ply%d=%d\n",i,mainMenu_custom1_stickright[i]);
+		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom1_A_Ply%d=%d\n",i,mainMenu_custom1_A[i]);
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom1_B_Ply%d=%d\n",i,mainMenu_custom1_B[i]);
@@ -1310,6 +1382,14 @@ int saveconfig(int general)
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom2_right_Ply%d=%d\n",i,mainMenu_custom2_right[i]);
 		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom2_stickup_Ply%d=%d\n",i,mainMenu_custom2_stickup[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom2_stickdown_Ply%d=%d\n",i,mainMenu_custom2_stickdown[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom2_stickleft_Ply%d=%d\n",i,mainMenu_custom2_stickleft[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom2_stickright_Ply%d=%d\n",i,mainMenu_custom2_stickright[i]);
+		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom2_A_Ply%d=%d\n",i,mainMenu_custom2_A[i]);
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom2_B_Ply%d=%d\n",i,mainMenu_custom2_B[i]);
@@ -1340,6 +1420,14 @@ int saveconfig(int general)
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom3_right_Ply%d=%d\n",i,mainMenu_custom3_right[i]);
 		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom3_stickup_Ply%d=%d\n",i,mainMenu_custom3_stickup[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom3_stickdown_Ply%d=%d\n",i,mainMenu_custom3_stickdown[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom3_stickleft_Ply%d=%d\n",i,mainMenu_custom3_stickleft[i]);
+		 fputs(buffer,f);
+		 snprintf((char*)buffer, 255, "custom3_stickright_Ply%d=%d\n",i,mainMenu_custom3_stickright[i]);
+		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom3_A_Ply%d=%d\n",i,mainMenu_custom3_A[i]);
 		 fputs(buffer,f);
 		 snprintf((char*)buffer, 255, "custom3_B_Ply%d=%d\n",i,mainMenu_custom3_B[i]);
@@ -1711,7 +1799,18 @@ void loadconfig(int general)
 			fscanf(f,"custom1_down_Ply%d=%d\n",&j,&mainMenu_custom1_down[i]);
 			fscanf(f,"custom1_left_Ply%d=%d\n",&j,&mainMenu_custom1_left[i]);
 			fscanf(f,"custom1_right_Ply%d=%d\n",&j,&mainMenu_custom1_right[i]);
-			fscanf(f,"custom1_A_Ply%d=%d\n",&j,&mainMenu_custom1_A[i]);
+			if (fscanf(f,"custom1_stickup_Ply%d=%d\n",&j,&mainMenu_custom1_stickup[i])) {
+				fscanf(f,"custom1_stickdown_Ply%d=%d\n",&j,&mainMenu_custom1_stickdown[i]);
+				fscanf(f,"custom1_stickleft_Ply%d=%d\n",&j,&mainMenu_custom1_stickleft[i]);
+				fscanf(f,"custom1_stickright_Ply%d=%d\n",&j,&mainMenu_custom1_stickright[i]);
+				fscanf(f,"custom1_A_Ply%d=%d\n",&j,&mainMenu_custom1_A[i]);
+			} else {
+				mainMenu_custom1_stickup[i] = mainMenu_custom1_up[i];
+				mainMenu_custom1_stickdown[i] = mainMenu_custom1_down[i];
+				mainMenu_custom1_stickleft[i] = mainMenu_custom1_left[i];
+				mainMenu_custom1_stickright[i] = mainMenu_custom1_right[i];
+				fscanf(f,"A_Ply%d=%d\n",&j,&mainMenu_custom1_A[i]);
+			}
 			fscanf(f,"custom1_B_Ply%d=%d\n",&j,&mainMenu_custom1_B[i]);
 			fscanf(f,"custom1_X_Ply%d=%d\n",&j,&mainMenu_custom1_X[i]);
 			fscanf(f,"custom1_Y_Ply%d=%d\n",&j,&mainMenu_custom1_Y[i]);
@@ -1744,7 +1843,18 @@ void loadconfig(int general)
 			fscanf(f,"custom2_down_Ply%d=%d\n",&j,&mainMenu_custom2_down[i]);
 			fscanf(f,"custom2_left_Ply%d=%d\n",&j,&mainMenu_custom2_left[i]);
 			fscanf(f,"custom2_right_Ply%d=%d\n",&j,&mainMenu_custom2_right[i]);
-			fscanf(f,"custom2_A_Ply%d=%d\n",&j,&mainMenu_custom2_A[i]);
+			if (fscanf(f,"custom2_stickup_Ply%d=%d\n",&j,&mainMenu_custom2_stickup[i])) {
+				fscanf(f,"custom2_stickdown_Ply%d=%d\n",&j,&mainMenu_custom2_stickdown[i]);
+				fscanf(f,"custom2_stickleft_Ply%d=%d\n",&j,&mainMenu_custom2_stickleft[i]);
+				fscanf(f,"custom2_stickright_Ply%d=%d\n",&j,&mainMenu_custom2_stickright[i]);
+				fscanf(f,"custom2_A_Ply%d=%d\n",&j,&mainMenu_custom2_A[i]);
+			} else {
+				mainMenu_custom2_stickup[i] = mainMenu_custom2_up[i];
+				mainMenu_custom2_stickdown[i] = mainMenu_custom2_down[i];
+				mainMenu_custom2_stickleft[i] = mainMenu_custom2_left[i];
+				mainMenu_custom2_stickright[i] = mainMenu_custom2_right[i];
+				fscanf(f,"A_Ply%d=%d\n",&j,&mainMenu_custom2_A[i]);
+			}
 			fscanf(f,"custom2_B_Ply%d=%d\n",&j,&mainMenu_custom2_B[i]);
 			fscanf(f,"custom2_X_Ply%d=%d\n",&j,&mainMenu_custom2_X[i]);
 			fscanf(f,"custom2_Y_Ply%d=%d\n",&j,&mainMenu_custom2_Y[i]);
@@ -1762,7 +1872,18 @@ void loadconfig(int general)
 			fscanf(f,"custom3_down_Ply%d=%d\n",&j,&mainMenu_custom3_down[i]);
 			fscanf(f,"custom3_left_Ply%d=%d\n",&j,&mainMenu_custom3_left[i]);
 			fscanf(f,"custom3_right_Ply%d=%d\n",&j,&mainMenu_custom3_right[i]);
-			fscanf(f,"custom3_A_Ply%d=%d\n",&j,&mainMenu_custom3_A[i]);
+			if (fscanf(f,"custom3_stickup_Ply%d=%d\n",&j,&mainMenu_custom3_stickup[i])) {
+				fscanf(f,"custom3_stickdown_Ply%d=%d\n",&j,&mainMenu_custom3_stickdown[i]);
+				fscanf(f,"custom3_stickleft_Ply%d=%d\n",&j,&mainMenu_custom3_stickleft[i]);
+				fscanf(f,"custom3_stickright_Ply%d=%d\n",&j,&mainMenu_custom3_stickright[i]);
+				fscanf(f,"custom3_A_Ply%d=%d\n",&j,&mainMenu_custom3_A[i]);
+			} else {
+				mainMenu_custom3_stickup[i] = mainMenu_custom3_up[i];
+				mainMenu_custom3_stickdown[i] = mainMenu_custom3_down[i];
+				mainMenu_custom3_stickleft[i] = mainMenu_custom3_left[i];
+				mainMenu_custom3_stickright[i] = mainMenu_custom3_right[i];
+				fscanf(f,"A_Ply%d=%d\n",&j,&mainMenu_custom3_A[i]);
+			}
 			fscanf(f,"custom3_B_Ply%d=%d\n",&j,&mainMenu_custom3_B[i]);
 			fscanf(f,"custom3_X_Ply%d=%d\n",&j,&mainMenu_custom3_X[i]);
 			fscanf(f,"custom3_Y_Ply%d=%d\n",&j,&mainMenu_custom3_Y[i]);
diff --git a/src/gp2x/menu/menu_config.h b/src/gp2x/menu/menu_config.h
index d48253b..80d1301 100755
--- a/src/gp2x/menu/menu_config.h
+++ b/src/gp2x/menu/menu_config.h
@@ -45,6 +45,10 @@ extern int mainMenu_custom_up[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_down[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_left[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_right[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom_stickup[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom_stickdown[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom_stickleft[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom_stickright[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_A[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_B[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom_X[MAX_NUM_CONTROLLERS];
@@ -129,6 +133,10 @@ extern int mainMenu_custom1_up[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_down[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_left[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_right[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom1_stickup[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom1_stickdown[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom1_stickleft[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom1_stickright[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_A[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_B[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom1_X[MAX_NUM_CONTROLLERS];
@@ -145,6 +153,10 @@ extern int mainMenu_custom2_up[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_down[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_left[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_right[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom2_stickup[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom2_stickdown[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom2_stickleft[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom2_stickright[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_A[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_B[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom2_X[MAX_NUM_CONTROLLERS];
@@ -161,6 +173,10 @@ extern int mainMenu_custom3_up[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_down[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_left[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_right[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom3_stickup[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom3_stickdown[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom3_stickleft[MAX_NUM_CONTROLLERS];
+extern int mainMenu_custom3_stickright[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_A[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_B[MAX_NUM_CONTROLLERS];
 extern int mainMenu_custom3_X[MAX_NUM_CONTROLLERS];
diff --git a/src/gp2x/menu/menu_controls.cpp b/src/gp2x/menu/menu_controls.cpp
index 214d45a..384dd21 100755
--- a/src/gp2x/menu/menu_controls.cpp
+++ b/src/gp2x/menu/menu_controls.cpp
@@ -35,6 +35,7 @@ const char *text_str_controls_title=    "         Custom Controls              -
 char tmpchar[256];
 char mapping[32]="";
 int menuControls = 0;
+static int editingStick = 0;
 extern int quit_pressed_in_submenu;
 extern int emulating;
 extern int nr_joysticks;
@@ -53,6 +54,7 @@ enum {
 #else
   MENUCONTROLS_DPAD,
 #endif
+  MENUCONTROLS_STICK,
   MENUCONTROLS_UP,
   MENUCONTROLS_DOWN,
   MENUCONTROLS_LEFT,
@@ -330,6 +332,10 @@ void mapback_custom_controls() // assign currently used custom set to custom con
 			mainMenu_custom1_down[i] = mainMenu_custom_down[i];
 			mainMenu_custom1_left[i] = mainMenu_custom_left[i];
 			mainMenu_custom1_right[i] = mainMenu_custom_right[i];
+			mainMenu_custom1_stickup[i] = mainMenu_custom_stickup[i];
+			mainMenu_custom1_stickdown[i] = mainMenu_custom_stickdown[i];
+			mainMenu_custom1_stickleft[i] = mainMenu_custom_stickleft[i];
+			mainMenu_custom1_stickright[i] = mainMenu_custom_stickright[i];
 			mainMenu_custom1_A[i] = mainMenu_custom_A[i];
 			mainMenu_custom1_B[i] = mainMenu_custom_B[i];
 			mainMenu_custom1_X[i] = mainMenu_custom_X[i];
@@ -348,6 +354,10 @@ void mapback_custom_controls() // assign currently used custom set to custom con
 			mainMenu_custom2_down[i] = mainMenu_custom_down[i];
 			mainMenu_custom2_left[i] = mainMenu_custom_left[i];
 			mainMenu_custom2_right[i] = mainMenu_custom_right[i];
+			mainMenu_custom2_stickup[i] = mainMenu_custom_stickup[i];
+			mainMenu_custom2_stickdown[i] = mainMenu_custom_stickdown[i];
+			mainMenu_custom2_stickleft[i] = mainMenu_custom_stickleft[i];
+			mainMenu_custom2_stickright[i] = mainMenu_custom_stickright[i];
 			mainMenu_custom2_A[i] = mainMenu_custom_A[i];
 			mainMenu_custom2_B[i] = mainMenu_custom_B[i];
 			mainMenu_custom2_X[i] = mainMenu_custom_X[i];
@@ -366,6 +376,10 @@ void mapback_custom_controls() // assign currently used custom set to custom con
 			mainMenu_custom3_down[i] = mainMenu_custom_down[i];
 			mainMenu_custom3_left[i] = mainMenu_custom_left[i];
 			mainMenu_custom3_right[i] = mainMenu_custom_right[i];
+			mainMenu_custom3_stickup[i] = mainMenu_custom_stickup[i];
+			mainMenu_custom3_stickdown[i] = mainMenu_custom_stickdown[i];
+			mainMenu_custom3_stickleft[i] = mainMenu_custom_stickleft[i];
+			mainMenu_custom3_stickright[i] = mainMenu_custom_stickright[i];
 			mainMenu_custom3_A[i] = mainMenu_custom_A[i];
 			mainMenu_custom3_B[i] = mainMenu_custom_B[i];
 			mainMenu_custom3_X[i] = mainMenu_custom_X[i];
@@ -492,24 +506,21 @@ static void draw_controlsMenu(int c)
 		write_text(tabstop9+8,menuLine,"8");
 #endif
 
-	menuLine++;
-	write_text(leftMargin,menuLine,text_str_controls_separator);
-	menuLine++;
-
 	// MENUCONTROLS_CUSTOMSET
-	write_text(leftMargin,menuLine," DPAD");
+	menuLine+=2;
+	write_text(leftMargin,menuLine,"Custom Set");
 	if ((mainMenu_custom_controlSet==0)&&((menuControls!=MENUCONTROLS_CUSTOMSET)||(bb)))
-		write_text_inv(tabstop1-6,menuLine,"Custom1");
+		write_text_inv(leftMargin+11,menuLine,"1");
 	else
-		write_text(tabstop1-6,menuLine,"Custom1");
+		write_text(leftMargin+11,menuLine,"1");
 	if ((mainMenu_custom_controlSet==1)&&((menuControls!=MENUCONTROLS_CUSTOMSET)||(bb)))
-		write_text_inv(tabstop2,menuLine,"Custom2");
+		write_text_inv(leftMargin+13,menuLine,"2");
 	else
-		write_text(tabstop2,menuLine,"Custom2");
+		write_text(leftMargin+13,menuLine,"2");
 	if ((mainMenu_custom_controlSet==2)&&((menuControls!=MENUCONTROLS_CUSTOMSET)||(bb)))
-		write_text_inv(tabstop6+2,menuLine,"Custom3");
+		write_text_inv(leftMargin+15,menuLine,"3");
 	else
-		write_text(tabstop6+2,menuLine,"Custom3");
+		write_text(leftMargin+15,menuLine,"3");
 		
 #else
 	menuLine++;
@@ -533,38 +544,77 @@ static void draw_controlsMenu(int c)
 #endif
 	if (mainMenu_custom_dpad==0)
 	{
+
+		// MENUCONTROLS_STICK
+		write_text(tabstop3+1,menuLine,"Edit");
+		if ((editingStick==0)&&((menuControls!=MENUCONTROLS_STICK)||(bb)))
+			write_text_inv(tabstop6,menuLine,"Dpad");
+		else
+			write_text(tabstop6,menuLine,"Dpad");
+		if ((editingStick==1)&&((menuControls!=MENUCONTROLS_STICK)||(bb)))
+			write_text_inv(tabstop9,menuLine,"Stick");
+		else
+			write_text(tabstop9,menuLine,"Stick");
+
+		menuLine++;
+		write_text(leftMargin,menuLine,text_str_controls_separator);
+		menuLine++;
+
 		// MENUCONTROLS_UP
-		menuLine+=2;
-		write_text(leftMargin,menuLine,"    Up");
-		getMapping(mainMenu_custom_up[ctrlNr]);
+		if (editingStick) {
+			write_text(leftMargin,menuLine,"Stick Up");
+			getMapping(mainMenu_custom_stickup[ctrlNr]);
+		}
+		else {
+			write_text(leftMargin,menuLine,"Dpad Up");
+			getMapping(mainMenu_custom_up[ctrlNr]);
+		}
 		if ((menuControls!=MENUCONTROLS_UP)||(bb))
-			write_text_inv(tabstop1-4,menuLine,mapping);
+			write_text_inv(tabstop1-2,menuLine,mapping);
 		else
-			write_text(tabstop1-4,menuLine,mapping);
+			write_text(tabstop1-2,menuLine,mapping);
 		// MENUCONTROLS_DOWN
 		menuLine+=2;
-		write_text(leftMargin,menuLine,"  Down");
-		getMapping(mainMenu_custom_down[ctrlNr]);
+		if (editingStick) {
+			write_text(leftMargin,menuLine,"Stick Down");
+			getMapping(mainMenu_custom_stickdown[ctrlNr]);
+		}
+		else {
+			write_text(leftMargin,menuLine,"Dpad Down");
+			getMapping(mainMenu_custom_down[ctrlNr]);
+		}
 		if ((menuControls!=MENUCONTROLS_DOWN)||(bb))
-			write_text_inv(tabstop1-4,menuLine,mapping);
+			write_text_inv(tabstop1-2,menuLine,mapping);
 		else
-			write_text(tabstop1-4,menuLine,mapping);
+			write_text(tabstop1-2,menuLine,mapping);
 		// MENUCONTROLS_LEFT
 		menuLine+=2;
-		write_text(leftMargin,menuLine,"  Left");
-		getMapping(mainMenu_custom_left[ctrlNr]);
+		if (editingStick) {
+			write_text(leftMargin,menuLine,"Stick Left");
+			getMapping(mainMenu_custom_stickleft[ctrlNr]);
+		}
+		else {
+			write_text(leftMargin,menuLine,"Dpad Left");
+			getMapping(mainMenu_custom_left[ctrlNr]);
+		}
 		if ((menuControls!=MENUCONTROLS_LEFT)||(bb))
-			write_text_inv(tabstop1-4,menuLine,mapping);
+			write_text_inv(tabstop1-2,menuLine,mapping);
 		else
-			write_text(tabstop1-4,menuLine,mapping);
+			write_text(tabstop1-2,menuLine,mapping);
 		// MENUCONTROLS_RIGHT
 		menuLine+=2;
-		write_text(leftMargin,menuLine," Right");
-		getMapping(mainMenu_custom_right[ctrlNr]);
+		if (editingStick) {
+			write_text(leftMargin,menuLine,"Stick Right");
+			getMapping(mainMenu_custom_stickright[ctrlNr]);
+		}
+		else {
+			write_text(leftMargin,menuLine,"Dpad Right");
+			getMapping(mainMenu_custom_right[ctrlNr]);
+		}
 		if ((menuControls!=MENUCONTROLS_RIGHT)||(bb))
-			write_text_inv(tabstop1-4,menuLine,mapping);
+			write_text_inv(tabstop1-2,menuLine,mapping);
 		else
-			write_text(tabstop1-4,menuLine,mapping);
+			write_text(tabstop1-2,menuLine,mapping);
 	}
 
 	// MENUCONTROLS_A
@@ -574,62 +624,62 @@ static void draw_controlsMenu(int c)
 	menuLine+=3;
 #endif
 #if defined(__PSP2__)
-	write_text(leftMargin,menuLine,"Square");
+	write_text(leftMargin,menuLine," Square");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   Y");
+	write_text(leftMargin,menuLine,"    Y");
 #else
-	write_text(leftMargin,menuLine,"   (A)");
+	write_text(leftMargin,menuLine,"    (A)");
 #endif
 	getMapping(mainMenu_custom_A[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_A)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 
 	// MENUCONTROLS_Y
 	menuLine+=2;
 #if defined(__PSP2__)
-	write_text(leftMargin,menuLine,"Triangle");
+	write_text(leftMargin,menuLine," Triangle");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   X");
+	write_text(leftMargin,menuLine,"    X");
 #else
-	write_text(leftMargin,menuLine,"   (Y)");
+	write_text(leftMargin,menuLine,"    (Y)");
 #endif
 	getMapping(mainMenu_custom_Y[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_Y)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 		
 	// MENUCONTROLS_X
 	menuLine+=2;
 #if defined(__PSP2__)
-	write_text(leftMargin,menuLine,"Cross");
+	write_text(leftMargin,menuLine," Cross");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   B");
+	write_text(leftMargin,menuLine,"    B");
 #else
-	write_text(leftMargin,menuLine,"   (X)");
+	write_text(leftMargin,menuLine,"    (X)");
 #endif
 	getMapping(mainMenu_custom_X[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_X)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 
 	// MENUCONTROLS_B
 	menuLine+=2;
 #if defined(__PSP2__)
-	write_text(leftMargin,menuLine,"Circle");
+	write_text(leftMargin,menuLine," Circle");
 #elif defined(__SWITCH__)
-	write_text(leftMargin,menuLine,"   A");
+	write_text(leftMargin,menuLine,"    A");
 #else
-	write_text(leftMargin,menuLine,"   (B)");
+	write_text(leftMargin,menuLine,"    (B)");
 #endif
 	getMapping(mainMenu_custom_B[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_B)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 
 
 	// MENUCONTROLS_L
@@ -638,38 +688,38 @@ static void draw_controlsMenu(int c)
 #else
 	menuLine+=3;
 #endif
-	write_text(leftMargin,menuLine,"   L");
+	write_text(leftMargin,menuLine,"    L");
 	getMapping(mainMenu_custom_L[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_L)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 	// MENUCONTROLS_R
 	menuLine+=2;
-	write_text(leftMargin,menuLine,"   R");
+	write_text(leftMargin,menuLine,"    R");
 	getMapping(mainMenu_custom_R[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_R)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 
 #ifdef __SWITCH__
 	// MENUCONTROLS_L2
 	menuLine+=2;
-	write_text(leftMargin,menuLine,"  ZL");
+	write_text(leftMargin,menuLine,"   ZL");
 	getMapping(mainMenu_custom_L2[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_L2)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 	// MENUCONTROLS_R2
 	menuLine+=2;
-	write_text(leftMargin,menuLine,"  ZR");
+	write_text(leftMargin,menuLine,"   ZR");
 	getMapping(mainMenu_custom_R2[ctrlNr]);
 	if ((menuControls!=MENUCONTROLS_R2)||(bb))
-		write_text_inv(tabstop1-4,menuLine,mapping);
+		write_text_inv(tabstop1-2,menuLine,mapping);
 	else
-		write_text(tabstop1-4,menuLine,mapping);
+		write_text(tabstop1-2,menuLine,mapping);
 #endif
 
 #if defined(__PSP2__)
@@ -926,30 +976,53 @@ static int key_controlsMenu(int *c)
 				}
 				break;
 #endif					
+			case MENUCONTROLS_STICK:
+				if (left || right)
+					editingStick=!editingStick;
+				break;
+
 			case MENUCONTROLS_UP:
 				if (left)
 				{
-					if (mainMenu_custom_up[ctrlNr]>MIN_CUSTOM_ID)
-						mainMenu_custom_up[ctrlNr]--;
-					else
-						mainMenu_custom_up[ctrlNr]=MAX_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickup[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_stickup[ctrlNr]--;
+						else
+							mainMenu_custom_stickup[ctrlNr]=MAX_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_up[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_up[ctrlNr]--;
+						else
+							mainMenu_custom_up[ctrlNr]=MAX_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (right)
 				{
-					if (mainMenu_custom_up[ctrlNr]<MAX_CUSTOM_ID)
-						mainMenu_custom_up[ctrlNr]++;
-					else
-						mainMenu_custom_up[ctrlNr]=MIN_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickup[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_stickup[ctrlNr]++;
+						else
+							mainMenu_custom_stickup[ctrlNr]=MIN_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_up[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_up[ctrlNr]++;
+						else
+							mainMenu_custom_up[ctrlNr]=MIN_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (del)
 				{
-					mainMenu_custom_up[ctrlNr]=0;
+					if (editingStick) {
+						mainMenu_custom_stickup[ctrlNr]=0;
+					} else {
+						mainMenu_custom_up[ctrlNr]=0;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
@@ -958,27 +1031,45 @@ static int key_controlsMenu(int *c)
 			case MENUCONTROLS_DOWN:
 				if (left)
 				{
-					if (mainMenu_custom_down[ctrlNr]>MIN_CUSTOM_ID)
-						mainMenu_custom_down[ctrlNr]--;
-					else
-						mainMenu_custom_down[ctrlNr]=MAX_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickdown[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_stickdown[ctrlNr]--;
+						else
+							mainMenu_custom_stickdown[ctrlNr]=MAX_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_down[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_down[ctrlNr]--;
+						else
+							mainMenu_custom_down[ctrlNr]=MAX_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (right)
 				{
-					if (mainMenu_custom_down[ctrlNr]<MAX_CUSTOM_ID)
-						mainMenu_custom_down[ctrlNr]++;
-					else
-						mainMenu_custom_down[ctrlNr]=MIN_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickdown[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_stickdown[ctrlNr]++;
+						else
+							mainMenu_custom_stickdown[ctrlNr]=MIN_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_down[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_down[ctrlNr]++;
+						else
+							mainMenu_custom_down[ctrlNr]=MIN_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (del)
 				{
-					mainMenu_custom_down[ctrlNr]=0;
+					if (editingStick) {
+						mainMenu_custom_stickdown[ctrlNr]=0;
+					} else {
+						mainMenu_custom_down[ctrlNr]=0;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
@@ -987,27 +1078,45 @@ static int key_controlsMenu(int *c)
 			case MENUCONTROLS_LEFT:
 				if (left)
 				{
-					if (mainMenu_custom_left[ctrlNr]>MIN_CUSTOM_ID)
-						mainMenu_custom_left[ctrlNr]--;
-					else
-						mainMenu_custom_left[ctrlNr]=MAX_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickleft[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_stickleft[ctrlNr]--;
+						else
+							mainMenu_custom_stickleft[ctrlNr]=MAX_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_left[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_left[ctrlNr]--;
+						else
+							mainMenu_custom_left[ctrlNr]=MAX_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (right)
 				{
-					if (mainMenu_custom_left[ctrlNr]<MAX_CUSTOM_ID)
-						mainMenu_custom_left[ctrlNr]++;
-					else
-						mainMenu_custom_left[ctrlNr]=MIN_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickleft[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_stickleft[ctrlNr]++;
+						else
+							mainMenu_custom_stickleft[ctrlNr]=MIN_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_left[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_left[ctrlNr]++;
+						else
+							mainMenu_custom_left[ctrlNr]=MIN_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (del)
 				{
-					mainMenu_custom_left[ctrlNr]=0;
+					if (editingStick) {
+						mainMenu_custom_stickleft[ctrlNr]=0;
+					} else {
+						mainMenu_custom_left[ctrlNr]=0;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
@@ -1016,27 +1125,45 @@ static int key_controlsMenu(int *c)
 			case MENUCONTROLS_RIGHT:
 				if (left)
 				{
-					if (mainMenu_custom_right[ctrlNr]>MIN_CUSTOM_ID)
-						mainMenu_custom_right[ctrlNr]--;
-					else
-						mainMenu_custom_right[ctrlNr]=MAX_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickright[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_stickright[ctrlNr]--;
+						else
+							mainMenu_custom_stickright[ctrlNr]=MAX_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_right[ctrlNr]>MIN_CUSTOM_ID)
+							mainMenu_custom_right[ctrlNr]--;
+						else
+							mainMenu_custom_right[ctrlNr]=MAX_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (right)
 				{
-					if (mainMenu_custom_right[ctrlNr]<MAX_CUSTOM_ID)
-						mainMenu_custom_right[ctrlNr]++;
-					else
-						mainMenu_custom_right[ctrlNr]=MIN_CUSTOM_ID;
+					if (editingStick) {
+						if (mainMenu_custom_stickright[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_stickright[ctrlNr]++;
+						else
+							mainMenu_custom_stickright[ctrlNr]=MIN_CUSTOM_ID;
+					} else {
+						if (mainMenu_custom_right[ctrlNr]<MAX_CUSTOM_ID)
+							mainMenu_custom_right[ctrlNr]++;
+						else
+							mainMenu_custom_right[ctrlNr]=MIN_CUSTOM_ID;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
 				}
 				else if (del)
 				{
-					mainMenu_custom_right[ctrlNr]=0;
+					if (editingStick) {
+						mainMenu_custom_stickright[ctrlNr]=0;
+					} else {
+						mainMenu_custom_right[ctrlNr]=0;
+					}
 #if defined(__PSP2__) || defined(__SWITCH__)
 					mapback_custom_controls(); //record this change in custom control set
 #endif
diff --git a/src/gui.cpp b/src/gui.cpp
index 8fb00ea..907518d 100755
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -68,6 +68,10 @@ int justLComma=0, justLPeriod=0;
 #ifdef USE_UAE4ALL_VKBD
 int justLK=0;
 #endif
+int justMovedStickUp[MAX_NUM_CONTROLLERS]={};
+int justMovedStickDown[MAX_NUM_CONTROLLERS]={};
+int justMovedStickLeft[MAX_NUM_CONTROLLERS]={};
+int justMovedStickRight[MAX_NUM_CONTROLLERS]={};
 int justPressedA[MAX_NUM_CONTROLLERS]={};
 int justPressedB[MAX_NUM_CONTROLLERS]={};
 int justPressedX[MAX_NUM_CONTROLLERS]={};
@@ -174,6 +178,10 @@ int dpadUp[MAX_NUM_CONTROLLERS]={};
 int dpadDown[MAX_NUM_CONTROLLERS]={};
 int dpadLeft[MAX_NUM_CONTROLLERS]={};
 int dpadRight[MAX_NUM_CONTROLLERS]={};
+int stickUp[MAX_NUM_CONTROLLERS]={};
+int stickDown[MAX_NUM_CONTROLLERS]={};
+int stickLeft[MAX_NUM_CONTROLLERS]={};
+int stickRight[MAX_NUM_CONTROLLERS]={};
 int buttonA[MAX_NUM_CONTROLLERS]={}; // Vita Square, GP2X_BUTTON_B
 int buttonB[MAX_NUM_CONTROLLERS]={}; // Vita Circle, GP2X_BUTTON_A
 int buttonX[MAX_NUM_CONTROLLERS]={}; // Vita Cross, GP2X_BUTTON_X
@@ -261,6 +269,10 @@ void remap_custom_controls() // assign custom 1-3 to currently used custom set
 				mainMenu_custom_down[i] = mainMenu_custom1_down[i];
 				mainMenu_custom_left[i] = mainMenu_custom1_left[i];
 				mainMenu_custom_right[i] = mainMenu_custom1_right[i];
+				mainMenu_custom_stickup[i] = mainMenu_custom1_stickup[i];
+				mainMenu_custom_stickdown[i] = mainMenu_custom1_stickdown[i];
+				mainMenu_custom_stickleft[i] = mainMenu_custom1_stickleft[i];
+				mainMenu_custom_stickright[i] = mainMenu_custom1_stickright[i];
 				mainMenu_custom_A[i] = mainMenu_custom1_A[i];
 				mainMenu_custom_B[i] = mainMenu_custom1_B[i];
 				mainMenu_custom_X[i] = mainMenu_custom1_X[i];
@@ -279,6 +291,10 @@ void remap_custom_controls() // assign custom 1-3 to currently used custom set
 				mainMenu_custom_down[i] = mainMenu_custom2_down[i];
 				mainMenu_custom_left[i] = mainMenu_custom2_left[i];
 				mainMenu_custom_right[i] = mainMenu_custom2_right[i];
+				mainMenu_custom_stickup[i] = mainMenu_custom2_stickup[i];
+				mainMenu_custom_stickdown[i] = mainMenu_custom2_stickdown[i];
+				mainMenu_custom_stickleft[i] = mainMenu_custom2_stickleft[i];
+				mainMenu_custom_stickright[i] = mainMenu_custom2_stickright[i];
 				mainMenu_custom_A[i] = mainMenu_custom2_A[i];
 				mainMenu_custom_B[i] = mainMenu_custom2_B[i];
 				mainMenu_custom_X[i] = mainMenu_custom2_X[i];
@@ -297,6 +313,10 @@ void remap_custom_controls() // assign custom 1-3 to currently used custom set
 				mainMenu_custom_down[i] = mainMenu_custom3_down[i];
 				mainMenu_custom_left[i] = mainMenu_custom3_left[i];
 				mainMenu_custom_right[i] = mainMenu_custom3_right[i];
+				mainMenu_custom_stickup[i] = mainMenu_custom3_stickup[i];
+				mainMenu_custom_stickdown[i] = mainMenu_custom3_stickdown[i];
+				mainMenu_custom_stickleft[i] = mainMenu_custom3_stickleft[i];
+				mainMenu_custom_stickright[i] = mainMenu_custom3_stickright[i];
 				mainMenu_custom_A[i] = mainMenu_custom3_A[i];
 				mainMenu_custom_B[i] = mainMenu_custom3_B[i];
 				mainMenu_custom_X[i] = mainMenu_custom3_X[i];
@@ -723,7 +743,12 @@ void gui_handle_events (void)
 		dpadLeft[i]  = SDL_JoystickGetButton(currentJoy, PAD_LEFT);
 		dpadUp[i]  = SDL_JoystickGetButton(currentJoy, PAD_UP);
 		dpadDown[i]  = SDL_JoystickGetButton(currentJoy, PAD_DOWN);
-		
+
+		stickUp[i] = 0;
+		stickDown[i] = 0;
+		stickLeft[i] = 0;
+		stickRight[i] = 0;
+
 		buttonA[i] = SDL_JoystickGetButton(currentJoy, PAD_SQUARE);
 		buttonB[i] = SDL_JoystickGetButton(currentJoy, PAD_CIRCLE);
 		buttonX[i] = SDL_JoystickGetButton(currentJoy, PAD_CROSS);
@@ -751,6 +776,10 @@ void gui_handle_events (void)
 			dpadLeft[i] = 0;
 			dpadUp[i] = 0;
 			dpadDown[i] = 0;
+			stickUp[i] = 0;
+			stickDown[i] = 0;
+			stickLeft[i] = 0;
+			stickRight[i] = 0;
 			triggerL2[i] = 0;
 			triggerR2[i] = 0;
 			
@@ -801,37 +830,58 @@ void gui_handle_events (void)
 		}
 		if ((joyX*joyX + joyY*joyY) > joyDeadZoneSquared)
 		{
+			int *up = 0;
+			int *down = 0;
+			int *left = 0;
+			int *right = 0;
+#ifdef __SWITCH__
+			if (mainMenu_customControls && !vkbd_mode && !(buttonStart[0] && triggerR[0]) && !singleJoycons)
+#else
+			if (mainMenu_customControls && !vkbd_mode && !(buttonStart[0] && triggerR[0]))
+#endif
+			{
+				up = &stickUp[i];
+				down = &stickDown[i];
+				left = &stickLeft[i];
+				right = &stickRight[i];
+			} else
+			{
+				up = &dpadUp[i];
+				down = &dpadDown[i];
+				left = &dpadLeft[i];
+				right = &dpadRight[i];
+			}
 			// upper right quadrant
 			if (joyY>0 && joyX>0)
 			{
 				if (joyY>slope*joyX)
-					dpadUp[i] = 1;
+					*up = 1;
 				if (joyX>slope*joyY)
-					dpadRight[i] = 1;
+					*right = 1;
 			}
 			// upper left quadrant
 			else if (joyY>0 && joyX<=0)
 			{
 				if (joyY>slope*(-joyX))
-					dpadUp[i] = 1;
+					*up = 1;
 				if ((-joyX)>slope*joyY)
-					dpadLeft[i] = 1;
+					*left = 1;
 			}
 			// lower right quadrant
 			else if (joyY<=0 && joyX>0)
 			{
 				if ((-joyY)>slope*joyX)
-					dpadDown[i] = 1;
+					*down = 1;
 				if (joyX>slope*(-joyY))
-					dpadRight[i] = 1;
+					*right = 1;
 			}
 			// lower left quadrant
 			else if (joyY<=0 && joyX<=0)
 			{
 				if ((-joyY)>slope*(-joyX))
-					dpadDown[i] = 1;
+					*down = 1;
 				if ((-joyX)>slope*(-joyY))
-					dpadLeft[i] = 1;
+					*left = 1;
 			}
 		}
 	}
@@ -1383,9 +1433,9 @@ if(!vkbd_mode)
 			if(mainMenu_custom_dpad == 0) // always true on Vita
 			{
 #ifdef __SWITCH__
-				for (int j = 0; j < 14; j++)
+				for (int j = 0; j < 18; j++)
 #else				
-				for (int j = 0; j < 10; j++)
+				for (int j = 0; j < 14; j++)
 #endif
 				{
 					switch (j)
@@ -1415,61 +1465,85 @@ if(!vkbd_mode)
 							mainMenu_custom = &(mainMenu_custom_right[i]);
 							break;
 						case 4:
+							//STICK UP
+							button = &(stickUp[i]);
+							justPressed = &(justMovedStickUp[i]);
+							mainMenu_custom = &(mainMenu_custom_stickup[i]);
+							break;
+						case 5:
+							//STICK DOWN
+							button = &(stickDown[i]);
+							justPressed = &(justMovedStickDown[i]);
+							mainMenu_custom = &(mainMenu_custom_stickdown[i]);
+							break;
+						case 6:
+							//STICK LEFT
+							button = &(stickLeft[i]);
+							justPressed = &(justMovedStickLeft[i]);
+							mainMenu_custom = &(mainMenu_custom_stickleft[i]);
+							break;
+						case 7:
+							//STICK RIGHT
+							button = &(stickRight[i]);
+							justPressed = &(justMovedStickRight[i]);
+							mainMenu_custom = &(mainMenu_custom_stickright[i]);
+							break;
+						case 8:
 							//(A)
 							button = &(buttonA[i]);
 							justPressed = &(justPressedA[i]);
 							mainMenu_custom = &(mainMenu_custom_A[i]);
 							break;
-						case 5:
+						case 9:
 							//(B)
 							button = &(buttonB[i]);
 							justPressed = &(justPressedB[i]);
 							mainMenu_custom = &(mainMenu_custom_B[i]);
 							break;
-						case 6:
+						case 10:
 							//(X)
 							button = &(buttonX[i]);
 							justPressed = &(justPressedX[i]);
 							mainMenu_custom = &(mainMenu_custom_X[i]);
 							break;
-						case 7:
+						case 11:
 							//(Y)
 							button = &(buttonY[i]);
 							justPressed = &(justPressedY[i]);
 							mainMenu_custom = &(mainMenu_custom_Y[i]);
 							break;
-						case 8:
+						case 12:
 							//(L)
 							button = &(triggerL[i]);
 							justPressed = &(justPressedL[i]);
 							mainMenu_custom = &(mainMenu_custom_L[i]);
 							break;
-						case 9:
+						case 13:
 							//(R)
 							button = &(triggerR[i]);
 							justPressed = &(justPressedR[i]);
 							mainMenu_custom = &(mainMenu_custom_R[i]);
 							break;
 #ifdef __SWITCH__
-						case 10:
+						case 14:
 							//(L2)
 							button = &(triggerL2[i]);
 							justPressed = &(justPressedL2[i]);
 							mainMenu_custom = &(mainMenu_custom_L2[i]);
 							break;
-						case 11:
+						case 15:
 							//(R2)
 							button = &(triggerR2[i]);
 							justPressed = &(justPressedR2[i]);
 							mainMenu_custom = &(mainMenu_custom_R2[i]);
 							break;
-						case 12:
+						case 16:
 							//(L3)
 							button = &(triggerL3[i]);
 							justPressed = &(justPressedL3[i]);
 							mainMenu_custom = &(mainMenu_custom_L3[i]);
 							break;
-						case 13:
+						case 17:
 							//(R3)
 							button = &(triggerR3[i]);
 							justPressed = &(justPressedR3[i]);
diff --git a/src/od-joy.cpp b/src/od-joy.cpp
index d280dba..84a94f4 100755
--- a/src/od-joy.cpp
+++ b/src/od-joy.cpp
@@ -41,6 +41,10 @@ extern int dpadUp[MAX_NUM_CONTROLLERS];
 extern int dpadDown[MAX_NUM_CONTROLLERS];
 extern int dpadLeft[MAX_NUM_CONTROLLERS];
 extern int dpadRight[MAX_NUM_CONTROLLERS];
+extern int stickUp[MAX_NUM_CONTROLLERS];
+extern int stickDown[MAX_NUM_CONTROLLERS];
+extern int stickLeft[MAX_NUM_CONTROLLERS];
+extern int stickRight[MAX_NUM_CONTROLLERS];
 extern int buttonA[MAX_NUM_CONTROLLERS];
 extern int buttonB[MAX_NUM_CONTROLLERS];
 extern int buttonX[MAX_NUM_CONTROLLERS];
@@ -529,7 +533,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 				top = 1;
 			else if(mainMenu_custom_dpad == 0)
 			{
-				if((mainMenu_custom_up[i]==u && dpadUp[i]) || (mainMenu_custom_down[i]==u && dpadDown[i]) || (mainMenu_custom_left[i]==u && dpadLeft[i]) || (mainMenu_custom_right[i]==u && dpadRight[i]))
+				if((mainMenu_custom_up[i]==u && dpadUp[i]) || (mainMenu_custom_down[i]==u && dpadDown[i]) || (mainMenu_custom_left[i]==u && dpadLeft[i]) || (mainMenu_custom_right[i]==u && dpadRight[i]) 
+				|| (mainMenu_custom_stickup[i]==u && stickUp[i]) || (mainMenu_custom_stickdown[i]==u && stickDown[i]) || (mainMenu_custom_stickleft[i]==u && stickLeft[i]) || (mainMenu_custom_stickright[i]==u && stickRight[i]))
 					top = 1;
 			}
 
@@ -542,7 +547,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 				bot = 1;
 			else if(mainMenu_custom_dpad == 0)
 			{
-				if((mainMenu_custom_up[i]==d && dpadUp[i]) || (mainMenu_custom_down[i]==d && dpadDown[i]) || (mainMenu_custom_left[i]==d && dpadLeft[i]) || (mainMenu_custom_right[i]==d && dpadRight[i]))
+				if((mainMenu_custom_up[i]==d && dpadUp[i]) || (mainMenu_custom_down[i]==d && dpadDown[i]) || (mainMenu_custom_left[i]==d && dpadLeft[i]) || (mainMenu_custom_right[i]==d && dpadRight[i])
+				|| (mainMenu_custom_stickup[i]==d && stickUp[i]) || (mainMenu_custom_stickdown[i]==d && stickDown[i]) || (mainMenu_custom_stickleft[i]==d && stickLeft[i]) || (mainMenu_custom_stickright[i]==d && stickRight[i]))
 					bot = 1;
 			}
 
@@ -555,7 +561,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 				left = 1;
 			else if(mainMenu_custom_dpad == 0)
 			{
-				if((mainMenu_custom_up[i]==l && dpadUp[i]) || (mainMenu_custom_down[i]==l && dpadDown[i]) || (mainMenu_custom_left[i]==l && dpadLeft[i]) || (mainMenu_custom_right[i]==l && dpadRight[i]))
+				if((mainMenu_custom_up[i]==l && dpadUp[i]) || (mainMenu_custom_down[i]==l && dpadDown[i]) || (mainMenu_custom_left[i]==l && dpadLeft[i]) || (mainMenu_custom_right[i]==l && dpadRight[i])
+				|| (mainMenu_custom_stickup[i]==l && stickUp[i]) || (mainMenu_custom_stickdown[i]==l && stickDown[i]) || (mainMenu_custom_stickleft[i]==l && stickLeft[i]) || (mainMenu_custom_stickright[i]==l && stickRight[i]))
 					left = 1;
 			}
 
@@ -568,7 +575,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 				right = 1;
 			else if(mainMenu_custom_dpad == 0)
 			{
-				if((mainMenu_custom_up[i]==r && dpadUp[i]) || (mainMenu_custom_down[i]==r && dpadDown[i]) || (mainMenu_custom_left[i]==r && dpadLeft[i]) || (mainMenu_custom_right[i]==r && dpadRight[i]))
+				if((mainMenu_custom_up[i]==r && dpadUp[i]) || (mainMenu_custom_down[i]==r && dpadDown[i]) || (mainMenu_custom_left[i]==r && dpadLeft[i]) || (mainMenu_custom_right[i]==r && dpadRight[i])
+				|| (mainMenu_custom_stickup[i]==r && stickUp[i]) || (mainMenu_custom_stickdown[i]==r && stickDown[i]) || (mainMenu_custom_stickleft[i]==r && stickLeft[i]) || (mainMenu_custom_stickright[i]==r && stickRight[i]))
 					right = 1;
 			}
 		}
@@ -621,7 +629,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 					*button = 1;
 				else if(mainMenu_custom_dpad == 0)
 				{
-					if((mainMenu_custom_up[i]==b1 && dpadUp[i]) || (mainMenu_custom_down[i]==b1 && dpadDown[i]) || (mainMenu_custom_left[i]==b1 && dpadLeft[i]) || (mainMenu_custom_right[i]==b1 && dpadRight[i]))
+					if((mainMenu_custom_up[i]==b1 && dpadUp[i]) || (mainMenu_custom_down[i]==b1 && dpadDown[i]) || (mainMenu_custom_left[i]==b1 && dpadLeft[i]) || (mainMenu_custom_right[i]==b1 && dpadRight[i])
+					|| (mainMenu_custom_stickup[i]==b1 && stickUp[i]) || (mainMenu_custom_stickdown[i]==b1 && stickDown[i]) || (mainMenu_custom_stickleft[i]==b1 && stickLeft[i]) || (mainMenu_custom_stickright[i]==b1 && stickRight[i]))
 						*button = 1;
 				}
 				if((mainMenu_custom_A[i]==b2 && buttonA[i]) || (mainMenu_custom_B[i]==b2 && buttonB[i]) || (mainMenu_custom_X[i]==b2 && buttonX[i]) || (mainMenu_custom_Y[i]==b2 && buttonY[i]) || (mainMenu_custom_L[i]==b2 && triggerL[i]) || (mainMenu_custom_R[i]==b2 && triggerR[i])
@@ -633,7 +642,8 @@ void read_joystick(int nr, unsigned int *dir, int *button)
 					*button |= 1 << 1;
 				else if(mainMenu_custom_dpad == 0)
 				{
-					if((mainMenu_custom_up[i]==b2 && dpadUp[i]) || (mainMenu_custom_down[i]==b2 && dpadDown[i]) || (mainMenu_custom_left[i]==b2 && dpadLeft[i]) || (mainMenu_custom_right[i]==b2 && dpadRight[i]))
+					if((mainMenu_custom_up[i]==b2 && dpadUp[i]) || (mainMenu_custom_down[i]==b2 && dpadDown[i]) || (mainMenu_custom_left[i]==b2 && dpadLeft[i]) || (mainMenu_custom_right[i]==b2 && dpadRight[i])
+					|| (mainMenu_custom_stickup[i]==b2 && stickUp[i]) || (mainMenu_custom_stickdown[i]==b2 && stickDown[i]) || (mainMenu_custom_stickleft[i]==b2 && stickLeft[i]) || (mainMenu_custom_stickright[i]==b2 && stickRight[i]))
 						*button |= 1 << 1;
 				}
 			}