diff --git a/MCUME_pico/CMakeLists.txt b/MCUME_pico/CMakeLists.txt
index fcc8ab1..d596bed 100644
--- a/MCUME_pico/CMakeLists.txt
+++ b/MCUME_pico/CMakeLists.txt
@@ -8,14 +8,14 @@ include(pico_sdk_import.cmake)
 
 #set(TARGET testkeymax)
 #set(TARGET pico20)
-#set(TARGET pico64)
+set(TARGET pico64)
 #set(TARGET pico81)
 #set(TARGET picospeccy)
 #set(TARGET pico800)
 #set(TARGET pico5200)
 #set(TARGET picocolem)
 #set(TARGET picoo2em)
-set(TARGET picovcs)
+#set(TARGET picovcs)
 
 project(${TARGET} C CXX)
 
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picoo2em.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/mcume_picoo2em.uf2
deleted file mode 100644
index 1344898..0000000
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picoo2em.uf2 and /dev/null differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picospeccy.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/mcume_picospeccy.uf2
deleted file mode 100644
index a021395..0000000
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picospeccy.uf2 and /dev/null differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_testkey.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/mcume_testkey.uf2
deleted file mode 100644
index 00e2e74..0000000
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_testkey.uf2 and /dev/null differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_pico20.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/pico20.uf2
similarity index 55%
rename from MCUME_pico/bin/PICORETROVGA/mcume_pico20.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/pico20.uf2
index c5c7c30..b2ef3f3 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_pico20.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/pico20.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico64.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/pico64.uf2
similarity index 57%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_pico64.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/pico64.uf2
index c7241df..b29cfed 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico64.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/pico64.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico800.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/pico800.uf2
similarity index 55%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_pico800.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/pico800.uf2
index 742d599..75efcc0 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico800.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/pico800.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico81.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/pico81.uf2
similarity index 57%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_pico81.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/pico81.uf2
index 37c9c32..e69d556 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico81.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/pico81.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picocolem.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/picocolem.uf2
similarity index 54%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_picocolem.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/picocolem.uf2
index d244998..bdd9568 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picocolem.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/picocolem.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico20.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/picoo2em.uf2
similarity index 53%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_pico20.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/picoo2em.uf2
index b17fb39..b45adbe 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_pico20.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/picoo2em.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/picospeccy.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/picospeccy.uf2
new file mode 100644
index 0000000..2d0210e
Binary files /dev/null and b/MCUME_pico/bin/PICOMPUTERMAX/picospeccy.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picovcs.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/picovcs.uf2
similarity index 57%
rename from MCUME_pico/bin/PICOMPUTERMAX/mcume_picovcs.uf2
rename to MCUME_pico/bin/PICOMPUTERMAX/picovcs.uf2
index c5954f9..c332f9a 100644
Binary files a/MCUME_pico/bin/PICOMPUTERMAX/mcume_picovcs.uf2 and b/MCUME_pico/bin/PICOMPUTERMAX/picovcs.uf2 differ
diff --git a/MCUME_pico/bin/PICOMPUTERMAX/testkeymax.uf2 b/MCUME_pico/bin/PICOMPUTERMAX/testkeymax.uf2
new file mode 100644
index 0000000..8919b79
Binary files /dev/null and b/MCUME_pico/bin/PICOMPUTERMAX/testkeymax.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_picospeccy.uf2 b/MCUME_pico/bin/PICORETROVGA/mcume_picospeccy.uf2
deleted file mode 100644
index c860ebb..0000000
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_picospeccy.uf2 and /dev/null differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_testkeymax.uf2 b/MCUME_pico/bin/PICORETROVGA/mcume_testkeymax.uf2
deleted file mode 100644
index 0c12e39..0000000
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_testkeymax.uf2 and /dev/null differ
diff --git a/MCUME_pico/bin/PICORETROVGA/pico20.uf2 b/MCUME_pico/bin/PICORETROVGA/pico20.uf2
new file mode 100644
index 0000000..f8facc5
Binary files /dev/null and b/MCUME_pico/bin/PICORETROVGA/pico20.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_pico64.uf2 b/MCUME_pico/bin/PICORETROVGA/pico64.uf2
similarity index 55%
rename from MCUME_pico/bin/PICORETROVGA/mcume_pico64.uf2
rename to MCUME_pico/bin/PICORETROVGA/pico64.uf2
index 85edd9e..fc28e9f 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_pico64.uf2 and b/MCUME_pico/bin/PICORETROVGA/pico64.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_pico800.uf2 b/MCUME_pico/bin/PICORETROVGA/pico800.uf2
similarity index 58%
rename from MCUME_pico/bin/PICORETROVGA/mcume_pico800.uf2
rename to MCUME_pico/bin/PICORETROVGA/pico800.uf2
index 2cd0ec9..3d720e1 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_pico800.uf2 and b/MCUME_pico/bin/PICORETROVGA/pico800.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_pico81.uf2 b/MCUME_pico/bin/PICORETROVGA/pico81.uf2
similarity index 58%
rename from MCUME_pico/bin/PICORETROVGA/mcume_pico81.uf2
rename to MCUME_pico/bin/PICORETROVGA/pico81.uf2
index add6851..0ad1e11 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_pico81.uf2 and b/MCUME_pico/bin/PICORETROVGA/pico81.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_picocolem.uf2 b/MCUME_pico/bin/PICORETROVGA/picocolem.uf2
similarity index 57%
rename from MCUME_pico/bin/PICORETROVGA/mcume_picocolem.uf2
rename to MCUME_pico/bin/PICORETROVGA/picocolem.uf2
index f946435..248231c 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_picocolem.uf2 and b/MCUME_pico/bin/PICORETROVGA/picocolem.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_picoo2em.uf2 b/MCUME_pico/bin/PICORETROVGA/picoo2em.uf2
similarity index 54%
rename from MCUME_pico/bin/PICORETROVGA/mcume_picoo2em.uf2
rename to MCUME_pico/bin/PICORETROVGA/picoo2em.uf2
index 8b6c119..ebb2714 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_picoo2em.uf2 and b/MCUME_pico/bin/PICORETROVGA/picoo2em.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/picospeccy.uf2 b/MCUME_pico/bin/PICORETROVGA/picospeccy.uf2
new file mode 100644
index 0000000..00614de
Binary files /dev/null and b/MCUME_pico/bin/PICORETROVGA/picospeccy.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/mcume_picovcs.uf2 b/MCUME_pico/bin/PICORETROVGA/picovcs.uf2
similarity index 58%
rename from MCUME_pico/bin/PICORETROVGA/mcume_picovcs.uf2
rename to MCUME_pico/bin/PICORETROVGA/picovcs.uf2
index b76945b..2e42139 100644
Binary files a/MCUME_pico/bin/PICORETROVGA/mcume_picovcs.uf2 and b/MCUME_pico/bin/PICORETROVGA/picovcs.uf2 differ
diff --git a/MCUME_pico/bin/PICORETROVGA/testkeymax.uf2 b/MCUME_pico/bin/PICORETROVGA/testkeymax.uf2
new file mode 100644
index 0000000..214993a
Binary files /dev/null and b/MCUME_pico/bin/PICORETROVGA/testkeymax.uf2 differ
diff --git a/MCUME_pico/bin/PICOZX/pico20.uf2 b/MCUME_pico/bin/PICOZX/pico20.uf2
index 10d6db8..7fc9594 100644
Binary files a/MCUME_pico/bin/PICOZX/pico20.uf2 and b/MCUME_pico/bin/PICOZX/pico20.uf2 differ
diff --git a/MCUME_pico/bin/PICOZX/pico64.uf2 b/MCUME_pico/bin/PICOZX/pico64.uf2
index 3797124..a384033 100644
Binary files a/MCUME_pico/bin/PICOZX/pico64.uf2 and b/MCUME_pico/bin/PICOZX/pico64.uf2 differ
diff --git a/MCUME_pico/config/iopins.h b/MCUME_pico/config/iopins.h
index cae3a56..c0258fc 100644
--- a/MCUME_pico/config/iopins.h
+++ b/MCUME_pico/config/iopins.h
@@ -47,7 +47,7 @@
 #define I2C_SCL_IO      15? 
 #define I2C_SDA_IO      14?
 */
-#else
+#else /* end MCUME_REV1 */
 
 #if (defined(PICOMPUTER) && defined(USE_VGA) )
 
@@ -58,7 +58,7 @@
    CSYNC */
 #define VGA_COLORBASE   0
 #define VGA_SYNCBASE    8
-#else
+#else /* end PICOMPUTER && USE_VGA () */
 
 #ifdef PICOZX
 
@@ -70,7 +70,7 @@
 #define VGA_COLORBASE   0
 #define VGA_SYNCBASE    6
 
-#else
+#else /* PICOZX */
 // Speaker
 #define AUDIO_PIN       0
 // VGA
@@ -110,12 +110,13 @@
 #define TFT_CS          21
 #define TFT_BACKLIGHT   20
 
-#else
+#else /* end PICOMPUTERMAX */
 #define TFT_RST         21
 #define TFT_CS          255
 #define TFT_BACKLIGHT   20
 #endif
-#else
+
+#else /* end PICOMPUTER */
 // MCUME_REV2 (ILI)
 #define TFT_RST         21
 #define TFT_CS          17
@@ -158,8 +159,8 @@
 #define KROWIN4         17
 #define KROWIN5         18
 #define KROWIN6         19
+#else /* end USE_VGA (RETROVGA)*/
 
-#else
 // Keyboard matrix 
 //Cols (out)
 #define KCOLOUT1        1
diff --git a/MCUME_pico/display/emuapi.cpp b/MCUME_pico/display/emuapi.cpp
index fa1f1c2..9bfe30e 100644
--- a/MCUME_pico/display/emuapi.cpp
+++ b/MCUME_pico/display/emuapi.cpp
@@ -1334,6 +1334,7 @@ int keypressed = emu_ReadKeys();
 #ifdef USE_VGA    
     tft.begin(MODE_VGA_320x240);
 #else
+
 #ifdef PICOZX    
   // Force VGA if LEFT/RIGHT pressed
   if (keypressed & MASK_JOY2_UP)
@@ -1360,34 +1361,24 @@ int keypressed = emu_ReadKeys();
       tft.begin(MODE_TFT_320x240);    
     }     
   }
-#else
+#else /* end PICOZX */
   tft.begin(MODE_TFT_320x240);    
 #endif 
 
 #endif
 
+#ifndef USE_VGA    
 #ifdef PICOMPUTER
   // Flip screen if UP pressed
   if (keypressed & MASK_JOY2_UP)
   {
-#ifdef PICOMPUTERMAX
-#ifndef USE_VGA    
     tft.flipscreen(true);
-#endif
-#else
-    tft.flipscreen(true);
-#endif
   }
   else 
   {
-#ifdef PICOMPUTERMAX
-#ifndef USE_VGA    
     tft.flipscreen(false);
-#endif
-#else
-    tft.flipscreen(false);
-#endif
   }
+#endif
 #endif
 
   if (keypressed & MASK_JOY2_DOWN) {
diff --git a/MCUME_pico/pico20/emucfg.h b/MCUME_pico/pico20/emucfg.h
index 61c897d..f518bb0 100644
--- a/MCUME_pico/pico20/emucfg.h
+++ b/MCUME_pico/pico20/emucfg.h
@@ -26,7 +26,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',
   'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M',0,' ',
-  145,157,29,17,157,29 //U L R D L R
+  0,0,0,0,157,29 // L R
   };  
 
 const unsigned short key_map2[] = {
@@ -34,7 +34,7 @@ const unsigned short key_map2[] = {
   0,0,0,'<','>',0,0,0,';','"',
   0,0,0,0,0,'^','-','+','=',0x0D,
   0,':',0,'?','\/','*',',','.',0,' ',
-  0,0,0,0,0,0
+  145,157,29,17,0,0 // U L R D
   };  
 
 const unsigned short key_map3[] = {
@@ -60,7 +60,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',157,
   0,'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M','.',' ',
-  145,157,29,17 //U L R D
+  0,0,0,0
   };  
 
 #define keylables_map2_0 (char *)"1234567890 "
@@ -70,7 +70,7 @@ const unsigned short key_map2[] = {
   '1','2','3','4','5','6','7','8','9','0',0,
   0, '!','@','#','$','%','+','&','*','-','\/',
   0, '(',')','?','\/','"','<','>',',',':',
-  0,0,0,0
+  145,157,29,17 //U L R D
   };  
 
 #define keylables_map3_0 (char *)"\x11\x12\x13\x14\x15\x16\x17\x18   "
diff --git a/MCUME_pico/pico64/emucfg.h b/MCUME_pico/pico64/emucfg.h
index 5c495f5..8190ce5 100644
--- a/MCUME_pico/pico64/emucfg.h
+++ b/MCUME_pico/pico64/emucfg.h
@@ -26,7 +26,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',
   'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M',0,' ',
-  145,157,29,17,157,29 //U L R D L R
+  0,0,0,0,157,29   // L R
   };  
 
 const unsigned short key_map2[] = {
@@ -34,7 +34,7 @@ const unsigned short key_map2[] = {
   0,0,0,'<','>',0,0,0,';','"',
   0,0,0,0,0,'^','-','+','=',0x0D,
   0,':',0,'?','\/','*',',','.',0,' ',
-  0,0,0,0,0,0
+  145,157,29,17,0,0 // U L R D
   };  
 
 const unsigned short key_map3[] = {
@@ -60,7 +60,7 @@ const unsigned short key_map1[] = {
   'Q','W','E','R','T','Y','U','I','O','P',157,
   0,'A','S','D','F','G','H','J','K','L',0x0D,
   0,'Z','X','C','V','B','N','M','.',' ',
-  145,157,29,17 //U L R D
+  0,0,0,0
   };  
 
 #define keylables_map2_0 (char *)"1234567890 "
@@ -70,7 +70,7 @@ const unsigned short key_map2[] = {
   '1','2','3','4','5','6','7','8','9','0',0,
   0, '!','@','#','$','%','+','&','*','-','\/',
   0, '(',')','?','\/','"','<','>',',',':',
-  0,0,0,0
+  145,157,29,17 //U L R D
   };  
 
 #define keylables_map3_0 (char *)"\x11\x12\x13\x14\x15\x16\x17\x18   "