diff --git a/pcb/BlinkyBoard.brd b/pcb/BlinkyBoard.brd
index 452809c..f866ddc 100644
--- a/pcb/BlinkyBoard.brd
+++ b/pcb/BlinkyBoard.brd
@@ -6,9 +6,9 @@
 <setting alwaysvectorfont="no"/>
 <setting verticaltext="up"/>
 </settings>
-<grid distance="0.01" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="0.1" altunitdist="mm" altunit="mm"/>
+<grid distance="0.1" unitdist="mm" unit="mm" style="lines" multiple="1" display="no" altdistance="0.01" altunitdist="mm" altunit="mm"/>
 <layers>
-<layer number="1" name="Top" color="4" fill="1" visible="yes" active="yes"/>
+<layer number="1" name="Top" color="4" fill="1" visible="no" active="yes"/>
 <layer number="2" name="Route2" color="1" fill="3" visible="no" active="no"/>
 <layer number="3" name="Route3" color="4" fill="3" visible="no" active="no"/>
 <layer number="4" name="Route4" color="1" fill="4" visible="no" active="no"/>
@@ -26,18 +26,18 @@
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <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="19" name="Unrouted" color="6" 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="11" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="3" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="11" fill="1" visible="no" active="yes"/>
+<layer number="22" name="bPlace" color="3" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="7" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="7" fill="1" visible="no" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="26" name="bNames" color="7" fill="1" visible="yes" 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="yes" active="yes"/>
-<layer number="30" name="bStop" color="7" fill="6" visible="yes" active="yes"/>
+<layer number="28" name="bValues" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="29" name="tStop" color="7" fill="3" visible="no" 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"/>
 <layer number="33" name="tFinish" color="6" fill="3" visible="no" active="yes"/>
@@ -136,18 +136,18 @@
 <wire x1="0" y1="10" x2="25.25" y2="10" width="0.127" layer="20"/>
 <wire x1="0" y1="0" x2="25.25" y2="0" width="0.127" layer="20"/>
 <wire x1="25.25" y1="10" x2="25.25" y2="0" width="0.127" layer="20"/>
-<text x="8.75" y="6" size="1.016" layer="26" font="vector" ratio="20" rot="MR0" align="center">Blinky
+<text x="9.15" y="6" size="1.016" layer="26" font="vector" ratio="20" rot="MR0" align="center">Blinky
 Tape</text>
-<text x="8.75" y="3.85" size="0.8128" layer="26" font="vector" ratio="20" rot="MR0" align="center">Rev E</text>
-<text x="24" y="8.95" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">D13</text>
-<text x="24" y="5.95" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">5V</text>
-<text x="24" y="2.95" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">GND</text>
-<text x="19.5" y="8" size="0.75" layer="25" font="vector" ratio="15" rot="R90" align="bottom-center">PUSH</text>
-<text x="8.93" y="3.59" size="0.75" layer="25" font="vector" ratio="15" rot="R90" align="center">Tape</text>
+<text x="9.15" y="3.85" size="0.8128" layer="26" font="vector" ratio="20" rot="MR0" align="center">Rev F</text>
+<text x="23.9" y="8.45" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">5V</text>
+<text x="23.9" y="5.89" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">D13</text>
+<text x="23.9" y="0.85" size="0.75" layer="25" font="vector" ratio="15" align="bottom-center">GND</text>
+<text x="19.4" y="8" size="0.75" layer="25" font="vector" ratio="15" rot="R90" align="bottom-center">PUSH</text>
+<text x="8.09" y="1.97" size="0.75" layer="25" font="vector" ratio="15" align="center">Tape</text>
 <text x="10.75" y="2.5" size="0.9" layer="26" font="vector" ratio="20" rot="MR0" align="center">blinkytape.com</text>
-<text x="24" y="8.95" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">D13</text>
-<text x="24" y="5.95" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">5V</text>
-<text x="24" y="2.95" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">GND</text>
+<text x="23.9" y="8.45" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">5V</text>
+<text x="23.9" y="5.89" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">D13</text>
+<text x="23.9" y="0.85" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">GND</text>
 <text x="20.5" y="8.75" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">5V</text>
 <text x="20.75" y="2" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="center">GND</text>
 <text x="20.5" y="8.75" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="bottom-center">5V</text>
@@ -155,14 +155,8 @@ Tape</text>
 <text x="4.35" y="6.25" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="center">D7</text>
 <text x="4.65" y="3.75" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="center">D11</text>
 <text x="0.5" y="10.75" size="0.8128" layer="46">Slot drill with copper</text>
-<text x="13.75" y="8.75" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="center">7/13</text>
-<text x="7.03" y="2.16" size="0.75" layer="25" font="vector" ratio="15" align="center">Blinky</text>
-<rectangle x1="22.6" y1="6.95" x2="25.3" y2="8.95" layer="16"/>
-<rectangle x1="22.6" y1="4" x2="25.3" y2="6" layer="16"/>
-<rectangle x1="22.6" y1="1.05" x2="25.3" y2="3.05" layer="16"/>
-<rectangle x1="22.6" y1="1.05" x2="25.3" y2="3.05" layer="1"/>
-<rectangle x1="22.6" y1="4" x2="25.3" y2="6" layer="1"/>
-<rectangle x1="22.6" y1="6.95" x2="25.3" y2="8.95" layer="1"/>
+<text x="13.75" y="8.75" size="0.75" layer="26" font="vector" ratio="15" rot="MR0" align="center">8/2013</text>
+<text x="6.93" y="2.96" size="0.75" layer="25" font="vector" ratio="15" align="center">Blinky</text>
 </plain>
 <libraries>
 <library name="blinkyboard">
@@ -269,11 +263,6 @@ by exp-project-lbr.ulp</description>
 <pad name="PAD@15" x="0.5" y="-1.5" drill="0.35" diameter="2" shape="square" stop="no" thermals="no"/>
 <pad name="PAD@16" x="1.5" y="-1.5" drill="0.35" diameter="2" stop="no" thermals="no"/>
 </package>
-<package name="WS2811_CONNECTOR">
-<smd name="DATA" x="0" y="2.95" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-<smd name="5V" x="0" y="0" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-<smd name="GND" x="0" y="-2.95" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-</package>
 <package name="MICRO_USB_FCI_THRUHOLE">
 <smd name="PIN$1" x="-1.3" y="2.7" dx="0.4" dy="1.35" layer="1"/>
 <smd name="PIN$2" x="-0.65" y="2.7" dx="0.4" dy="1.35" layer="1"/>
@@ -389,6 +378,20 @@ by exp-project-lbr.ulp</description>
 <vertex x="0.1794" y="-0.4331"/>
 </polygon>
 </package>
+<package name="WS2812B_CONNECTOR">
+<smd name="5V" x="0" y="2.5" dx="2.7" dy="1.6" layer="16" roundness="25" rot="R180" thermals="no" cream="no"/>
+<smd name="DATA" x="0" y="0" dx="2.7" dy="1.6" layer="1" roundness="25" thermals="no" cream="no"/>
+<smd name="GND" x="0" y="-2.5" dx="2.7" dy="1.6" layer="1" roundness="50" thermals="no" cream="no"/>
+<pad name="5V_1" x="1.35" y="2.5" drill="1" thermals="no"/>
+<pad name="DATA_1" x="1.35" y="0" drill="1" diameter="1.5" thermals="no"/>
+<pad name="GND_1" x="1.35" y="-2.5" drill="1" diameter="1.5" thermals="no"/>
+<pad name="5V_2" x="-0.5" y="2.5" drill="1" thermals="no"/>
+<pad name="DATA_2" x="-0.5" y="0" drill="1" diameter="1.5" thermals="no"/>
+<pad name="GND_2" x="-0.5" y="-2.5" drill="1" diameter="1.5" thermals="no"/>
+<smd name="5V1" x="0" y="2.5" dx="2.7" dy="1.6" layer="1" roundness="25" thermals="no" cream="no"/>
+<smd name="DATA1" x="0" y="0" dx="2.7" dy="1.6" layer="16" roundness="25" rot="R180" thermals="no" cream="no"/>
+<smd name="GND1" x="0" y="-2.5" dx="2.7" dy="1.6" layer="16" roundness="50" rot="R180" thermals="no" cream="no"/>
+</package>
 </packages>
 </library>
 <library name="adafruit">
@@ -416,7 +419,7 @@ Metric Code Size 1608</description>
 <class number="0" name="default" width="0" drill="0">
 </class>
 </classes>
-<designrules name="BlinkyTape">
+<designrules name="BlinkyTape *">
 <description language="de">&lt;b&gt;EAGLE Design Rules&lt;/b&gt;
 &lt;p&gt;
 Die Standard-Design-Rules sind so gewählt, dass sie für 
@@ -441,7 +444,7 @@ Modified from Laen's PCB Order Design Rules</description>
 <param name="mdSmdSmd" value="0.2mm"/>
 <param name="mdViaViaSameLayer" value="8mil"/>
 <param name="mnLayersViaInSmd" value="2"/>
-<param name="mdCopperDimension" value="15mil"/>
+<param name="mdCopperDimension" value="8mil"/>
 <param name="mdDrill" value="0.25mm"/>
 <param name="mdSmdStop" value="0mil"/>
 <param name="msWidth" value="0.25mm"/>
@@ -576,7 +579,6 @@ Modified from Laen's PCB Order Design Rules</description>
 <element name="S1" library="blinkyboard" package="GLOWBOARD_KMR211G_SWITCH" value="Normally open" x="21" y="7" rot="R270"/>
 <element name="Q1" library="blinkiverse" package="CRSYTAL_2520" value="16 MHz" x="20.25" y="2.25" smashed="yes" rot="R270"/>
 <element name="C4" library="blinkiverse" package="CAP_0402_KEMET_MEDIAN" value="0.1uF" x="19" y="4.75" smashed="yes" rot="R270"/>
-<element name="WS1" library="blinkiverse" package="WS2811_CONNECTOR" value="WS2811_CONNECTORSTRIP" x="24" y="5"/>
 <element name="U$4" library="blinkiverse" package="MICRO_USB_FCI_THRUHOLE" value="MICRO_USBSMT+THRUHULE" x="1.5" y="5" rot="R270"/>
 <element name="U$1" library="blinkiverse" package="TEST_VIA_.5MM" value="TEST_VIA" x="9" y="1"/>
 <element name="U$3" library="blinkiverse" package="TEST_VIA_.5MM" value="TEST_VIA" x="7.5" y="1"/>
@@ -584,13 +586,13 @@ Modified from Laen's PCB Order Design Rules</description>
 <element name="U$6" library="blinkiverse" package="TEST_VIA_.5MM" value="TEST_VIA" x="10.5" y="1"/>
 <element name="U$7" library="blinkiverse" package="TEST_VIA_.5MM" value="TEST_VIA" x="6.25" y="4.25"/>
 <element name="U$8" library="blinkiverse" package="TEST_VIA_.5MM" value="TEST_VIA" x="5.75" y="8.75"/>
-<element name="WS3" library="blinkiverse" package="WS2811_CONNECTOR" value="WS2811_CONNECTORSTRIP" x="24" y="5" rot="MR0"/>
 <element name="U$10" library="blinkiverse" package="TEST_PAD_SMT" value="TEST_PAD_SMT" x="2" y="6.25" rot="MR90"/>
 <element name="U$11" library="blinkiverse" package="TEST_PAD_SMT" value="TEST_PAD_SMT" x="18" y="5" rot="MR90"/>
 <element name="U$12" library="blinkiverse" package="TEST_PAD_SMT" value="TEST_PAD_SMT" x="18" y="7.9" rot="MR270"/>
 <element name="U$13" library="blinkiverse" package="TEST_PAD_SMT" value="TEST_PAD_SMT" x="18" y="2.1" rot="MR270"/>
 <element name="U$14" library="blinkiverse" package="TEST_PAD_SMT" value="TEST_PAD_SMT" x="2" y="3.75" rot="MR270"/>
-<element name="U$15" library="blinkiverse" package="OSHW-LOGO-S" value="" x="21.25" y="6.75" rot="MR0"/>
+<element name="U$15" library="blinkiverse" package="OSHW-LOGO-S" value="" x="20.89" y="6.7" rot="MR0"/>
+<element name="U$9" library="blinkiverse" package="WS2812B_CONNECTOR" value="WS2812B_CONNECTOR" x="23.9" y="5"/>
 </elements>
 <signals>
 <signal name="GND">
@@ -609,12 +611,15 @@ Modified from Laen's PCB Order Design Rules</description>
 <contactref element="C1" pad="2"/>
 <contactref element="C2" pad="P$2"/>
 <contactref element="C4" pad="P$2"/>
-<polygon width="0.4064" layer="16" isolate="0.254">
-<vertex x="5.75" y="10"/>
-<vertex x="16" y="10"/>
+<polygon width="0.1" layer="16" isolate="0.254">
+<vertex x="5.75" y="7.6"/>
+<vertex x="15.6" y="7.6"/>
+<vertex x="16" y="7.2"/>
 <vertex x="16" y="4"/>
-<vertex x="22.3" y="4"/>
-<vertex x="22.3" y="0"/>
+<vertex x="22.2" y="4"/>
+<vertex x="22.5" y="3.6"/>
+<vertex x="25.3" y="3.6"/>
+<vertex x="25.3" y="0"/>
 <vertex x="5.75" y="0"/>
 </polygon>
 <contactref element="U$2" pad="PAD@2"/>
@@ -632,29 +637,26 @@ Modified from Laen's PCB Order Design Rules</description>
 <contactref element="U$2" pad="PAD@14"/>
 <contactref element="U$2" pad="PAD@15"/>
 <contactref element="U$2" pad="PAD@16"/>
-<contactref element="WS1" pad="GND"/>
 <wire x1="10.225" y1="5.75" x2="12.25" y2="5.75" width="0.254" layer="1"/>
-<wire x1="12.75" y1="1.725" x2="12.75" y2="3.25" width="0.254" layer="1"/>
-<wire x1="12.75" y1="3.25" x2="13.25" y2="3.75" width="0.254" layer="1"/>
-<wire x1="17.275" y1="2.75" x2="16.25" y2="2.75" width="0.254" layer="1"/>
-<wire x1="16.25" y1="2.75" x2="15.25" y2="3.75" width="0.254" layer="1"/>
-<wire x1="11.75" y1="8.775" x2="11.75" y2="7.25" width="0.254" layer="1"/>
-<wire x1="11.75" y1="7.25" x2="12.25" y2="6.75" width="0.254" layer="1"/>
-<wire x1="15.75" y1="8.775" x2="15.75" y2="7.25" width="0.254" layer="1"/>
-<wire x1="15.75" y1="7.25" x2="15.25" y2="6.75" width="0.254" layer="1"/>
-<via x="6.43" y="7" extent="1-16" drill="0.35"/>
+<wire x1="12.75" y1="1.725" x2="12.75" y2="3.04289375" width="0.254" layer="1"/>
+<wire x1="12.75" y1="3.04289375" x2="12.896446875" y2="3.396446875" width="0.254" layer="1" curve="-45"/>
+<wire x1="12.896446875" y1="3.396446875" x2="13.25" y2="3.75" width="0.254" layer="1"/>
+<wire x1="17.275" y1="2.75" x2="16.45710625" y2="2.75" width="0.254" layer="1"/>
+<wire x1="16.45710625" y1="2.75" x2="16.103553125" y2="2.896446875" width="0.254" layer="1" curve="-45"/>
+<wire x1="16.103553125" y1="2.896446875" x2="15.25" y2="3.75" width="0.254" layer="1"/>
+<wire x1="11.75" y1="8.775" x2="11.75" y2="7.45710625" width="0.254" layer="1"/>
+<wire x1="11.75" y1="7.45710625" x2="11.896446875" y2="7.103553125" width="0.254" layer="1" curve="45"/>
+<wire x1="11.896446875" y1="7.103553125" x2="12.25" y2="6.75" width="0.254" layer="1"/>
+<wire x1="15.75" y1="8.775" x2="15.75" y2="7.45710625" width="0.254" layer="1"/>
+<wire x1="15.75" y1="7.45710625" x2="15.603553125" y2="7.103553125" width="0.254" layer="1" curve="-45"/>
+<wire x1="15.603553125" y1="7.103553125" x2="15.25" y2="6.75" width="0.254" layer="1"/>
+<via x="6.43" y="6.96" extent="1-16" drill="0.35"/>
 <contactref element="U$4" pad="PIN$5"/>
 <wire x1="7.3" y1="7.75" x2="7" y2="7.75" width="0.4" layer="1"/>
 <contactref element="U$7" pad="P$1"/>
 <wire x1="7.25" y1="4.75" x2="7.3" y2="4.75" width="0.4" layer="1"/>
 <wire x1="7.3" y1="4.75" x2="7.3" y2="3.75" width="0.4" layer="1"/>
 <wire x1="21.8" y1="4.9" x2="21.926" y2="4.75" width="0.254" layer="1"/>
-<contactref element="WS3" pad="GND"/>
-<via x="23.5" y="2.05" extent="1-16" drill="1"/>
-<wire x1="23.5" y1="2.05" x2="24" y2="2.05" width="0.254" layer="1"/>
-<wire x1="24" y1="2.05" x2="24.05" y2="2" width="0.254" layer="1"/>
-<wire x1="23.5" y1="2.05" x2="23.3" y2="2.05" width="0.254" layer="16"/>
-<wire x1="23.5" y1="2.05" x2="24" y2="2.05" width="0.254" layer="16"/>
 <wire x1="4.2" y1="3.7" x2="5.45" y2="3.7" width="0.4" layer="1"/>
 <wire x1="5.45" y1="3.7" x2="6.25" y2="4.25" width="1.016" layer="1"/>
 <wire x1="19" y1="4.3" x2="18.95" y2="4.3" width="0.254" layer="1"/>
@@ -670,18 +672,16 @@ Modified from Laen's PCB Order Design Rules</description>
 <wire x1="21.88" y1="4.12" x2="22" y2="3.85" width="0.254" layer="1"/>
 <wire x1="21.926" y1="4.75" x2="21.926" y2="4.074" width="0.254" layer="1"/>
 <wire x1="21.926" y1="4.074" x2="22" y2="3.85" width="0.254" layer="1"/>
-<wire x1="23.3" y1="2.05" x2="22.2" y2="2.05" width="0.8128" layer="16"/>
-<wire x1="22.2" y1="2.05" x2="22" y2="2.25" width="0.8128" layer="16"/>
-<wire x1="21.8" y1="9" x2="22" y2="8.8" width="0.254" layer="1"/>
-<wire x1="22" y1="8.8" x2="22" y2="5.25" width="0.254" layer="1"/>
-<wire x1="22" y1="5.25" x2="21.8" y2="5.05" width="0.254" layer="1"/>
+<wire x1="21.8" y1="9" x2="21.85" y2="8.83" width="0.254" layer="1"/>
+<wire x1="21.85" y1="8.83" x2="21.85" y2="5.28" width="0.254" layer="1"/>
+<wire x1="21.85" y1="5.28" x2="21.8" y2="5.05" width="0.254" layer="1"/>
 <wire x1="21.8" y1="5.05" x2="21.8" y2="4.9" width="0.254" layer="1"/>
 <contactref element="U$13" pad="P$1"/>
-<via x="25.25" y="2.05" extent="1-16" drill="1"/>
 <wire x1="7.125" y1="9" x2="7.125" y2="8.625" width="0.4064" layer="1"/>
-<wire x1="7.125" y1="8.625" x2="6.43" y2="8" width="0.4064" layer="1"/>
-<wire x1="6.43" y1="8" x2="6.43" y2="7.75" width="0.4064" layer="1"/>
-<wire x1="6.43" y1="7.75" x2="6.43" y2="7" width="0.4064" layer="1"/>
+<wire x1="7.125" y1="8.625" x2="6.595665625" y2="8.14898125" width="0.4064" layer="1"/>
+<wire x1="6.595665625" y1="8.14898125" x2="6.43" y2="7.7772" width="0.4064" layer="1" curve="48.035678"/>
+<wire x1="6.43" y1="7.7772" x2="6.43" y2="7.75" width="0.4064" layer="1"/>
+<wire x1="6.43" y1="7.75" x2="6.43" y2="6.96" width="0.4064" layer="1"/>
 <wire x1="7" y1="7.75" x2="6.43" y2="7.75" width="0.4064" layer="1"/>
 <contactref element="Q1" pad="P$4"/>
 <contactref element="Q1" pad="P$2"/>
@@ -689,58 +689,68 @@ Modified from Laen's PCB Order Design Rules</description>
 <wire x1="19.45" y1="1.55" x2="19.6" y2="1.4" width="0.254" layer="1"/>
 <wire x1="22" y1="3" x2="21" y2="3" width="0.254" layer="1"/>
 <wire x1="21" y1="3" x2="20.9" y2="3.1" width="0.254" layer="1"/>
-<wire x1="6.25" y1="4.25" x2="6.75" y2="4.75" width="0.4064" layer="1"/>
-<wire x1="6.75" y1="4.75" x2="7.3" y2="4.75" width="0.4064" layer="1"/>
-<wire x1="24.05" y1="2" x2="25.25" y2="2" width="0.1" layer="1"/>
-<wire x1="25.25" y1="2" x2="25.25" y2="2.05" width="0.1" layer="1"/>
-<wire x1="22.76" y1="2.73" x2="22.21" y2="2.73" width="0.7" layer="16"/>
-<wire x1="22" y1="2.95" x2="22.21" y2="2.73" width="0" layer="19" extent="1-16"/>
+<wire x1="6.25" y1="4.25" x2="6.603553125" y2="4.603553125" width="0.4064" layer="1"/>
+<wire x1="6.603553125" y1="4.603553125" x2="6.95710625" y2="4.75" width="0.4064" layer="1" curve="-45"/>
+<wire x1="6.95710625" y1="4.75" x2="7.3" y2="4.75" width="0.4064" layer="1"/>
+<contactref element="U$9" pad="GND1"/>
+<contactref element="U$9" pad="GND_1"/>
+<contactref element="U$9" pad="GND_2"/>
+<contactref element="U$9" pad="GND"/>
+<wire x1="23.9" y1="2.5" x2="23.9" y2="2.5" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="MOSI">
 <contactref element="U$2" pad="10"/>
 <contactref element="U$3" pad="P$1"/>
-<wire x1="9.51" y1="3.25" x2="10.225" y2="3.25" width="0.254" layer="1"/>
-<wire x1="9.51" y1="3.25" x2="7.5" y2="1" width="0.254" layer="1"/>
+<wire x1="10.225" y1="3.25" x2="9.82330625" y2="3.25" width="0.254" layer="1"/>
+<wire x1="9.82330625" y1="3.25" x2="9.301271875" y2="3.01635" width="0.254" layer="1" curve="48.224566"/>
+<wire x1="9.301271875" y1="3.01635" x2="7.5" y2="1" width="0.254" layer="1"/>
 </signal>
 <signal name="MISO">
 <contactref element="U$2" pad="11"/>
 <contactref element="U$1" pad="P$1"/>
-<wire x1="9" y1="1" x2="9" y2="1.98" width="0.254" layer="1"/>
-<wire x1="9" y1="1.98" x2="9.75" y2="2.75" width="0.254" layer="1"/>
+<wire x1="9" y1="1" x2="9" y2="1.573471875" width="0.254" layer="1"/>
+<wire x1="9" y1="1.573471875" x2="9.28365" y2="2.2712125" width="0.254" layer="1" curve="-44.246033"/>
+<wire x1="9.28365" y1="2.2712125" x2="9.75" y2="2.75" width="0.254" layer="1"/>
 <wire x1="9.75" y1="2.75" x2="10.225" y2="2.75" width="0.254" layer="1"/>
 </signal>
 <signal name="SCK">
 <contactref element="U$2" pad="9"/>
 <contactref element="U$5" pad="P$1"/>
-<wire x1="10.225" y1="3.75" x2="9.35" y2="3.75" width="0.254" layer="1"/>
-<wire x1="9.35" y1="3.75" x2="7.5" y2="2" width="0.254" layer="1"/>
-<wire x1="7.5" y1="2" x2="7" y2="2" width="0.254" layer="1"/>
-<wire x1="7" y1="2" x2="6" y2="1" width="0.254" layer="1"/>
+<wire x1="10.225" y1="3.75" x2="9.7480375" y2="3.75" width="0.254" layer="1"/>
+<wire x1="9.7480375" y1="3.75" x2="9.0608375" y2="3.47646875" width="0.254" layer="1" curve="43.408853"/>
+<wire x1="9.0608375" y1="3.47646875" x2="7.812778125" y2="2.301278125" width="0.254" layer="1"/>
+<wire x1="7.812778125" y1="2.301278125" x2="7.25710625" y2="2.02" width="0.254" layer="1" curve="-43.408955"/>
+<wire x1="7.25710625" y1="2.02" x2="6.753553125" y2="1.753553125" width="0.254" layer="1" curve="45"/>
+<wire x1="6.753553125" y1="1.753553125" x2="6" y2="1" width="0.254" layer="1"/>
 </signal>
 <signal name="RST">
 <contactref element="U$2" pad="13"/>
 <wire x1="11.75" y1="1.725" x2="11.75" y2="1.25" width="0.254" layer="1"/>
-<wire x1="11.75" y1="1.25" x2="11.25" y2="0.75" width="0.254" layer="1"/>
+<wire x1="11.75" y1="1.25" x2="11.396446875" y2="0.896446875" width="0.254" layer="1"/>
+<wire x1="11.396446875" y1="0.896446875" x2="11.04289375" y2="0.75" width="0.254" layer="1" curve="-45"/>
+<wire x1="11.04289375" y1="0.75" x2="10.95710625" y2="0.75" width="0.254" layer="1"/>
+<wire x1="10.95710625" y1="0.75" x2="10.603553125" y2="0.896446875" width="0.254" layer="1" curve="-45"/>
+<wire x1="10.603553125" y1="0.896446875" x2="10.5" y2="1" width="0.254" layer="1"/>
 <contactref element="U$6" pad="P$1"/>
-<wire x1="11.25" y1="0.75" x2="10.75" y2="0.75" width="0.254" layer="1"/>
-<wire x1="10.75" y1="0.75" x2="10.5" y2="1" width="0.254" layer="1"/>
 </signal>
 <signal name="N$9">
 <contactref element="C7" pad="P$1"/>
 <contactref element="U$2" pad="17"/>
 <contactref element="Q1" pad="P$1"/>
 <wire x1="13.75" y1="1.725" x2="13.75" y2="1.25" width="0.254" layer="1"/>
-<wire x1="13.75" y1="1.25" x2="14.25" y2="0.75" width="0.254" layer="1"/>
-<wire x1="14.25" y1="0.75" x2="16.5" y2="0.75" width="0.254" layer="1"/>
-<wire x1="19.6" y1="3.1" x2="18.6" y2="3.1" width="0.254" layer="1"/>
-<wire x1="18.6" y1="3.1" x2="18.5" y2="3" width="0.254" layer="1"/>
-<wire x1="18.5" y1="3" x2="18.5" y2="2.45" width="0.254" layer="1"/>
-<wire x1="18.5" y1="2.45" x2="18.2" y2="2.45" width="0.254" layer="1"/>
-<wire x1="18.2" y1="2.45" x2="18" y2="2.25" width="0.254" layer="1"/>
-<wire x1="18" y1="2.25" x2="17" y2="2.25" width="0.254" layer="1"/>
-<wire x1="17" y1="2.25" x2="16.75" y2="2" width="0.254" layer="1"/>
-<wire x1="16.75" y1="2" x2="16.75" y2="1" width="0.254" layer="1"/>
-<wire x1="16.75" y1="1" x2="16.5" y2="0.75" width="0.254" layer="1"/>
+<wire x1="16.25" y1="0.75" x2="14.45710625" y2="0.75" width="0.254" layer="1"/>
+<wire x1="14.45710625" y1="0.75" x2="14.103553125" y2="0.896446875" width="0.254" layer="1" curve="-45"/>
+<wire x1="14.103553125" y1="0.896446875" x2="13.75" y2="1.25" width="0.254" layer="1"/>
+<wire x1="16.75" y1="1.75" x2="16.75" y2="1.25" width="0.254" layer="1"/>
+<wire x1="16.75" y1="1.25" x2="16.25" y2="0.75" width="0.254" layer="1" curve="-90"/>
+<wire x1="19.6" y1="3.1" x2="19" y2="3.1" width="0.254" layer="1"/>
+<wire x1="19" y1="3.1" x2="18.5" y2="2.6" width="0.254" layer="1" curve="90"/>
+<wire x1="18.5" y1="2.6" x2="18.5" y2="2.45" width="0.254" layer="1"/>
+<wire x1="18.5" y1="2.45" x2="18.275734375" y2="2.45" width="0.254" layer="1"/>
+<wire x1="18.275734375" y1="2.45" x2="18.146446875" y2="2.396446875" width="0.254" layer="1" curve="45"/>
+<wire x1="18.146446875" y1="2.396446875" x2="17.79289375" y2="2.25" width="0.254" layer="1" curve="-45"/>
+<wire x1="17.79289375" y1="2.25" x2="17.25" y2="2.25" width="0.254" layer="1"/>
+<wire x1="17.25" y1="2.25" x2="16.75" y2="1.75" width="0.254" layer="1" curve="90"/>
 </signal>
 <signal name="N$8">
 <contactref element="C6" pad="P$1"/>
@@ -748,10 +758,11 @@ Modified from Laen's PCB Order Design Rules</description>
 <contactref element="Q1" pad="P$3"/>
 <wire x1="13.25" y1="1.725" x2="13.25" y2="0.7" width="0.254" layer="1"/>
 <via x="13.25" y="0.7" extent="1-16" drill="0.35"/>
-<wire x1="13.25" y1="0.7" x2="13.25" y2="0.75" width="0.254" layer="16"/>
-<wire x1="13.25" y1="0.75" x2="21.75" y2="0.75" width="0.254" layer="16"/>
+<wire x1="13.25" y1="0.7" x2="13.3" y2="0.75" width="0.254" layer="16" curve="-90"/>
+<wire x1="22" y1="1" x2="21.896446875" y2="0.896446875" width="0.254" layer="16"/>
+<wire x1="21.896446875" y1="0.896446875" x2="21.54289375" y2="0.75" width="0.254" layer="16" curve="-45"/>
+<wire x1="21.54289375" y1="0.75" x2="13.3" y2="0.75" width="0.254" layer="16"/>
 <via x="22" y="1" extent="1-16" drill="0.35"/>
-<wire x1="22" y1="1" x2="21.75" y2="0.75" width="0.254" layer="16"/>
 <wire x1="20.9" y1="1.4" x2="21.1" y2="1" width="0.254" layer="1"/>
 <wire x1="21.1" y1="1" x2="22" y2="1" width="0.254" layer="1"/>
 <wire x1="22" y1="2.05" x2="22" y2="1" width="0.254" layer="1"/>
@@ -759,47 +770,64 @@ Modified from Laen's PCB Order Design Rules</description>
 <signal name="D+_IN">
 <contactref element="R1" pad="P$1"/>
 <contactref element="U$4" pad="PIN$3"/>
-<wire x1="5.75" y1="5" x2="7" y2="5.75" width="0.254" layer="1"/>
-<wire x1="7" y1="5.75" x2="7.3" y2="5.75" width="0.254" layer="1"/>
-<wire x1="5.75" y1="5" x2="4.2" y2="5" width="0.254" layer="1"/>
+<wire x1="5.916259375" y1="5.09975625" x2="6.833740625" y2="5.65024375" width="0.254" layer="1"/>
+<wire x1="6.833740625" y1="5.65024375" x2="7.1938875" y2="5.75" width="0.254" layer="1" curve="-30.963669"/>
+<wire x1="7.1938875" y1="5.75" x2="7.3" y2="5.75" width="0.254" layer="1"/>
+<wire x1="5.916259375" y1="5.09975625" x2="5.5561125" y2="5" width="0.254" layer="1" curve="-30.9638"/>
+<wire x1="5.5561125" y1="5" x2="4.2" y2="5" width="0.254" layer="1"/>
 </signal>
 <signal name="D-_IN">
 <contactref element="R2" pad="P$1"/>
 <contactref element="U$4" pad="PIN$2"/>
-<wire x1="4.2" y1="5.65" x2="5.9" y2="5.65" width="0.254" layer="1"/>
-<wire x1="5.9" y1="5.65" x2="7.25" y2="6.75" width="0.254" layer="1"/>
-<wire x1="7.25" y1="6.75" x2="7.3" y2="6.75" width="0.254" layer="1"/>
+<wire x1="4.2" y1="5.65" x2="5.650921875" y2="5.65" width="0.254" layer="1"/>
+<wire x1="5.650921875" y1="5.65" x2="6.09309375" y2="5.807334375" width="0.254" layer="1" curve="39.173651"/>
+<wire x1="6.09309375" y1="5.807334375" x2="7.2112375" y2="6.718415625" width="0.254" layer="1"/>
+<wire x1="7.2112375" y1="6.718415625" x2="7.3" y2="6.75" width="0.254" layer="1" curve="-39.174024"/>
 </signal>
 <signal name="D-">
 <contactref element="R2" pad="P$2"/>
 <contactref element="U$2" pad="3"/>
 <wire x1="10.225" y1="6.75" x2="9.7" y2="6.75" width="0.254" layer="1"/>
-<wire x1="9.7" y1="6.75" x2="9.125" y2="6.5" width="0.254" layer="1"/>
-<wire x1="9.125" y1="6.5" x2="8.45" y2="6.5" width="0.254" layer="1"/>
-<wire x1="8.45" y1="6.5" x2="8.2" y2="6.75" width="0.254" layer="1"/>
+<wire x1="9.42036875" y1="6.641465625" x2="9.02100625" y2="6.6" width="0.254" layer="1" curve="-23.498537"/>
+<wire x1="9.02100625" y1="6.6" x2="8.7762125" y2="6.707678125" width="0.254" layer="1"/>
+<wire x1="8.7762125" y1="6.707678125" x2="8.574890625" y2="6.75" width="0.254" layer="1" curve="23.743424"/>
+<wire x1="8.574890625" y1="6.75" x2="8.2" y2="6.75" width="0.254" layer="1"/>
+<wire x1="9.7" y1="6.75" x2="9.42036875" y2="6.641465625" width="0.254" layer="1"/>
 </signal>
 <signal name="D+">
 <contactref element="U$2" pad="4"/>
 <contactref element="R1" pad="P$2"/>
-<wire x1="10.225" y1="6.25" x2="9.7" y2="6.25" width="0.254" layer="1"/>
-<wire x1="9.7" y1="6.25" x2="9" y2="5.95" width="0.254" layer="1"/>
-<wire x1="9" y1="5.95" x2="8.5" y2="5.75" width="0.254" layer="1"/>
-<wire x1="8.5" y1="5.75" x2="8.2" y2="5.75" width="0.254" layer="1"/>
+<wire x1="10.225" y1="6.25" x2="9.8142125" y2="6.25" width="0.254" layer="1"/>
+<wire x1="9.8142125" y1="6.25" x2="9.20710625" y2="5.95710625" width="0.254" layer="1" curve="45"/>
+<wire x1="9.20710625" y1="5.95710625" x2="8.80710625" y2="5.75" width="0.254" layer="1" curve="-45"/>
+<wire x1="8.80710625" y1="5.75" x2="8.2" y2="5.75" width="0.254" layer="1"/>
 </signal>
 <signal name="D10">
 <contactref element="S1" pad="P$4"/>
 <contactref element="S1" pad="P$3"/>
 <wire x1="20.2" y1="9" x2="20.482" y2="8.982" width="0.254" layer="1"/>
-<wire x1="20.444" y1="5.194" x2="20.2" y2="4.9" width="0.254" layer="1"/>
-<wire x1="20.444" y1="5.194" x2="21.25" y2="6" width="0.254" layer="1"/>
-<wire x1="21.25" y1="6" x2="21.25" y2="7.3" width="0.254" layer="1"/>
-<wire x1="21.25" y1="7.3" x2="21.25" y2="8" width="0.254" layer="1"/>
-<wire x1="21.25" y1="8" x2="20.25" y2="9" width="0.254" layer="1"/>
 <wire x1="20.25" y1="9" x2="20.2" y2="9" width="0.254" layer="1"/>
 <contactref element="U$2" pad="30"/>
-<wire x1="17.275" y1="6.25" x2="17.95" y2="6.25" width="0.254" layer="1"/>
-<wire x1="17.95" y1="6.25" x2="19" y2="7.3" width="0.254" layer="1"/>
-<wire x1="19" y1="7.3" x2="21.25" y2="7.3" width="0.254" layer="1"/>
+<wire x1="17.275" y1="6.25" x2="17.739928125" y2="6.25" width="0.254" layer="1"/>
+<wire x1="17.739928125" y1="6.25" x2="18.097034375" y2="6.400034375" width="0.254" layer="1" curve="45.578603"/>
+<wire x1="18.097034375" y1="6.400034375" x2="18.292965625" y2="6.599965625" width="0.254" layer="1"/>
+<wire x1="18.292965625" y1="6.599965625" x2="18.650071875" y2="6.75" width="0.254" layer="1" curve="-45.578859"/>
+<wire x1="18.650071875" y1="6.75" x2="19.170909375" y2="6.75" width="0.254" layer="1"/>
+<wire x1="19.170909375" y1="6.75" x2="19.3077" y2="6.69590625" width="0.254" layer="1" curve="-43.153124"/>
+<wire x1="19.3077" y1="6.69590625" x2="19.3523" y2="6.65409375" width="0.254" layer="1"/>
+<wire x1="20.653553125" y1="7.666446875" x2="20.346446875" y2="7.973553125" width="0.254" layer="1"/>
+<wire x1="20.346446875" y1="7.973553125" x2="20.2" y2="8.32710625" width="0.254" layer="1" curve="-45"/>
+<wire x1="20.2" y1="8.32710625" x2="20.2" y2="9" width="0.254" layer="1"/>
+<wire x1="20.8" y1="6.6" x2="20.8" y2="7.31289375" width="0.254" layer="1"/>
+<wire x1="20.8" y1="7.31289375" x2="20.653553125" y2="7.666446875" width="0.254" layer="1" curve="45"/>
+<wire x1="20.653553125" y1="5.57781875" x2="20.646446875" y2="5.5707125" width="0.254" layer="1"/>
+<wire x1="20.646446875" y1="5.5707125" x2="20.5" y2="5.217159375" width="0.254" layer="1" curve="45"/>
+<wire x1="20.5" y1="5.217159375" x2="20.5" y2="5.2" width="0.254" layer="1"/>
+<wire x1="20.5" y1="5.2" x2="20.2" y2="4.9" width="0.254" layer="1"/>
+<wire x1="19.3523" y1="6.65409375" x2="19.489090625" y2="6.6" width="0.254" layer="1" curve="43.153367"/>
+<wire x1="19.489090625" y1="6.6" x2="20.8" y2="6.6" width="0.254" layer="1"/>
+<wire x1="20.8" y1="6.6" x2="20.8" y2="5.931371875" width="0.254" layer="1"/>
+<wire x1="20.8" y1="5.931371875" x2="20.653553125" y2="5.57781875" width="0.254" layer="1" curve="-45"/>
 </signal>
 <signal name="AREF">
 <contactref element="U$2" pad="42"/>
@@ -807,30 +835,30 @@ Modified from Laen's PCB Order Design Rules</description>
 <signal name="N$2">
 <contactref element="U$2" pad="6"/>
 <contactref element="C5" pad="P$1"/>
-<wire x1="8.2" y1="4.75" x2="8.75" y2="4.75" width="0.254" layer="1"/>
-<wire x1="8.75" y1="4.75" x2="9.375" y2="5.25" width="0.254" layer="1"/>
-<wire x1="9.375" y1="5.25" x2="10.225" y2="5.25" width="0.254" layer="1"/>
+<wire x1="8.2" y1="4.75" x2="8.574609375" y2="4.75" width="0.254" layer="1"/>
+<wire x1="8.574609375" y1="4.75" x2="8.88695625" y2="4.859565625" width="0.254" layer="1" curve="38.659752"/>
+<wire x1="8.88695625" y1="4.859565625" x2="9.23804375" y2="5.140434375" width="0.254" layer="1"/>
+<wire x1="9.23804375" y1="5.140434375" x2="9.550390625" y2="5.25" width="0.254" layer="1" curve="-38.659752"/>
+<wire x1="9.550390625" y1="5.25" x2="10.225" y2="5.25" width="0.254" layer="1"/>
 </signal>
 <signal name="D13">
-<via x="20.3" y="7.98" extent="1-16" drill="0.35"/>
-<contactref element="WS1" pad="DATA"/>
-<wire x1="23.95" y1="8" x2="24" y2="7.95" width="0.254" layer="1"/>
-<contactref element="WS3" pad="DATA"/>
-<via x="23.5" y="7.95" extent="1-16" drill="1"/>
-<wire x1="23.5" y1="7.95" x2="24" y2="7.95" width="0.254" layer="1"/>
-<wire x1="24" y1="7.95" x2="24.05" y2="8" width="0.254" layer="1"/>
-<wire x1="24" y1="7.95" x2="24.05" y2="8" width="0.254" layer="16"/>
-<via x="25.25" y="7.95" extent="1-16" drill="1"/>
-<wire x1="20.3" y1="7.98" x2="21.75" y2="8" width="0.254" layer="16"/>
-<wire x1="21.75" y1="8" x2="21.77" y2="7.98" width="0.254" layer="16"/>
-<wire x1="21.77" y1="7.98" x2="23.2" y2="7.98" width="0.254" layer="16"/>
-<wire x1="23.2" y1="7.98" x2="23.5" y2="7.95" width="0.254" layer="16"/>
+<via x="20.07" y="7.28" extent="1-16" drill="0.35"/>
 <contactref element="U$2" pad="32"/>
-<wire x1="17.275" y1="7.25" x2="18" y2="7.25" width="0.254" layer="1"/>
-<wire x1="18" y1="7.25" x2="18.75" y2="7.98" width="0.254" layer="1"/>
-<wire x1="18.75" y1="7.98" x2="20.3" y2="7.98" width="0.254" layer="1"/>
-<wire x1="25.25" y1="7.95" x2="24" y2="7.95" width="0.1" layer="1"/>
-<wire x1="24" y1="7.95" x2="23.5" y2="7.95" width="0.1" layer="16"/>
+<wire x1="17.275" y1="7.25" x2="20.04" y2="7.25" width="0.254" layer="1"/>
+<wire x1="20.04" y1="7.25" x2="20.07" y2="7.28" width="0.254" layer="1"/>
+<wire x1="20.07" y1="7.28" x2="20.70710625" y2="6.64289375" width="0.4064" layer="16"/>
+<wire x1="20.70710625" y1="6.64289375" x2="21" y2="5.9357875" width="0.4064" layer="16" curve="-45"/>
+<wire x1="21" y1="5.9357875" x2="21.2374375" y2="5.3625625" width="0.4064" layer="16" curve="45"/>
+<wire x1="21.2374375" y1="5.3625625" x2="21.30710625" y2="5.29289375" width="0.254" layer="16"/>
+<wire x1="21.30710625" y1="5.29289375" x2="22.0142125" y2="5" width="0.4064" layer="16" curve="45"/>
+<contactref element="U$9" pad="DATA1"/>
+<contactref element="U$9" pad="DATA_1"/>
+<contactref element="U$9" pad="DATA_2"/>
+<contactref element="U$9" pad="DATA"/>
+<wire x1="22.0142125" y1="5" x2="23.9" y2="5" width="0.4064" layer="16"/>
+<wire x1="25.25" y1="5" x2="23.9" y2="5" width="0.254" layer="1"/>
+<wire x1="23.9" y1="5" x2="23.4" y2="5" width="0.254" layer="1"/>
+<wire x1="23.9" y1="5" x2="23.9" y2="5" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="VCC">
 <contactref element="C1" pad="1"/>
@@ -843,76 +871,82 @@ Modified from Laen's PCB Order Design Rules</description>
 <contactref element="C2" pad="P$1"/>
 <contactref element="C3" pad="P$1"/>
 <contactref element="C4" pad="P$1"/>
-<contactref element="WS1" pad="5V"/>
-<wire x1="17.25" y1="8.75" x2="10.25" y2="8.75" width="1.27" layer="16"/>
 <wire x1="17.25" y1="8.75" x2="17" y2="8.775" width="0.254" layer="1"/>
 <wire x1="17" y1="8.775" x2="16.25" y2="8.775" width="0.254" layer="1"/>
 <wire x1="12.25" y1="1.725" x2="12.25" y2="0.7" width="0.254" layer="1"/>
 <via x="12.25" y="0.7" extent="1-16" drill="0.35"/>
-<via x="7.25" y="2.77" extent="1-16" drill="0.35"/>
-<wire x1="7.25" y1="2.77" x2="10.5" y2="2.77" width="0.4" layer="16"/>
-<wire x1="10.5" y1="2.77" x2="12.25" y2="1" width="0.4" layer="16"/>
-<wire x1="12.25" y1="1" x2="12.25" y2="0.7" width="0.4" layer="16"/>
+<via x="7.25" y="2.87" extent="1-16" drill="0.35"/>
+<wire x1="7.25" y1="2.87" x2="10.191228125" y2="2.87" width="0.4" layer="16"/>
+<wire x1="10.191228125" y1="2.87" x2="10.646784375" y2="2.6215375" width="0.4" layer="16" curve="-45.325636"/>
+<wire x1="10.646784375" y1="2.6215375" x2="12.10555625" y2="1.14609375" width="0.4" layer="16"/>
+<wire x1="12.10555625" y1="1.14609375" x2="12.25" y2="0.79455625" width="0.4" layer="16" curve="-44.674364"/>
+<wire x1="12.25" y1="0.79455625" x2="12.25" y2="0.7" width="0.4" layer="16"/>
 <via x="10.25" y="8.75" extent="1-16" drill="0.35"/>
 <wire x1="11.25" y1="8.775" x2="10.225" y2="8.775" width="0.254" layer="1"/>
 <wire x1="10.225" y1="8.775" x2="10.25" y2="8.75" width="0.254" layer="1"/>
 <via x="17.25" y="8.75" extent="1-16" drill="0.35"/>
-<wire x1="19" y1="5.2" x2="18.65" y2="5.15" width="0.254" layer="1"/>
-<wire x1="18.65" y1="5.15" x2="18.25" y2="4.75" width="0.254" layer="1"/>
-<wire x1="18.25" y1="4.75" x2="18.25" y2="3.5" width="0.254" layer="1"/>
-<wire x1="17.275" y1="3.25" x2="18" y2="3.25" width="0.254" layer="1"/>
-<wire x1="18" y1="3.25" x2="18.25" y2="3.5" width="0.254" layer="1"/>
-<wire x1="8.2" y1="3.75" x2="8.5" y2="3.75" width="0.254" layer="1"/>
-<wire x1="8.5" y1="3.75" x2="9.5" y2="4.75" width="0.254" layer="1"/>
-<wire x1="9.5" y1="4.75" x2="10.225" y2="4.75" width="0.254" layer="1"/>
+<wire x1="18.25" y1="3.75" x2="18.25" y2="4.659209375" width="0.254" layer="1"/>
+<wire x1="18.25" y1="4.659209375" x2="18.6792875" y2="5.154184375" width="0.254" layer="1" curve="-81.869695"/>
+<wire x1="18.6792875" y1="5.154184375" x2="19" y2="5.2" width="0.254" layer="1"/>
+<wire x1="17.275" y1="3.25" x2="17.75" y2="3.25" width="0.254" layer="1"/>
+<wire x1="17.75" y1="3.25" x2="18.25" y2="3.75" width="0.254" layer="1" curve="90"/>
+<wire x1="8.2" y1="3.75" x2="8.71213125" y2="3.96213125" width="0.254" layer="1" curve="44.999825"/>
+<wire x1="8.71213125" y1="3.96213125" x2="9.441421875" y2="4.691421875" width="0.254" layer="1"/>
+<wire x1="9.441421875" y1="4.691421875" x2="9.58284375" y2="4.75" width="0.254" layer="1" curve="-45"/>
+<wire x1="9.58284375" y1="4.75" x2="10.225" y2="4.75" width="0.254" layer="1"/>
 <contactref element="U$8" pad="P$1"/>
-<wire x1="5.75" y1="8.75" x2="8.25" y2="8.75" width="1.27" layer="16"/>
-<wire x1="8.25" y1="8.75" x2="8.25" y2="8.9" width="0.98" layer="16"/>
-<wire x1="8.25" y1="8.9" x2="10" y2="8.9" width="0.98" layer="16"/>
-<wire x1="10" y1="8.9" x2="10" y2="8.75" width="0.98" layer="16"/>
-<wire x1="10" y1="8.75" x2="10.25" y2="8.75" width="1.27" layer="16"/>
-<contactref element="WS3" pad="5V"/>
-<wire x1="19.5" y1="6.25" x2="19.5" y2="5.7" width="0.254" layer="1"/>
-<wire x1="19.5" y1="5.7" x2="19" y2="5.2" width="0.254" layer="1"/>
-<wire x1="18" y1="7.9" x2="18.35" y2="7.9" width="1.27" layer="16"/>
-<wire x1="18.35" y1="7.9" x2="18.5" y2="7.75" width="1.27" layer="16"/>
-<wire x1="18.5" y1="7.75" x2="20.23076875" y2="6.596153125" width="1.27" layer="16"/>
-<wire x1="21.153846875" y1="6.596153125" x2="22.75" y2="5" width="1.27" layer="16"/>
-<wire x1="22.75" y1="5" x2="23.5" y2="5" width="1.27" layer="16"/>
-<via x="23.5" y="5" extent="1-16" drill="1"/>
-<wire x1="23.5" y1="5" x2="24" y2="5" width="0.254" layer="1"/>
 <contactref element="U$4" pad="PIN$1"/>
-<wire x1="5.47" y1="6.4" x2="5.47" y2="8.5" width="0.8128" layer="1"/>
-<wire x1="5.47" y1="8.5" x2="5.75" y2="8.75" width="0.8128" layer="1"/>
+<wire x1="5.47" y1="6.4" x2="5.47" y2="8.27613125" width="0.8128" layer="1"/>
+<wire x1="5.47" y1="8.27613125" x2="5.636990625" y2="8.6491" width="0.8128" layer="1" curve="-48.239567"/>
+<wire x1="5.636990625" y1="8.6491" x2="5.75" y2="8.75" width="0.8128" layer="1"/>
 <via x="5.47" y="6.4" extent="1-16" drill="0.35"/>
-<wire x1="7.25" y1="2.77" x2="6.23" y2="2.77" width="0.4" layer="16"/>
-<wire x1="6.23" y1="2.77" x2="5.25" y2="3.75" width="0.4" layer="16"/>
-<wire x1="5.25" y1="3.75" x2="5.25" y2="6.25" width="0.4" layer="16"/>
-<wire x1="5.25" y1="6.25" x2="5.47" y2="6.4" width="0.4" layer="16"/>
+<wire x1="7.25" y1="2.87" x2="6.33710625" y2="2.87" width="0.4" layer="16"/>
+<wire x1="6.33710625" y1="2.87" x2="5.983553125" y2="3.016446875" width="0.4" layer="16" curve="-45"/>
+<wire x1="5.983553125" y1="3.016446875" x2="5.396446875" y2="3.603553125" width="0.4" layer="16"/>
+<wire x1="5.396446875" y1="3.603553125" x2="5.25" y2="3.95710625" width="0.4" layer="16" curve="-45"/>
+<wire x1="5.25" y1="3.95710625" x2="5.25" y2="5.98575" width="0.4" layer="16"/>
+<wire x1="5.25" y1="5.98575" x2="5.46833125" y2="6.3988625" width="0.4" layer="16" curve="-55.713015"/>
+<wire x1="5.46833125" y1="6.3988625" x2="5.47" y2="6.4" width="0.4" layer="16"/>
 <wire x1="4.2" y1="6.3" x2="5.05" y2="6.3" width="0.4" layer="1"/>
 <wire x1="5.05" y1="6.3" x2="5.47" y2="6.4" width="0.4" layer="1"/>
-<wire x1="23.5" y1="5" x2="24" y2="5" width="0.8128" layer="16"/>
 <contactref element="U$12" pad="P$1"/>
-<via x="20.23076875" y="6.596153125" extent="1-16" drill="0.35"/>
-<wire x1="18" y1="7.9" x2="17.25" y2="8.75" width="1.27" layer="16"/>
-<wire x1="8.2" y1="3.75" x2="8.2" y2="3.45" width="0.254" layer="1"/>
-<wire x1="8.2" y1="3.45" x2="7.5" y2="2.75" width="0.254" layer="1"/>
-<wire x1="7.5" y1="2.75" x2="7.25" y2="2.77" width="0.254" layer="1"/>
-<wire x1="20.23076875" y1="6.596153125" x2="21.153846875" y2="6.596153125" width="1.27" layer="16"/>
-<wire x1="8.875" y1="9" x2="8.7" y2="9" width="0.4064" layer="1"/>
-<wire x1="8.7" y1="9" x2="8.2" y2="7.75" width="0.4064" layer="1"/>
+<via x="19.95076875" y="5.906153125" extent="1-16" drill="0.35"/>
+<wire x1="8.2" y1="3.75" x2="7.984815625" y2="3.200965625" width="0.254" layer="1" curve="-45.83031"/>
+<wire x1="7.984815625" y1="3.200965625" x2="7.67931875" y2="2.944196875" width="0.254" layer="1"/>
+<wire x1="7.67931875" y1="2.944196875" x2="7.25" y2="2.87" width="0.254" layer="1" curve="-44.169613"/>
+<wire x1="8.875" y1="9" x2="8.63500625" y2="8.837515625" width="0.4064" layer="1" curve="68.198719"/>
+<wire x1="8.63500625" y1="8.837515625" x2="8.2" y2="7.75" width="0.4064" layer="1"/>
 <wire x1="10.225" y1="8.775" x2="8.875" y2="8.775" width="0.4064" layer="1"/>
 <wire x1="8.875" y1="8.775" x2="8.875" y2="9" width="0.4064" layer="1"/>
-<via x="25.25" y="5" extent="1-16" drill="1"/>
 <wire x1="10.225" y1="7.25" x2="9.7" y2="7.25" width="0.254" layer="1"/>
-<wire x1="9.7" y1="7.25" x2="9.1" y2="7.11" width="0.254" layer="1"/>
-<wire x1="9.1" y1="7.11" x2="8.95" y2="7.11" width="0.254" layer="1"/>
-<wire x1="8.95" y1="7.11" x2="8.51" y2="7.5" width="0.254" layer="1"/>
-<wire x1="8.51" y1="7.5" x2="8.25" y2="7.75" width="0.254" layer="1"/>
+<wire x1="9.7" y1="7.25" x2="9.346053125" y2="7.113078125" width="0.254" layer="1"/>
+<wire x1="9.346053125" y1="7.113078125" x2="9.222440625" y2="7.1" width="0.254" layer="1" curve="-13.133641"/>
+<wire x1="9.222440625" y1="7.1" x2="8.600821875" y2="7.421315625" width="0.254" layer="1" curve="-41.552376"/>
+<wire x1="8.600821875" y1="7.421315625" x2="8.48" y2="7.53" width="0.254" layer="1"/>
+<wire x1="8.48" y1="7.53" x2="8.25" y2="7.75" width="0.254" layer="1"/>
 <wire x1="8.25" y1="7.75" x2="8.2" y2="7.75" width="0.254" layer="1"/>
-<wire x1="20.23076875" y1="6.596153125" x2="19.846153125" y2="6.596153125" width="0.254" layer="1"/>
-<wire x1="19.846153125" y1="6.596153125" x2="19.5" y2="6.25" width="0.254" layer="1"/>
-<wire x1="25.25" y1="5" x2="24" y2="5" width="0.1" layer="1"/>
+<polygon width="0.1" layer="16" thermals="no">
+<vertex x="5.2" y="10"/>
+<vertex x="25.2" y="10"/>
+<vertex x="25.2" y="6.4"/>
+<vertex x="20.7" y="6.4"/>
+<vertex x="20.6" y="6.3"/>
+<vertex x="20.6" y="5.7"/>
+<vertex x="20.4" y="5.5"/>
+<vertex x="19.7" y="5.5"/>
+<vertex x="18.8" y="6.4"/>
+<vertex x="16.6" y="6.4"/>
+<vertex x="16.6" y="7.3"/>
+<vertex x="15.9" y="8"/>
+<vertex x="5.2" y="8"/>
+</polygon>
+<wire x1="19.95076875" y1="5.906153125" x2="19.533184375" y2="5.733184375" width="0.254" layer="1" curve="45"/>
+<wire x1="19.533184375" y1="5.733184375" x2="19" y2="5.2" width="0.254" layer="1"/>
+<contactref element="U$9" pad="5V_1"/>
+<contactref element="U$9" pad="5V1"/>
+<contactref element="U$9" pad="5V"/>
+<contactref element="U$9" pad="5V_2"/>
+<wire x1="23.9" y1="7.5" x2="23.9" y2="7.5" width="0" layer="19" extent="1-16"/>
 </signal>
 <signal name="N$3">
 </signal>
@@ -927,33 +961,40 @@ Modified from Laen's PCB Order Design Rules</description>
 <signal name="D11">
 <contactref element="U$2" pad="12"/>
 <contactref element="U$14" pad="P$1"/>
-<wire x1="2" y1="3.75" x2="4.5" y2="3.75" width="0.254" layer="16"/>
-<wire x1="4.5" y1="3.75" x2="6.25" y2="2" width="0.254" layer="16"/>
-<wire x1="6.25" y1="2" x2="10" y2="2" width="0.254" layer="16"/>
+<wire x1="2" y1="3.75" x2="4.29289375" y2="3.75" width="0.254" layer="16"/>
+<wire x1="4.29289375" y1="3.75" x2="4.646446875" y2="3.603553125" width="0.254" layer="16" curve="-45"/>
+<wire x1="4.646446875" y1="3.603553125" x2="6.103553125" y2="2.146446875" width="0.254" layer="16"/>
+<wire x1="6.103553125" y1="2.146446875" x2="6.45710625" y2="2" width="0.254" layer="16" curve="45"/>
+<wire x1="6.45710625" y1="2" x2="10" y2="2" width="0.254" layer="16"/>
 <via x="10" y="2" extent="1-16" drill="0.35"/>
-<wire x1="10" y1="2" x2="10.5" y2="2" width="0.254" layer="1"/>
-<wire x1="11.25" y1="1.85" x2="10.65" y2="1.85" width="0.254" layer="1"/>
-<wire x1="10.65" y1="1.85" x2="10.5" y2="2" width="0.254" layer="1"/>
+<wire x1="11.25" y1="1.85" x2="10.73284375" y2="1.85" width="0.254" layer="1"/>
+<wire x1="10.73284375" y1="1.85" x2="10.591421875" y2="1.908578125" width="0.254" layer="1" curve="-45"/>
+<wire x1="10.591421875" y1="1.908578125" x2="10.558578125" y2="1.941421875" width="0.254" layer="1"/>
+<wire x1="10.558578125" y1="1.941421875" x2="10.41715625" y2="2" width="0.254" layer="1" curve="45"/>
+<wire x1="10.41715625" y1="2" x2="10" y2="2" width="0.254" layer="1"/>
 </signal>
 <signal name="D7">
 <contactref element="U$2" pad="1"/>
 <contactref element="U$10" pad="P$1"/>
-<wire x1="2" y1="6.25" x2="4.35" y2="6.25" width="0.254" layer="16"/>
-<wire x1="4.35" y1="6.25" x2="5.75" y2="7.75" width="0.254" layer="16"/>
-<wire x1="5.75" y1="7.75" x2="9.125" y2="7.75" width="0.254" layer="16"/>
-<wire x1="9.125" y1="7.75" x2="9.14" y2="7.85" width="0.254" layer="16"/>
-<via x="9.14" y="7.85" extent="1-16" drill="0.35"/>
-<wire x1="9.14" y1="7.85" x2="9.14" y2="7.75" width="0.254" layer="1"/>
+<wire x1="2" y1="6.25" x2="4.132725" y2="6.25" width="0.254" layer="16"/>
+<wire x1="4.132725" y1="6.25" x2="4.49825" y2="6.408840625" width="0.254" layer="16" curve="46.974707"/>
+<wire x1="4.49825" y1="6.408840625" x2="5.60175" y2="7.491159375" width="0.254" layer="16"/>
+<wire x1="5.60175" y1="7.491159375" x2="5.967275" y2="7.65" width="0.254" layer="16" curve="-46.974593"/>
+<wire x1="5.967275" y1="7.65" x2="9.125" y2="7.65" width="0.254" layer="16"/>
+<wire x1="9.125" y1="7.65" x2="9.18" y2="7.82" width="0.254" layer="16"/>
+<via x="9.18" y="7.82" extent="1-16" drill="0.35"/>
+<wire x1="9.18" y1="7.82" x2="9.14" y2="7.75" width="0.254" layer="1"/>
 <wire x1="9.14" y1="7.75" x2="10.225" y2="7.75" width="0.254" layer="1"/>
 </signal>
 <signal name="A10">
 <contactref element="U$2" pad="29"/>
-<via x="18.8" y="6.1" extent="1-16" drill="0.35"/>
+<via x="18.8" y="6.07" extent="1-16" drill="0.35"/>
 <contactref element="U$11" pad="P$1"/>
 <wire x1="18" y1="5" x2="18.55" y2="5.5" width="0.254" layer="16"/>
-<wire x1="18.55" y1="5.5" x2="18.8" y2="6.1" width="0.254" layer="16"/>
-<wire x1="17.275" y1="5.75" x2="18.3" y2="5.75" width="0.254" layer="1"/>
-<wire x1="18.3" y1="5.75" x2="18.8" y2="6.1" width="0.254" layer="1"/>
+<wire x1="18.55" y1="5.5" x2="18.8" y2="6.07" width="0.254" layer="16"/>
+<wire x1="17.275" y1="5.75" x2="18.149875" y2="5.75" width="0.254" layer="1"/>
+<wire x1="18.149875" y1="5.75" x2="18.425296875" y2="5.832696875" width="0.254" layer="1" curve="33.424985"/>
+<wire x1="18.425296875" y1="5.832696875" x2="18.8" y2="6.07" width="0.254" layer="1"/>
 </signal>
 <signal name="SHIELD">
 <contactref element="U$4" pad="PAD$8"/>
@@ -990,6 +1031,29 @@ Modified from Laen's PCB Order Design Rules</description>
 <wire x1="4.2" y1="7.5" x2="4.2" y2="7.5" width="0" layer="19" extent="1-16"/>
 </signal>
 </signals>
+<errors>
+<approved hash="3,16,7e8e077606a17f59"/>
+<approved hash="3,16,df2e07d607a6df5e"/>
+<approved hash="5,1,790bd713719bf6b8"/>
+<approved hash="5,1,f77134fa38526f2a"/>
+<approved hash="5,1,330e78872257cd52"/>
+<approved hash="4,1,979f681d6e70abaa"/>
+<approved hash="4,1,9fbd681f6f88a3de"/>
+<approved hash="4,1,70c57e4ee6830a91"/>
+<approved hash="4,1,b7642e26b1e3de12"/>
+<approved hash="4,1,dde0af5da35ad1e7"/>
+<approved hash="4,1,c145a3baafbdcd42"/>
+<approved hash="4,1,f58a97079b00f98d"/>
+<approved hash="19,16,c93997ea27c57ac2"/>
+<approved hash="19,16,86e7b6a36d5f44f5"/>
+<approved hash="19,16,80fb0aef65944a72"/>
+<approved hash="4,16,70c57e4ee6830a91"/>
+<approved hash="4,16,9fbd681f6f88a3de"/>
+<approved hash="4,16,979f681d6e70abaa"/>
+<approved hash="4,16,c145a3baafbdcd42"/>
+<approved hash="4,16,dde0af5da35ad1e7"/>
+<approved hash="4,16,f58a97079b00f98d"/>
+</errors>
 </board>
 </drawing>
 <compatibility>
diff --git a/pcb/BlinkyBoard.sch b/pcb/BlinkyBoard.sch
index 7733b13..b7293fe 100644
--- a/pcb/BlinkyBoard.sch
+++ b/pcb/BlinkyBoard.sch
@@ -553,11 +553,6 @@ by exp-project-lbr.ulp</description>
 <pad name="PAD@15" x="0.5" y="-1.5" drill="0.35" diameter="2" shape="square" stop="no" thermals="no"/>
 <pad name="PAD@16" x="1.5" y="-1.5" drill="0.35" diameter="2" stop="no" thermals="no"/>
 </package>
-<package name="WS2811_CONNECTOR">
-<smd name="DATA" x="0" y="2.95" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-<smd name="5V" x="0" y="0" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-<smd name="GND" x="0" y="-2.95" dx="2.5" dy="1" layer="1" roundness="50" thermals="no" cream="no"/>
-</package>
 <package name="CRYSTAL_3225">
 <smd name="P$1" x="-1.1" y="-0.8" dx="1.4" dy="1.15" layer="1"/>
 <smd name="P$2" x="1.1" y="-0.8" dx="1.4" dy="1.15" layer="1"/>
@@ -736,10 +731,19 @@ by exp-project-lbr.ulp</description>
 <package name="TEST_PAD_SMT">
 <smd name="P$1" x="0" y="0" dx="1.8" dy="3" layer="1" roundness="50" thermals="no" cream="no"/>
 </package>
-<package name="BLINKYTILE_PCB_EDGE">
-<smd name="P$1" x="-5.08" y="0" dx="6.5" dy="3.6" layer="1" thermals="no" cream="no"/>
-<smd name="P$2" x="0" y="0" dx="1.66" dy="3.6" layer="1" thermals="no" cream="no"/>
-<smd name="P$3" x="5.08" y="0" dx="6.5" dy="3.6" layer="1" thermals="no" cream="no"/>
+<package name="WS2812B_CONNECTOR">
+<smd name="5V" x="0" y="2.5" dx="2.7" dy="1.6" layer="16" roundness="25" rot="R180" thermals="no" cream="no"/>
+<smd name="DATA" x="0" y="0" dx="2.7" dy="1.6" layer="1" roundness="25" thermals="no" cream="no"/>
+<smd name="GND" x="0" y="-2.5" dx="2.7" dy="1.6" layer="1" roundness="50" thermals="no" cream="no"/>
+<pad name="5V_1" x="1.35" y="2.5" drill="1" thermals="no"/>
+<pad name="DATA_1" x="1.35" y="0" drill="1" diameter="1.5" thermals="no"/>
+<pad name="GND_1" x="1.35" y="-2.5" drill="1" diameter="1.5" thermals="no"/>
+<pad name="5V_2" x="-0.5" y="2.5" drill="1" thermals="no"/>
+<pad name="DATA_2" x="-0.5" y="0" drill="1" diameter="1.5" thermals="no"/>
+<pad name="GND_2" x="-0.5" y="-2.5" drill="1" diameter="1.5" thermals="no"/>
+<smd name="5V1" x="0" y="2.5" dx="2.7" dy="1.6" layer="1" roundness="25" thermals="no" cream="no"/>
+<smd name="DATA1" x="0" y="0" dx="2.7" dy="1.6" layer="16" roundness="25" rot="R180" thermals="no" cream="no"/>
+<smd name="GND1" x="0" y="-2.5" dx="2.7" dy="1.6" layer="16" roundness="50" rot="R180" thermals="no" cream="no"/>
 </package>
 </packages>
 <symbols>
@@ -815,15 +819,6 @@ by exp-project-lbr.ulp</description>
 <text x="-20.32" y="-63.5" size="1.778" layer="96">&gt;VALUE</text>
 <text x="-20.32" y="26.162" size="1.778" layer="95">&gt;NAME</text>
 </symbol>
-<symbol name="WS2811_CONNECTOR">
-<pin name="DATA" x="-7.62" y="2.54" visible="pad" length="middle"/>
-<pin name="5V" x="-7.62" y="0" visible="pad" length="middle"/>
-<pin name="GND" x="-7.62" y="-2.54" visible="pad" length="middle"/>
-<wire x1="-2.54" y1="5.08" x2="0" y2="5.08" width="0.254" layer="94"/>
-<wire x1="0" y1="5.08" x2="0" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="0" y1="-5.08" x2="-2.54" y2="-5.08" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="-5.08" x2="-2.54" y2="5.08" width="0.254" layer="94"/>
-</symbol>
 <symbol name="MICRO_USB">
 <wire x1="-7.62" y1="7.62" x2="2.54" y2="7.62" width="0.254" layer="94"/>
 <wire x1="2.54" y1="7.62" x2="2.54" y2="-7.62" width="0.254" layer="94"/>
@@ -869,6 +864,15 @@ by exp-project-lbr.ulp</description>
 <symbol name="TEST_PAD_SMT">
 <pin name="P$1" x="-5.08" y="0" length="middle"/>
 </symbol>
+<symbol name="WS2812B_CONNECTOR">
+<pin name="DATA" x="-5.08" y="0" visible="pad" length="middle"/>
+<pin name="5V" x="-5.08" y="2.54" visible="pad" length="middle"/>
+<pin name="GND" x="-5.08" y="-2.54" visible="pad" length="middle"/>
+<wire x1="0" y1="5.08" x2="5.08" y2="5.08" width="0.254" layer="94"/>
+<wire x1="5.08" y1="5.08" x2="5.08" y2="-5.08" width="0.254" layer="94"/>
+<wire x1="5.08" y1="-5.08" x2="0" y2="-5.08" width="0.254" layer="94"/>
+<wire x1="0" y1="-5.08" x2="0" y2="5.08" width="0.254" layer="94"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="CRYSTAL_4PAD">
@@ -1113,33 +1117,6 @@ by exp-project-lbr.ulp</description>
 </device>
 </devices>
 </deviceset>
-<deviceset name="WS2811_CONNECTOR">
-<gates>
-<gate name="G$1" symbol="WS2811_CONNECTOR" x="2.54" y="0"/>
-</gates>
-<devices>
-<device name="STRIP" package="WS2811_CONNECTOR">
-<connects>
-<connect gate="G$1" pin="5V" pad="5V"/>
-<connect gate="G$1" pin="DATA" pad="DATA"/>
-<connect gate="G$1" pin="GND" pad="GND"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="BLINKYTILE_EDGE" package="BLINKYTILE_PCB_EDGE">
-<connects>
-<connect gate="G$1" pin="5V" pad="P$3"/>
-<connect gate="G$1" pin="DATA" pad="P$2"/>
-<connect gate="G$1" pin="GND" pad="P$1"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 <deviceset name="MICRO_USB">
 <gates>
 <gate name="G$1" symbol="MICRO_USB" x="-2.54" y="0"/>
@@ -1235,6 +1212,23 @@ by exp-project-lbr.ulp</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="WS2812B_CONNECTOR">
+<gates>
+<gate name="G$1" symbol="WS2812B_CONNECTOR" x="-2.54" y="0"/>
+</gates>
+<devices>
+<device name="" package="WS2812B_CONNECTOR">
+<connects>
+<connect gate="G$1" pin="5V" pad="5V 5V1 5V_1 5V_2"/>
+<connect gate="G$1" pin="DATA" pad="DATA DATA1 DATA_1 DATA_2"/>
+<connect gate="G$1" pin="GND" pad="GND GND1 GND_1 GND_2"/>
+</connects>
+<technologies>
+<technology name=""/>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 <library name="adafruit">
@@ -3522,7 +3516,6 @@ Metric Code Size 5664</description>
 <part name="S1" library="blinkyboard" deviceset="GLOWBOARD_KMR211G" device="" value="Normally open"/>
 <part name="Q1" library="blinkiverse" deviceset="CRYSTAL_4PAD" device="2520" value="16 MHz"/>
 <part name="C4" library="blinkiverse" deviceset="C_US" device="" value="0.1uF"/>
-<part name="WS1" library="blinkiverse" deviceset="WS2811_CONNECTOR" device="STRIP"/>
 <part name="P+3" library="supply1" deviceset="VCC" device=""/>
 <part name="GND4" library="supply1" deviceset="GND" device=""/>
 <part name="P+4" library="supply1" deviceset="VCC" device=""/>
@@ -3537,7 +3530,6 @@ Metric Code Size 5664</description>
 <part name="P+2" library="supply1" deviceset="VCC" device=""/>
 <part name="GND1" library="supply1" deviceset="GND" device=""/>
 <part name="GND2" library="supply1" deviceset="GND" device=""/>
-<part name="WS3" library="blinkiverse" deviceset="WS2811_CONNECTOR" device="STRIP"/>
 <part name="P+5" library="supply1" deviceset="VCC" device=""/>
 <part name="U$10" library="blinkiverse" deviceset="TEST_PAD_SMT" device=""/>
 <part name="U$11" library="blinkiverse" deviceset="TEST_PAD_SMT" device=""/>
@@ -3545,6 +3537,7 @@ Metric Code Size 5664</description>
 <part name="U$13" library="blinkiverse" deviceset="TEST_PAD_SMT" device=""/>
 <part name="U$14" library="blinkiverse" deviceset="TEST_PAD_SMT" device=""/>
 <part name="GND9" library="supply1" deviceset="GND" device=""/>
+<part name="U$9" library="blinkiverse" deviceset="WS2812B_CONNECTOR" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -3581,7 +3574,6 @@ Metric Code Size 5664</description>
 <instance part="S1" gate="1" x="134.62" y="78.74" rot="MR0"/>
 <instance part="Q1" gate="G$1" x="15.24" y="71.12" rot="R90"/>
 <instance part="C4" gate="G$1" x="-20.32" y="121.92"/>
-<instance part="WS1" gate="G$1" x="172.72" y="33.02"/>
 <instance part="P+3" gate="VCC" x="162.56" y="43.18"/>
 <instance part="GND4" gate="1" x="162.56" y="25.4"/>
 <instance part="P+4" gate="VCC" x="-20.32" y="73.66"/>
@@ -3596,7 +3588,6 @@ Metric Code Size 5664</description>
 <instance part="P+2" gate="VCC" x="101.6" y="137.16" rot="R90"/>
 <instance part="GND1" gate="1" x="101.6" y="132.08" rot="R270"/>
 <instance part="GND2" gate="1" x="170.18" y="81.28"/>
-<instance part="WS3" gate="G$1" x="182.88" y="33.02"/>
 <instance part="P+5" gate="VCC" x="180.34" y="106.68"/>
 <instance part="U$10" gate="G$1" x="187.96" y="91.44"/>
 <instance part="U$11" gate="G$1" x="187.96" y="96.52"/>
@@ -3604,6 +3595,7 @@ Metric Code Size 5664</description>
 <instance part="U$13" gate="G$1" x="187.96" y="86.36"/>
 <instance part="U$14" gate="G$1" x="187.96" y="93.98"/>
 <instance part="GND9" gate="1" x="20.32" y="63.5"/>
+<instance part="U$9" gate="G$1" x="172.72" y="33.02"/>
 </instances>
 <busses>
 </busses>
@@ -3676,13 +3668,10 @@ Metric Code Size 5664</description>
 <junction x="33.02" y="10.16"/>
 </segment>
 <segment>
-<pinref part="WS1" gate="G$1" pin="GND"/>
-<wire x1="165.1" y1="30.48" x2="162.56" y2="30.48" width="0.1524" layer="91"/>
 <pinref part="GND4" gate="1" pin="GND"/>
 <wire x1="162.56" y1="30.48" x2="162.56" y2="27.94" width="0.1524" layer="91"/>
-<pinref part="WS3" gate="G$1" pin="GND"/>
-<wire x1="175.26" y1="30.48" x2="165.1" y2="30.48" width="0.1524" layer="91"/>
-<junction x="165.1" y="30.48"/>
+<pinref part="U$9" gate="G$1" pin="GND"/>
+<wire x1="162.56" y1="30.48" x2="167.64" y2="30.48" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="U$4" gate="G$1" pin="GND"/>
@@ -3823,18 +3812,15 @@ Metric Code Size 5664</description>
 </net>
 <net name="D13" class="0">
 <segment>
-<pinref part="WS1" gate="G$1" pin="DATA"/>
-<wire x1="165.1" y1="35.56" x2="157.48" y2="35.56" width="0.1524" layer="91"/>
-<label x="157.48" y="35.56" size="1.778" layer="95" rot="R180" xref="yes"/>
-<pinref part="WS3" gate="G$1" pin="DATA"/>
-<wire x1="175.26" y1="35.56" x2="165.1" y2="35.56" width="0.1524" layer="91"/>
-<junction x="165.1" y="35.56"/>
-</segment>
-<segment>
 <pinref part="U$2" gate="G$1" pin="(ICP3/CLK0/OC4A)PC7"/>
 <wire x1="96.52" y1="60.96" x2="99.06" y2="60.96" width="0.1524" layer="91"/>
 <label x="99.06" y="60.96" size="1.778" layer="95" xref="yes"/>
 </segment>
+<segment>
+<wire x1="167.64" y1="33.02" x2="157.48" y2="33.02" width="0.1524" layer="91"/>
+<label x="157.48" y="33.02" size="1.778" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$9" gate="G$1" pin="DATA"/>
+</segment>
 </net>
 <net name="VCC" class="0">
 <segment>
@@ -3890,13 +3876,10 @@ Metric Code Size 5664</description>
 <pinref part="C4" gate="G$1" pin="1"/>
 </segment>
 <segment>
-<pinref part="WS1" gate="G$1" pin="5V"/>
-<wire x1="165.1" y1="33.02" x2="162.56" y2="33.02" width="0.1524" layer="91"/>
 <pinref part="P+3" gate="VCC" pin="VCC"/>
-<wire x1="162.56" y1="33.02" x2="162.56" y2="40.64" width="0.1524" layer="91"/>
-<pinref part="WS3" gate="G$1" pin="5V"/>
-<wire x1="165.1" y1="33.02" x2="175.26" y2="33.02" width="0.1524" layer="91"/>
-<junction x="165.1" y="33.02"/>
+<wire x1="162.56" y1="35.56" x2="162.56" y2="40.64" width="0.1524" layer="91"/>
+<pinref part="U$9" gate="G$1" pin="5V"/>
+<wire x1="162.56" y1="35.56" x2="167.64" y2="35.56" width="0.1524" layer="91"/>
 </segment>
 <segment>
 <pinref part="P+4" gate="VCC" pin="VCC"/>
@@ -3955,6 +3938,20 @@ Metric Code Size 5664</description>
 </nets>
 </sheet>
 </sheets>
+<errors>
+<approved hash="204,1,35.56,55.88,U$2,AREF,,,,"/>
+<approved hash="104,1,35.56,60.96,U$2,AVCC,VCC,,,"/>
+<approved hash="104,1,35.56,63.5,U$2,AVCC1,VCC,,,"/>
+<approved hash="104,1,35.56,48.26,U$2,GND1,GND,,,"/>
+<approved hash="104,1,35.56,45.72,U$2,GND2,GND,,,"/>
+<approved hash="104,1,35.56,83.82,U$2,GND3,GND,,,"/>
+<approved hash="104,1,35.56,10.16,U$2,PAD,GND,,,"/>
+<approved hash="104,1,35.56,33.02,U$2,UGND,GND,,,"/>
+<approved hash="104,1,35.56,40.64,U$2,UVCC,VCC,,,"/>
+<approved hash="104,1,35.56,86.36,U$2,VCC1,VCC,,,"/>
+<approved hash="106,1,-20.32,25.4,SHIELD,,,,,"/>
+<approved hash="115,1,68.476,46.886,FRAME1,,,,,"/>
+</errors>
 </schematic>
 </drawing>
 </eagle>