diff --git a/zoncoffee.sch b/zoncoffee.sch
--- a/zoncoffee.sch
+++ b/zoncoffee.sch
@@ -5751,9 +5751,8 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="281.94" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<label x="-167.64" y="53.34" size="1.016" layer="95" rot="R180" xref="yes"/>
-<wire x1="-167.64" y1="53.34" x2="-162.56" y2="53.34" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="PB2"/>
+<label x="-187.96" y="50.8" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="-187.96" y1="50.8" x2="-182.88" y2="50.8" width="0.1524" layer="91"/>
 </segment>
 </net>
 <net name="SWCLK" class="0">
@@ -5793,9 +5792,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="RES#"/>
 </segment>
 <segment>
-<label x="-68.58" y="83.82" size="1.016" layer="95" xref="yes"/>
-<wire x1="-68.58" y1="83.82" x2="-76.2" y2="83.82" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SCL/USART1_TX/PB6"/>
+<label x="-170.18" y="71.12" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="-170.18" y1="71.12" x2="-162.56" y2="71.12" width="0.1524" layer="91"/>
+<pinref part="U$13" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
 </segment>
 </net>
 <net name="D/!C" class="0">
@@ -5805,9 +5804,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="D/C#"/>
 </segment>
 <segment>
-<label x="-68.58" y="86.36" size="1.016" layer="95" xref="yes"/>
-<wire x1="-68.58" y1="86.36" x2="-76.2" y2="86.36" width="0.1524" layer="91"/>
-<pinref part="U$13" gate="G$1" pin="I2C1_SDA/USART1_RX/PB7"/>
+<label x="-170.18" y="68.58" size="1.016" layer="95" rot="R180" xref="yes"/>
+<wire x1="-170.18" y1="68.58" x2="-162.56" y2="68.58" width="0.1524" layer="91"/>
+<pinref part="U$13" gate="G$1" pin="PA4/ADC4"/>
 </segment>
 </net>
 <net name="T-" class="0">
@@ -5866,9 +5865,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="SDIN"/>
 </segment>
 <segment>
-<wire x1="-76.2" y1="81.28" x2="-66.04" y2="81.28" width="0.1524" layer="91"/>
-<label x="-66.04" y="81.28" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MOSI/PB5"/>
+<wire x1="-162.56" y1="60.96" x2="-172.72" y2="60.96" width="0.1524" layer="91"/>
+<label x="-172.72" y="60.96" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="PA7/ADC7/SPI1_MOSI"/>
 </segment>
 </net>
 <net name="SPI_MISO" class="0">
@@ -5878,9 +5877,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="96.52" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-76.2" y1="78.74" x2="-66.04" y2="78.74" width="0.1524" layer="91"/>
-<label x="-66.04" y="78.74" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
+<wire x1="-162.56" y1="63.5" x2="-172.72" y2="63.5" width="0.1524" layer="91"/>
+<label x="-172.72" y="63.5" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="PA6/ADC6/SPI1_MISO"/>
 </segment>
 </net>
 <net name="SPI_SCK" class="0">
@@ -5895,9 +5894,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="101.6" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-76.2" y1="76.2" x2="-66.04" y2="76.2" width="0.1524" layer="91"/>
-<label x="-66.04" y="76.2" size="1.27" layer="95" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="SPI1_SCK/PB3"/>
+<wire x1="-162.56" y1="66.04" x2="-172.72" y2="66.04" width="0.1524" layer="91"/>
+<label x="-172.72" y="66.04" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="PA5/ADC5/SPI1_SCK"/>
 </segment>
 </net>
 <net name="!CS_OLED" class="0">
@@ -5907,9 +5906,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <pinref part="LCD1" gate="G$1" pin="CS#"/>
 </segment>
 <segment>
-<pinref part="U$13" gate="G$1" pin="USART2_RX/PA15"/>
-<wire x1="-76.2" y1="73.66" x2="-66.04" y2="73.66" width="0.1524" layer="91"/>
-<label x="-66.04" y="73.66" size="1.27" layer="95" xref="yes"/>
+<wire x1="-162.56" y1="73.66" x2="-172.72" y2="73.66" width="0.1524" layer="91"/>
+<label x="-172.72" y="73.66" size="1.27" layer="95" rot="R180" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="PA2/ADC2/USART2_TX"/>
 </segment>
 </net>
 <net name="!CS_MAX" class="0">
@@ -5919,9 +5918,9 @@ REPLACE WITH 1UF 6v ARR</text>
 <label x="251.46" y="99.06" size="1.016" layer="95" rot="R180" xref="yes"/>
 </segment>
 <segment>
-<wire x1="-162.56" y1="71.12" x2="-172.72" y2="71.12" width="0.1524" layer="91"/>
-<label x="-172.72" y="71.12" size="1.27" layer="95" rot="R180" xref="yes"/>
-<pinref part="U$13" gate="G$1" pin="PA3/ADC3/USART2_RX"/>
+<wire x1="-76.2" y1="78.74" x2="-66.04" y2="78.74" width="0.1524" layer="91"/>
+<label x="-66.04" y="78.74" size="1.27" layer="95" xref="yes"/>
+<pinref part="U$13" gate="G$1" pin="SPI1_MISO/PB4"/>
 </segment>
 </net>
 <net name="N$5" class="0">