diff --git a/.gitignore b/.gitignore
index f90d8f8..f20a23c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ cores/Oric/build/xlnx_auto_0_cores/Oric/build/COREn.ZX1
 cores/Oric/build/xlnx_auto_0_xdb/
 cores/Oric/build/xst/
 
+_xmsgs/
diff --git a/cores/Oric/build/oric.ut b/cores/Oric/build/oric.ut
index e72e557..af093e7 100644
--- a/cores/Oric/build/oric.ut
+++ b/cores/Oric/build/oric.ut
@@ -9,7 +9,7 @@
 -g TdiPin:PullUp
 -g TdoPin:PullUp
 -g TmsPin:PullUp
--g UnusedPin:PullDown
+-g UnusedPin:PullUp
 -g UserID:0xFFFFFFFF
 -g ExtMasterCclk_en:Yes
 -g ExtMasterCclk_divide:50
diff --git a/cores/Oric/source/oric_zxuno_my.ucf b/cores/Oric/source/oric_zxuno_my.ucf
index 94c4a81..7ceadf0 100644
--- a/cores/Oric/source/oric_zxuno_my.ucf
+++ b/cores/Oric/source/oric_zxuno_my.ucf
@@ -1,106 +1,106 @@
 #UCF for ZX-UNO
-NET "CLK_50"          LOC="P126"  | IOSTANDARD = LVCMOS25 | PERIOD=20.0ns;
-#NET "testled"         LOC="P10"  | IOSTANDARD = LVCMOS25;
+NET "CLK_50"          LOC="P126"  | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns;
+#NET "testled"         LOC="P10"  | IOSTANDARD = LVCMOS33;
 
 # Video output
-NET O_VIDEO_R(2)      LOC="P100"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_R(1)      LOC="P80"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_R(0)      LOC="P79"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-NET O_VIDEO_G(2)      LOC="P99"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_G(1)      LOC="P83"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_G(0)      LOC="P82"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-NET O_VIDEO_B(2)      LOC="P98"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_B(1)      LOC="P92"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_VIDEO_B(0)      LOC="P88"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-NET O_HSYNC           LOC="P95"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-NET O_VSYNC           LOC="P97"  | IOSTANDARD = LVCMOS25 | DRIVE = 8 | SLEW = FAST;
-#NET O_NTSC            LOC="P66"  | IOSTANDARD = LVCMOS25;
-#NET O_PAL             LOC="P67"  | IOSTANDARD = LVCMOS25;
+NET O_VIDEO_R(2)      LOC="P100"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_R(1)      LOC="P80"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_R(0)      LOC="P79"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+NET O_VIDEO_G(2)      LOC="P99"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_G(1)      LOC="P83"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_G(0)      LOC="P82"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+NET O_VIDEO_B(2)      LOC="P98"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_B(1)      LOC="P92"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_VIDEO_B(0)      LOC="P88"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+NET O_HSYNC           LOC="P95"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+NET O_VSYNC           LOC="P97"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = FAST;
+#NET O_NTSC            LOC="P66"  | IOSTANDARD = LVCMOS33;
+#NET O_PAL             LOC="P67"  | IOSTANDARD = LVCMOS33;
 
 # Audio
 NET "AUDIO_OUT"       LOC="P94"  | IOSTANDARD = LVCMOS33;
-NET "K7_TAPEOUT"      LOC="P115"   | IOSTANDARD = LVCMOS25;
-NET "K7_TAPEIN"       LOC="P116"  | IOSTANDARD = LVCMOS25; 
+NET "K7_TAPEOUT"      LOC="P115"   | IOSTANDARD = LVCMOS33;
+NET "K7_TAPEIN"       LOC="P116"  | IOSTANDARD = LVCMOS33; 
 
 # Keyboard and mouse
-NET "PS2CLK1" LOC="P105" | IOSTANDARD = LVCMOS25 | PULLUP;
-NET "PS2DAT1" LOC="P104" | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "mouseclk"        LOC="P95"  | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "mousedata"       LOC="P97"  | IOSTANDARD = LVCMOS25 | PULLUP;
+NET "PS2CLK1" LOC="P105" | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "PS2DAT1" LOC="P104" | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "mouseclk"        LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "mousedata"       LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
 # SRAM
-#NET "sram_addr<0>"    LOC="P141" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<1>"    LOC="P139" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<2>"    LOC="P137" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<3>"    LOC="P134" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<4>"    LOC="P133" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<5>"    LOC="P120" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<6>"    LOC="P118" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<7>"    LOC="P116" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<8>"    LOC="P114" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<9>"    LOC="P112" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<10>"   LOC="P104" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<11>"   LOC="P102" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<12>"   LOC="P101" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<13>"   LOC="P100" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<14>"   LOC="P111" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<15>"   LOC="P131" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<16>"   LOC="P138" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<17>"   LOC="P140" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<18>"   LOC="P142" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<19>"   LOC="P105" | IOSTANDARD = LVCMOS25;
-#NET "sram_addr<20>"   LOC="P143" | IOSTANDARD = LVCMOS25;
+#NET "sram_addr<0>"    LOC="P141" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<1>"    LOC="P139" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<2>"    LOC="P137" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<3>"    LOC="P134" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<4>"    LOC="P133" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<5>"    LOC="P120" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<6>"    LOC="P118" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<7>"    LOC="P116" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<8>"    LOC="P114" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<9>"    LOC="P112" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<10>"   LOC="P104" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<11>"   LOC="P102" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<12>"   LOC="P101" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<13>"   LOC="P100" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<14>"   LOC="P111" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<15>"   LOC="P131" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<16>"   LOC="P138" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<17>"   LOC="P140" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<18>"   LOC="P142" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<19>"   LOC="P105" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<20>"   LOC="P143" | IOSTANDARD = LVCMOS33;
 
-#NET "sram_data<0>"    LOC="P132" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<1>"    LOC="P127" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<2>"    LOC="P124" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<3>"    LOC="P123  | IOSTANDARD = LVCMOS25;
-#NET "sram_data<4>"    LOC="P115" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<5>"    LOC="P117" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<6>"    LOC="P119" | IOSTANDARD = LVCMOS25;
-#NET "sram_data<7>"    LOC="P126" | IOSTANDARD = LVCMOS25;
+#NET "sram_data<0>"    LOC="P132" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<1>"    LOC="P127" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<2>"    LOC="P124" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<3>"    LOC="P123  | IOSTANDARD = LVCMOS33;
+#NET "sram_data<4>"    LOC="P115" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<5>"    LOC="P117" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<6>"    LOC="P119" | IOSTANDARD = LVCMOS33;
+#NET "sram_data<7>"    LOC="P126" | IOSTANDARD = LVCMOS33;
 
-#NET "sram_we_n"       LOC="P121" | IOSTANDARD = LVCMOS25;
+#NET "sram_we_n"       LOC="P121" | IOSTANDARD = LVCMOS33;
 
 # SPI Flash
-#NET "flash_cs_n"      LOC="P38"  | IOSTANDARD = LVCMOS25;
-#NET "flash_clk"       LOC="P70"  | IOSTANDARD = LVCMOS25;
-#NET "flash_mosi"      LOC="P64"  | IOSTANDARD = LVCMOS25;
-#NET "flash_miso"      LOC="P65"  | IOSTANDARD = LVCMOS25;
-#NET "flash_ext1"      LOC="P62"  | IOSTANDARD = LVCMOS25;
-#NET "flash_ext2"      LOC="P61"  | IOSTANDARD = LVCMOS25;
+#NET "flash_cs_n"      LOC="P38"  | IOSTANDARD = LVCMOS33;
+#NET "flash_clk"       LOC="P70"  | IOSTANDARD = LVCMOS33;
+#NET "flash_mosi"      LOC="P64"  | IOSTANDARD = LVCMOS33;
+#NET "flash_miso"      LOC="P65"  | IOSTANDARD = LVCMOS33;
+#NET "flash_ext1"      LOC="P62"  | IOSTANDARD = LVCMOS33;
+#NET "flash_ext2"      LOC="P61"  | IOSTANDARD = LVCMOS33;
 
 # SD/MMC
-#NET "sd_cs_n"         LOC="P59"  | IOSTANDARD = LVCMOS25;
-#NET "sd_clk"          LOC="P75"  | IOSTANDARD = LVCMOS25;
-#NET "sd_mosi"         LOC="P74"  | IOSTANDARD = LVCMOS25;
-#NET "sd_miso"         LOC="P78"  | IOSTANDARD = LVCMOS25;
+#NET "sd_cs_n"         LOC="P59"  | IOSTANDARD = LVCMOS33;
+#NET "sd_clk"          LOC="P75"  | IOSTANDARD = LVCMOS33;
+#NET "sd_mosi"         LOC="P74"  | IOSTANDARD = LVCMOS33;
+#NET "sd_miso"         LOC="P78"  | IOSTANDARD = LVCMOS33;
 
 # JOYSTICK
-#NET "joyup"           LOC="P1"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joydown"         LOC="P5"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joyleft"         LOC="P6"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joyright"        LOC="P7"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joyfire"         LOC="P2"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joyfire2"        LOC="P8"   | IOSTANDARD = LVCMOS25 | PULLUP;
-#NET "joyfire3"        LOC="P39"  | IOSTANDARD = LVCMOS25 | PULLUP;
+#NET "joyup"           LOC="P1"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joydown"         LOC="P5"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyleft"         LOC="P6"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyright"        LOC="P7"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire"         LOC="P2"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire2"        LOC="P8"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire3"        LOC="P39"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
 
 
 # Switch
-NET "I_RESET"         LOC="P15"  | IOSTANDARD = LVCMOS25 | PULLUP;
-NET "I_NMI"           LOC="P111"  | IOSTANDARD = LVCMOS25 | PULLUP;
+NET "I_RESET"         LOC="P15"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "I_NMI"           LOC="P111"  | IOSTANDARD = LVCMOS33 | PULLUP;
 NET "CLK_50" TNM_NET = "CLK_50";
 TIMESPEC "TS_CLK_50" = PERIOD "CLK_50" 20 ns HIGH 50 %;
 
-# NET D_VIDEO_R(2)        LOC="P51"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_R(1)        LOC="P50"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_R(0)        LOC="P47"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_G(2)        LOC="P40"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_G(1)        LOC="P35"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_G(0)        LOC="P33"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_B(2)        LOC="P23"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_B(1)        LOC="P17"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VIDEO_B(0)        LOC="P24"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_HSYNC             LOC="P57"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
-# NET D_VSYNC             LOC="P58"  | IOSTANDARD = LVCMOS25 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_R(2)        LOC="P51"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_R(1)        LOC="P50"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_R(0)        LOC="P47"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_G(2)        LOC="P40"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_G(1)        LOC="P35"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_G(0)        LOC="P33"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_B(2)        LOC="P23"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_B(1)        LOC="P17"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VIDEO_B(0)        LOC="P24"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_HSYNC             LOC="P57"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
+# NET D_VSYNC             LOC="P58"  | IOSTANDARD = LVCMOS33 | DRIVE=2 | SLEW=SLOW;
diff --git a/cores/generar.sh b/cores/generar.sh
index 552f802..8acef3a 100755
--- a/cores/generar.sh
+++ b/cores/generar.sh
@@ -4,6 +4,6 @@ ngdbuild -intstyle ise -dd _ngo -sd ipcore_dir -nt timestamp -uc "$ruta_ucf"_zxu
 map      -intstyle ise -w -ol high -mt 2 -p xc6slx9-tqg144-"$speed" -logic_opt off -t 1 -xt 0 -register_duplication off -r 4 -global_opt off -ir off -pr off -lc off -power off -o "$machine"_map.ncd "$machine".ngd "$machine".pcf
 par      -intstyle ise -w -ol high -mt 4 "$machine"_map.ncd "$machine".ncd "$machine".pcf
 trce     -intstyle ise -v 3 -s "$speed" -n 3 -fastpaths -xml "$machine".twx "$machine".ncd -o "$machine".twr "$machine".pcf
-bitgen   -intstyle ise -g UnusedPin:Pullup -f "$machine".ut "$machine".ncd
+bitgen   -intstyle ise -f "$machine".ut "$machine".ncd
 bit2bin "$machine".bit COREn."$2"
 cp  "$machine".bit "$machine"."$1".bit