diff --git a/hardware/zxuno.brd b/hardware/zxuno.brd
index b981b9f..514ff2a 100644
--- a/hardware/zxuno.brd
+++ b/hardware/zxuno.brd
@@ -154,7 +154,7 @@
 <wire x1="0" y1="56.007" x2="0" y2="0" width="0" layer="20"/>
 <text x="0.76195" y="53.530421875" size="1.016" layer="25" font="vector" ratio="15">1</text>
 <text x="0.78310625" y="48.386946875" size="1.016" layer="25" font="vector" ratio="15">1</text>
-<text x="24.3331875" y="35.151484375" size="1.016" layer="21" font="vector" ratio="15">v4.1</text>
+<text x="24.3331875" y="35.151484375" size="1.016" layer="21" font="vector" ratio="15">v4.2</text>
 <text x="1.447325" y="42.234396875" size="1.016" layer="21" font="vector" ratio="15">(C)2015 ZX-Uno Team
 http://www.zxuno.com</text>
 <rectangle x1="1.407590625" y1="34.075340625" x2="3.205909375" y2="34.096421875" layer="21"/>
@@ -3040,7 +3040,7 @@ http://www.zxuno.com</text>
 <rectangle x1="12.794409375" y1="39.578759375" x2="12.817265625" y2="39.599840625" layer="21"/>
 <rectangle x1="19.124090625" y1="39.578759375" x2="22.319409375" y2="39.599840625" layer="21"/>
 <text x="46.0375" y="26.7096875" size="1" layer="26" font="vector" ratio="15" rot="MR270">1</text>
-<text x="64.373125" y="18.3753125" size="1" layer="26" font="vector" ratio="15" rot="MR0">1</text>
+<text x="70.4903125" y="18.9221875" size="1" layer="26" font="vector" ratio="15" rot="MR0">1</text>
 <text x="24.765" y="5.953125" size="1" layer="25" font="vector" ratio="15">1</text>
 <text x="39.0525" y="0.9525" size="1" layer="26" font="vector" ratio="15" rot="MR0">1</text>
 <text x="72.546921875" y="45.596734375" size="1.016" layer="125" font="vector" ratio="15" rot="R90">AUDIO</text>
@@ -3090,9 +3090,7 @@ http://www.zxuno.com</text>
 <text x="32.52904375" y="54.4456125" size="1.016" layer="125" font="vector" ratio="15">J10</text>
 <text x="31.323078125" y="51.017271875" size="1.016" layer="125" font="vector" ratio="15">J11</text>
 <text x="32.52904375" y="48.39294375" size="1.016" layer="125" font="vector" ratio="15">J12</text>
-<text x="65.88125" y="18.176875" size="1.016" layer="125" font="vector" ratio="15" rot="R270">J16</text>
 <text x="73.57231875" y="17.811725" size="1.016" layer="125" font="vector" ratio="15">JOY</text>
-<text x="58.09249375" y="16.2298375" size="1.016" layer="125" font="vector" ratio="15">JTAG</text>
 <text x="3.0916625" y="27.65549375" size="1.016" layer="125" font="vector" ratio="15">L1</text>
 <text x="21.55825" y="30.8014625" size="1.016" layer="125" font="vector" ratio="15" rot="R90">L2</text>
 <text x="5.588" y="12.898425" size="1.016" layer="125" font="vector" ratio="15" rot="R270">L3</text>
@@ -6156,8 +6154,14 @@ design rules under a new name.</description>
 <element name="CVBS" library="uzebox" package="RCA" value="RCA" x="46.2046875" y="50.8" smashed="yes">
 <attribute name="NAME" x="40.86671875" y="45.7596875" size="1.016" layer="25" font="vector" ratio="15" rot="R180"/>
 </element>
-<element name="JP1" library="pinhead" package="1X06" value="" x="61.921875" y="18.734375" rot="R180"/>
-<element name="JP2" library="pinhead" package="1X03" value="" x="68.265625" y="16.1953125" rot="R180"/>
+<element name="JTAG" library="pinhead" package="1X06" value="" x="61.921875" y="18.734375" smashed="yes" rot="R180">
+<attribute name="NAME" x="61.4383875" y="17.3352625" size="1.016" layer="125" font="vector" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="69.541875" y="21.909375" size="1.27" layer="27" rot="R180"/>
+</element>
+<element name="KEYB" library="pinhead" package="1X03" value="" x="68.265625" y="16.1953125" smashed="yes" rot="R180">
+<attribute name="NAME" x="72.6987" y="18.5462" size="1.016" layer="125" font="vector" ratio="15" rot="R180"/>
+<attribute name="VALUE" x="72.075625" y="19.3703125" size="1.27" layer="27" rot="R180"/>
+</element>
 </elements>
 <signals>
 <signal name="GND">
@@ -6414,7 +6418,7 @@ design rules under a new name.</description>
 <wire x1="54.04234375" y1="35.34953125" x2="53.75671875" y2="35.06390625" width="0.1778" layer="1"/>
 <wire x1="53.75671875" y1="35.06390625" x2="52.85859375" y2="35.06390625" width="0.1778" layer="1"/>
 <wire x1="52.85859375" y1="35.06390625" x2="52.85125" y2="35.07125" width="0.1778" layer="1"/>
-<contactref element="JP1" pad="2"/>
+<contactref element="JTAG" pad="2"/>
 </signal>
 <signal name="XD0">
 <contactref element="U3" pad="9"/>
@@ -6706,7 +6710,7 @@ design rules under a new name.</description>
 <wire x1="41.91" y1="13.49375" x2="41.91" y2="4.355625" width="0.2032" layer="1"/>
 <wire x1="41.91" y1="4.355625" x2="43.581" y2="2.684625" width="0.2032" layer="1"/>
 <wire x1="43.581" y1="2.04375" x2="43.581" y2="2.684625" width="0.2032" layer="1"/>
-<contactref element="JP1" pad="1"/>
+<contactref element="JTAG" pad="1"/>
 <wire x1="68.271875" y1="18.734375" x2="68.271875" y2="21.028125" width="0.3048" layer="16"/>
 <wire x1="68.271875" y1="21.028125" x2="66.46625" y2="22.83375" width="0.3048" layer="16"/>
 <wire x1="51.038125" y1="34.44875" x2="51.038125" y2="34.471875" width="0" layer="19" extent="1-16"/>
@@ -7148,6 +7152,11 @@ design rules under a new name.</description>
 <wire x1="69.215" y1="8.5725" x2="68.42125" y2="9.36625" width="0.1778" layer="1"/>
 <wire x1="68.42125" y1="9.36625" x2="68.42125" y2="10.63625" width="0.1778" layer="1"/>
 <wire x1="68.42125" y1="10.63625" x2="63.8175" y2="15.24" width="0.1778" layer="1"/>
+<contactref element="KEYB" pad="1"/>
+<wire x1="70.805625" y1="16.1953125" x2="70.805625" y2="16.180625" width="0.1778" layer="1"/>
+<wire x1="70.805625" y1="16.180625" x2="70.34375" y2="15.71875" width="0.1778" layer="1"/>
+<wire x1="70.34375" y1="15.71875" x2="70.34375" y2="9.54" width="0.1778" layer="1"/>
+<wire x1="70.34375" y1="9.54" x2="69.37625" y2="8.5725" width="0.1778" layer="1"/>
 </signal>
 <signal name="PS2_CLK">
 <contactref element="R10" pad="2"/>
@@ -7156,7 +7165,13 @@ design rules under a new name.</description>
 <wire x1="46.00125" y1="19.22125" x2="46.00125" y2="18.2925" width="0.2032" layer="1"/>
 <wire x1="46.00125" y1="18.2925" x2="48.73625" y2="15.5575" width="0.1778" layer="1"/>
 <wire x1="69.37625" y1="10.795" x2="68.8975" y2="10.795" width="0.1778" layer="1"/>
-<wire x1="68.8975" y1="10.795" x2="64.135" y2="15.5575" width="0.1778" layer="1"/>
+<contactref element="KEYB" pad="2"/>
+<wire x1="64.135" y1="15.5575" x2="64.135" y2="15.5525" width="0.1778" layer="1"/>
+<wire x1="64.135" y1="15.5525" x2="65.171875" y2="14.515625" width="0.1778" layer="1"/>
+<wire x1="68.265625" y1="16.1953125" x2="68.265625" y2="14.515625" width="0.1778" layer="1"/>
+<wire x1="68.265625" y1="14.515625" x2="68.265625" y2="11.905625" width="0.1778" layer="1"/>
+<wire x1="68.265625" y1="11.905625" x2="69.37625" y2="10.795" width="0.1778" layer="1"/>
+<wire x1="65.171875" y1="14.515625" x2="68.265625" y2="14.515625" width="0.1778" layer="1"/>
 </signal>
 <signal name="EAR">
 <contactref element="R27" pad="1"/>
@@ -7848,7 +7863,7 @@ design rules under a new name.</description>
 <signal name="TCK">
 <contactref element="U1" pad="P109"/>
 <wire x1="52.85125" y1="21.57125" x2="60.355" y2="21.57125" width="0.1778" layer="1"/>
-<contactref element="JP1" pad="3"/>
+<contactref element="JTAG" pad="3"/>
 <wire x1="60.355" y1="21.57125" x2="63.191875" y2="18.734375" width="0.1778" layer="1"/>
 </signal>
 <signal name="TDO">
@@ -7856,14 +7871,14 @@ design rules under a new name.</description>
 <wire x1="49.50125" y1="19.22125" x2="49.50125" y2="18.285" width="0.1778" layer="1"/>
 <wire x1="49.50125" y1="18.285" x2="50.32375" y2="17.4625" width="0.1778" layer="1"/>
 <wire x1="50.32375" y1="17.4625" x2="59.38" y2="17.4625" width="0.1778" layer="1"/>
-<contactref element="JP1" pad="4"/>
+<contactref element="JTAG" pad="4"/>
 <wire x1="59.38" y1="17.4625" x2="60.651875" y2="18.734375" width="0.1778" layer="1"/>
 </signal>
 <signal name="TDI">
 <contactref element="U1" pad="P110"/>
 <wire x1="52.85125" y1="22.07125" x2="51.519375" y2="22.07125" width="0.1778" layer="1"/>
 <wire x1="51.519375" y1="22.07125" x2="51.1571875" y2="21.7090625" width="0.1778" layer="1"/>
-<contactref element="JP1" pad="5"/>
+<contactref element="JTAG" pad="5"/>
 <wire x1="51.1571875" y1="21.7090625" x2="51.1571875" y2="20.7490625" width="0.1778" layer="1"/>
 <wire x1="51.1571875" y1="20.7490625" x2="51.9296875" y2="20.0078125" width="0.1778" layer="1"/>
 <wire x1="51.9296875" y1="20.0078125" x2="56.8696875" y2="20.0078125" width="0.1778" layer="1"/>
@@ -8013,12 +8028,12 @@ design rules under a new name.</description>
 <wire x1="47.5853125" y1="43.6959375" x2="39.3620625" y2="43.6959375" width="0.3048" layer="16"/>
 <wire x1="39.3620625" y1="43.6959375" x2="33.147" y2="49.911" width="0.3048" layer="16"/>
 <contactref element="R5" pad="1"/>
-<contactref element="JP2" pad="3"/>
+<contactref element="KEYB" pad="3"/>
 <wire x1="65.725625" y1="16.1953125" x2="65.725625" y2="16.1728125" width="0.3048" layer="16"/>
 <wire x1="65.725625" y1="16.1728125" x2="67.015625" y2="14.8828125" width="0.3048" layer="16"/>
 <wire x1="67.015625" y1="14.8828125" x2="68.9816375" y2="14.8828125" width="0.3048" layer="16"/>
 <wire x1="68.9816375" y1="14.8828125" x2="77.05725" y2="6.8072" width="0.3048" layer="16"/>
-<wire x1="71.755" y1="13.0175" x2="71.27625" y2="13.0175" width="0" layer="19" extent="1-1"/>
+<wire x1="71.755" y1="13.0175" x2="71.27625" y2="13.0175" width="0.3048" layer="1"/>
 </signal>
 <signal name="N$14">
 <contactref element="U6" pad="2"/>
@@ -8123,7 +8138,7 @@ design rules under a new name.</description>
 <contactref element="U1" pad="P107"/>
 <wire x1="50.00125" y1="19.22125" x2="50.00125" y2="18.26125" width="0.1778" layer="1"/>
 <wire x1="50.00125" y1="18.26125" x2="50.4825" y2="17.78" width="0.1778" layer="1"/>
-<contactref element="JP1" pad="6"/>
+<contactref element="JTAG" pad="6"/>
 <wire x1="50.4825" y1="17.78" x2="54.6175" y2="17.78" width="0.1778" layer="1"/>
 <wire x1="54.6175" y1="17.78" x2="55.571875" y2="18.734375" width="0.1778" layer="1"/>
 </signal>
@@ -8376,13 +8391,13 @@ design rules under a new name.</description>
 <wire x1="77.77875" y1="33.2275" x2="78.0615625" y2="33.2275" width="0.1778" layer="1"/>
 <wire x1="78.0615625" y1="33.2275" x2="79.6484375" y2="31.640625" width="0.1778" layer="1"/>
 <wire x1="79.6484375" y1="31.640625" x2="79.6484375" y2="20.7890625" width="0.1778" layer="1"/>
-<wire x1="79.6484375" y1="20.7890625" x2="74.7734375" y2="15.9140625" width="0.1778" layer="1"/>
-<wire x1="74.7734375" y1="15.9140625" x2="73.9296875" y2="15.9140625" width="0.1778" layer="1"/>
-<wire x1="73.9296875" y1="15.9140625" x2="72.2578125" y2="14.2421875" width="0.1778" layer="1"/>
-<wire x1="72.2578125" y1="14.2421875" x2="70.046875" y2="14.2421875" width="0.1778" layer="1"/>
-<wire x1="70.046875" y1="14.2421875" x2="69.4140625" y2="13.609375" width="0.1778" layer="1"/>
 <wire x1="69.4140625" y1="13.609375" x2="69.4140625" y2="13.0553125" width="0.1778" layer="1"/>
 <wire x1="69.4140625" y1="13.0553125" x2="69.37625" y2="13.0175" width="0.1778" layer="1"/>
+<wire x1="79.6484375" y1="20.7890625" x2="76.3203125" y2="17.4609375" width="0.1778" layer="1"/>
+<wire x1="76.3203125" y1="17.4609375" x2="70.203125" y2="17.4609375" width="0.1778" layer="1"/>
+<wire x1="70.203125" y1="17.4609375" x2="69.5" y2="16.7578125" width="0.1778" layer="1"/>
+<wire x1="69.5" y1="16.7578125" x2="69.5" y2="13.14125" width="0.1778" layer="1"/>
+<wire x1="69.5" y1="13.14125" x2="69.37625" y2="13.0175" width="0.1778" layer="1"/>
 </signal>
 <signal name="DATAPS2">
 <contactref element="R8" pad="1"/>
@@ -8391,20 +8406,12 @@ design rules under a new name.</description>
 <wire x1="71.755" y1="8.5725" x2="74.70875" y2="11.495" width="0.3048" layer="1"/>
 <wire x1="74.70875" y1="11.495" x2="76.8614" y2="11.495" width="0.3048" layer="1"/>
 <wire x1="76.8614" y1="11.495" x2="77.05725" y2="11.4554" width="0.3048" layer="1"/>
-<contactref element="JP2" pad="2"/>
-<wire x1="68.265625" y1="16.1953125" x2="69.0078125" y2="16.1953125" width="0.3048" layer="16"/>
-<wire x1="69.0078125" y1="16.1953125" x2="73.75" y2="11.484375" width="0.3048" layer="16"/>
-<wire x1="73.75" y1="11.484375" x2="77.059525" y2="11.484375" width="0.3048" layer="16"/>
-<wire x1="77.059525" y1="11.484375" x2="77.05725" y2="11.4554" width="0.3048" layer="16"/>
 </signal>
 <signal name="CLKPS2">
 <contactref element="R10" pad="1"/>
 <contactref element="PS/2" pad="5"/>
 <wire x1="71.27625" y1="10.795" x2="71.85025" y2="10.795" width="0.3048" layer="1"/>
 <wire x1="71.85025" y1="10.795" x2="74.56805" y2="13.5128" width="0.3048" layer="1"/>
-<contactref element="JP2" pad="1"/>
-<wire x1="70.805625" y1="16.1953125" x2="71.8855375" y2="16.1953125" width="0.3048" layer="16"/>
-<wire x1="71.8855375" y1="16.1953125" x2="74.56805" y2="13.5128" width="0.3048" layer="16"/>
 </signal>
 </signals>
 <errors>
diff --git a/hardware/zxuno.sch b/hardware/zxuno.sch
index 62d4930..20a5516 100644
--- a/hardware/zxuno.sch
+++ b/hardware/zxuno.sch
@@ -19581,8 +19581,8 @@ KINGFONT SDCMF-10915W010</description>
 <part name="R31" library="rcl" deviceset="R-US_" device="M0805" value="10K"/>
 <part name="R32" library="rcl" deviceset="R-US_" device="M0805" value="10K"/>
 <part name="CVBS" library="uzebox" deviceset="RCA" device=""/>
-<part name="JP1" library="pinhead" deviceset="PINHD-1X6" device=""/>
-<part name="JP2" library="pinhead" deviceset="PINHD-1X3" device=""/>
+<part name="JTAG" library="pinhead" deviceset="PINHD-1X6" device=""/>
+<part name="KEYB" library="pinhead" deviceset="PINHD-1X3" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -19733,8 +19733,8 @@ KINGFONT SDCMF-10915W010</description>
 <instance part="R31" gate="G$1" x="124.46" y="-15.24" rot="R270"/>
 <instance part="R32" gate="G$1" x="134.62" y="-15.24" rot="R270"/>
 <instance part="CVBS" gate="G$1" x="276.86" y="-104.14" rot="MR0"/>
-<instance part="JP1" gate="A" x="274.32" y="88.9"/>
-<instance part="JP2" gate="A" x="-45.72" y="-71.12" rot="R180"/>
+<instance part="JTAG" gate="A" x="274.32" y="88.9"/>
+<instance part="KEYB" gate="A" x="-45.72" y="-71.12" rot="R180"/>
 </instances>
 <busses>
 </busses>
@@ -20025,7 +20025,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="96.52" x2="271.78" y2="96.52" width="0.1524" layer="91"/>
 <label x="261.62" y="96.52" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="1"/>
+<pinref part="JTAG" gate="A" pin="1"/>
 </segment>
 <segment>
 <wire x1="154.94" y1="33.02" x2="142.24" y2="33.02" width="0.1524" layer="91"/>
@@ -20433,7 +20433,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="93.98" x2="271.78" y2="93.98" width="0.1524" layer="91"/>
 <label x="261.62" y="93.98" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="2"/>
+<pinref part="JTAG" gate="A" pin="2"/>
 </segment>
 </net>
 <net name="XA0" class="0">
@@ -20922,6 +20922,11 @@ KINGFONT SDCMF-10915W010</description>
 <label x="22.86" y="-43.18" size="1.778" layer="95"/>
 <pinref part="U1" gate="B1" pin="IO_L34P_1"/>
 </segment>
+<segment>
+<pinref part="KEYB" gate="A" pin="1"/>
+<wire x1="-43.18" y1="-73.66" x2="-33.02" y2="-73.66" width="0.1524" layer="91"/>
+<label x="-38.1" y="-73.66" size="1.778" layer="95"/>
+</segment>
 </net>
 <net name="PS2_CLK" class="0">
 <segment>
@@ -20934,6 +20939,11 @@ KINGFONT SDCMF-10915W010</description>
 <label x="22.86" y="-45.72" size="1.778" layer="95"/>
 <pinref part="U1" gate="B1" pin="IO_L33N_1"/>
 </segment>
+<segment>
+<pinref part="KEYB" gate="A" pin="2"/>
+<wire x1="-43.18" y1="-71.12" x2="-33.02" y2="-71.12" width="0.1524" layer="91"/>
+<label x="-38.1" y="-71.12" size="1.778" layer="95"/>
+</segment>
 </net>
 <net name="EAR" class="0">
 <segment>
@@ -21540,7 +21550,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="83.82" x2="271.78" y2="83.82" width="0.1524" layer="91"/>
 <label x="261.62" y="83.82" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="6"/>
+<pinref part="JTAG" gate="A" pin="6"/>
 </segment>
 </net>
 <net name="R" class="0">
@@ -21655,7 +21665,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="91.44" x2="271.78" y2="91.44" width="0.1524" layer="91"/>
 <label x="261.62" y="91.44" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="3"/>
+<pinref part="JTAG" gate="A" pin="3"/>
 </segment>
 </net>
 <net name="TDO" class="0">
@@ -21667,7 +21677,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="88.9" x2="271.78" y2="88.9" width="0.1524" layer="91"/>
 <label x="261.62" y="88.9" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="4"/>
+<pinref part="JTAG" gate="A" pin="4"/>
 </segment>
 </net>
 <net name="TDI" class="0">
@@ -21679,7 +21689,7 @@ KINGFONT SDCMF-10915W010</description>
 <segment>
 <wire x1="261.62" y1="86.36" x2="271.78" y2="86.36" width="0.1524" layer="91"/>
 <label x="261.62" y="86.36" size="1.778" layer="95"/>
-<pinref part="JP1" gate="A" pin="5"/>
+<pinref part="JTAG" gate="A" pin="5"/>
 </segment>
 </net>
 <net name="N$10" class="0">
@@ -21793,7 +21803,7 @@ KINGFONT SDCMF-10915W010</description>
 <pinref part="PS/2" gate="G$1" pin="4"/>
 </segment>
 <segment>
-<pinref part="JP2" gate="A" pin="3"/>
+<pinref part="KEYB" gate="A" pin="3"/>
 <wire x1="-43.18" y1="-68.58" x2="-33.02" y2="-68.58" width="0.1524" layer="91"/>
 <label x="-38.1" y="-68.58" size="1.778" layer="95"/>
 </segment>
@@ -22079,12 +22089,6 @@ KINGFONT SDCMF-10915W010</description>
 <pinref part="R8" gate="G$1" pin="1"/>
 <wire x1="-12.7" y1="-60.96" x2="-20.32" y2="-60.96" width="0.1524" layer="91"/>
 <pinref part="PS/2" gate="G$1" pin="1"/>
-<label x="-20.32" y="-60.96" size="1.778" layer="95"/>
-</segment>
-<segment>
-<pinref part="JP2" gate="A" pin="2"/>
-<wire x1="-43.18" y1="-71.12" x2="-33.02" y2="-71.12" width="0.1524" layer="91"/>
-<label x="-38.1" y="-71.12" size="1.778" layer="95"/>
 </segment>
 </net>
 <net name="CLKPS2" class="0">
@@ -22092,12 +22096,6 @@ KINGFONT SDCMF-10915W010</description>
 <pinref part="R10" gate="G$1" pin="1"/>
 <wire x1="-12.7" y1="-50.8" x2="-20.32" y2="-50.8" width="0.1524" layer="91"/>
 <pinref part="PS/2" gate="G$1" pin="5"/>
-<label x="-20.32" y="-50.8" size="1.778" layer="95"/>
-</segment>
-<segment>
-<pinref part="JP2" gate="A" pin="1"/>
-<wire x1="-43.18" y1="-73.66" x2="-33.02" y2="-73.66" width="0.1524" layer="91"/>
-<label x="-38.1" y="-73.66" size="1.778" layer="95"/>
 </segment>
 </net>
 </nets>