diff --git a/BOM.csv b/BOM.csv
index d959573..306d26b 100644
--- a/BOM.csv
+++ b/BOM.csv
@@ -1,5 +1,5 @@
-Refs,Value,Footprint,QTY,MFR,MPN,SPR,SPN
-SW1,DNI,Buttons_Switches_SMD:SW_SPST_B3U-1000P,1,Omron Electronics,B3U-1000P,Mouser,653-B3U-1000P
+Refs,Value,Footprint,Quantity,MFR,MPN,SPR,SPN
+SW1,NO,Buttons_Switches_SMD:SW_SPST_B3U-1000P,1,Omron Electronics,B3U-1000P,Mouser,653-B3U-1000P
 C43;C44;C45;C46;C50;C36;C20;C14;C30;C35;C19;C13;C29,100n,Capacitors_SMD:C_0402,13,Vishay / Vitramon,VJ0402V104ZXJCW1BC,Mouser,77-VJ0402V104ZXJCBC
 C49;C39;C16;C18;C4;C32;C42;C38;C15;C17;C3;C31,10n,Capacitors_SMD:C_0402,12,Vishay / Vitramon,VJ0402Y103KXJCW1BC,Mouser,77-VJ0402Y103KXJCBC
 C9;C6,10p,Capacitors_SMD:C_0402,2,Murata Electronics,GRM1555C1E100GA01D,Mouser,81-GRM1555C1E100GA1D
diff --git a/BOM.xlsx b/BOM.xlsx
index db670f4..51b6b28 100644
Binary files a/BOM.xlsx and b/BOM.xlsx differ
diff --git a/Power.sch b/Power.sch
index a96ad80..8e31e78 100644
--- a/Power.sch
+++ b/Power.sch
@@ -62,14 +62,13 @@ L mmdvm_hs_dual_hat-rescue:SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_h
 U 1 1 5A7E28DC
 P 1050 1300
 F 0 "SW1" H 1050 1450 50  0000 C CNN
-F 1 "DNI" H 1050 1150 50  0000 C CNN
+F 1 "NO" H 1050 1150 50  0000 C CNN
 F 2 "Buttons_Switches_SMD:SW_SPST_B3U-1000P" H 1050 1300 50  0001 C CNN
 F 3 "http://www.mouser.com/ds/2/307/en-b3u-3615.pdf" H 1050 1300 50  0001 C CNN
 F 4 "Omron Electronics" H -3900 -1350 50  0001 C CNN "MFR"
 F 5 "B3U-1000P" H -3900 -1350 50  0001 C CNN "MPN"
 F 6 "Mouser" H -3900 -1350 50  0001 C CNN "SPR"
 F 7 "653-B3U-1000P" H -3900 -1350 50  0001 C CNN "SPN"
-F 8 "" H 0   0   50  0001 C CNN "SPURL"
 	1    1050 1300
 	1    0    0    -1  
 $EndComp
diff --git a/mmdvm_hs_dual_hat.bak b/mmdvm_hs_dual_hat.bak
index 1444379..aab205b 100644
--- a/mmdvm_hs_dual_hat.bak
+++ b/mmdvm_hs_dual_hat.bak
@@ -6,7 +6,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 3
 Title "MMDVM_HS_Dual_Hat"
-Date "2018-06-12"
+Date "2018-06-14"
 Rev "1.3"
 Comp "DB9MAT+DF2ET+DO7EN"
 Comment1 ""
diff --git a/mmdvm_hs_dual_hat.pdf b/mmdvm_hs_dual_hat.pdf
index c1fbcf0..482a9b0 100644
Binary files a/mmdvm_hs_dual_hat.pdf and b/mmdvm_hs_dual_hat.pdf differ
diff --git a/mmdvm_hs_dual_hat.xml b/mmdvm_hs_dual_hat.xml
index 8608a33..4e75b69 100644
--- a/mmdvm_hs_dual_hat.xml
+++ b/mmdvm_hs_dual_hat.xml
@@ -2,14 +2,14 @@
 <export version="D">
   <design>
     <source>/opt/MMDVM_HS_Dual_Hat/mmdvm_hs_dual_hat.sch</source>
-    <date>Tue 03 Apr 2018 10:25:41 AM CEST</date>
-    <tool>Eeschema 5.0.0-rc2-dev-unknown-0171547~63~ubuntu17.10.1</tool>
+    <date>Fri 22 Jun 2018 12:36:57 PM CEST</date>
+    <tool>Eeschema 5.0.0-rc2-unknown-147c1e6~65~ubuntu18.04.1</tool>
     <sheet number="1" name="/" tstamps="/">
       <title_block>
         <title>MMDVM_HS_Dual_Hat</title>
         <company>DB9MAT+DF2ET+DO7EN</company>
-        <rev>1.2</rev>
-        <date>2018-03-13</date>
+        <rev>1.3</rev>
+        <date>2018-06-14</date>
         <source>mmdvm_hs_dual_hat.sch</source>
         <comment number="1" value=""/>
         <comment number="2" value=""/>
@@ -21,8 +21,8 @@
       <title_block>
         <title>MMDVM_HS_Dual_Hat</title>
         <company>DB9MAT+DF2ET+DO7EN</company>
-        <rev>1.1</rev>
-        <date>2018-03-02</date>
+        <rev>1.3</rev>
+        <date>2018-06-12</date>
         <source>Power.sch</source>
         <comment number="1" value=""/>
         <comment number="2" value=""/>
@@ -52,10 +52,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589685C3</tstamp>
     </comp>
@@ -66,10 +66,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58968631</tstamp>
     </comp>
@@ -80,10 +80,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58969AA4</tstamp>
     </comp>
@@ -94,10 +94,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58969E8F</tstamp>
     </comp>
@@ -108,10 +108,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5896DEF7</tstamp>
     </comp>
@@ -122,10 +122,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510P-3831-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510P-3831D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5896E5F8</tstamp>
     </comp>
@@ -136,10 +136,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5896E97E</tstamp>
     </comp>
@@ -150,10 +150,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510P-112-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510P-112D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5896F75D</tstamp>
     </comp>
@@ -164,10 +164,10 @@
       <fields>
         <field name="MFR">Analog Devices</field>
         <field name="MPN">ADF7021BCPZ</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">584-ADF7021BCPZ</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="adf7021" part="ADF7021"/>
+      <libsource lib="adf7021" part="ADF7021" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5896FF14</tstamp>
     </comp>
@@ -178,10 +178,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H6R8BB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H6R8BB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589705E1</tstamp>
     </comp>
@@ -192,10 +192,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15AN27NG80D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15AN27NG80D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589706C7</tstamp>
     </comp>
@@ -206,10 +206,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H4R7CA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H4R7CA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58971A8F</tstamp>
     </comp>
@@ -220,10 +220,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1E100GA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1E100GA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58971E4D</tstamp>
     </comp>
@@ -234,10 +234,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H6R8BB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H6R8BB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58972AD9</tstamp>
     </comp>
@@ -248,10 +248,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15CA22NJ00D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15CA22NJ00D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58972EEA</tstamp>
     </comp>
@@ -262,10 +262,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15AN13NG80D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15AN13NG80D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58973BF8</tstamp>
     </comp>
@@ -276,10 +276,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H221JA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H221JA01</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58973FC2</tstamp>
     </comp>
@@ -290,10 +290,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58974124</tstamp>
     </comp>
@@ -304,10 +304,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GCM155R71E223KA55D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GCM155R71E223KA5D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589757AF</tstamp>
     </comp>
@@ -318,10 +318,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW04023R90JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW0402J-3.9-E3</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58976039</tstamp>
     </comp>
@@ -332,10 +332,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589762ED</tstamp>
     </comp>
@@ -346,10 +346,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>589765ED</tstamp>
     </comp>
@@ -360,10 +360,10 @@
       <fields>
         <field name="MFR">Panasonic</field>
         <field name="MPN">ERA-2AEB561X</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">667-ERA-2AEB561X</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58977A3D</tstamp>
     </comp>
@@ -374,24 +374,24 @@
       <fields>
         <field name="MFR">Panasonic</field>
         <field name="MPN">ERA-2AEB271X</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">667-ERA-2AEB271X</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58977B33</tstamp>
     </comp>
     <comp ref="C22">
       <value>470p</value>
       <footprint>Capacitors_SMD:C_0402</footprint>
-      <datasheet>https://www.mouser.com/ds/2/281/c03e-516224.pdf</datasheet>
+      <datasheet>https://www.mouser.de/datasheet/2/281/murata_03122018_GCM_Series-1310150.pdf</datasheet>
       <fields>
         <field name="MFR">Murata Electronics</field>
-        <field name="MPN">GCG1555G1H471JA01D</field>
+        <field name="MPN">GCM1555C1H471JA16J</field>
+        <field name="SPN">81-GCM1555C1H471JA6J</field>
         <field name="SPR">Mouser</field>
-        <field name="SPN">81-GCG1555G1H471JA1D</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58977C18</tstamp>
     </comp>
@@ -402,10 +402,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM155R71C153KA01J</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM155R71C153KA1J</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58977D12</tstamp>
     </comp>
@@ -416,10 +416,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM155R60J102KA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM155R60J102KA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58977DF7</tstamp>
     </comp>
@@ -430,10 +430,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58979714</tstamp>
     </comp>
@@ -444,10 +444,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58979B33</tstamp>
     </comp>
@@ -458,10 +458,10 @@
       <fields>
         <field name="MFR">ECS</field>
         <field name="MPN">ECS-TXO-3225-147.4-TR</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">520-TXO-3225-14.74T</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TCXO_DFAS11-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TCXO_DFAS11-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5897A831</tstamp>
     </comp>
@@ -472,10 +472,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5897B23C</tstamp>
     </comp>
@@ -486,10 +486,10 @@
       <fields>
         <field name="MFR">AVX</field>
         <field name="MPN">04025A220GAT2A</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">581-04025A220G</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5897BA0E</tstamp>
     </comp>
@@ -500,10 +500,10 @@
       <fields>
         <field name="MFR">TE Connectivity</field>
         <field name="MPN">5-1814832-1</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-5-1814832-1</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X02-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X02-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5897CEF8</tstamp>
     </comp>
@@ -514,10 +514,10 @@
       <fields>
         <field name="MFR">TE Connectivity / Sigma Inductors</field>
         <field name="MPN">36501E20NJTDG</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">279-36501E20NJTDG</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>58972852</tstamp>
     </comp>
@@ -528,10 +528,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A726</tstamp>
     </comp>
@@ -542,10 +542,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A731</tstamp>
     </comp>
@@ -556,10 +556,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A748</tstamp>
     </comp>
@@ -570,10 +570,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A753</tstamp>
     </comp>
@@ -584,10 +584,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A776</tstamp>
     </comp>
@@ -598,10 +598,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510P-3831-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510P-3831D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A787</tstamp>
     </comp>
@@ -612,10 +612,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A798</tstamp>
     </comp>
@@ -626,10 +626,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510P-112-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510P-112D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7A9</tstamp>
     </comp>
@@ -640,10 +640,10 @@
       <fields>
         <field name="MFR">Analog Devices</field>
         <field name="MPN">ADF7021BCPZ</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">584-ADF7021BCPZ</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="adf7021" part="ADF7021"/>
+      <libsource lib="adf7021" part="ADF7021" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7BA</tstamp>
     </comp>
@@ -654,10 +654,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H6R8BB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H6R8BB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7C5</tstamp>
     </comp>
@@ -668,10 +668,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15AN27NG80D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15AN27NG80D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7D0</tstamp>
     </comp>
@@ -682,10 +682,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H4R7CA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H4R7CA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7E7</tstamp>
     </comp>
@@ -696,10 +696,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1E100GA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1E100GA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7F2</tstamp>
     </comp>
@@ -710,10 +710,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H6R8BB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H6R8BB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A7FD</tstamp>
     </comp>
@@ -724,10 +724,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15CA22NJ00D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15CA22NJ00D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A80E</tstamp>
     </comp>
@@ -738,10 +738,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">LQW15AN13NG80D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-LQW15AN13NG80D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A819</tstamp>
     </comp>
@@ -752,10 +752,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H221JA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H221JA01</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A824</tstamp>
     </comp>
@@ -766,10 +766,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A82F</tstamp>
     </comp>
@@ -780,10 +780,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GCM155R71E223KA55D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GCM155R71E223KA5D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A84C</tstamp>
     </comp>
@@ -794,10 +794,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW04023R90JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW0402J-3.9-E3</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A857</tstamp>
     </comp>
@@ -808,10 +808,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A862</tstamp>
     </comp>
@@ -822,10 +822,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A86D</tstamp>
     </comp>
@@ -836,10 +836,10 @@
       <fields>
         <field name="MFR">Panasonic</field>
         <field name="MPN">ERA-2AEB561X</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">667-ERA-2AEB561X</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A884</tstamp>
     </comp>
@@ -850,24 +850,24 @@
       <fields>
         <field name="MFR">Panasonic</field>
         <field name="MPN">ERA-2AEB271X</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">667-ERA-2AEB271X</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A88F</tstamp>
     </comp>
     <comp ref="C21">
       <value>470p</value>
       <footprint>Capacitors_SMD:C_0402</footprint>
-      <datasheet>https://www.mouser.com/ds/2/281/c03e-516224.pdf</datasheet>
+      <datasheet>https://www.mouser.de/datasheet/2/281/murata_03122018_GCM_Series-1310150.pdf</datasheet>
       <fields>
         <field name="MFR">Murata Electronics</field>
-        <field name="MPN">GCG1555G1H471JA01D</field>
+        <field name="MPN">GCM1555C1H471JA16J</field>
+        <field name="SPN">81-GCM1555C1H471JA6J</field>
         <field name="SPR">Mouser</field>
-        <field name="SPN">81-GCG1555G1H471JA1D</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A89A</tstamp>
     </comp>
@@ -878,10 +878,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM155R71C153KA01J</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM155R71C153KA1J</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A8A5</tstamp>
     </comp>
@@ -892,10 +892,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM155R60J102KA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM155R60J102KA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A8B0</tstamp>
     </comp>
@@ -906,10 +906,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A8BB</tstamp>
     </comp>
@@ -920,10 +920,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A8CC</tstamp>
     </comp>
@@ -934,10 +934,10 @@
       <fields>
         <field name="MFR">AVX</field>
         <field name="MPN">04025A220GAT2A</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">581-04025A220G</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A8FF</tstamp>
     </comp>
@@ -948,10 +948,10 @@
       <fields>
         <field name="MFR">TE Connectivity / Sigma Inductors</field>
         <field name="MPN">36501E20NJTDG</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">279-36501E20NJTDG</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68A946</tstamp>
     </comp>
@@ -962,10 +962,10 @@
       <fields>
         <field name="MFR">TE Connectivity</field>
         <field name="MPN">5-1814832-1</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-5-1814832-1</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X02-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X02-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A68D98C</tstamp>
     </comp>
@@ -976,10 +976,10 @@
       <fields>
         <field name="MFR">TE Connectivity / Sigma Inductors</field>
         <field name="MPN">36501E18NJTDG</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">279-36501E18NJTDG</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L_Small-device"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L_Small-device" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A9A9455</tstamp>
     </comp>
@@ -990,24 +990,24 @@
       <fields>
         <field name="MFR">TE Connectivity / Sigma Inductors</field>
         <field name="MPN">36501E18NJTDG</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">279-36501E18NJTDG</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L_Small-device"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L_Small-device" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A9D350B</tstamp>
     </comp>
     <comp ref="W1">
       <value>TEST_1P</value>
       <footprint>Connectors_TestPoints:Test_Point_Pad_1.0x1.0mm</footprint>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TEST_1P-conn"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TEST_1P-conn" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5AAA77D4</tstamp>
     </comp>
     <comp ref="W2">
       <value>TEST_1P</value>
       <footprint>Connectors_TestPoints:Test_Point_Pad_1.0x1.0mm</footprint>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TEST_1P-conn"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="TEST_1P-conn" description=""/>
       <sheetpath names="/" tstamps="/"/>
       <tstamp>5A9EA804</tstamp>
     </comp>
@@ -1018,10 +1018,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW040210K0JNEDC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW040210K0JNEDC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E28BE</tstamp>
     </comp>
@@ -1032,10 +1032,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E28CA</tstamp>
     </comp>
@@ -1046,10 +1046,10 @@
       <fields>
         <field name="MFR">Omron Electronics</field>
         <field name="MPN">B3U-1000P</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">653-B3U-1000P</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E28DC</tstamp>
     </comp>
@@ -1060,10 +1060,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E323F</tstamp>
     </comp>
@@ -1074,10 +1074,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E324B</tstamp>
     </comp>
@@ -1088,10 +1088,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7E3257</tstamp>
     </comp>
@@ -1102,10 +1102,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW040210K0JNEDC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW040210K0JNEDC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842562</tstamp>
     </comp>
@@ -1116,10 +1116,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005CGCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005CGCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A84256D</tstamp>
     </comp>
@@ -1130,10 +1130,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SYCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SYCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842578</tstamp>
     </comp>
@@ -1144,10 +1144,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SURCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SURCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842583</tstamp>
     </comp>
@@ -1158,10 +1158,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SYCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SYCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A84258E</tstamp>
     </comp>
@@ -1172,10 +1172,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005CGCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005CGCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842599</tstamp>
     </comp>
@@ -1186,10 +1186,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SECK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SECK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425A4</tstamp>
     </comp>
@@ -1200,10 +1200,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SURCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SURCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425AF</tstamp>
     </comp>
@@ -1214,10 +1214,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425BB</tstamp>
     </comp>
@@ -1228,10 +1228,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425C7</tstamp>
     </comp>
@@ -1242,10 +1242,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425D3</tstamp>
     </comp>
@@ -1256,10 +1256,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425DF</tstamp>
     </comp>
@@ -1270,10 +1270,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425EB</tstamp>
     </comp>
@@ -1284,10 +1284,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8425F7</tstamp>
     </comp>
@@ -1298,10 +1298,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842602</tstamp>
     </comp>
@@ -1312,10 +1312,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN">APHHS1005SURCK</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005SURCK</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A842643</tstamp>
     </comp>
@@ -1326,10 +1326,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A84264F</tstamp>
     </comp>
@@ -1340,10 +1340,10 @@
       <fields>
         <field name="MFR">Harwin</field>
         <field name="MPN">M20-7832046</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">855-M20-7832046</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="RPi_GPIO-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="RPi_GPIO-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8426B4</tstamp>
     </comp>
@@ -1354,10 +1354,10 @@
       <fields>
         <field name="MFR">Kingbright</field>
         <field name="MPN"> APHHS1005QBC/D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">604-APHHS1005QBCD</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LED-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8426D3</tstamp>
     </comp>
@@ -1368,10 +1368,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">RCS04021K00JNED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-RCS04021K00JNED</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8426DF</tstamp>
     </comp>
@@ -1382,10 +1382,10 @@
       <fields>
         <field name="MFR">TE Connectivity / AMP</field>
         <field name="MPN"> 826632-3</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-826632-3</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_02X03-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_02X03-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD6E0</tstamp>
     </comp>
@@ -1396,10 +1396,10 @@
       <fields>
         <field name="MFR">Panasonic</field>
         <field name="MPN">ERA-2AED152X</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">667-ERA-2AED152X</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD6F0</tstamp>
     </comp>
@@ -1410,10 +1410,10 @@
       <fields>
         <field name="MFR">Wurth Electronics</field>
         <field name="MPN">74279277</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">710-74279277</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD704</tstamp>
     </comp>
@@ -1424,10 +1424,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402Y103KXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402Y103KXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD719</tstamp>
     </comp>
@@ -1438,10 +1438,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H470FA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H470FA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD730</tstamp>
     </comp>
@@ -1452,10 +1452,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM1555C1H470FA01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM1555C1H470FA1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD737</tstamp>
     </comp>
@@ -1466,10 +1466,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510R-270-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510R-270D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD73E</tstamp>
     </comp>
@@ -1480,10 +1480,10 @@
       <fields>
         <field name="MFR">Susumu</field>
         <field name="MPN">RR0510R-270-D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">754-RR0510R-270D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD745</tstamp>
     </comp>
@@ -1494,10 +1494,10 @@
       <fields>
         <field name="MFR">Wurth Electronics</field>
         <field name="MPN">65100516121</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">710-65100516121</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="USB_OTG-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8AD758</tstamp>
     </comp>
@@ -1508,10 +1508,10 @@
       <fields>
         <field name="MFR">Vishay / Vitramon</field>
         <field name="MPN">VJ0402V104ZXJCW1BC</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">77-VJ0402V104ZXJCBC</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8EDEA6</tstamp>
     </comp>
@@ -1522,10 +1522,10 @@
       <fields>
         <field name="MFR">Wurth Electronics</field>
         <field name="MPN">74279277</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">710-74279277</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="L-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8EDEB2</tstamp>
     </comp>
@@ -1536,10 +1536,10 @@
       <fields>
         <field name="MFR">AVX</field>
         <field name="MPN">TPSA106K010T0900</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">581-TPSA106K010T0900</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CP-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CP-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8EDECA</tstamp>
     </comp>
@@ -1550,10 +1550,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GRM155C80J106ME11J</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GRM155C80J106ME1J</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8EDEDC</tstamp>
     </comp>
@@ -1562,12 +1562,12 @@
       <footprint>TO_SOT_Packages_SMD:SOT-223-3_TabPin2</footprint>
       <datasheet>https://www.mouser.com/ds/2/268/21665b-63633.pdf</datasheet>
       <fields>
-        <field name="SPR">Mouser</field>
         <field name="MFR">Microchip Technology</field>
         <field name="MPN">TC2117-3.3VDBTR</field>
         <field name="SPN">579-TC2117-3.3VDBTR</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LD1117S33TR-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="LD1117S33TR-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A8EDEF3</tstamp>
     </comp>
@@ -1578,10 +1578,10 @@
       <fields>
         <field name="MFR">TE Connectivity / AMP</field>
         <field name="MPN">826629-4</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-826629-4</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7D83E9</tstamp>
     </comp>
@@ -1592,10 +1592,10 @@
       <fields>
         <field name="MFR">TE Connectivity / AMP</field>
         <field name="MPN">826629-4</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-826629-4</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7D83FB</tstamp>
     </comp>
@@ -1606,10 +1606,10 @@
       <fields>
         <field name="MFR">TE Connectivity / AMP</field>
         <field name="MPN">826629-4</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">571-826629-4</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="CONN_01X04-conn-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A7ED3C6</tstamp>
     </comp>
@@ -1620,10 +1620,10 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW0402100KFKED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW0402-100K-E3</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A89671B</tstamp>
     </comp>
@@ -1634,17 +1634,18 @@
       <fields>
         <field name="MFR">Vishay</field>
         <field name="MPN">CRCW0402100KFKED</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">71-CRCW0402-100K-E3</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="R-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A896849</tstamp>
     </comp>
     <comp ref="JP1">
       <value>SolderJumper_2_Open</value>
       <footprint>Jumper:SolderJumper-2_P1.3mm_Open_TrianglePad1.0x1.5mm</footprint>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="GS2-Connector"/>
+      <datasheet>~</datasheet>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="GS2-Connector" description=""/>
       <sheetpath names="/Power/" tstamps="/5A778C4F/"/>
       <tstamp>5A9B5613</tstamp>
     </comp>
@@ -1655,10 +1656,10 @@
       <fields>
         <field name="MFR">ABRACON</field>
         <field name="MPN">ABM3-8.000MHz-D2Y-T</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">815-ABM3-8-D2Y-T</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="Crystal-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="Crystal-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/STM32F103/" tstamps="/5A86EF1A/"/>
       <tstamp>5A775536</tstamp>
     </comp>
@@ -1669,10 +1670,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H200FB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H200FB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/STM32F103/" tstamps="/5A86EF1A/"/>
       <tstamp>5A775542</tstamp>
     </comp>
@@ -1683,10 +1684,10 @@
       <fields>
         <field name="MFR">Murata Electronics</field>
         <field name="MPN">GJM1555C1H200FB01D</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">81-GJM1555C1H200FB1D</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue"/>
+      <libsource lib="mmdvm_hs_dual_hat-rescue" part="C-device-mmdvm_hs_dual_hat-rescue" description=""/>
       <sheetpath names="/STM32F103/" tstamps="/5A86EF1A/"/>
       <tstamp>5A77554E</tstamp>
     </comp>
@@ -1697,10 +1698,10 @@
       <fields>
         <field name="MFR">STMicroelectronics</field>
         <field name="MPN">STM32F103C8T6</field>
-        <field name="SPR">Mouser</field>
         <field name="SPN">511-STM32F103C8T6</field>
+        <field name="SPR">Mouser</field>
       </fields>
-      <libsource lib="stm32f103c8t6" part="STM32F103C8T6"/>
+      <libsource lib="stm32f103c8t6" part="STM32F103C8T6" description=""/>
       <sheetpath names="/STM32F103/" tstamps="/5A86EF1A/"/>
       <tstamp>5A775653</tstamp>
     </comp>
@@ -1992,69 +1993,13 @@
         <pin num="40" name="BCM21_SCLK" type="BiDi"/>
       </pins>
     </libpart>
-    <libpart lib="stm32f103c8t6" part="STM32F103C8T6">
+    <libpart lib="mmdvm_hs_dual_hat-rescue" part="SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue">
+      <footprints>
+        <fp>SW?DIP?x1*</fp>
+      </footprints>
       <fields>
-        <field name="Reference">U</field>
-        <field name="Value">STM32F103C8T6</field>
-      </fields>
-      <pins>
-        <pin num="1" name="VBAT" type="input"/>
-        <pin num="2" name="PC13" type="input"/>
-        <pin num="3" name="PC14/OSC32_IN" type="input"/>
-        <pin num="4" name="PC15/OSC32_OUT" type="input"/>
-        <pin num="5" name="OSC_IN" type="input"/>
-        <pin num="6" name="OSC_OUT" type="input"/>
-        <pin num="7" name="NRST" type="input"/>
-        <pin num="8" name="VSSA" type="input"/>
-        <pin num="9" name="VDDA" type="input"/>
-        <pin num="10" name="PA0" type="input"/>
-        <pin num="11" name="PA1" type="input"/>
-        <pin num="12" name="PA2" type="input"/>
-        <pin num="13" name="PA3" type="input"/>
-        <pin num="14" name="PA4" type="input"/>
-        <pin num="15" name="PA5" type="input"/>
-        <pin num="16" name="PA6" type="input"/>
-        <pin num="17" name="PA7" type="input"/>
-        <pin num="18" name="PB0" type="input"/>
-        <pin num="19" name="PB1" type="input"/>
-        <pin num="20" name="PB2" type="input"/>
-        <pin num="21" name="PB10" type="input"/>
-        <pin num="22" name="PB11" type="input"/>
-        <pin num="23" name="VSS_1" type="input"/>
-        <pin num="24" name="VDD_1" type="input"/>
-        <pin num="25" name="PB12" type="input"/>
-        <pin num="26" name="PB13" type="input"/>
-        <pin num="27" name="PB14" type="input"/>
-        <pin num="28" name="PB15" type="input"/>
-        <pin num="29" name="PA8" type="input"/>
-        <pin num="30" name="PA9" type="input"/>
-        <pin num="31" name="PA10" type="input"/>
-        <pin num="32" name="PA11" type="input"/>
-        <pin num="33" name="PA12" type="input"/>
-        <pin num="34" name="PA13" type="input"/>
-        <pin num="35" name="VSS_2" type="input"/>
-        <pin num="36" name="VDD_2" type="input"/>
-        <pin num="37" name="PA14" type="input"/>
-        <pin num="38" name="PA15" type="input"/>
-        <pin num="39" name="PB3" type="input"/>
-        <pin num="40" name="PB4" type="input"/>
-        <pin num="41" name="PB5" type="input"/>
-        <pin num="42" name="PB6" type="input"/>
-        <pin num="43" name="PB7" type="input"/>
-        <pin num="44" name="BOOT0" type="input"/>
-        <pin num="45" name="PB8" type="input"/>
-        <pin num="46" name="PB9" type="input"/>
-        <pin num="47" name="VSS_3" type="input"/>
-        <pin num="48" name="VDD_3" type="input"/>
-      </pins>
-    </libpart>
-    <libpart lib="mmdvm_hs_dual_hat-rescue" part="SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue">
-      <footprints>
-        <fp>SW?DIP?x1*</fp>
-      </footprints>
-      <fields>
-        <field name="Reference">SW</field>
-        <field name="Value">SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue</field>
+        <field name="Reference">SW</field>
+        <field name="Value">SW_DIP_x01-RESCUE-mmdvm_hs-hat-RESCUE-mmdvm_hs_dual_hat-mmdvm_hs_dual_hat-rescue</field>
       </fields>
       <pins>
         <pin num="1" name="~" type="input"/>
@@ -2099,6 +2044,62 @@
         <pin num="6" name="shield" type="passive"/>
       </pins>
     </libpart>
+    <libpart lib="stm32f103c8t6" part="STM32F103C8T6">
+      <fields>
+        <field name="Reference">U</field>
+        <field name="Value">STM32F103C8T6</field>
+      </fields>
+      <pins>
+        <pin num="1" name="VBAT" type="input"/>
+        <pin num="2" name="PC13" type="input"/>
+        <pin num="3" name="PC14/OSC32_IN" type="input"/>
+        <pin num="4" name="PC15/OSC32_OUT" type="input"/>
+        <pin num="5" name="OSC_IN" type="input"/>
+        <pin num="6" name="OSC_OUT" type="input"/>
+        <pin num="7" name="NRST" type="input"/>
+        <pin num="8" name="VSSA" type="input"/>
+        <pin num="9" name="VDDA" type="input"/>
+        <pin num="10" name="PA0" type="input"/>
+        <pin num="11" name="PA1" type="input"/>
+        <pin num="12" name="PA2" type="input"/>
+        <pin num="13" name="PA3" type="input"/>
+        <pin num="14" name="PA4" type="input"/>
+        <pin num="15" name="PA5" type="input"/>
+        <pin num="16" name="PA6" type="input"/>
+        <pin num="17" name="PA7" type="input"/>
+        <pin num="18" name="PB0" type="input"/>
+        <pin num="19" name="PB1" type="input"/>
+        <pin num="20" name="PB2" type="input"/>
+        <pin num="21" name="PB10" type="input"/>
+        <pin num="22" name="PB11" type="input"/>
+        <pin num="23" name="VSS_1" type="input"/>
+        <pin num="24" name="VDD_1" type="input"/>
+        <pin num="25" name="PB12" type="input"/>
+        <pin num="26" name="PB13" type="input"/>
+        <pin num="27" name="PB14" type="input"/>
+        <pin num="28" name="PB15" type="input"/>
+        <pin num="29" name="PA8" type="input"/>
+        <pin num="30" name="PA9" type="input"/>
+        <pin num="31" name="PA10" type="input"/>
+        <pin num="32" name="PA11" type="input"/>
+        <pin num="33" name="PA12" type="input"/>
+        <pin num="34" name="PA13" type="input"/>
+        <pin num="35" name="VSS_2" type="input"/>
+        <pin num="36" name="VDD_2" type="input"/>
+        <pin num="37" name="PA14" type="input"/>
+        <pin num="38" name="PA15" type="input"/>
+        <pin num="39" name="PB3" type="input"/>
+        <pin num="40" name="PB4" type="input"/>
+        <pin num="41" name="PB5" type="input"/>
+        <pin num="42" name="PB6" type="input"/>
+        <pin num="43" name="PB7" type="input"/>
+        <pin num="44" name="BOOT0" type="input"/>
+        <pin num="45" name="PB8" type="input"/>
+        <pin num="46" name="PB9" type="input"/>
+        <pin num="47" name="VSS_3" type="input"/>
+        <pin num="48" name="VDD_3" type="input"/>
+      </pins>
+    </libpart>
   </libparts>
   <libraries>
     <library logical="adf7021">
@@ -2112,56 +2113,55 @@
     </library>
   </libraries>
   <nets>
-    <net code="1" name="Net-(C22-Pad1)">
+    <net code="1" name="Net-(C14-Pad1)">
+      <node ref="R6" pin="2"/>
+      <node ref="C14" pin="1"/>
+    </net>
+    <net code="2" name="Net-(C34-Pad1)">
+      <node ref="U1" pin="39"/>
+      <node ref="C34" pin="1"/>
+    </net>
+    <net code="3" name="Net-(C22-Pad1)">
       <node ref="R8" pin="2"/>
       <node ref="C22" pin="1"/>
       <node ref="U1" pin="1"/>
     </net>
-    <net code="2" name="Net-(C28-Pad1)">
+    <net code="4" name="Net-(C28-Pad1)">
       <node ref="R8" pin="1"/>
-      <node ref="R10" pin="1"/>
-      <node ref="C28" pin="1"/>
       <node ref="U1" pin="42"/>
+      <node ref="C28" pin="1"/>
+      <node ref="R10" pin="1"/>
     </net>
-    <net code="3" name="Net-(C6-Pad1)">
-      <node ref="C6" pin="1"/>
-      <node ref="L7" pin="1"/>
-      <node ref="U2" pin="4"/>
-    </net>
-    <net code="4" name="Net-(C6-Pad2)">
-      <node ref="C7" pin="2"/>
-      <node ref="L3" pin="2"/>
-      <node ref="C6" pin="2"/>
-    </net>
-    <net code="5" name="Net-(C24-Pad1)">
-      <node ref="U1" pin="48"/>
-      <node ref="C24" pin="1"/>
+    <net code="5" name="Net-(C20-Pad1)">
+      <node ref="C20" pin="1"/>
+      <node ref="U1" pin="11"/>
     </net>
     <net code="6" name="Net-(R4-Pad1)">
-      <node ref="U1" pin="10"/>
       <node ref="R4" pin="1"/>
+      <node ref="U1" pin="10"/>
     </net>
-    <net code="7" name="Net-(R2-Pad1)">
+    <net code="7" name="Net-(C6-Pad1)">
+      <node ref="L7" pin="1"/>
+      <node ref="C6" pin="1"/>
+      <node ref="U2" pin="4"/>
+    </net>
+    <net code="8" name="Net-(R2-Pad1)">
       <node ref="U1" pin="8"/>
       <node ref="R2" pin="1"/>
     </net>
-    <net code="8" name="Net-(C10-Pad1)">
-      <node ref="U1" pin="6"/>
-      <node ref="L6" pin="2"/>
+    <net code="9" name="Net-(C10-Pad1)">
       <node ref="C10" pin="1"/>
+      <node ref="L6" pin="2"/>
+      <node ref="U1" pin="6"/>
     </net>
-    <net code="9" name="Net-(C24-Pad2)">
-      <node ref="U1" pin="2"/>
-      <node ref="R6" pin="1"/>
-      <node ref="C24" pin="2"/>
-    </net>
-    <net code="10" name="Net-(C14-Pad1)">
-      <node ref="R6" pin="2"/>
-      <node ref="C14" pin="1"/>
+    <net code="10" name="Net-(C24-Pad1)">
+      <node ref="C24" pin="1"/>
+      <node ref="U1" pin="48"/>
     </net>
-    <net code="11" name="Net-(C34-Pad1)">
-      <node ref="U1" pin="39"/>
-      <node ref="C34" pin="1"/>
+    <net code="11" name="Net-(C24-Pad2)">
+      <node ref="C24" pin="2"/>
+      <node ref="R6" pin="1"/>
+      <node ref="U1" pin="2"/>
     </net>
     <net code="12" name="Net-(C11-Pad1)">
       <node ref="C11" pin="1"/>
@@ -2169,99 +2169,111 @@
       <node ref="U2" pin="7"/>
     </net>
     <net code="13" name="Net-(C7-Pad1)">
-      <node ref="L5" pin="2"/>
       <node ref="U2" pin="6"/>
+      <node ref="L5" pin="2"/>
       <node ref="C7" pin="1"/>
     </net>
     <net code="14" name="Net-(C1-Pad1)">
+      <node ref="L1" pin="2"/>
       <node ref="C1" pin="1"/>
       <node ref="L3" pin="1"/>
-      <node ref="L1" pin="2"/>
     </net>
     <net code="15" name="Net-(C29-Pad2)">
-      <node ref="U2" pin="41"/>
       <node ref="C29" pin="2"/>
+      <node ref="U2" pin="41"/>
     </net>
-    <net code="16" name="DCLK2">
-      <node ref="U3" pin="15"/>
-      <node ref="R11" pin="1"/>
-    </net>
-    <net code="17" name="DATA2">
-      <node ref="R12" pin="1"/>
-      <node ref="U3" pin="14"/>
+    <net code="16" name="SCLK">
+      <node ref="U1" pin="28"/>
+      <node ref="U2" pin="28"/>
+      <node ref="U3" pin="41"/>
     </net>
-    <net code="18" name="Net-(C19-Pad1)">
-      <node ref="C19" pin="1"/>
-      <node ref="U2" pin="11"/>
+    <net code="17" name="Net-(C6-Pad2)">
+      <node ref="C7" pin="2"/>
+      <node ref="C6" pin="2"/>
+      <node ref="L3" pin="2"/>
     </net>
-    <net code="19" name="Net-(R11-Pad2)">
-      <node ref="U2" pin="35"/>
+    <net code="18" name="Net-(R11-Pad2)">
       <node ref="R11" pin="2"/>
+      <node ref="U2" pin="35"/>
     </net>
-    <net code="20" name="Net-(R12-Pad2)">
-      <node ref="U2" pin="34"/>
+    <net code="19" name="Net-(R12-Pad2)">
       <node ref="R12" pin="2"/>
+      <node ref="U2" pin="34"/>
     </net>
-    <net code="21" name="SCLK">
-      <node ref="U3" pin="41"/>
-      <node ref="U2" pin="28"/>
-      <node ref="U1" pin="28"/>
+    <net code="20" name="DATA1">
+      <node ref="U3" pin="40"/>
+      <node ref="R14" pin="1"/>
     </net>
-    <net code="22" name="SREAD">
+    <net code="21" name="SREAD">
       <node ref="U2" pin="27"/>
-      <node ref="U1" pin="27"/>
       <node ref="U3" pin="43"/>
+      <node ref="U1" pin="27"/>
     </net>
-    <net code="23" name="SDATA">
-      <node ref="U2" pin="26"/>
-      <node ref="U1" pin="26"/>
+    <net code="22" name="SDATA">
       <node ref="U3" pin="42"/>
+      <node ref="U1" pin="26"/>
+      <node ref="U2" pin="26"/>
     </net>
-    <net code="24" name="SLE2">
+    <net code="23" name="SLE2">
       <node ref="U2" pin="25"/>
       <node ref="U3" pin="16"/>
     </net>
-    <net code="25" name="Net-(C35-Pad2)">
+    <net code="24" name="Net-(C35-Pad2)">
       <node ref="C35" pin="2"/>
       <node ref="U2" pin="31"/>
     </net>
-    <net code="26" name="DCLK1">
-      <node ref="U3" pin="39"/>
-      <node ref="R13" pin="1"/>
-    </net>
-    <net code="27" name="CE">
+    <net code="25" name="CE">
+      <node ref="U3" pin="3"/>
       <node ref="U2" pin="24"/>
       <node ref="U1" pin="24"/>
-      <node ref="U3" pin="3"/>
     </net>
-    <net code="28" name="Net-(C9-Pad1)">
-      <node ref="L8" pin="1"/>
+    <net code="26" name="SLE1">
+      <node ref="U1" pin="25"/>
+      <node ref="U3" pin="45"/>
+    </net>
+    <net code="27" name="DCLK1">
+      <node ref="R13" pin="1"/>
+      <node ref="U3" pin="39"/>
+    </net>
+    <net code="28" name="DATA2">
+      <node ref="R12" pin="1"/>
+      <node ref="U3" pin="14"/>
+    </net>
+    <net code="29" name="DCLK2">
+      <node ref="R11" pin="1"/>
+      <node ref="U3" pin="15"/>
+    </net>
+    <net code="30" name="SWD_TP2">
+      <node ref="U2" pin="33"/>
+      <node ref="W2" pin="1"/>
+    </net>
+    <net code="31" name="SWD_TP1">
+      <node ref="W1" pin="1"/>
+      <node ref="U1" pin="33"/>
+    </net>
+    <net code="32" name="Net-(C9-Pad1)">
       <node ref="C9" pin="1"/>
+      <node ref="L8" pin="1"/>
       <node ref="U1" pin="4"/>
     </net>
-    <net code="29" name="DATA1">
-      <node ref="U3" pin="40"/>
-      <node ref="R14" pin="1"/>
-    </net>
-    <net code="30" name="+3V3">
-      <node ref="U3" pin="36"/>
-      <node ref="C16" pin="1"/>
-      <node ref="L8" pin="2"/>
-      <node ref="C8" pin="1"/>
+    <net code="33" name="+3V3">
       <node ref="C18" pin="1"/>
-      <node ref="C4" pin="1"/>
+      <node ref="C8" pin="1"/>
+      <node ref="L8" pin="2"/>
       <node ref="X1" pin="4"/>
-      <node ref="C42" pin="1"/>
-      <node ref="C32" pin="1"/>
-      <node ref="U1" pin="3"/>
-      <node ref="C39" pin="2"/>
       <node ref="U1" pin="9"/>
-      <node ref="U1" pin="40"/>
-      <node ref="U1" pin="32"/>
-      <node ref="U1" pin="43"/>
-      <node ref="L7" pin="2"/>
-      <node ref="C5" pin="1"/>
       <node ref="C17" pin="1"/>
+      <node ref="C5" pin="1"/>
+      <node ref="L7" pin="2"/>
+      <node ref="U1" pin="43"/>
+      <node ref="U1" pin="32"/>
+      <node ref="U1" pin="40"/>
+      <node ref="C4" pin="1"/>
+      <node ref="C39" pin="2"/>
+      <node ref="U1" pin="3"/>
+      <node ref="C16" pin="1"/>
+      <node ref="C32" pin="1"/>
+      <node ref="C42" pin="1"/>
       <node ref="C3" pin="1"/>
       <node ref="P5" pin="4"/>
       <node ref="L10" pin="2"/>
@@ -2272,6 +2284,7 @@
       <node ref="P3" pin="1"/>
       <node ref="R16" pin="2"/>
       <node ref="R15" pin="2"/>
+      <node ref="U3" pin="36"/>
       <node ref="U3" pin="24"/>
       <node ref="U3" pin="48"/>
       <node ref="U3" pin="9"/>
@@ -2279,7 +2292,6 @@
       <node ref="C44" pin="1"/>
       <node ref="U2" pin="32"/>
       <node ref="U2" pin="40"/>
-      <node ref="U2" pin="9"/>
       <node ref="U2" pin="43"/>
       <node ref="C38" pin="2"/>
       <node ref="U2" pin="3"/>
@@ -2288,301 +2300,290 @@
       <node ref="C45" pin="1"/>
       <node ref="C46" pin="1"/>
       <node ref="R24" pin="1"/>
+      <node ref="U2" pin="9"/>
     </net>
-    <net code="31" name="Net-(C10-Pad2)">
-      <node ref="C9" pin="2"/>
+    <net code="34" name="Net-(C10-Pad2)">
       <node ref="C10" pin="2"/>
       <node ref="L4" pin="2"/>
+      <node ref="C9" pin="2"/>
     </net>
-    <net code="32" name="Net-(R13-Pad2)">
-      <node ref="R13" pin="2"/>
-      <node ref="U1" pin="35"/>
-    </net>
-    <net code="33" name="Net-(R14-Pad2)">
-      <node ref="R14" pin="2"/>
-      <node ref="U1" pin="34"/>
-    </net>
-    <net code="34" name="Net-(L12-Pad1)">
+    <net code="35" name="Net-(L12-Pad1)">
       <node ref="U1" pin="46"/>
       <node ref="L12" pin="1"/>
     </net>
-    <net code="35" name="Net-(L12-Pad2)">
-      <node ref="L12" pin="2"/>
+    <net code="36" name="Net-(L12-Pad2)">
       <node ref="U1" pin="44"/>
+      <node ref="L12" pin="2"/>
     </net>
-    <net code="36" name="Net-(L11-Pad1)">
+    <net code="37" name="Net-(L11-Pad1)">
       <node ref="U2" pin="46"/>
       <node ref="L11" pin="1"/>
     </net>
-    <net code="37" name="Net-(L11-Pad2)">
+    <net code="38" name="Net-(L11-Pad2)">
       <node ref="L11" pin="2"/>
       <node ref="U2" pin="44"/>
     </net>
-    <net code="38" name="SLE1">
-      <node ref="U3" pin="45"/>
-      <node ref="U1" pin="25"/>
+    <net code="39" name="Net-(C12-Pad1)">
+      <node ref="U1" pin="7"/>
+      <node ref="L6" pin="1"/>
+      <node ref="C12" pin="1"/>
     </net>
-    <net code="39" name="Net-(C2-Pad1)">
-      <node ref="L4" pin="1"/>
+    <net code="40" name="Net-(C2-Pad1)">
       <node ref="C2" pin="1"/>
       <node ref="L2" pin="2"/>
+      <node ref="L4" pin="1"/>
     </net>
-    <net code="40" name="GND">
-      <node ref="J1" pin="25"/>
+    <net code="41" name="GND">
       <node ref="J1" pin="20"/>
       <node ref="J1" pin="14"/>
-      <node ref="U2" pin="22"/>
-      <node ref="U2" pin="12"/>
-      <node ref="U3" pin="23"/>
-      <node ref="U3" pin="35"/>
-      <node ref="C48" pin="1"/>
+      <node ref="J1" pin="9"/>
+      <node ref="D8" pin="1"/>
+      <node ref="J1" pin="25"/>
+      <node ref="P8" pin="5"/>
+      <node ref="C51" pin="2"/>
       <node ref="C50" pin="2"/>
       <node ref="P8" pin="6"/>
-      <node ref="P8" pin="5"/>
+      <node ref="C48" pin="1"/>
       <node ref="C47" pin="2"/>
+      <node ref="U3" pin="47"/>
+      <node ref="U3" pin="23"/>
+      <node ref="U3" pin="35"/>
       <node ref="C41" pin="2"/>
-      <node ref="C51" pin="2"/>
-      <node ref="P7" pin="5"/>
-      <node ref="U3" pin="8"/>
       <node ref="C40" pin="2"/>
-      <node ref="C43" pin="2"/>
+      <node ref="U3" pin="8"/>
       <node ref="SW1" pin="2"/>
+      <node ref="C43" pin="2"/>
       <node ref="C44" pin="2"/>
-      <node ref="D5" pin="1"/>
-      <node ref="U3" pin="47"/>
-      <node ref="C46" pin="2"/>
-      <node ref="D1" pin="1"/>
-      <node ref="D2" pin="1"/>
-      <node ref="D3" pin="1"/>
-      <node ref="C45" pin="2"/>
-      <node ref="J1" pin="30"/>
-      <node ref="J1" pin="34"/>
+      <node ref="D7" pin="1"/>
+      <node ref="D6" pin="1"/>
+      <node ref="D4" pin="1"/>
       <node ref="J1" pin="39"/>
-      <node ref="J1" pin="6"/>
-      <node ref="J1" pin="9"/>
-      <node ref="C49" pin="1"/>
-      <node ref="P7" pin="6"/>
+      <node ref="J1" pin="34"/>
+      <node ref="J1" pin="30"/>
+      <node ref="C45" pin="2"/>
+      <node ref="D3" pin="1"/>
+      <node ref="D2" pin="1"/>
+      <node ref="D1" pin="1"/>
+      <node ref="P5" pin="1"/>
+      <node ref="C46" pin="2"/>
+      <node ref="D5" pin="1"/>
       <node ref="JP1" pin="2"/>
+      <node ref="P7" pin="6"/>
+      <node ref="C49" pin="1"/>
+      <node ref="P7" pin="5"/>
+      <node ref="J1" pin="6"/>
       <node ref="C52" pin="2"/>
       <node ref="U4" pin="1"/>
-      <node ref="D8" pin="1"/>
-      <node ref="P5" pin="2"/>
       <node ref="P4" pin="4"/>
       <node ref="P3" pin="2"/>
-      <node ref="D4" pin="1"/>
-      <node ref="D6" pin="1"/>
-      <node ref="D7" pin="1"/>
-      <node ref="C29" pin="1"/>
-      <node ref="C31" pin="2"/>
-      <node ref="C16" pin="2"/>
-      <node ref="C27" pin="2"/>
-      <node ref="R2" pin="2"/>
       <node ref="R4" pin="2"/>
-      <node ref="C21" pin="2"/>
-      <node ref="U1" pin="5"/>
-      <node ref="C39" pin="1"/>
-      <node ref="C25" pin="2"/>
-      <node ref="C32" pin="2"/>
-      <node ref="C30" pin="1"/>
+      <node ref="U2" pin="5"/>
+      <node ref="C17" pin="2"/>
+      <node ref="C5" pin="2"/>
+      <node ref="C20" pin="2"/>
       <node ref="R1" pin="2"/>
+      <node ref="C38" pin="1"/>
+      <node ref="C16" pin="2"/>
       <node ref="C15" pin="2"/>
-      <node ref="C20" pin="2"/>
-      <node ref="R3" pin="2"/>
-      <node ref="C19" pin="2"/>
-      <node ref="C3" pin="2"/>
-      <node ref="P1" pin="2"/>
-      <node ref="C13" pin="2"/>
-      <node ref="U2" pin="49"/>
-      <node ref="C11" pin="2"/>
-      <node ref="C1" pin="2"/>
+      <node ref="R2" pin="2"/>
+      <node ref="U2" pin="19"/>
+      <node ref="C35" pin="1"/>
+      <node ref="C30" pin="1"/>
+      <node ref="U2" pin="29"/>
       <node ref="C36" pin="1"/>
+      <node ref="C21" pin="2"/>
       <node ref="U1" pin="45"/>
-      <node ref="U1" pin="47"/>
       <node ref="U1" pin="19"/>
-      <node ref="U1" pin="12"/>
+      <node ref="C27" pin="2"/>
+      <node ref="C31" pin="2"/>
+      <node ref="C29" pin="1"/>
+      <node ref="U1" pin="47"/>
+      <node ref="R3" pin="2"/>
+      <node ref="C19" pin="2"/>
+      <node ref="C32" pin="2"/>
+      <node ref="U1" pin="5"/>
+      <node ref="C39" pin="1"/>
       <node ref="U1" pin="22"/>
-      <node ref="C5" pin="2"/>
-      <node ref="C17" pin="2"/>
-      <node ref="U1" pin="49"/>
+      <node ref="U1" pin="12"/>
       <node ref="C12" pin="2"/>
+      <node ref="C14" pin="2"/>
+      <node ref="C4" pin="2"/>
+      <node ref="U1" pin="49"/>
       <node ref="C2" pin="2"/>
-      <node ref="X1" pin="2"/>
-      <node ref="U2" pin="47"/>
+      <node ref="C11" pin="2"/>
+      <node ref="U2" pin="12"/>
+      <node ref="C1" pin="2"/>
       <node ref="C8" pin="2"/>
+      <node ref="U2" pin="22"/>
       <node ref="C18" pin="2"/>
-      <node ref="U1" pin="29"/>
-      <node ref="U2" pin="45"/>
-      <node ref="C14" pin="2"/>
-      <node ref="C4" pin="2"/>
-      <node ref="C38" pin="1"/>
       <node ref="C42" pin="2"/>
-      <node ref="U2" pin="5"/>
-      <node ref="C22" pin="2"/>
+      <node ref="C25" pin="2"/>
       <node ref="P2" pin="2"/>
       <node ref="C26" pin="2"/>
-      <node ref="U2" pin="19"/>
-      <node ref="C35" pin="1"/>
-      <node ref="U2" pin="29"/>
+      <node ref="C22" pin="2"/>
+      <node ref="U1" pin="29"/>
       <node ref="C28" pin="2"/>
+      <node ref="U2" pin="47"/>
+      <node ref="P1" pin="2"/>
+      <node ref="X1" pin="2"/>
+      <node ref="U2" pin="49"/>
+      <node ref="C3" pin="2"/>
+      <node ref="C13" pin="2"/>
+      <node ref="U2" pin="45"/>
     </net>
-    <net code="41" name="Net-(C30-Pad2)">
+    <net code="42" name="Net-(C30-Pad2)">
       <node ref="C30" pin="2"/>
       <node ref="U1" pin="41"/>
     </net>
-    <net code="42" name="Net-(C20-Pad1)">
-      <node ref="C20" pin="1"/>
-      <node ref="U1" pin="11"/>
-    </net>
-    <net code="43" name="Net-(C36-Pad2)">
-      <node ref="C36" pin="2"/>
-      <node ref="U1" pin="31"/>
+    <net code="43" name="Net-(R13-Pad2)">
+      <node ref="R13" pin="2"/>
+      <node ref="U1" pin="35"/>
     </net>
-    <net code="44" name="Net-(C12-Pad1)">
-      <node ref="C12" pin="1"/>
-      <node ref="L6" pin="1"/>
-      <node ref="U1" pin="7"/>
+    <net code="44" name="Net-(R14-Pad2)">
+      <node ref="R14" pin="2"/>
+      <node ref="U1" pin="34"/>
     </net>
-    <net code="45" name="Net-(C33-Pad1)">
-      <node ref="C33" pin="1"/>
-      <node ref="X1" pin="3"/>
-      <node ref="C34" pin="2"/>
+    <net code="45" name="Net-(C36-Pad2)">
+      <node ref="U1" pin="31"/>
+      <node ref="C36" pin="2"/>
     </net>
-    <net code="46" name="SWD_TP2">
-      <node ref="W2" pin="1"/>
-      <node ref="U2" pin="33"/>
+    <net code="46" name="Net-(C23-Pad2)">
+      <node ref="C23" pin="2"/>
+      <node ref="R5" pin="1"/>
+      <node ref="U2" pin="2"/>
     </net>
     <net code="47" name="Net-(U2-Pad18)">
       <node ref="U2" pin="18"/>
     </net>
-    <net code="48" name="Net-(U2-Pad17)">
+    <net code="48" name="Net-(U1-Pad15)">
+      <node ref="U1" pin="15"/>
+    </net>
+    <net code="49" name="Net-(U1-Pad14)">
+      <node ref="U1" pin="14"/>
+    </net>
+    <net code="50" name="Net-(U1-Pad13)">
+      <node ref="U1" pin="13"/>
+    </net>
+    <net code="51" name="Net-(U1-Pad38)">
+      <node ref="U1" pin="38"/>
+    </net>
+    <net code="52" name="Net-(U1-Pad37)">
+      <node ref="U1" pin="37"/>
+    </net>
+    <net code="53" name="Net-(X1-Pad1)">
+      <node ref="X1" pin="1"/>
+    </net>
+    <net code="54" name="Net-(U2-Pad30)">
+      <node ref="U2" pin="30"/>
+    </net>
+    <net code="55" name="Net-(U2-Pad23)">
+      <node ref="U2" pin="23"/>
+    </net>
+    <net code="56" name="Net-(U2-Pad21)">
+      <node ref="U2" pin="21"/>
+    </net>
+    <net code="57" name="Net-(U2-Pad20)">
+      <node ref="U2" pin="20"/>
+    </net>
+    <net code="58" name="Net-(U1-Pad16)">
+      <node ref="U1" pin="16"/>
+    </net>
+    <net code="59" name="Net-(U2-Pad17)">
       <node ref="U2" pin="17"/>
     </net>
-    <net code="49" name="Net-(U2-Pad16)">
+    <net code="60" name="Net-(U2-Pad16)">
       <node ref="U2" pin="16"/>
     </net>
-    <net code="50" name="Net-(U2-Pad15)">
+    <net code="61" name="Net-(U2-Pad15)">
       <node ref="U2" pin="15"/>
     </net>
-    <net code="51" name="Net-(U2-Pad14)">
+    <net code="62" name="Net-(U2-Pad14)">
       <node ref="U2" pin="14"/>
     </net>
-    <net code="52" name="Net-(U2-Pad13)">
+    <net code="63" name="Net-(U2-Pad13)">
       <node ref="U2" pin="13"/>
     </net>
-    <net code="53" name="Net-(U2-Pad38)">
+    <net code="64" name="Net-(U2-Pad38)">
       <node ref="U2" pin="38"/>
     </net>
-    <net code="54" name="Net-(U2-Pad37)">
+    <net code="65" name="Net-(U2-Pad37)">
       <node ref="U2" pin="37"/>
     </net>
-    <net code="55" name="Net-(U2-Pad36)">
+    <net code="66" name="Net-(U2-Pad36)">
       <node ref="U2" pin="36"/>
     </net>
-    <net code="56" name="Net-(U1-Pad36)">
+    <net code="67" name="Net-(U1-Pad36)">
       <node ref="U1" pin="36"/>
     </net>
-    <net code="57" name="Net-(U2-Pad20)">
-      <node ref="U2" pin="20"/>
-    </net>
-    <net code="58" name="SWD_TP1">
-      <node ref="U1" pin="33"/>
-      <node ref="W1" pin="1"/>
-    </net>
-    <net code="59" name="Net-(U1-Pad16)">
-      <node ref="U1" pin="16"/>
+    <net code="68" name="Net-(C33-Pad1)">
+      <node ref="C34" pin="2"/>
+      <node ref="X1" pin="3"/>
+      <node ref="C33" pin="1"/>
     </net>
-    <net code="60" name="Net-(U1-Pad30)">
+    <net code="69" name="Net-(U1-Pad30)">
       <node ref="U1" pin="30"/>
     </net>
-    <net code="61" name="Net-(U1-Pad23)">
+    <net code="70" name="Net-(U1-Pad23)">
       <node ref="U1" pin="23"/>
     </net>
-    <net code="62" name="Net-(U1-Pad21)">
+    <net code="71" name="Net-(U1-Pad21)">
       <node ref="U1" pin="21"/>
     </net>
-    <net code="63" name="Net-(U1-Pad20)">
+    <net code="72" name="Net-(U1-Pad20)">
       <node ref="U1" pin="20"/>
     </net>
-    <net code="64" name="Net-(U1-Pad18)">
+    <net code="73" name="Net-(U1-Pad18)">
       <node ref="U1" pin="18"/>
     </net>
-    <net code="65" name="Net-(U1-Pad17)">
+    <net code="74" name="Net-(U1-Pad17)">
       <node ref="U1" pin="17"/>
     </net>
-    <net code="66" name="Net-(U1-Pad15)">
-      <node ref="U1" pin="15"/>
-    </net>
-    <net code="67" name="Net-(U1-Pad14)">
-      <node ref="U1" pin="14"/>
-    </net>
-    <net code="68" name="Net-(U1-Pad13)">
-      <node ref="U1" pin="13"/>
-    </net>
-    <net code="69" name="Net-(U1-Pad38)">
-      <node ref="U1" pin="38"/>
-    </net>
-    <net code="70" name="Net-(U1-Pad37)">
-      <node ref="U1" pin="37"/>
-    </net>
-    <net code="71" name="Net-(X1-Pad1)">
-      <node ref="X1" pin="1"/>
-    </net>
-    <net code="72" name="Net-(U2-Pad30)">
-      <node ref="U2" pin="30"/>
-    </net>
-    <net code="73" name="Net-(U2-Pad23)">
-      <node ref="U2" pin="23"/>
+    <net code="75" name="Net-(C13-Pad1)">
+      <node ref="C13" pin="1"/>
+      <node ref="R5" pin="2"/>
     </net>
-    <net code="74" name="Net-(U2-Pad21)">
-      <node ref="U2" pin="21"/>
+    <net code="76" name="Net-(C33-Pad2)">
+      <node ref="U2" pin="39"/>
+      <node ref="C33" pin="2"/>
     </net>
-    <net code="75" name="Net-(C21-Pad1)">
+    <net code="77" name="Net-(C21-Pad1)">
+      <node ref="U2" pin="1"/>
       <node ref="R7" pin="2"/>
       <node ref="C21" pin="1"/>
-      <node ref="U2" pin="1"/>
     </net>
-    <net code="76" name="Net-(R3-Pad1)">
-      <node ref="R3" pin="1"/>
+    <net code="78" name="Net-(C27-Pad1)">
+      <node ref="C27" pin="1"/>
+      <node ref="R7" pin="1"/>
+      <node ref="U2" pin="42"/>
+      <node ref="R9" pin="1"/>
+    </net>
+    <net code="79" name="Net-(C19-Pad1)">
+      <node ref="U2" pin="11"/>
+      <node ref="C19" pin="1"/>
+    </net>
+    <net code="80" name="Net-(R3-Pad1)">
       <node ref="U2" pin="10"/>
+      <node ref="R3" pin="1"/>
     </net>
-    <net code="77" name="Net-(R1-Pad1)">
+    <net code="81" name="Net-(R1-Pad1)">
       <node ref="R1" pin="1"/>
       <node ref="U2" pin="8"/>
     </net>
-    <net code="78" name="Net-(C23-Pad1)">
+    <net code="82" name="Net-(C23-Pad1)">
       <node ref="U2" pin="48"/>
       <node ref="C23" pin="1"/>
     </net>
-    <net code="79" name="Net-(C23-Pad2)">
-      <node ref="U2" pin="2"/>
-      <node ref="C23" pin="2"/>
-      <node ref="R5" pin="1"/>
-    </net>
-    <net code="80" name="Net-(C13-Pad1)">
-      <node ref="R5" pin="2"/>
-      <node ref="C13" pin="1"/>
-    </net>
-    <net code="81" name="Net-(C33-Pad2)">
-      <node ref="C33" pin="2"/>
-      <node ref="U2" pin="39"/>
-    </net>
-    <net code="82" name="Net-(C27-Pad1)">
-      <node ref="R7" pin="1"/>
-      <node ref="R9" pin="1"/>
-      <node ref="C27" pin="1"/>
-      <node ref="U2" pin="42"/>
-    </net>
     <net code="83" name="Net-(L2-Pad1)">
-      <node ref="L2" pin="1"/>
       <node ref="P1" pin="1"/>
+      <node ref="L2" pin="1"/>
     </net>
     <net code="84" name="Net-(L1-Pad1)">
-      <node ref="L1" pin="1"/>
       <node ref="P2" pin="1"/>
+      <node ref="L1" pin="1"/>
     </net>
     <net code="85" name="Net-(C26-Pad1)">
-      <node ref="C26" pin="1"/>
       <node ref="R10" pin="2"/>
+      <node ref="C26" pin="1"/>
     </net>
     <net code="86" name="Net-(C25-Pad1)">
       <node ref="R9" pin="2"/>
@@ -2601,8 +2602,8 @@
       <node ref="D8" pin="2"/>
     </net>
     <net code="90" name="NXDN_LED">
-      <node ref="R23" pin="2"/>
       <node ref="U3" pin="29"/>
+      <node ref="R23" pin="2"/>
     </net>
     <net code="91" name="Net-(D1-Pad2)">
       <node ref="R16" pin="1"/>
@@ -2617,8 +2618,8 @@
       <node ref="D3" pin="2"/>
     </net>
     <net code="94" name="PTT_LED">
-      <node ref="U3" pin="27"/>
       <node ref="R18" pin="2"/>
+      <node ref="U3" pin="27"/>
     </net>
     <net code="95" name="DSTAR_LED">
       <node ref="U3" pin="25"/>
@@ -2629,54 +2630,54 @@
       <node ref="R20" pin="1"/>
     </net>
     <net code="97" name="Net-(D4-Pad2)">
-      <node ref="D4" pin="2"/>
       <node ref="R19" pin="1"/>
+      <node ref="D4" pin="2"/>
     </net>
     <net code="98" name="DMR_LED">
-      <node ref="U3" pin="26"/>
       <node ref="R20" pin="2"/>
+      <node ref="U3" pin="26"/>
     </net>
     <net code="99" name="Net-(C49-Pad2)">
       <node ref="C49" pin="2"/>
-      <node ref="L9" pin="2"/>
       <node ref="P8" pin="1"/>
+      <node ref="L9" pin="2"/>
     </net>
     <net code="100" name="Net-(C48-Pad2)">
       <node ref="P8" pin="3"/>
-      <node ref="C48" pin="2"/>
       <node ref="R27" pin="1"/>
+      <node ref="C48" pin="2"/>
       <node ref="R28" pin="2"/>
     </net>
     <net code="101" name="Net-(C47-Pad1)">
+      <node ref="P8" pin="2"/>
       <node ref="R26" pin="1"/>
       <node ref="C47" pin="1"/>
-      <node ref="P8" pin="2"/>
     </net>
     <net code="102" name="NRST">
       <node ref="U3" pin="7"/>
-      <node ref="J1" pin="40"/>
       <node ref="SW1" pin="1"/>
-      <node ref="C43" pin="1"/>
+      <node ref="J1" pin="40"/>
       <node ref="R15" pin="1"/>
+      <node ref="C43" pin="1"/>
     </net>
     <net code="103" name="RXD">
-      <node ref="J1" pin="8"/>
       <node ref="U3" pin="31"/>
+      <node ref="J1" pin="8"/>
     </net>
     <net code="104" name="+5V">
       <node ref="J1" pin="4"/>
-      <node ref="J1" pin="2"/>
-      <node ref="P4" pin="1"/>
+      <node ref="U4" pin="3"/>
       <node ref="L9" pin="1"/>
       <node ref="R28" pin="1"/>
-      <node ref="U4" pin="3"/>
+      <node ref="P4" pin="1"/>
+      <node ref="J1" pin="2"/>
     </net>
     <net code="105" name="SWCLK">
       <node ref="U3" pin="37"/>
-      <node ref="P5" pin="3"/>
+      <node ref="P5" pin="2"/>
     </net>
     <net code="106" name="SWDIO">
-      <node ref="P5" pin="1"/>
+      <node ref="P5" pin="3"/>
       <node ref="U3" pin="34"/>
     </net>
     <net code="107" name="SCL">
@@ -2684,24 +2685,24 @@
       <node ref="P3" pin="3"/>
     </net>
     <net code="108" name="SDA">
-      <node ref="J1" pin="3"/>
       <node ref="P3" pin="4"/>
+      <node ref="J1" pin="3"/>
     </net>
     <net code="109" name="DISP_RXD">
-      <node ref="U3" pin="13"/>
       <node ref="P4" pin="2"/>
+      <node ref="U3" pin="13"/>
     </net>
     <net code="110" name="DISP_TXD">
       <node ref="P4" pin="3"/>
       <node ref="U3" pin="12"/>
     </net>
     <net code="111" name="D-">
-      <node ref="U3" pin="32"/>
       <node ref="R26" pin="2"/>
+      <node ref="U3" pin="32"/>
     </net>
     <net code="112" name="D+">
-      <node ref="R27" pin="2"/>
       <node ref="U3" pin="33"/>
+      <node ref="R27" pin="2"/>
     </net>
     <net code="113" name="BOOT0">
       <node ref="R29" pin="2"/>
@@ -2721,106 +2722,106 @@
       <node ref="R22" pin="2"/>
     </net>
     <net code="117" name="Net-(D7-Pad2)">
-      <node ref="R22" pin="1"/>
       <node ref="D7" pin="2"/>
+      <node ref="R22" pin="1"/>
     </net>
     <net code="118" name="Net-(D0-Pad2)">
-      <node ref="D0" pin="2"/>
       <node ref="R24" pin="2"/>
+      <node ref="D0" pin="2"/>
     </net>
     <net code="119" name="SERVICE">
       <node ref="D0" pin="1"/>
       <node ref="U3" pin="2"/>
     </net>
     <net code="120" name="YSF_LED">
-      <node ref="U3" pin="19"/>
       <node ref="R21" pin="2"/>
+      <node ref="U3" pin="19"/>
     </net>
-    <net code="121" name="Net-(C50-Pad1)">
-      <node ref="L10" pin="1"/>
+    <net code="121" name="Net-(JP1-Pad1)">
+      <node ref="JP1" pin="1"/>
+      <node ref="P7" pin="4"/>
+      <node ref="R30" pin="2"/>
+    </net>
+    <net code="122" name="Net-(C50-Pad1)">
       <node ref="C50" pin="1"/>
+      <node ref="L10" pin="1"/>
       <node ref="U4" pin="2"/>
     </net>
-    <net code="122" name="Net-(JP1-Pad1)">
-      <node ref="R30" pin="2"/>
-      <node ref="P7" pin="4"/>
-      <node ref="JP1" pin="1"/>
+    <net code="123" name="Net-(J1-Pad7)">
+      <node ref="J1" pin="7"/>
     </net>
-    <net code="123" name="Net-(J1-Pad37)">
-      <node ref="J1" pin="37"/>
+    <net code="124" name="Net-(J1-Pad32)">
+      <node ref="J1" pin="32"/>
     </net>
-    <net code="124" name="Net-(P8-Pad4)">
+    <net code="125" name="Net-(P8-Pad4)">
       <node ref="P8" pin="4"/>
     </net>
-    <net code="125" name="Net-(J1-Pad17)">
+    <net code="126" name="Net-(J1-Pad17)">
       <node ref="J1" pin="17"/>
     </net>
-    <net code="126" name="Net-(J1-Pad1)">
+    <net code="127" name="Net-(J1-Pad1)">
       <node ref="J1" pin="1"/>
     </net>
-    <net code="127" name="Net-(J1-Pad12)">
+    <net code="128" name="Net-(J1-Pad12)">
       <node ref="J1" pin="12"/>
     </net>
-    <net code="128" name="Net-(J1-Pad16)">
+    <net code="129" name="Net-(J1-Pad16)">
       <node ref="J1" pin="16"/>
     </net>
-    <net code="129" name="Net-(J1-Pad18)">
+    <net code="130" name="Net-(J1-Pad18)">
       <node ref="J1" pin="18"/>
     </net>
-    <net code="130" name="Net-(J1-Pad22)">
+    <net code="131" name="Net-(J1-Pad22)">
       <node ref="J1" pin="22"/>
     </net>
-    <net code="131" name="Net-(J1-Pad24)">
+    <net code="132" name="Net-(J1-Pad24)">
       <node ref="J1" pin="24"/>
     </net>
-    <net code="132" name="Net-(J1-Pad26)">
+    <net code="133" name="Net-(J1-Pad26)">
       <node ref="J1" pin="26"/>
     </net>
-    <net code="133" name="Net-(J1-Pad28)">
+    <net code="134" name="Net-(J1-Pad28)">
       <node ref="J1" pin="28"/>
     </net>
-    <net code="134" name="Net-(J1-Pad32)">
-      <node ref="J1" pin="32"/>
-    </net>
     <net code="135" name="Net-(J1-Pad36)">
       <node ref="J1" pin="36"/>
     </net>
-    <net code="136" name="Net-(J1-Pad35)">
+    <net code="136" name="Net-(J1-Pad37)">
+      <node ref="J1" pin="37"/>
+    </net>
+    <net code="137" name="Net-(J1-Pad35)">
       <node ref="J1" pin="35"/>
     </net>
-    <net code="137" name="Net-(J1-Pad33)">
+    <net code="138" name="Net-(J1-Pad33)">
       <node ref="J1" pin="33"/>
     </net>
-    <net code="138" name="Net-(J1-Pad31)">
+    <net code="139" name="Net-(J1-Pad31)">
       <node ref="J1" pin="31"/>
     </net>
-    <net code="139" name="Net-(J1-Pad29)">
+    <net code="140" name="Net-(J1-Pad29)">
       <node ref="J1" pin="29"/>
     </net>
-    <net code="140" name="Net-(J1-Pad27)">
+    <net code="141" name="Net-(J1-Pad27)">
       <node ref="J1" pin="27"/>
     </net>
-    <net code="141" name="Net-(J1-Pad23)">
+    <net code="142" name="Net-(J1-Pad23)">
       <node ref="J1" pin="23"/>
     </net>
-    <net code="142" name="Net-(J1-Pad21)">
+    <net code="143" name="Net-(J1-Pad21)">
       <node ref="J1" pin="21"/>
     </net>
-    <net code="143" name="Net-(J1-Pad19)">
+    <net code="144" name="Net-(J1-Pad19)">
       <node ref="J1" pin="19"/>
     </net>
-    <net code="144" name="Net-(J1-Pad15)">
+    <net code="145" name="Net-(J1-Pad15)">
       <node ref="J1" pin="15"/>
     </net>
-    <net code="145" name="Net-(J1-Pad13)">
+    <net code="146" name="Net-(J1-Pad13)">
       <node ref="J1" pin="13"/>
     </net>
-    <net code="146" name="Net-(J1-Pad11)">
+    <net code="147" name="Net-(J1-Pad11)">
       <node ref="J1" pin="11"/>
     </net>
-    <net code="147" name="Net-(J1-Pad7)">
-      <node ref="J1" pin="7"/>
-    </net>
     <net code="148" name="Net-(P7-Pad3)">
       <node ref="P7" pin="3"/>
       <node ref="R29" pin="1"/>
@@ -2830,14 +2831,14 @@
       <node ref="R17" pin="1"/>
     </net>
     <net code="150" name="Net-(C41-Pad1)">
-      <node ref="Y1" pin="2"/>
       <node ref="C41" pin="1"/>
+      <node ref="Y1" pin="2"/>
       <node ref="U3" pin="6"/>
     </net>
     <net code="151" name="Net-(C40-Pad1)">
+      <node ref="U3" pin="5"/>
       <node ref="C40" pin="1"/>
       <node ref="Y1" pin="1"/>
-      <node ref="U3" pin="5"/>
     </net>
     <net code="152" name="Net-(U3-Pad10)">
       <node ref="U3" pin="10"/>