diff --git a/hardware/v2/pentabug_v2.1.brd b/hardware/v2/pentabug_v2.1.brd
index fce7919..897cf54 100644
--- a/hardware/v2/pentabug_v2.1.brd
+++ b/hardware/v2/pentabug_v2.1.brd
@@ -27,7 +27,7 @@
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
-<layer number="20" name="Dimension" color="15" fill="1" visible="no" active="yes"/>
+<layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="22" name="bPlace" color="7" fill="1" visible="no" active="yes"/>
 <layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
@@ -36,7 +36,7 @@
 <layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
-<layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="yes" active="yes"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
 <layer number="32" name="bCream" color="7" fill="5" visible="no" active="yes"/>
@@ -127,30 +127,6 @@
 <text x="57.785" y="28.575" size="1.27" layer="25" font="vector" ratio="10" rot="R270">PB2</text>
 <text x="63.1825" y="3.81" size="1.27" layer="25" font="vector" ratio="14">Pentabug V2.1</text>
 <polygon width="0" layer="21">
-<vertex x="75.8825" y="26.3525"/>
-<vertex x="77.1525" y="28.8925"/>
-<vertex x="75.8825" y="31.4325"/>
-<vertex x="74.6125" y="31.4325"/>
-<vertex x="75.8825" y="28.8925"/>
-<vertex x="74.6125" y="26.3525"/>
-</polygon>
-<polygon width="0" layer="21">
-<vertex x="72.0725" y="26.3525"/>
-<vertex x="73.3425" y="28.8925"/>
-<vertex x="72.0725" y="31.4325"/>
-<vertex x="70.8025" y="31.4325"/>
-<vertex x="72.0725" y="28.8925"/>
-<vertex x="70.8025" y="26.3525"/>
-</polygon>
-<polygon width="0" layer="21">
-<vertex x="73.9775" y="26.3525"/>
-<vertex x="75.2475" y="28.8925"/>
-<vertex x="73.9775" y="31.4325"/>
-<vertex x="72.7075" y="31.4325"/>
-<vertex x="73.9775" y="28.8925"/>
-<vertex x="72.7075" y="26.3525"/>
-</polygon>
-<polygon width="0" layer="21">
 <vertex x="63.8175" y="31.4325"/>
 <vertex x="62.5475" y="28.8925"/>
 <vertex x="63.8175" y="26.3525"/>
@@ -159,9 +135,11 @@
 <vertex x="65.0875" y="31.4325"/>
 </polygon>
 <polygon width="0" layer="21">
-<vertex x="70.1675" y="31.4325"/>
-<vertex x="68.8975" y="26.3525"/>
+<vertex x="67.6275" y="31.4325"/>
+<vertex x="66.3575" y="28.8925"/>
 <vertex x="67.6275" y="26.3525"/>
+<vertex x="68.8975" y="26.3525"/>
+<vertex x="67.6275" y="28.8925"/>
 <vertex x="68.8975" y="31.4325"/>
 </polygon>
 <polygon width="0" layer="21">
@@ -172,10 +150,32 @@
 <vertex x="65.7225" y="28.8925"/>
 <vertex x="66.9925" y="31.4325"/>
 </polygon>
+<polygon width="0" layer="21">
+<vertex x="75.8825" y="26.3525"/>
+<vertex x="77.1525" y="28.8925"/>
+<vertex x="75.8825" y="31.4325"/>
+<vertex x="74.6125" y="31.4325"/>
+<vertex x="75.8825" y="28.8925"/>
+<vertex x="74.6125" y="26.3525"/>
+</polygon>
+<polygon width="0" layer="21">
+<vertex x="69.5325" y="26.3525"/>
+<vertex x="70.8025" y="31.4325"/>
+<vertex x="72.0725" y="31.4325"/>
+<vertex x="70.8025" y="26.3525"/>
+</polygon>
+<polygon width="0" layer="21">
+<vertex x="73.9775" y="26.3525"/>
+<vertex x="75.2475" y="28.8925"/>
+<vertex x="73.9775" y="31.4325"/>
+<vertex x="72.7075" y="31.4325"/>
+<vertex x="73.9775" y="28.8925"/>
+<vertex x="72.7075" y="26.3525"/>
+</polygon>
 <text x="16.51" y="30.48" size="1.016" layer="25" font="vector" ratio="10">https://github.com/c3d2/pentabug</text>
 <text x="36.83" y="16.8275" size="1.016" layer="25" font="vector" ratio="10">RESISTANCE</text>
 <text x="38.735" y="15.24" size="1.016" layer="25" font="vector" ratio="10">BELOW</text>
-<text x="64.135" y="2.2225" size="1.016" layer="25" font="vector" ratio="10">bigalex@gmx.de</text>
+<text x="63.8175" y="2.2225" size="1.016" layer="25" font="vector" ratio="10">bigalex@c3d2.de</text>
 <text x="15.24" y="15.5575" size="1.27" layer="25" font="vector" ratio="10" rot="R90">IR</text>
 <wire x1="39.37" y1="6.35" x2="43.18" y2="6.35" width="0.254" layer="21"/>
 <wire x1="43.18" y1="6.35" x2="46.99" y2="6.35" width="0.254" layer="21"/>
@@ -960,7 +960,7 @@ design rules under a new name.</description>
 <param name="dpMaxLengthDifference" value="10mm"/>
 <param name="dpGapFactor" value="2.5"/>
 <param name="checkGrid" value="0"/>
-<param name="checkAngle" value="0"/>
+<param name="checkAngle" value="1"/>
 <param name="checkFont" value="1"/>
 <param name="checkRestrict" value="1"/>
 <param name="useDiameter" value="13"/>
@@ -1035,7 +1035,7 @@ design rules under a new name.</description>
 </pass>
 </autorouter>
 <elements>
-<element name="IC1" library="atmel" package="DIL28-3" value="ATMEGA88" x="40.64" y="16.51" smashed="yes">
+<element name="IC1" library="atmel" package="DIL28-3" value="ATMEGA328P-PU" x="40.64" y="16.51" smashed="yes">
 <attribute name="MF" value="" x="40.64" y="16.51" size="1.778" layer="27" display="off"/>
 <attribute name="MPN" value="" x="40.64" y="16.51" size="1.778" layer="27" display="off"/>
 <attribute name="OC_FARNELL" value="unknown" x="40.64" y="16.51" size="1.778" layer="27" display="off"/>
@@ -1125,9 +1125,9 @@ design rules under a new name.</description>
 <attribute name="NAME" x="2.4677" y="11.690428125" size="1.27" layer="25" font="vector" ratio="10"/>
 <attribute name="VALUE" x="4.709878125" y="11.562284375" size="1.27" layer="27" ratio="10" rot="R110"/>
 </element>
-<element name="R5" library="bigalexeasysolder" package="0207/10" value="33R" x="10.16" y="26.45" smashed="yes" rot="R65">
-<attribute name="NAME" x="10.34814375" y="25.28414375" size="1.27" layer="25" font="vector" ratio="10" rot="R65"/>
-<attribute name="VALUE" x="9.780134375" y="24.1328375" size="1.27" layer="27" ratio="10" rot="R65"/>
+<element name="R5" library="bigalexeasysolder" package="0207/10" value="33R" x="10.16" y="26.44" smashed="yes" rot="R65">
+<attribute name="NAME" x="10.34814375" y="25.27414375" size="1.27" layer="25" font="vector" ratio="10" rot="R65"/>
+<attribute name="VALUE" x="9.780134375" y="24.1228375" size="1.27" layer="27" ratio="10" rot="R65"/>
 </element>
 <element name="LED4" library="SparkFun" package="LED3MM" value="" x="3.81" y="23.495" smashed="yes" rot="R70">
 <attribute name="NAME" x="2.833525" y="20.017921875" size="1.27" layer="25" font="vector" ratio="10"/>
@@ -1238,8 +1238,6 @@ design rules under a new name.</description>
 <element name="LED18" library="led" package="LED5MM" value="" x="153.561053125" y="6.72198125" smashed="yes" rot="R315">
 <attribute name="VALUE" x="154.54888125" y="3.183759375" size="1.27" layer="27" ratio="10" rot="R315"/>
 </element>
-<element name="R6" library="bigalexeasysolder" package="0207/10" value="" x="-8.89" y="7.62"/>
-<element name="R7" library="bigalexeasysolder" package="0207/10" value="100K" x="-8.89" y="2.54"/>
 </elements>
 <signals>
 <signal name="PD5">
@@ -1262,7 +1260,6 @@ design rules under a new name.</description>
 <wire x1="38.1" y1="15.24" x2="34.925" y2="15.24" width="0.2032" layer="1"/>
 <wire x1="34.925" y1="15.24" x2="34.925" y2="15.875" width="0.2032" layer="1"/>
 <wire x1="34.925" y1="15.875" x2="38.1" y2="15.875" width="0.2032" layer="1"/>
-<wire x1="38.1" y1="15.875" x2="40.005" y2="14.605" width="0.2032" layer="1"/>
 <wire x1="40.005" y1="14.605" x2="46.99" y2="14.605" width="0.2032" layer="1"/>
 <wire x1="46.99" y1="14.605" x2="46.99" y2="15.24" width="0.2032" layer="1"/>
 <wire x1="46.99" y1="15.24" x2="40.005" y2="15.24" width="0.2032" layer="1"/>
@@ -1290,8 +1287,7 @@ design rules under a new name.</description>
 <contactref element="IR" pad="VCC"/>
 <wire x1="39.37" y1="12.7" x2="43.18" y2="8.89" width="0.6096" layer="1"/>
 <wire x1="43.18" y1="8.89" x2="43.18" y2="3.81" width="0.6096" layer="1"/>
-<wire x1="50.8" y1="30.45" x2="49.53" y2="31.115" width="1.27" layer="1"/>
-<wire x1="49.53" y1="31.115" x2="26.67" y2="31.115" width="1.27" layer="1"/>
+<wire x1="50.135" y1="31.115" x2="26.67" y2="31.115" width="1.27" layer="1"/>
 <wire x1="19.0234" y1="14.0112" x2="20.3612" y2="14.0112" width="1.27" layer="1"/>
 <wire x1="20.3612" y1="14.0112" x2="21.59" y2="15.24" width="1.27" layer="1"/>
 <wire x1="21.59" y1="15.24" x2="21.59" y2="21.59" width="1.27" layer="1"/>
@@ -1311,9 +1307,7 @@ design rules under a new name.</description>
 <contactref element="R4" pad="2"/>
 <contactref element="R5" pad="2"/>
 <wire x1="26.67" y1="31.115" x2="26.3525" y2="31.4325" width="0.6096" layer="1"/>
-<wire x1="26.3525" y1="31.4325" x2="12.7" y2="31.4325" width="0.6096" layer="1"/>
-<wire x1="12.7" y1="31.4325" x2="12.1936375" y2="31.2436375" width="0.6096" layer="1"/>
-<wire x1="12.1936375" y1="31.2436375" x2="12.3069" y2="31.054040625" width="0.6096" layer="1"/>
+<wire x1="26.3525" y1="31.4325" x2="12.695359375" y2="31.4325" width="0.6096" layer="1"/>
 <wire x1="22.86" y1="7.62" x2="21.59" y2="6.35" width="1.27" layer="1"/>
 <wire x1="21.59" y1="6.35" x2="21.59" y2="1.905" width="1.27" layer="1"/>
 <wire x1="43.18" y1="3.81" x2="43.18" y2="2.54" width="1.27" layer="1"/>
@@ -1338,11 +1332,13 @@ design rules under a new name.</description>
 <wire x1="41.91" y1="5.08" x2="43.10560625" y2="3.88439375" width="1.27" layer="16"/>
 <wire x1="43.10560625" y1="3.88439375" x2="43.18" y2="3.704790625" width="1.27" layer="16" curve="-44.999295"/>
 <wire x1="43.18" y1="3.704790625" x2="43.18" y2="2.54" width="1.27" layer="16"/>
-<wire x1="5.715" y1="2.54" x2="6.23465" y2="2.02035" width="0.6096" layer="1"/>
-<wire x1="6.23465" y1="2.02035" x2="6.414253125" y2="1.94595625" width="0.6096" layer="1" curve="44.999295"/>
-<wire x1="6.414253125" y1="1.94595625" x2="12.3069" y2="1.96595625" width="0.6096" layer="1"/>
-<wire x1="12.3069" y1="1.96595625" x2="12.405778125" y2="1.905" width="0.6096" layer="1" curve="45"/>
-<wire x1="12.405778125" y1="1.905" x2="21.59" y2="1.905" width="0.6096" layer="1"/>
+<wire x1="12.36785625" y1="1.905" x2="21.59" y2="1.905" width="0.6096" layer="1"/>
+<wire x1="12.695359375" y1="31.4325" x2="12.3069" y2="31.044040625" width="0.6096" layer="1"/>
+<wire x1="12.36785625" y1="1.905" x2="12.3069" y2="1.96595625" width="0.6096" layer="1"/>
+<wire x1="12.3069" y1="1.96595625" x2="6.28904375" y2="1.96595625" width="0.6096" layer="1"/>
+<wire x1="6.28904375" y1="1.96595625" x2="5.715" y2="2.54" width="0.6096" layer="1"/>
+<wire x1="38.1" y1="15.875" x2="38.1" y2="16.51" width="0" layer="19" extent="1-1"/>
+<wire x1="50.135" y1="31.115" x2="50.8" y2="30.45" width="1.27" layer="1"/>
 </signal>
 <signal name="GND">
 <contactref element="IC1" pad="8"/>
@@ -1360,7 +1356,7 @@ design rules under a new name.</description>
 <contactref element="JP2" pad="6"/>
 <contactref element="R2" pad="2"/>
 <contactref element="JP5" pad="5"/>
-<polygon width="0.6096" layer="1" isolate="0.4064">
+<polygon width="0.6096" layer="1" isolate="0.4064" rank="2">
 <vertex x="0" y="0"/>
 <vertex x="0" y="34.29"/>
 <vertex x="87" y="34.29"/>
@@ -1604,16 +1600,16 @@ design rules under a new name.</description>
 <wire x1="64.85" y1="17.78" x2="68.58" y2="21.51" width="0.4064" layer="16"/>
 </signal>
 <signal name="N$1">
-<via x="2.54" y="19.05" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
+<via x="2.54" y="19.25" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
 </signal>
 <signal name="N$2">
-<via x="6.35" y="19.05" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
+<via x="6.35" y="19.25" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
 </signal>
 <signal name="N$4">
-<via x="6.35" y="13.97" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
+<via x="6.35" y="13.67" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
 </signal>
 <signal name="N$6">
-<via x="2.54" y="13.97" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
+<via x="2.54" y="13.67" extent="1-16" drill="0.8" diameter="1.6764" alwaysstop="yes"/>
 </signal>
 <signal name="BAT">
 <contactref element="BAT1" pad="+"/>
@@ -1740,14 +1736,14 @@ design rules under a new name.</description>
 <signal name="N$7">
 <contactref element="LED4" pad="A"/>
 <contactref element="R5" pad="1"/>
-<wire x1="8.013096875" y1="21.84595625" x2="3.9808625" y2="21.696359375" width="0.6096" layer="1"/>
-<wire x1="3.9808625" y1="21.696359375" x2="3.375634375" y2="22.3015875" width="0.6096" layer="1" curve="-90"/>
+<wire x1="8.013096875" y1="21.83595625" x2="7.547465625" y2="22.3015875" width="0.6096" layer="1"/>
+<wire x1="7.547465625" y1="22.3015875" x2="3.375634375" y2="22.3015875" width="0.6096" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="LED3" pad="A"/>
 <contactref element="R4" pad="1"/>
-<wire x1="4.2443625" y1="8.0140875" x2="5.1129875" y2="8.0140875" width="0.6096" layer="16"/>
-<wire x1="5.1129875" y1="8.0140875" x2="8.013096875" y2="11.174040625" width="0.6096" layer="16"/>
+<wire x1="8.013096875" y1="11.174040625" x2="7.404315625" y2="11.174040625" width="0.6096" layer="16"/>
+<wire x1="7.404315625" y1="11.174040625" x2="4.2443625" y2="8.0140875" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$11">
 <contactref element="LED4" pad="K"/>
@@ -2013,6 +2009,13 @@ design rules under a new name.</description>
 <wire x1="162.54130625" y1="19.70369375" x2="162.54130625" y2="17.498284375" width="0.6096" layer="16"/>
 </signal>
 </signals>
+<errors>
+<approved hash="8,1,8636273120383bac"/>
+<approved hash="19,1,745b54f6428adb83"/>
+<approved hash="19,1,7032feb9532ba90b"/>
+<approved hash="19,1,722f5724f9b263e3"/>
+<approved hash="19,1,9d9392f3c078dce0"/>
+</errors>
 </board>
 </drawing>
 </eagle>
diff --git a/hardware/v2/pentabug_v2.1.sch b/hardware/v2/pentabug_v2.1.sch
index 724c25e..50521b1 100644
--- a/hardware/v2/pentabug_v2.1.sch
+++ b/hardware/v2/pentabug_v2.1.sch
@@ -5565,7 +5565,7 @@ type 0207, grid 10 mm</description>
 </class>
 </classes>
 <parts>
-<part name="IC1" library="atmel" deviceset="MEGA8-P" device="" value="ATMEGA88"/>
+<part name="IC1" library="atmel" deviceset="MEGA8-P" device="" value="ATMEGA328P-PU"/>
 <part name="P+2" library="supply1" deviceset="VCC" device=""/>
 <part name="GND2" library="supply1" deviceset="GND" device=""/>
 <part name="C1" library="resistor" deviceset="C-EU" device="025-024X044" value="100nF"/>
@@ -5656,8 +5656,6 @@ type 0207, grid 10 mm</description>
 <part name="LED16" library="led" deviceset="LED" device="5MM"/>
 <part name="LED17" library="led" deviceset="LED" device="5MM"/>
 <part name="LED18" library="led" deviceset="LED" device="5MM"/>
-<part name="R6" library="bigalexeasysolder" deviceset="R-EU_EASY-SOLDER" device="0207/10_EASY-SOLDER"/>
-<part name="R7" library="bigalexeasysolder" deviceset="R-EU_EASY-SOLDER" device="0207/10_EASY-SOLDER" value="100K"/>
 </parts>
 <sheets>
 <sheet>
@@ -5665,7 +5663,7 @@ type 0207, grid 10 mm</description>
 <wire x1="157.48" y1="119.38" x2="157.48" y2="40.64" width="0.1524" layer="94"/>
 <wire x1="157.48" y1="40.64" x2="205.74" y2="40.64" width="0.1524" layer="94"/>
 <text x="160.02" y="43.18" size="1.778" layer="94">Serielle Schnittstelle und ISP</text>
-<text x="127.508" y="-46.482" size="3.81" layer="94" font="vector">DEFEKT!</text>
+<text x="127.508" y="-50.8" size="3.81" layer="94" font="vector">DEFEKT!</text>
 <text x="104.14" y="43.18" size="1.778" layer="94">Vibrationsmotor und Treiber</text>
 <wire x1="157.48" y1="40.64" x2="101.6" y2="40.64" width="0.1524" layer="94"/>
 <wire x1="101.6" y1="40.64" x2="101.6" y2="119.38" width="0.1524" layer="94"/>
@@ -5681,7 +5679,9 @@ type 0207, grid 10 mm</description>
 <text x="71.12" y="-20.32" size="1.778" layer="94">Taster</text>
 <text x="104.14" y="-20.32" size="1.778" layer="94">Piezo Buzzer</text>
 <text x="160.02" y="-20.32" size="1.778" layer="94">Batterie und Spannungssensor</text>
-<text x="119.38" y="-38.1" size="3.81" layer="94">Pentabug V2.0</text>
+<text x="119.38" y="-38.1" size="3.81" layer="94">Pentabug V2.1</text>
+<text x="119.38" y="-41.91" size="1.27" layer="94">voll kompatibel zu V2.0
+Lötstellen+Beschriftung verbesert</text>
 </plain>
 <instances>
 <instance part="IC1" gate="G$1" x="7.62" y="-2.54"/>
@@ -5762,8 +5762,6 @@ type 0207, grid 10 mm</description>
 <instance part="LED4" gate="G$1" x="-7.62" y="99.06" rot="R90"/>
 <instance part="P+8" gate="VCC" x="-22.86" y="106.68"/>
 <instance part="P+9" gate="VCC" x="55.88" y="2.54"/>
-<instance part="R6" gate="G$1" x="25.4" y="53.34"/>
-<instance part="R7" gate="G$1" x="-10.16" y="43.18"/>
 </instances>
 <busses>
 </busses>
@@ -6634,4 +6632,10 @@ type 0207, grid 10 mm</description>
 </sheets>
 </schematic>
 </drawing>
+<compatibility>
+<note version="6.3" minversion="6.2.2" severity="warning">
+Since Version 6.2.2 text objects can contain more than one line,
+which will not be processed correctly with this version.
+</note>
+</compatibility>
 </eagle>