diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp
index b3bc09c164..dc4019496d 100644
--- a/Common/KeyMap.cpp
+++ b/Common/KeyMap.cpp
@@ -99,6 +99,34 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEY_x, "x"},
 	{KEY_y, "y"},
 	{KEY_z, "z"},
+
+	{KEY_A, "A"},
+	{KEY_B, "B"},
+	{KEY_C, "C"},
+	{KEY_D, "D"},
+	{KEY_E, "E"},
+	{KEY_F, "F"},
+	{KEY_G, "G"},
+	{KEY_H, "H"},
+	{KEY_I, "I"},
+	{KEY_J, "J"},
+	{KEY_K, "K"},
+	{KEY_L, "L"},
+	{KEY_M, "M"},
+	{KEY_N, "N"},
+	{KEY_O, "O"},
+	{KEY_P, "P"},
+	{KEY_Q, "Q"},
+	{KEY_R, "R"},
+	{KEY_S, "S"},
+	{KEY_T, "T"},
+	{KEY_U, "U"},
+	{KEY_V, "V"},
+	{KEY_W, "W"},
+	{KEY_X, "X"},
+	{KEY_Y, "Y"},
+	{KEY_Z, "Z"},
+
 	{KEY_1, "1"},
 	{KEY_2, "2"},
 	{KEY_3, "3"},
@@ -110,6 +138,7 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEY_9, "9"},
 	{KEY_0, "0"},
 
+
 	{KEY_BACKSPACE, "Backspace"},
 	{KEY_TAB, "Tab"},
 	{KEY_ENTER, "Enter"},
@@ -129,11 +158,23 @@ const KeyMap_IntStrPair key_names[] = {
 	{KEY_CALL_START, "Start Call"},
 	{KEY_CALL_END, "End Call"},
 
+	{KEY_FASTFORWARD, "Fast foward"},
+
 	{KEY_ARROW_LEFT, "Left"},
 	{KEY_ARROW_UP, "Up"},
 	{KEY_ARROW_RIGHT, "Right"},
 	{KEY_ARROW_DOWN, "Down"},
 
+	{KEY_ANALOG_FAKE_LEFT, "Analog Left"},
+	{KEY_ANALOG_FAKE_UP, "Analog Up"},
+	{KEY_ANALOG_FAKE_RIGHT, "Analog Right"},
+	{KEY_ANALOG_FAKE_DOWN, "Analog Down"},
+
+	{KEY_ANALOG_ALT_LEFT, "Alt analog Left"},
+	{KEY_ANALOG_ALT_UP, "Alt analog Up"},
+	{KEY_ANALOG_ALT_RIGHT, "Alt analog Right"},
+	{KEY_ANALOG_ALT_DOWN, "Alt analog Down"},
+
 	{KEY_EXTRA1, "Extra1"},
 	{KEY_EXTRA2, "Extra2"},
 	{KEY_EXTRA3, "Extra3"},
diff --git a/Common/KeyMap.h b/Common/KeyMap.h
index 2d10d140de..b993810224 100644
--- a/Common/KeyMap.h
+++ b/Common/KeyMap.h
@@ -70,6 +70,37 @@ namespace KeyMap {
 			KEY_n,
 			KEY_m,
 
+			/* Upper class latin */
+			KEY_Q, // top row
+			KEY_W,
+			KEY_E,
+			KEY_R,
+			KEY_T,
+			KEY_Y,
+			KEY_U,
+			KEY_I,
+			KEY_O,
+			KEY_P,
+
+			KEY_A, // mid row
+			KEY_S,
+			KEY_D,
+			KEY_F,
+			KEY_G,
+			KEY_H,
+			KEY_J,
+			KEY_K,
+			KEY_L,
+
+			KEY_Z, // low row
+			KEY_X,
+			KEY_C,
+			KEY_V,
+			KEY_B,
+			KEY_N,
+			KEY_M,
+
+
 			/* Numeric */
 			KEY_1,
 			KEY_2,
@@ -93,6 +124,11 @@ namespace KeyMap {
 			KEY_ANALOG_FAKE_UP,
 			KEY_ANALOG_FAKE_DOWN,
 
+			KEY_ANALOG_ALT_LEFT,
+			KEY_ANALOG_ALT_RIGHT,
+			KEY_ANALOG_ALT_UP,
+			KEY_ANALOG_ALT_DOWN,
+
 			KEY_SPACE,
 			KEY_ENTER,
 			KEY_CTRL_LEFT,
@@ -112,6 +148,9 @@ namespace KeyMap {
 			KEY_CALL_START,
 			KEY_CALL_END,
 
+			/* Special PPSSPP keys */
+			KEY_FASTFORWARD,
+
 			/* Extra keys
 			 * Use for platform specific keys.
 			 * Example: android's back btn */
@@ -126,8 +165,6 @@ namespace KeyMap {
 			KEY_EXTRA9,
 			KEY_EXTRA0,
 
-			// TODO: Add second set of joysticks
-			// TODO: Add fastforward key
 			// TODO: Add any missing keys.
 			// Many can be found in the
 			// window's port's keyboard