diff --git a/libretro/core-mapper.c b/libretro/core-mapper.c
index 00f5726..74c51b2 100644
--- a/libretro/core-mapper.c
+++ b/libretro/core-mapper.c
@@ -221,13 +221,14 @@ void vkbd_key(int key,int pressed){
 		if(SHIFTON==1)
 			;//keyboard_matrix[0x25 >> 4] &= ~bit_values2[0x25 & 7]; // key needs to be SHIFTed
 
+Key_Sate[key]=1;
 		//keyboard_matrix[(unsigned char)key >> 4] &= ~bit_values2[(unsigned char)key & 7]; // key is being held down
 
 	}
 	else {
 		if(SHIFTON==1)
 			;//keyboard_matrix[0x25 >> 4] |= bit_values2[0x25 & 7]; // make sure key is unSHIFTed
-
+Key_Sate[key]=0;
 		//keyboard_matrix[(unsigned char)key >> 4] |= bit_values2[(unsigned char)key & 7];
 
 	}
@@ -600,7 +601,7 @@ F12 PLAY TAPE
 
 int Retro_PollEvent()
 {
-	//   RETRO        B    Y    SLT  STA  UP   DWN  LEFT RGT  A    X    L    R    L2   R2   L3   R3
+    //   RETRO        B    Y    SLT  STA  UP   DWN  LEFT RGT  A    X    L    R    L2   R2   L3   R3
     //   INDEX        0    1    2    3    4    5    6    7    8    9    10   11   12   13   14   15
 
    int SAVPAS=PAS;	
diff --git a/libretro/platform.c b/libretro/platform.c
index 644acf4..918491a 100644
--- a/libretro/platform.c
+++ b/libretro/platform.c
@@ -143,7 +143,7 @@ int PLATFORM_Keyboard(void)
 
 		return AKEY_NONE;
 	}
-
+else if (Atari800_machine_type != Atari800_MACHINE_5200 && !UI_is_active){
 	/* OPTION / SELECT / START keys */
 	INPUT_key_consol = INPUT_CONSOL_NONE;
 	if (Key_Sate[RETROK_F2])
@@ -181,7 +181,7 @@ int PLATFORM_Keyboard(void)
 		return AKEY_ESCAPE;
 	if (mbt[RETRO_DEVICE_ID_JOYPAD_B])
 		return AKEY_RETURN;
-
+}
 	if (UI_is_active){
 	// whitout kbd in GUI 
 		if (MXjoy[0]&0x04)
diff --git a/libretro/vkbd_def.h b/libretro/vkbd_def.h
index 618936a..bf6f7d7 100644
--- a/libretro/vkbd_def.h
+++ b/libretro/vkbd_def.h
@@ -9,29 +9,29 @@ typedef struct {
 
 Mvk MVk[NPLGN*NLIGN*2]={
 
-	{ "ESC" ,"ESC"  ,0x82 },//0
-	{ " 1" ," !" , 0x80 },//0
-	{ " 2" ," \"" ,0x81 },
-	{ " 3" ," #"  ,0x71 },
-	{ " 4" ," $"  ,0x70 },
-	{ " 5" ," %"  ,0x61 },
-	{ " 6" ," &"  ,0x60 },
-	{ " 7" ," \'"  ,0x51 },
-	{ " 8" ," ("  ,0x50 },
-	{ " 9" ," )"  ,0x41 },
-	{ " 0" ," _"  ,0x40 },
+	{ "ESC" ,"ESC"  ,RETROK_ESCAPE },//0
+	{ " 1" ," !" , RETROK_1 },//0
+	{ " 2" ," \"" ,RETROK_2 },
+	{ " 3" ," #"  ,RETROK_3 },
+	{ " 4" ," $"  ,RETROK_4 },
+	{ " 5" ," %"  ,RETROK_5 },
+	{ " 6" ," &"  ,RETROK_6 },
+	{ " 7" ," \'"  ,RETROK_7 },
+	{ " 8" ," ("  ,RETROK_8 },
+	{ " 9" ," )"  ,RETROK_9 },
+	{ " 0" ," _"  ,RETROK_0 },
 	{ " ^" ,"Pnd"  ,0x30 },
 
 	{ " q" ," Q"  ,0x83}, //10+2
 	{ " w" ," W"  ,0x73},
 	{ " e" ," E"  ,0x72},
-	{ " r" ," R"  ,0x62},
+	{ " r" ," R"  ,RETROK_r},
 	{ " t" ," T"  ,0x63},
 	{ " y" ," Y"  ,0x53},
 	{ " u" ," U"  ,0x52},
 	{ " i" ," I"  ,0x43},
 	{ " o" ," O"  ,0x42},
-	{ " p" ," P"  ,0x33},
+	{ " p" ," P"  ,RETROK_p},
 	{ " @" ," |"  ,0x32},
 	{ " [" ," ["  ,0x21},
 
@@ -69,29 +69,29 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ "CTRL" ,"CTRL"  ,0x27},
 	{ "CLR" ,"CLR" , 0x20},
 	{ "Spc" ,"Spc",0x57},
-	{ "COPY" ,"COPY"  ,0x11},
-	{ " ." ," .",0x07},
-	{ "F0" ,"F0"  ,0x17},
+	{ "= " ,"= "  ,RETROK_EQUALS},
+	{ " *" ," *",  RETROK_ASTERISK},
+	{ "# " ,"# "  ,RETROK_HASH},
 	{ "Ent" ,"Ent",0x06},
 
 
-	{ "ESC" ,"ESC"  ,0x82 },//50+10
-	{ " 1" ," !" , 0x80 },
-	{ " 2" ," \"" ,0x81 },
-	{ " 3" ," #"  ,0x71 },
-	{ " 4" ," $"  ,0x70 },
-	{ " 5" ," %"  ,0x61 },
-	{ " 6" ," &"  ,0x60 },
-	{ " 7" ," \'"  ,0x51 },
-	{ " 8" ," ("  ,0x50 },
-	{ " 9" ," )"  ,0x41 },
-	{ " 0" ," _"  ,0x40 },
+	{ "ESC" ,"ESC"  ,RETROK_ESCAPE },//50+1°
+	{ " 1" ," !" , RETROK_1 },//0
+	{ " 2" ," \"" ,RETROK_2 },
+	{ " 3" ," #"  ,RETROK_3 },
+	{ " 4" ," $"  ,RETROK_4 },
+	{ " 5" ," %"  ,RETROK_5 },
+	{ " 6" ," &"  ,RETROK_6 },
+	{ " 7" ," \'"  ,RETROK_7 },
+	{ " 8" ," ("  ,RETROK_8 },
+	{ " 9" ," )"  ,RETROK_9 },
+	{ " 0" ," _"  ,RETROK_0 },
 	{ " ^" ,"Pnd"  ,0x30 },
 
-	{ " F7" ," F7"  ,0x12}, //60+12
-	{ " F8" ," F8"  ,0x13},
-	{ " F9" ," F9"  ,0x03},
-	{ " F0" ," F0"  ,0x17},
+	{ " F7" ," F7"  ,RETROK_F7}, //60+12
+	{ " F8" ," F8"  ,RETROK_F8},
+	{ " F9" ," F9"  ,RETROK_F9},
+	{ " F0" ," F0"  ,RETROK_F10},
 	{ " t" ," T"  ,0x63},
 	{ " /\\" ," /\\"  ,0x00},
 	{ " u" ," U"  ,0x52},
@@ -101,22 +101,22 @@ Mvk MVk[NPLGN*NLIGN*2]={
 	{ " @" ," |"  ,0x32},
 	{ " [" ," ["  ,0x21},
 
-	{ " F4" ," F4"  ,0x24}, //70+14
-	{ " F5" ," F5"  ,0x14},
-	{ " F6" ," F6"  ,0x04},
+	{ " F4" ," F4"  ,RETROK_F4}, //70+14
+	{ " F5" ," F5"  ,RETROK_F5},
+	{ " F6" ," F6"  ,RETROK_F6},
 	{ " ." ," ."  ,0x07},
 	{ " <-" ," <-"  ,0x10},
 	{ "COPY" ,"COPY"  ,0x11},
 	{ " ->" ," ->"  ,0x01},
-	{ " k" ," K"  ,0x45},	
-	{ " l" ," L"  ,0x44},
-	{ " :" ," *"  ,0x35},
-	{ " ;" ," +"  ,0x34},
-	{ " ]" ," ]"  ,0x23},
+	{ " r" ," R"  ,RETROK_r},
+	{ " p" ," P"  ,RETROK_p},
+	{ "= " ,"= "  ,RETROK_EQUALS},
+	{ " *" ," *",  RETROK_ASTERISK},
+	{ "# " ,"# "  ,RETROK_HASH},
 
-	{ " F1" ," F1"  ,0x15},//80+16
-	{ " F2" ," F2"  ,0x16},
-	{ " F3" ," F3"  ,0x05},
+	{ " F1" ," F1"  ,RETROK_F1},//80+16
+	{ " F2" ," F2"  ,RETROK_F2},
+	{ " F3" ," F3"  ,RETROK_F3},
 	{ "Ent" ,"Ent"  ,0x06},
 	{ " b" ," B"  ,0x66},
 	{ " \\/" ," \\/"  ,0x02},