diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -4610,7 +4610,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <part name="SUPPLY3" library="SparkFun-Aesthetics" deviceset="V_BATT" device=""/>
 <part name="GND2" library="SparkFun-Aesthetics" deviceset="GND" device=""/>
 <part name="SUPPLY4" library="SparkFun-Aesthetics" deviceset="3.3V" device=""/>
-<part name="U$3" library="microbuilder" deviceset="GND" device=""/>
 <part name="U$4" library="microbuilder" deviceset="GND" device=""/>
 <part name="U$5" library="microbuilder" deviceset="GND" device=""/>
 <part name="D1" library="SparkFun-DiscreteSemi" deviceset="DIODE" device="SOD523"/>
@@ -4683,7 +4682,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="SUPPLY3" gate="G$1" x="116.84" y="124.46"/>
 <instance part="GND2" gate="1" x="116.84" y="106.68"/>
 <instance part="SUPPLY4" gate="G$1" x="142.24" y="124.46"/>
-<instance part="U$3" gate="G$1" x="129.54" y="40.64"/>
 <instance part="U$4" gate="G$1" x="165.1" y="40.64"/>
 <instance part="U$5" gate="G$1" x="139.7" y="22.86"/>
 <instance part="D1" gate="G$1" x="132.08" y="27.94" rot="R180"/>
@@ -4717,7 +4715,7 @@ Standard 0603 ceramic capacitor, and 0.1
 <instance part="U$11" gate="G$1" x="-48.26" y="58.42"/>
 <instance part="GND6" gate="1" x="139.7" y="76.2"/>
 <instance part="SUPPLY10" gate="G$1" x="139.7" y="96.52"/>
-<instance part="U$12" gate="G$1" x="91.44" y="60.96"/>
+<instance part="U$12" gate="G$1" x="96.52" y="55.88"/>
 <instance part="U$13" gate="G$1" x="45.72" y="-2.54"/>
 <instance part="GND7" gate="1" x="104.14" y="109.22"/>
 <instance part="GND8" gate="1" x="147.32" y="106.68"/>
@@ -4802,12 +4800,6 @@ Standard 0603 ceramic capacitor, and 0.1
 <pinref part="GND2" gate="1" pin="GND"/>
 </segment>
 <segment>
-<pinref part="SW1" gate="SW" pin="CENTER"/>
-<pinref part="U$3" gate="G$1" pin="GND"/>
-<wire x1="139.7" y1="45.72" x2="129.54" y2="45.72" width="0.1524" layer="91"/>
-<wire x1="129.54" y1="45.72" x2="129.54" y2="43.18" width="0.1524" layer="91"/>
-</segment>
-<segment>
 <pinref part="SW1" gate="SW" pin="COMMON"/>
 <pinref part="U$4" gate="G$1" pin="GND"/>
 <wire x1="154.94" y1="45.72" x2="165.1" y2="45.72" width="0.1524" layer="91"/>
@@ -4904,8 +4896,7 @@ Standard 0603 ceramic capacitor, and 0.1
 </segment>
 <segment>
 <pinref part="U$1" gate="G$1" pin="BOOT0"/>
-<wire x1="83.82" y1="58.42" x2="86.36" y2="58.42" width="0.1524" layer="91"/>
-<wire x1="86.36" y1="58.42" x2="91.44" y2="63.5" width="0.1524" layer="91"/>
+<wire x1="83.82" y1="58.42" x2="96.52" y2="58.42" width="0.1524" layer="91"/>
 <pinref part="U$12" gate="G$1" pin="GND"/>
 </segment>
 <segment>
@@ -5275,12 +5266,10 @@ Standard 0603 ceramic capacitor, and 0.1
 <wire x1="175.26" y1="132.08" x2="177.8" y2="132.08" width="0.1524" layer="91"/>
 <label x="175.26" y="132.08" size="1.27" layer="95" rot="R180" xref="yes"/>
 </segment>
-</net>
-<net name="LED_ACT" class="0">
 <segment>
-<pinref part="R5" gate="G$1" pin="1"/>
-<wire x1="175.26" y1="121.92" x2="177.8" y2="121.92" width="0.1524" layer="91"/>
-<label x="175.26" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$1" gate="G$1" pin="I2C1_SDA/PB9"/>
+<wire x1="86.36" y1="63.5" x2="83.82" y2="63.5" width="0.1524" layer="91"/>
+<label x="86.36" y="63.5" size="1.016" layer="95" xref="yes"/>
 </segment>
 </net>
 <net name="!CS" class="0">
@@ -5380,6 +5369,30 @@ Standard 0603 ceramic capacitor, and 0.1
 <label x="86.36" y="10.16" size="1.016" layer="95" xref="yes"/>
 </segment>
 </net>
+<net name="LED_STAT" class="0">
+<segment>
+<pinref part="U$1" gate="G$1" pin="JTDI/PA15"/>
+<wire x1="86.36" y1="43.18" x2="83.82" y2="43.18" width="0.1524" layer="91"/>
+<label x="86.36" y="43.18" size="1.016" layer="95" xref="yes"/>
+</segment>
+<segment>
+<pinref part="R5" gate="G$1" pin="1"/>
+<wire x1="175.26" y1="121.92" x2="177.8" y2="121.92" width="0.1524" layer="91"/>
+<label x="175.26" y="121.92" size="1.27" layer="95" rot="R180" xref="yes"/>
+</segment>
+</net>
+<net name="SW-BTN" class="0">
+<segment>
+<pinref part="SW1" gate="SW" pin="CENTER"/>
+<wire x1="139.7" y1="45.72" x2="129.54" y2="45.72" width="0.1524" layer="91"/>
+<label x="129.54" y="45.72" size="1.016" layer="95" rot="R180" xref="yes"/>
+</segment>
+<segment>
+<pinref part="U$1" gate="G$1" pin="JTDO/PB3"/>
+<wire x1="83.82" y1="45.72" x2="86.36" y2="45.72" width="0.1524" layer="91"/>
+<label x="86.36" y="45.72" size="1.016" layer="95" xref="yes"/>
+</segment>
+</net>
 </nets>
 </sheet>
 </sheets>