diff --git a/libretro/core-mapper.c b/libretro/core-mapper.c
index 237711e..05a114a 100644
--- a/libretro/core-mapper.c
+++ b/libretro/core-mapper.c
@@ -328,7 +328,7 @@ void retro_virtualkb(void)
 
                oldi=-1;
             }
-            else if(RETROK_LCTRL) //CTRL
+            else if(i==RETROK_LCTRL) //CTRL
             {     
                CTRLON=-CTRLON;
 
diff --git a/libretro/vkbd_def.h b/libretro/vkbd_def.h
index bf6f7d7..6a77f20 100644
--- a/libretro/vkbd_def.h
+++ b/libretro/vkbd_def.h
@@ -22,43 +22,43 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " 0" ," _"  ,RETROK_0 },
 	{ " ^" ,"Pnd"  ,0x30 },
 
-	{ " q" ," Q"  ,0x83}, //10+2
-	{ " w" ," W"  ,0x73},
-	{ " e" ," E"  ,0x72},
+	{ " q" ," Q"  ,RETROK_q}, //10+2
+	{ " w" ," W"  ,RETROK_w},
+	{ " e" ," E"  ,RETROK_e},
 	{ " r" ," R"  ,RETROK_r},
-	{ " t" ," T"  ,0x63},
-	{ " y" ," Y"  ,0x53},
-	{ " u" ," U"  ,0x52},
-	{ " i" ," I"  ,0x43},
-	{ " o" ," O"  ,0x42},
+	{ " t" ," T"  ,RETROK_t},
+	{ " y" ," Y"  ,RETROK_y},
+	{ " u" ," U"  ,RETROK_u},
+	{ " i" ," I"  ,RETROK_i},
+	{ " o" ," O"  ,RETROK_o},
 	{ " p" ," P"  ,RETROK_p},
-	{ " @" ," |"  ,0x32},
-	{ " [" ," ["  ,0x21},
+	{ " @" ," |"  ,RETROK_QUOTEDBL},
+	{ " [" ," ["  ,RETROK_LEFTBRACKET},
 
-	{ " a" ," A"  ,0x85}, //20+4
-	{ " s" ," S"  ,0x74},
-	{ " d" ," D"  ,0x75},
-	{ " f" ," F"  ,0x65},
-	{ " g" ," G"  ,0x64},
-	{ " h" ," H"  ,0x54},
-	{ " j" ," J"  ,0x55},
-	{ " k" ," K"  ,0x45},	
-	{ " l" ," L"  ,0x44},
-	{ " :" ," *"  ,0x35},
-	{ " ;" ," +"  ,0x34},
-	{ " ]" ," ]"  ,0x23},
+	{ " a" ," A"  ,RETROK_a}, //20+4
+	{ " s" ," S"  ,RETROK_s},
+	{ " d" ," D"  ,RETROK_d},
+	{ " f" ," F"  ,RETROK_f},
+	{ " g" ," G"  ,RETROK_g},
+	{ " h" ," H"  ,RETROK_h},
+	{ " j" ," J"  ,RETROK_j},
+	{ " k" ," K"  ,RETROK_k},	
+	{ " l" ," L"  ,RETROK_l},
+	{ " :" ," *"  ,RETROK_COLON},
+	{ " ;" ," +"  ,RETROK_SEMICOLON},
+	{ " ]" ," ]"  ,RETROK_RIGHTBRACKET},
 
-	{ " z" ," Z"  ,0x87},//30+6
-	{ " x" ," X"  ,0x77},
-	{ " c" ," C"  ,0x76},
-	{ " v" ," V"  ,0x67},
-	{ " b" ," B"  ,0x66},
-	{ " n" ," N"  ,0x56},
-	{ " m"," M"   ,0x46},
-	{ " ,"," <"   ,0x47},
-	{ " ."," >"   ,0x37},
-	{ " /" ," ?"  ,0x36},
-	{ " \\"," \\"   ,0x26},
+	{ " z" ," Z"  ,RETROK_z},//30+6
+	{ " x" ," X"  ,RETROK_x},
+	{ " c" ," C"  ,RETROK_c},
+	{ " v" ," V"  ,RETROK_v},
+	{ " b" ," B"  ,RETROK_b},
+	{ " n" ," N"  ,RETROK_n},
+	{ " m"," M"   ,RETROK_m},
+	{ " ,"," <"   ,RETROK_COMMA},
+	{ " ."," >"   ,RETROK_PERIOD},
+	{ " /" ," ?"  ,RETROK_SLASH},
+	{ " \\"," \\"   ,RETROK_BACKSLASH},
 	{ "SHFT" ,"SHFT"  ,0x25},
 
 	{ "PG2","PG2" ,-2}, //40+8