diff --git a/PCB/Main Boards/OSO-SWAT-A1-04-BLUE.brd b/PCB/Main Boards/OSO-SWAT-A1-04-BLUE.brd
index 4ed64108..d1709ca0 100644
--- a/PCB/Main Boards/OSO-SWAT-A1-04-BLUE.brd	
+++ b/PCB/Main Boards/OSO-SWAT-A1-04-BLUE.brd	
@@ -27,14 +27,14 @@
 <layer number="16" name="Bottom" color="1" fill="1" visible="yes" active="yes"/>
 <layer number="17" name="Pads" color="2" fill="1" visible="yes" active="yes"/>
 <layer number="18" name="Vias" color="2" fill="1" visible="yes" active="yes"/>
-<layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
+<layer number="19" name="Unrouted" color="6" fill="1" visible="no" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="21" name="tPlace" color="14" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="13" fill="1" visible="yes" active="yes"/>
-<layer number="23" name="tOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="24" name="bOrigins" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="25" name="tNames" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="26" name="bNames" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="21" name="tPlace" color="14" fill="1" visible="no" active="yes"/>
+<layer number="22" name="bPlace" color="13" fill="1" visible="no" active="yes"/>
+<layer number="23" name="tOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="24" name="bOrigins" color="15" fill="1" visible="no" active="yes"/>
+<layer number="25" name="tNames" color="7" fill="1" visible="no" active="yes"/>
+<layer number="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="28" name="bValues" color="7" fill="1" visible="no" active="yes"/>
 <layer number="29" name="tStop" color="7" fill="3" visible="no" active="yes"/>
@@ -47,10 +47,10 @@
 <layer number="36" name="bGlue" color="7" fill="5" visible="no" active="yes"/>
 <layer number="37" name="tTest" color="7" fill="1" visible="no" active="yes"/>
 <layer number="38" name="bTest" color="7" fill="1" visible="no" active="yes"/>
-<layer number="39" name="tKeepout" color="4" fill="11" visible="yes" active="yes"/>
-<layer number="40" name="bKeepout" color="1" fill="11" visible="yes" active="yes"/>
-<layer number="41" name="tRestrict" color="4" fill="10" visible="yes" active="yes"/>
-<layer number="42" name="bRestrict" color="1" fill="10" visible="yes" active="yes"/>
+<layer number="39" name="tKeepout" color="4" fill="11" visible="no" active="yes"/>
+<layer number="40" name="bKeepout" color="1" fill="11" visible="no" active="yes"/>
+<layer number="41" name="tRestrict" color="4" fill="10" visible="no" active="yes"/>
+<layer number="42" name="bRestrict" color="1" fill="10" visible="no" active="yes"/>
 <layer number="43" name="vRestrict" color="2" fill="10" visible="no" active="yes"/>
 <layer number="44" name="Drills" color="7" fill="1" visible="no" active="yes"/>
 <layer number="45" name="Holes" color="7" fill="1" visible="no" active="yes"/>
@@ -59,8 +59,8 @@
 <layer number="48" name="Document" color="7" fill="1" visible="no" active="yes"/>
 <layer number="49" name="Reference" color="7" fill="1" visible="no" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="yes"/>
-<layer number="51" name="tDocu" color="15" fill="1" visible="yes" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="51" name="tDocu" color="15" fill="1" visible="no" active="yes"/>
+<layer number="52" name="bDocu" color="7" fill="1" visible="no" active="yes"/>
 <layer number="53" name="tGND_GNDA" color="7" fill="9" visible="no" active="no"/>
 <layer number="54" name="bGND_GNDA" color="1" fill="9" visible="no" active="no"/>
 <layer number="56" name="wert" color="7" fill="1" visible="no" active="yes"/>
@@ -3181,7 +3181,7 @@ Please make sure your boards conform to these design rules.
 <attribute name="DIGI-KEY_PART_NUMBER" value="160-2026-1-ND" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MF" value="Lite-On Inc." x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="MP" value="LTST-C235KGKRKT" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
-<attribute name="NAME" x="-11.2522" y="0.381" size="0.6096" layer="25" font="vector" ratio="18" rot="R180" align="center"/>
+<attribute name="NAME" x="-11.340009375" y="0.01056875" size="0.508" layer="25" font="vector" ratio="18" align="center"/>
 <attribute name="PACKAGE" value="1206 Lite-On" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="PURCHASE-URL" value="https://pricing.snapeda.com/search/part/LTST-C235KGKRKT/?ref=eda" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
 <attribute name="VALUE" x="-9.74758125" y="-0.05493125" size="0.826140625" layer="27" font="vector" ratio="18" rot="R90" align="center"/>
diff --git a/PCB/Main Boards/OSO-SWAT-A1-04.brd b/PCB/Main Boards/OSO-SWAT-A1-04.brd
index 8b872029..15bda448 100644
--- a/PCB/Main Boards/OSO-SWAT-A1-04.brd	
+++ b/PCB/Main Boards/OSO-SWAT-A1-04.brd	
@@ -2842,9 +2842,9 @@ by exp-lbrs.ulp</description>
 </package>
 </packages>
 </library>
-<library name="QBLP655R">
+<library name="QBLP655">
 <packages>
-<package name="LED_QBLP655R">
+<package name="LED_QBLP655">
 <text x="0.011609375" y="1.46263125" size="0.83205625" layer="25" font="vector" ratio="18" align="center">&gt;NAME</text>
 <text x="-0.05493125" y="-1.58081875" size="0.826140625" layer="27" font="vector" ratio="18" align="center">&gt;VALUE</text>
 <wire x1="1.6" y1="0.6" x2="1.6" y2="-0.6" width="0.127" layer="51"/>
@@ -3135,16 +3135,6 @@ Please make sure your boards conform to these design rules.
 <attribute name="PURCHASE-URL" value="https://pricing.snapeda.com/search/part/EVP-BB1AAB000/?ref=eda" x="3.7084" y="-11.049" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="VALUE" x="6.33821875" y="-14.05451875" size="0.508" layer="28" font="vector" ratio="18" rot="MR0" align="center"/>
 </element>
-<element name="LED" library="QBLP655R" package="LED_QBLP655R" value="QBLP655R" x="-11.3284" y="0" smashed="yes" rot="R90">
-<attribute name="DESCRIPTION" value=" Green, Red 571nm Green, 631nm Red LED Indication - Discrete 2V Green, 2V Red 1206 (3216 Metric) " x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="DIGI-KEY_PART_NUMBER" value="160-2026-1-ND" x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="MF" value="Lite-On Inc." x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="MP" value="LTST-C235KGKRKT" x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="NAME" x="-11.340009375" y="0.01056875" size="0.508" layer="25" font="vector" ratio="18" rot="R180" align="center"/>
-<attribute name="PACKAGE" value="1206 Lite-On" x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="PURCHASE-URL" value="https://pricing.snapeda.com/search/part/LTST-C235KGKRKT/?ref=eda" x="-11.3284" y="0" size="0.508" layer="27" font="vector" ratio="18" rot="R90" display="off"/>
-<attribute name="VALUE" x="-9.74758125" y="-0.05493125" size="0.826140625" layer="27" font="vector" ratio="18" rot="R90" align="center"/>
-</element>
 <element name="R8" library="microbuilder" package="_0603MP" value="1K" x="-8.255" y="2.9464" smashed="yes" rot="R180">
 <attribute name="NAME" x="-6.4643" y="2.9464" size="0.508" layer="25" font="vector" ratio="18" rot="R180" align="center"/>
 <attribute name="VALUE" x="-7.3025" y="3.8989" size="0.4064" layer="27" ratio="10" rot="R180"/>
@@ -3186,6 +3176,16 @@ Please make sure your boards conform to these design rules.
 <attribute name="BOM" value="EXCLUDE" x="6.604" y="-9.906" size="1.778" layer="28" rot="MR0" display="off"/>
 <attribute name="REV" value="A" x="6.604" y="-9.906" size="1.778" layer="28" rot="MR0" display="off"/>
 </element>
+<element name="LED" library="QBLP655" package="LED_QBLP655" value="QBLP655-RIG" x="-11.3284" y="0" smashed="yes" rot="R90">
+<attribute name="DESCRIPTION" value=" Green, Red 571nm Green, 631nm Red LED Indication - Discrete 2V Green, 2V Red 1206 (3216 Metric) " x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="DIGI-KEY_PART_NUMBER" value="160-2026-1-ND" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="MF" value="Lite-On Inc." x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="MP" value="LTST-C235KGKRKT" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="NAME" x="-11.340009375" y="0.01056875" size="0.508" layer="25" font="vector" ratio="18" align="center"/>
+<attribute name="PACKAGE" value="1206 Lite-On" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="PURCHASE-URL" value="https://pricing.snapeda.com/search/part/LTST-C235KGKRKT/?ref=eda" x="-11.3284" y="0" size="1.778" layer="27" rot="R90" display="off"/>
+<attribute name="VALUE" x="-9.74758125" y="-0.05493125" size="0.826140625" layer="27" font="vector" ratio="18" rot="R90" align="center"/>
+</element>
 </elements>
 <signals>
 <signal name="GND" class="2">
@@ -3411,9 +3411,9 @@ Please make sure your boards conform to these design rules.
 <wire x1="-10.922" y1="-0.2032" x2="-10.7116125" y2="0.0071875" width="0.127" layer="16"/>
 <wire x1="-7.6604375" y1="0.0071875" x2="-10.7116125" y2="0.0071875" width="0.127" layer="16"/>
 <via x="-10.922" y="-0.2032" extent="1-16" drill="0.3048"/>
-<contactref element="LED" pad="3"/>
 <wire x1="-10.9284" y1="-1.5" x2="-10.9284" y2="-0.2096" width="0.127" layer="1"/>
 <wire x1="-10.9284" y1="-0.2096" x2="-10.922" y2="-0.2032" width="0.127" layer="1"/>
+<contactref element="LED" pad="3"/>
 </signal>
 <signal name="COM0">
 <contactref element="U$2" pad="7"/>
@@ -4087,24 +4087,24 @@ Please make sure your boards conform to these design rules.
 <wire x1="-11.684" y1="-0.1096" x2="-11.303" y2="0.2714" width="0.127" layer="16"/>
 <wire x1="-7.248425" y1="0.269975" x2="-7.248425" y2="0.2714" width="0.127" layer="16"/>
 <via x="-11.684" y="-0.1096" extent="1-16" drill="0.3048"/>
-<contactref element="LED" pad="1"/>
 <wire x1="-11.7284" y1="-1.5" x2="-11.7284" y2="-0.154" width="0.127" layer="1"/>
 <wire x1="-11.7284" y1="-0.154" x2="-11.684" y2="-0.1096" width="0.127" layer="1"/>
+<contactref element="LED" pad="1"/>
 </signal>
 <signal name="N$1">
 <contactref element="R8" pad="2"/>
-<contactref element="LED" pad="4"/>
 <wire x1="-10.9284" y1="1.5" x2="-10.9284" y2="2.68860625" width="0.127" layer="1"/>
 <wire x1="-9.017" y1="2.9464" x2="-9.3472" y2="3.2766" width="0.127" layer="1"/>
 <wire x1="-10.34040625" y1="3.2766" x2="-9.3472" y2="3.2766" width="0.127" layer="1"/>
 <wire x1="-10.9284" y1="2.68860625" x2="-10.34040625" y2="3.2766" width="0.127" layer="1"/>
+<contactref element="LED" pad="4"/>
 </signal>
 <signal name="N$2">
 <contactref element="R9" pad="2"/>
-<contactref element="LED" pad="2"/>
 <wire x1="-11.7284" y1="1.5" x2="-11.7284" y2="2.267" width="0.127" layer="1"/>
 <wire x1="-10.0076" y1="3.9878" x2="-9.2964" y2="3.9878" width="0.127" layer="1"/>
 <wire x1="-11.7284" y1="2.267" x2="-10.0076" y2="3.9878" width="0.127" layer="1"/>
+<contactref element="LED" pad="2"/>
 </signal>
 <signal name="VBUS_DET">
 <contactref element="R5" pad="2"/>
diff --git a/PCB/Main Boards/OSO-SWAT-A1-04.sch b/PCB/Main Boards/OSO-SWAT-A1-04.sch
index f832646f..dc67b522 100644
--- a/PCB/Main Boards/OSO-SWAT-A1-04.sch	
+++ b/PCB/Main Boards/OSO-SWAT-A1-04.sch	
@@ -4071,9 +4071,9 @@ by exp-lbrs.ulp</description>
 </deviceset>
 </devicesets>
 </library>
-<library name="QBLP655R">
+<library name="QBLP655">
 <packages>
-<package name="LED_QBLP655R">
+<package name="LED_QBLP655">
 <text x="0.011609375" y="1.46263125" size="0.83205625" layer="25" font="vector" ratio="18" align="center">&gt;NAME</text>
 <text x="-0.05493125" y="-1.58081875" size="0.826140625" layer="27" font="vector" ratio="18" align="center">&gt;VALUE</text>
 <wire x1="1.6" y1="0.6" x2="1.6" y2="-0.6" width="0.127" layer="51"/>
@@ -4089,7 +4089,7 @@ by exp-lbrs.ulp</description>
 </package>
 </packages>
 <symbols>
-<symbol name="LED_QBLP655R_SECTION1">
+<symbol name="LED_QBLP655_R">
 <wire x1="0" y1="-1.27" x2="2.54" y2="0" width="0.254" layer="94"/>
 <wire x1="2.54" y1="0" x2="0" y2="1.27" width="0.254" layer="94"/>
 <wire x1="2.54" y1="-1.27" x2="2.54" y2="0" width="0.254" layer="94"/>
@@ -4113,7 +4113,7 @@ by exp-lbrs.ulp</description>
 <pin name="C" x="5.08" y="0" visible="pad" length="short" direction="pas" rot="R180"/>
 <pin name="A" x="-2.54" y="0" visible="pad" length="short" direction="pas"/>
 </symbol>
-<symbol name="LED_QBLP655R_SECTION2">
+<symbol name="LED_QBLP655_G">
 <wire x1="0" y1="-1.27" x2="2.54" y2="0" width="0.254" layer="94"/>
 <wire x1="2.54" y1="0" x2="0" y2="1.27" width="0.254" layer="94"/>
 <wire x1="2.54" y1="-1.27" x2="2.54" y2="0" width="0.254" layer="94"/>
@@ -4139,14 +4139,14 @@ by exp-lbrs.ulp</description>
 </symbol>
 </symbols>
 <devicesets>
-<deviceset name="QBLP655R" prefix="D">
+<deviceset name="QBLP655-RIG" prefix="D">
 <description>Green, Red 571nm Green, 631nm Red LED Indication - Discrete 2V Green, 2V Red 1206 (3216 Metric) </description>
 <gates>
-<gate name="G$1" symbol="LED_QBLP655R_SECTION1" x="0" y="7.62" swaplevel="1"/>
-<gate name="G$2" symbol="LED_QBLP655R_SECTION2" x="0" y="-7.62" swaplevel="2"/>
+<gate name="G$1" symbol="LED_QBLP655_R" x="0" y="7.62" swaplevel="1"/>
+<gate name="G$2" symbol="LED_QBLP655_G" x="0" y="-7.62" swaplevel="2"/>
 </gates>
 <devices>
-<device name="" package="LED_QBLP655R">
+<device name="" package="LED_QBLP655">
 <connects>
 <connect gate="G$1" pin="A" pad="1"/>
 <connect gate="G$1" pin="C" pad="2"/>
@@ -4222,7 +4222,6 @@ by exp-lbrs.ulp</description>
 <part name="U$8" library="microbuilder" deviceset="VBUS" device=""/>
 <part name="+3V1" library="supply1" library_urn="urn:adsk.eagle:library:371" deviceset="+3V3" device=""/>
 <part name="RESET" library="EVP-BB1AAB000" deviceset="EVP-BB1AAB000" device=""/>
-<part name="LED" library="QBLP655R" deviceset="QBLP655R" device=""/>
 <part name="GND15" library="supply1" deviceset="GND" device=""/>
 <part name="R8" library="microbuilder" deviceset="RESISTOR" device="_0603MP" value="1K"/>
 <part name="R9" library="microbuilder" deviceset="RESISTOR" device="_0603MP" value="100"/>
@@ -4242,6 +4241,7 @@ by exp-lbrs.ulp</description>
 <part name="FID6" library="microbuilder" deviceset="FIDUCIAL" device="_1MM">
 <attribute name="REV" value="A"/>
 </part>
+<part name="LED" library="QBLP655" deviceset="QBLP655-RIG" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -4404,12 +4404,6 @@ by exp-lbrs.ulp</description>
 <attribute name="NAME" x="76.2" y="109.22" size="1.27" layer="95"/>
 <attribute name="VALUE" x="76.2" y="104.14" size="1.27" layer="96" align="top-left"/>
 </instance>
-<instance part="LED" gate="G$1" x="231.14" y="116.84" smashed="yes">
-<attribute name="NAME" x="228.6" y="121.92" size="1.780740625" layer="95"/>
-</instance>
-<instance part="LED" gate="G$2" x="231.14" y="127" smashed="yes">
-<attribute name="NAME" x="228.6" y="132.08" size="1.780740625" layer="95"/>
-</instance>
 <instance part="GND15" gate="1" x="248.92" y="111.76" smashed="yes" rot="MR0">
 <attribute name="VALUE" x="248.92" y="109.22" size="1.778" layer="96" rot="MR0"/>
 </instance>
@@ -4451,6 +4445,8 @@ by exp-lbrs.ulp</description>
 <instance part="FID3" gate="G$1" x="185.42" y="45.72" smashed="yes"/>
 <instance part="FID4" gate="G$1" x="193.04" y="40.64" smashed="yes"/>
 <instance part="FID6" gate="G$1" x="185.42" y="40.64" smashed="yes"/>
+<instance part="LED" gate="G$1" x="231.14" y="116.84" smashed="yes"/>
+<instance part="LED" gate="G$2" x="231.14" y="127" smashed="yes"/>
 </instances>
 <busses>
 </busses>