diff --git a/cores/Spectrum/pines_zxuno_Ap.ucf b/cores/Spectrum/pines_zxuno_Ap.ucf
index 7f7fd8f..de59282 100644
--- a/cores/Spectrum/pines_zxuno_Ap.ucf
+++ b/cores/Spectrum/pines_zxuno_Ap.ucf
@@ -1,84 +1,91 @@
 # Clocks & debug
-NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33;
-NET "testled" LOC="P2" | IOSTANDARD = LVCMOS33;
-NET "clk50mhz" PERIOD=20 ns;
-NET "sysclk" PERIOD=35 ns;
+NET "clk50mhz"        LOC="P55"  | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns;
+NET "testled"         LOC="P2"   | IOSTANDARD = LVCMOS33;
 
 # Video output
-NET "r<2>" LOC="P97" | IOSTANDARD = LVCMOS33;
-NET "r<1>" LOC="P95" | IOSTANDARD = LVCMOS33;
-NET "r<0>" LOC="P94" | IOSTANDARD = LVCMOS33;
-NET "g<2>" LOC="P88" | IOSTANDARD = LVCMOS33;
-NET "g<1>" LOC="P87" | IOSTANDARD = LVCMOS33;
-NET "g<0>" LOC="P85" | IOSTANDARD = LVCMOS33;
-NET "b<2>" LOC="P84" | IOSTANDARD = LVCMOS33;
-NET "b<1>" LOC="P83" | IOSTANDARD = LVCMOS33;
-NET "b<0>" LOC="P82" | IOSTANDARD = LVCMOS33;
-NET "hsync" LOC="P93" | IOSTANDARD = LVCMOS33;
-NET "vsync" LOC="P92" | IOSTANDARD = LVCMOS33;
-NET "stdn" LOC="P51" | IOSTANDARD = LVCMOS33;
-NET "stdnb" LOC="P50" | IOSTANDARD = LVCMOS33;
+NET "r<2>"            LOC="P97"  | IOSTANDARD = LVCMOS33;
+NET "r<1>"            LOC="P95"  | IOSTANDARD = LVCMOS33;
+NET "r<0>"            LOC="P94"  | IOSTANDARD = LVCMOS33;
+NET "g<2>"            LOC="P88"  | IOSTANDARD = LVCMOS33;
+NET "g<1>"            LOC="P87"  | IOSTANDARD = LVCMOS33;
+NET "g<0>"            LOC="P85"  | IOSTANDARD = LVCMOS33;
+NET "b<2>"            LOC="P84"  | IOSTANDARD = LVCMOS33;
+NET "b<1>"            LOC="P83"  | IOSTANDARD = LVCMOS33;
+NET "b<0>"            LOC="P82"  | IOSTANDARD = LVCMOS33;
+NET "hsync"           LOC="P93"  | IOSTANDARD = LVCMOS33;
+NET "vsync"           LOC="P92"  | IOSTANDARD = LVCMOS33;
+NET "stdn"            LOC="P51"  | IOSTANDARD = LVCMOS33;
+NET "stdnb"           LOC="P50"  | IOSTANDARD = LVCMOS33;
 
 # Sound input/output
-NET "audio_out_left" LOC="P98" | IOSTANDARD = LVCMOS33;
-NET "audio_out_right" LOC="P99" | IOSTANDARD = LVCMOS33;
-NET "ear" LOC="P1" | IOSTANDARD = LVCMOS33;
+NET "audio_out_left"  LOC="P98"  | IOSTANDARD = LVCMOS33;
+NET "audio_out_right" LOC="P99"  | IOSTANDARD = LVCMOS33;
+NET "ear"             LOC="P1"   | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET "clkps2" LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP;     # pin 1 DIN
-NET "dataps2" LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP;    # pin 5 DIN
-NET "mouseclk" LOC="P57" | IOSTANDARD = LVCMOS33 | PULLUP;   # pin 6 DIN
-NET "mousedata" LOC="P56" | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 2 DIN
+NET "clkps2"          LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "dataps2"         LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mouseclk"        LOC="P57"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mousedata"       LOC="P56"  | IOSTANDARD = LVCMOS33 | PULLUP;
+  
+# SRAM  
+NET "sram_addr<0>"    LOC="P115" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<1>"    LOC="P116" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<2>"    LOC="P117" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<3>"    LOC="P119" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<4>"    LOC="P120" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<5>"    LOC="P123" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<6>"    LOC="P126" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<7>"    LOC="P131" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<8>"    LOC="P127" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<9>"    LOC="P124" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<10>"   LOC="P118" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<11>"   LOC="P121" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<12>"   LOC="P133" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<13>"   LOC="P132" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<14>"   LOC="P137" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<15>"   LOC="P140" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<16>"   LOC="P139" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<17>"   LOC="P141" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<18>"   LOC="P138" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<19>"   LOC="P111" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<20>"   LOC="P138" | IOSTANDARD = LVCMOS33;
 
-# SRAM
-NET "sram_addr<0>"  LOC="P115" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<1>"  LOC="P116" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<2>"  LOC="P117" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<3>"  LOC="P119" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<4>"  LOC="P120" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<5>"  LOC="P123" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<6>"  LOC="P126" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<7>"  LOC="P131" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<8>"  LOC="P127" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<9>"  LOC="P124" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<10>" LOC="P118" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<11>" LOC="P121" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<12>" LOC="P133" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<13>" LOC="P132" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<14>" LOC="P137" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<15>" LOC="P140" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<16>" LOC="P139" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<17>" LOC="P141" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<18>" LOC="P138" | IOSTANDARD = LVCMOS33;
+NET "sram_data<0>"    LOC="P114" | IOSTANDARD = LVCMOS33;
+NET "sram_data<1>"    LOC="P112" | IOSTANDARD = LVCMOS33;
+NET "sram_data<2>"    LOC="P111" | IOSTANDARD = LVCMOS33;
+NET "sram_data<3>"    LOC="P105" | IOSTANDARD = LVCMOS33;
+NET "sram_data<4>"    LOC="P104" | IOSTANDARD = LVCMOS33;
+NET "sram_data<5>"    LOC="P102" | IOSTANDARD = LVCMOS33;
+NET "sram_data<6>"    LOC="P101" | IOSTANDARD = LVCMOS33;
+NET "sram_data<7>"    LOC="P100" | IOSTANDARD = LVCMOS33;
 
-NET "sram_data<0>" LOC="P114" | IOSTANDARD = LVCMOS33;
-NET "sram_data<1>" LOC="P112" | IOSTANDARD = LVCMOS33;
-NET "sram_data<2>" LOC="P111" | IOSTANDARD = LVCMOS33;
-NET "sram_data<3>" LOC="P105" | IOSTANDARD = LVCMOS33;
-NET "sram_data<4>" LOC="P104" | IOSTANDARD = LVCMOS33;
-NET "sram_data<5>" LOC="P102" | IOSTANDARD = LVCMOS33;
-NET "sram_data<6>" LOC="P101" | IOSTANDARD = LVCMOS33;
-NET "sram_data<7>" LOC="P100" | IOSTANDARD = LVCMOS33;
-
-NET "sram_we_n" LOC="P134" | IOSTANDARD = LVCMOS33;
+NET "sram_we_n"       LOC="P134" | IOSTANDARD = LVCMOS33;
 
 # SPI Flash
-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;
+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="P78" | IOSTANDARD = LVCMOS33;
-NET "sd_clk" LOC="P80" | IOSTANDARD = LVCMOS33;
-NET "sd_mosi" LOC="P79" | IOSTANDARD = LVCMOS33;
-NET "sd_miso" LOC="P81" | IOSTANDARD = LVCMOS33;
+NET "sd_cs_n"         LOC="P78"  | IOSTANDARD = LVCMOS33;
+NET "sd_clk"          LOC="P80"  | IOSTANDARD = LVCMOS33;
+NET "sd_mosi"         LOC="P79"  | IOSTANDARD = LVCMOS33;
+NET "sd_miso"         LOC="P81"  | IOSTANDARD = LVCMOS33;
 
 # JOYSTICK
-NET "joyup"    LOC="P74" | IOSTANDARD = LVCMOS33 | PULLUP;    #JOY6
-NET "joydown"  LOC="P67" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY4
-NET "joyleft"  LOC="P59" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY3
-NET "joyright" LOC="P58" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY2
-NET "joyfire"  LOC="P75" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY7
+NET "joyup"           LOC="P74"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joydown"         LOC="P67"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyleft"         LOC="P59"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyright"        LOC="P58"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyfire"         LOC="P75"  | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire2"        LOC="P8"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire3"        LOC="P39"  | IOSTANDARD = LVCMOS33 | PULLUP;
+
+
+# Otros
+NET "sysclk"          PERIOD=35 ns;
+
diff --git a/cores/Spectrum/pines_zxuno_v2.ucf b/cores/Spectrum/pines_zxuno_v2.ucf
index c7ebcb8..ae5a0b8 100644
--- a/cores/Spectrum/pines_zxuno_v2.ucf
+++ b/cores/Spectrum/pines_zxuno_v2.ucf
@@ -1,84 +1,91 @@
 # Clocks & debug
-NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33;
-NET "testled" LOC="P10" | IOSTANDARD = LVCMOS33;
-NET "clk50mhz" PERIOD=20 ns;
-NET "sysclk" PERIOD=35 ns;
+NET "clk50mhz"        LOC="P55"  | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns;
+NET "testled"         LOC="P10"  | IOSTANDARD = LVCMOS33;
 
-# Video output
-NET "r<2>" LOC="P93" | IOSTANDARD = LVCMOS33;
-NET "r<1>" LOC="P92" | IOSTANDARD = LVCMOS33;
-NET "r<0>" LOC="P88" | IOSTANDARD = LVCMOS33;
-NET "g<2>" LOC="P84" | IOSTANDARD = LVCMOS33;
-NET "g<1>" LOC="P83" | IOSTANDARD = LVCMOS33;
-NET "g<0>" LOC="P82" | IOSTANDARD = LVCMOS33;
-NET "b<2>" LOC="P81" | IOSTANDARD = LVCMOS33;
-NET "b<1>" LOC="P80" | IOSTANDARD = LVCMOS33;
-NET "b<0>" LOC="P79" | IOSTANDARD = LVCMOS33;
-NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33;
-NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33;
-NET "stdn" LOC="P67" | IOSTANDARD = LVCMOS33;
-NET "stdnb" LOC="P66" | IOSTANDARD = LVCMOS33;
+# Video output       
+NET "r<2>"            LOC="P93"  | IOSTANDARD = LVCMOS33;
+NET "r<1>"            LOC="P92"  | IOSTANDARD = LVCMOS33;
+NET "r<0>"            LOC="P88"  | IOSTANDARD = LVCMOS33;
+NET "g<2>"            LOC="P84"  | IOSTANDARD = LVCMOS33;
+NET "g<1>"            LOC="P83"  | IOSTANDARD = LVCMOS33;
+NET "g<0>"            LOC="P82"  | IOSTANDARD = LVCMOS33;
+NET "b<2>"            LOC="P81"  | IOSTANDARD = LVCMOS33;
+NET "b<1>"            LOC="P80"  | IOSTANDARD = LVCMOS33;
+NET "b<0>"            LOC="P79"  | IOSTANDARD = LVCMOS33;
+NET "hsync"           LOC="P87"  | IOSTANDARD = LVCMOS33;
+NET "vsync"           LOC="P85"  | IOSTANDARD = LVCMOS33;
+NET "stdn"            LOC="P67"  | IOSTANDARD = LVCMOS33;
+NET "stdnb"           LOC="P66"  | IOSTANDARD = LVCMOS33;
 
 # Sound input/output
-NET "audio_out_left" LOC="P8" | IOSTANDARD = LVCMOS33;
-NET "audio_out_right" LOC="P9" | IOSTANDARD = LVCMOS33;
-NET "ear" LOC="P105" | IOSTANDARD = LVCMOS33;
+NET "audio_out_left"  LOC="P8"   | IOSTANDARD = LVCMOS33;
+NET "audio_out_right" LOC="P9"   | IOSTANDARD = LVCMOS33;
+NET "ear"             LOC="P105" | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET "clkps2" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;     # pin 1 DIN
-NET "dataps2" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;    # pin 5 DIN
-NET "mouseclk" LOC="P94" | IOSTANDARD = LVCMOS33 | PULLUP;   # pin 6 DIN
-NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 2 DIN
+NET "clkps2"          LOC="P98"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "dataps2"         LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mouseclk"        LOC="P94"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mousedata"       LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
 # SRAM
-NET "sram_addr<0>"  LOC="P115" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<1>"  LOC="P116" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<2>"  LOC="P117" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<3>"  LOC="P119" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<4>"  LOC="P120" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<5>"  LOC="P123" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<6>"  LOC="P126" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<7>"  LOC="P131" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<8>"  LOC="P127" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<9>"  LOC="P124" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<10>" LOC="P118" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<11>" LOC="P121" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<12>" LOC="P133" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<13>" LOC="P132" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<14>" LOC="P137" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<15>" LOC="P140" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<16>" LOC="P139" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<17>" LOC="P141" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<18>" LOC="P138" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<0>"    LOC="P115" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<1>"    LOC="P116" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<2>"    LOC="P117" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<3>"    LOC="P119" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<4>"    LOC="P120" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<5>"    LOC="P123" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<6>"    LOC="P126" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<7>"    LOC="P131" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<8>"    LOC="P127" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<9>"    LOC="P124" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<10>"   LOC="P118" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<11>"   LOC="P121" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<12>"   LOC="P133" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<13>"   LOC="P132" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<14>"   LOC="P137" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<15>"   LOC="P140" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<16>"   LOC="P139" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<17>"   LOC="P141" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<18>"   LOC="P138" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<19>"   LOC="P111" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<20>"   LOC="P138" | IOSTANDARD = LVCMOS33;
 
-NET "sram_data<0>" LOC="P114" | IOSTANDARD = LVCMOS33;
-NET "sram_data<1>" LOC="P112" | IOSTANDARD = LVCMOS33;
-NET "sram_data<2>" LOC="P111" | IOSTANDARD = LVCMOS33;
-NET "sram_data<3>" LOC="P99" | IOSTANDARD = LVCMOS33;
-NET "sram_data<4>" LOC="P100" | IOSTANDARD = LVCMOS33;
-NET "sram_data<5>" LOC="P101" | IOSTANDARD = LVCMOS33;
-NET "sram_data<6>" LOC="P102" | IOSTANDARD = LVCMOS33;
-NET "sram_data<7>" LOC="P104" | IOSTANDARD = LVCMOS33;
+NET "sram_data<0>"    LOC="P114" | IOSTANDARD = LVCMOS33;
+NET "sram_data<1>"    LOC="P112" | IOSTANDARD = LVCMOS33;
+NET "sram_data<2>"    LOC="P111" | IOSTANDARD = LVCMOS33;
+NET "sram_data<3>"    LOC="P99"  | IOSTANDARD = LVCMOS33;
+NET "sram_data<4>"    LOC="P100" | IOSTANDARD = LVCMOS33;
+NET "sram_data<5>"    LOC="P101" | IOSTANDARD = LVCMOS33;
+NET "sram_data<6>"    LOC="P102" | IOSTANDARD = LVCMOS33;
+NET "sram_data<7>"    LOC="P104" | IOSTANDARD = LVCMOS33;
 
-NET "sram_we_n" LOC="P134" | IOSTANDARD = LVCMOS33;
+NET "sram_we_n"       LOC="P134" | IOSTANDARD = LVCMOS33;
 
 # SPI Flash
-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;
+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 = LVCMOS33;
-NET "sd_clk" LOC="P75" | IOSTANDARD = LVCMOS33;
-NET "sd_mosi" LOC="P74" | IOSTANDARD = LVCMOS33;
-NET "sd_miso" LOC="P78" | IOSTANDARD = LVCMOS33;
+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="P142" | IOSTANDARD = LVCMOS33 | PULLUP;    #JOY6
-NET "joydown" LOC="P1" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY4
-NET "joyleft" LOC="P2" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY3
-NET "joyright" LOC="P5" | IOSTANDARD = LVCMOS33 | PULLUP; #JOY2
-NET "joyfire" LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY7
\ No newline at end of file
+NET "joyup"           LOC="P142" | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joydown"         LOC="P1"   | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyleft"         LOC="P2"   | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyright"        LOC="P5"   | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "joyfire"         LOC="P143" | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire2"        LOC="P6"   | IOSTANDARD = LVCMOS33 | PULLUP;
+#NET "joyfire3"        LOC="P7"   | IOSTANDARD = LVCMOS33 | PULLUP;
+
+
+# Otros
+NET "sysclk"          PERIOD=35 ns;
+
diff --git a/cores/Spectrum/pines_zxuno_v3.ucf b/cores/Spectrum/pines_zxuno_v3.ucf
index 5879eec..3c62425 100644
--- a/cores/Spectrum/pines_zxuno_v3.ucf
+++ b/cores/Spectrum/pines_zxuno_v3.ucf
@@ -1,88 +1,91 @@
 # Clocks & debug
-NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33;
-NET "testled" LOC="P10" | IOSTANDARD = LVCMOS33;
-NET "clk50mhz" PERIOD=20 ns;
-NET "sysclk" PERIOD=35 ns;
+NET "clk50mhz"        LOC="P55"  | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns;
+NET "testled"         LOC="P10"  | IOSTANDARD = LVCMOS33;
 
 # Video output
-NET "r<2>" LOC="P93" | IOSTANDARD = LVCMOS33;
-NET "r<1>" LOC="P92" | IOSTANDARD = LVCMOS33;
-NET "r<0>" LOC="P88" | IOSTANDARD = LVCMOS33;
-NET "g<2>" LOC="P84" | IOSTANDARD = LVCMOS33;
-NET "g<1>" LOC="P83" | IOSTANDARD = LVCMOS33;
-NET "g<0>" LOC="P82" | IOSTANDARD = LVCMOS33;
-NET "b<2>" LOC="P81" | IOSTANDARD = LVCMOS33;
-NET "b<1>" LOC="P80" | IOSTANDARD = LVCMOS33;
-NET "b<0>" LOC="P79" | IOSTANDARD = LVCMOS33;
-NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33;
-NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33;
-NET "stdn" LOC="P67" | IOSTANDARD = LVCMOS33;
-NET "stdnb" LOC="P66" | IOSTANDARD = LVCMOS33;
+NET "r<2>"            LOC="P93"  | IOSTANDARD = LVCMOS33;
+NET "r<1>"            LOC="P92"  | IOSTANDARD = LVCMOS33;
+NET "r<0>"            LOC="P88"  | IOSTANDARD = LVCMOS33;
+NET "g<2>"            LOC="P84"  | IOSTANDARD = LVCMOS33;
+NET "g<1>"            LOC="P83"  | IOSTANDARD = LVCMOS33;
+NET "g<0>"            LOC="P82"  | IOSTANDARD = LVCMOS33;
+NET "b<2>"            LOC="P81"  | IOSTANDARD = LVCMOS33;
+NET "b<1>"            LOC="P80"  | IOSTANDARD = LVCMOS33;
+NET "b<0>"            LOC="P79"  | IOSTANDARD = LVCMOS33;
+NET "hsync"           LOC="P87"  | IOSTANDARD = LVCMOS33;
+NET "vsync"           LOC="P85"  | IOSTANDARD = LVCMOS33;
+NET "stdn"            LOC="P67"  | IOSTANDARD = LVCMOS33;
+NET "stdnb"           LOC="P66"  | IOSTANDARD = LVCMOS33;
 
 # Sound input/output
-NET "audio_out_left" LOC="P8" | IOSTANDARD = LVCMOS33;
-NET "audio_out_right" LOC="P9" | IOSTANDARD = LVCMOS33;
-NET "ear" LOC="P105" | IOSTANDARD = LVCMOS33;
+NET "audio_out_left"  LOC="P8"   | IOSTANDARD = LVCMOS33;
+NET "audio_out_right" LOC="P9"   | IOSTANDARD = LVCMOS33;
+NET "ear"             LOC="P105" | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET "clkps2" LOC="P98"    | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 1 DIN
-NET "dataps2" LOC="P97"   | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 5 DIN
-NET "mouseclk" LOC="P94"  | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 6 DIN
-NET "mousedata" LOC="P95" | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 2 DIN
+NET "clkps2"          LOC="P98"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "dataps2"         LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mouseclk"        LOC="P94"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "mousedata"       LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
 # SRAM
-NET "sram_addr<0>"  LOC="P143" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<1>"  LOC="P142" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<2>"  LOC="P141" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<3>"  LOC="P140" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<4>"  LOC="P139" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<5>"  LOC="P104" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<6>"  LOC="P102" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<7>"  LOC="P101" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<8>"  LOC="P100" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<9>"  LOC="P99"  | IOSTANDARD = LVCMOS33;
-NET "sram_addr<10>" LOC="P112" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<11>" LOC="P114" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<12>" LOC="P115" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<13>" LOC="P116" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<14>" LOC="P117" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<15>" LOC="P131" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<16>" LOC="P133" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<17>" LOC="P134" | IOSTANDARD = LVCMOS33;
-NET "sram_addr<18>" LOC="P137" | IOSTANDARD = LVCMOS33;
-#NET "sram_addr<19>" LOC="P111" | IOSTANDARD = LVCMOS33;
-#NET "sram_addr<20>" LOC="P138" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<0>"    LOC="P143" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<1>"    LOC="P142" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<2>"    LOC="P141" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<3>"    LOC="P140" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<4>"    LOC="P139" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<5>"    LOC="P104" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<6>"    LOC="P102" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<7>"    LOC="P101" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<8>"    LOC="P100" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<9>"    LOC="P99"  | IOSTANDARD = LVCMOS33;
+NET "sram_addr<10>"   LOC="P112" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<11>"   LOC="P114" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<12>"   LOC="P115" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<13>"   LOC="P116" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<14>"   LOC="P117" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<15>"   LOC="P131" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<16>"   LOC="P133" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<17>"   LOC="P134" | IOSTANDARD = LVCMOS33;
+NET "sram_addr<18>"   LOC="P137" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<19>"   LOC="P111" | IOSTANDARD = LVCMOS33;
+#NET "sram_addr<20>"   LOC="P138" | IOSTANDARD = LVCMOS33;
 
-NET "sram_data<0>" LOC="P132" | IOSTANDARD = LVCMOS33;
-NET "sram_data<1>" LOC="P126" | IOSTANDARD = LVCMOS33;
-NET "sram_data<2>" LOC="P123" | IOSTANDARD = LVCMOS33;
-NET "sram_data<3>" LOC="P120" | IOSTANDARD = LVCMOS33;
-NET "sram_data<4>" LOC="P119" | IOSTANDARD = LVCMOS33;
-NET "sram_data<5>" LOC="P121" | IOSTANDARD = LVCMOS33;
-NET "sram_data<6>" LOC="P124" | IOSTANDARD = LVCMOS33;
-NET "sram_data<7>" LOC="P127" | IOSTANDARD = LVCMOS33;
+NET "sram_data<0>"    LOC="P132" | IOSTANDARD = LVCMOS33;
+NET "sram_data<1>"    LOC="P126" | IOSTANDARD = LVCMOS33;
+NET "sram_data<2>"    LOC="P123" | IOSTANDARD = LVCMOS33;
+NET "sram_data<3>"    LOC="P120" | IOSTANDARD = LVCMOS33;
+NET "sram_data<4>"    LOC="P119" | IOSTANDARD = LVCMOS33;
+NET "sram_data<5>"    LOC="P121" | IOSTANDARD = LVCMOS33;
+NET "sram_data<6>"    LOC="P124" | IOSTANDARD = LVCMOS33;
+NET "sram_data<7>"    LOC="P127" | IOSTANDARD = LVCMOS33;
 
-NET "sram_we_n" 	 LOC="P118" | IOSTANDARD = LVCMOS33;
+NET "sram_we_n"       LOC="P118" | IOSTANDARD = LVCMOS33;
 
 # SPI Flash
-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;
+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 = LVCMOS33;
-NET "sd_clk"  LOC="P75" | IOSTANDARD = LVCMOS33;
-NET "sd_mosi" LOC="P74" | IOSTANDARD = LVCMOS33;
-NET "sd_miso" LOC="P78" | IOSTANDARD = LVCMOS33;
+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 = LVCMOS33 | PULLUP;  #JOY6
-NET "joydown"  LOC="P5"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY4
-NET "joyleft"  LOC="P6"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY3
-NET "joyright" LOC="P7"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY2
-NET "joyfire"  LOC="P2"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY7
-#NET "btn2"    LOC="P39"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY5
+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;
+
+
+# Otros
+NET "sysclk"          PERIOD=35 ns;
 
diff --git a/cores/Spectrum/pines_zxuno_v4.ucf b/cores/Spectrum/pines_zxuno_v4.ucf
index 10ecc30..747e025 100644
--- a/cores/Spectrum/pines_zxuno_v4.ucf
+++ b/cores/Spectrum/pines_zxuno_v4.ucf
@@ -1,85 +1,91 @@
 # Clocks & debug
-NET "clk50mhz" LOC="P55" | IOSTANDARD = LVCMOS33;
-NET "testled" LOC="P11" | IOSTANDARD = LVCMOS33;
-NET "clk50mhz" PERIOD=20 ns;
-NET "sysclk" PERIOD=35 ns;
+NET "clk50mhz"        LOC="P55"  | IOSTANDARD = LVCMOS33 | PERIOD=20.0ns;
+NET "testled"         LOC="P11"  | IOSTANDARD = LVCMOS33;
 
 # Video output
-NET "b<2>" LOC="P93" | IOSTANDARD = LVCMOS33;
-NET "b<1>" LOC="P92" | IOSTANDARD = LVCMOS33;
-NET "b<0>" LOC="P88" | IOSTANDARD = LVCMOS33;
-NET "g<2>" LOC="P84" | IOSTANDARD = LVCMOS33;
-NET "g<1>" LOC="P83" | IOSTANDARD = LVCMOS33;
-NET "g<0>" LOC="P82" | IOSTANDARD = LVCMOS33;
-NET "r<2>" LOC="P81" | IOSTANDARD = LVCMOS33;
-NET "r<1>" LOC="P80" | IOSTANDARD = LVCMOS33;
-NET "r<0>" LOC="P79" | IOSTANDARD = LVCMOS33;
-NET "hsync" LOC="P87" | IOSTANDARD = LVCMOS33; #87
-NET "vsync" LOC="P85" | IOSTANDARD = LVCMOS33;
-NET "stdn" LOC="P66" | IOSTANDARD = LVCMOS33;
-NET "stdnb" LOC="P67" | IOSTANDARD = LVCMOS33;
+NET "r<2>"            LOC="P81"  | IOSTANDARD = LVCMOS33;
+NET "r<1>"            LOC="P80"  | IOSTANDARD = LVCMOS33;
+NET "r<0>"            LOC="P79"  | IOSTANDARD = LVCMOS33;
+NET "g<2>"            LOC="P84"  | IOSTANDARD = LVCMOS33;
+NET "g<1>"            LOC="P83"  | IOSTANDARD = LVCMOS33;
+NET "g<0>"            LOC="P82"  | IOSTANDARD = LVCMOS33;
+NET "b<2>"            LOC="P93"  | IOSTANDARD = LVCMOS33;
+NET "b<1>"            LOC="P92"  | IOSTANDARD = LVCMOS33;
+NET "b<0>"            LOC="P88"  | IOSTANDARD = LVCMOS33;
+NET "hsync"           LOC="P87"  | IOSTANDARD = LVCMOS33;
+NET "vsync"           LOC="P85"  | IOSTANDARD = LVCMOS33;
+NET "stdn"            LOC="P66"  | IOSTANDARD = LVCMOS33;
+NET "stdnb"           LOC="P67"  | IOSTANDARD = LVCMOS33;
 
 # Sound input/output
-NET "audio_out_left" LOC="P10" | IOSTANDARD = LVCMOS33;
-NET "audio_out_right" LOC="P9" | IOSTANDARD = LVCMOS33;
-NET "ear" LOC="P94" | IOSTANDARD = LVCMOS33;
+NET "audio_out_left"  LOC="P10"  | IOSTANDARD = LVCMOS33;
+NET "audio_out_right" LOC="P9"   | IOSTANDARD = LVCMOS33;
+NET "ear"             LOC="P94"  | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET "clkps2" LOC="P99"    | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 1 DIN
-NET "dataps2" LOC="P98"   | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 5 DIN
-NET "mouseclk" LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 6 DIN
-NET "mousedata" LOC="P97" | IOSTANDARD = LVCMOS33 | PULLUP;  # pin 2 DIN
+NET "clkps2"          LOC="P99"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "dataps2"         LOC="P98"  | 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 = 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_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 = 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_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 = LVCMOS33;
+NET "sram_we_n"       LOC="P121" | IOSTANDARD = LVCMOS33;
 
 # SPI Flash
-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_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 = LVCMOS33;
-NET "sd_clk"  LOC="P75" | IOSTANDARD = LVCMOS33;
-NET "sd_mosi" LOC="P74" | IOSTANDARD = LVCMOS33;
-NET "sd_miso" LOC="P78" | IOSTANDARD = LVCMOS33;
+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 = LVCMOS33 | PULLUP;  #JOY6
-NET "joydown"  LOC="P5"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY4
-NET "joyleft"  LOC="P6"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY3
-NET "joyright" LOC="P7"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY2
-NET "joyfire"  LOC="P2"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY7
-#NET "btn2"    LOC="P8"  | IOSTANDARD = LVCMOS33 | PULLUP;  #JOY5
+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;
+
+
+# Otros
+NET "sysclk"          PERIOD=35 ns;
+