diff --git a/hardware/pentabug.brd b/hardware/pentabug.brd
index 74f646d..07d1a64 100644
--- a/hardware/pentabug.brd
+++ b/hardware/pentabug.brd
@@ -29,13 +29,13 @@
 <layer number="19" name="Unrouted" color="6" fill="1" visible="yes" active="yes"/>
 <layer number="20" name="Dimension" color="15" fill="1" visible="yes" active="yes"/>
 <layer number="21" name="tPlace" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="22" name="bPlace" color="7" fill="1" visible="yes" active="yes"/>
+<layer number="22" name="bPlace" color="7" fill="1" visible="no" 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="24" name="bOrigins" color="15" fill="1" visible="no" 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="26" name="bNames" color="7" fill="1" visible="no" active="yes"/>
 <layer number="27" name="tValues" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="28" name="bValues" color="7" fill="1" visible="yes" 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"/>
 <layer number="30" name="bStop" color="7" fill="6" visible="no" active="yes"/>
 <layer number="31" name="tCream" color="7" fill="4" visible="no" active="yes"/>
@@ -59,7 +59,7 @@
 <layer number="49" name="Reference" color="7" fill="1" visible="yes" active="yes"/>
 <layer number="50" name="dxf" color="7" fill="1" visible="no" active="yes"/>
 <layer number="51" name="tDocu" color="7" fill="1" visible="yes" active="yes"/>
-<layer number="52" name="bDocu" color="7" fill="1" visible="yes" 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"/>
@@ -108,9 +108,9 @@
 <board>
 <plain>
 <wire x1="0" y1="0" x2="33" y2="0" width="0" layer="20"/>
-<wire x1="33" y1="0" x2="33" y2="100" width="0" layer="20"/>
-<wire x1="33" y1="100" x2="0" y2="100" width="0" layer="20"/>
-<wire x1="0" y1="100" x2="0" y2="0" width="0" layer="20"/>
+<wire x1="33" y1="0" x2="33" y2="89.205" width="0" layer="20"/>
+<wire x1="33" y1="89.205" x2="0" y2="89.205" width="0" layer="20"/>
+<wire x1="0" y1="89.205" x2="0" y2="0" width="0" layer="20"/>
 <polygon width="0.4064" layer="21">
 <vertex x="16.51" y="24.13"/>
 <vertex x="2.54" y="22.86"/>
@@ -213,15 +213,6 @@
 <pad name="4" x="3.2512" y="-2.2606" drill="1.016" diameter="1.8796"/>
 <text x="-2.54" y="3.81" size="1.27" layer="25" ratio="10">&gt;NAME</text>
 </package>
-<package name="BUZZER-12MM">
-<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9" diameter="1.778"/>
-<pad name="+" x="3.25" y="0" drill="0.9" diameter="1.778"/>
-<text x="-2.54" y="2.54" size="0.6096" layer="25" ratio="10">&gt;NAME</text>
-<text x="-3.175" y="-3.048" size="0.6096" layer="27" ratio="10">&gt;VALUE</text>
-</package>
 </packages>
 </library>
 <library name="resistor">
@@ -477,6 +468,23 @@ type 0207, grid 10 mm</description>
 <vertex x="7.965" y="0.73"/>
 </polygon>
 </package>
+<package name="MULTIBUZZR">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
+<wire x1="6.096" y1="0.127" x2="7.874" y2="0.127" width="0.1524" layer="21"/>
+<wire x1="6.985" y1="1.016" x2="6.985" y2="-0.762" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="6" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="5.5" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="1" width="0.1524" layer="21"/>
+<circle x="6.985" y="0.127" radius="1" width="0.1524" layer="21"/>
+<pad name="-" x="-3.8" y="0" drill="0.8" diameter="1.8" shape="octagon"/>
+<pad name="+" x="3.8" y="0" drill="0.8" diameter="1.8" shape="octagon"/>
+<text x="-5.08" y="6.35" size="1.778" layer="25" ratio="10">&gt;NAME</text>
+<text x="-5.08" y="-7.62" size="1.778" layer="27" ratio="10">&gt;VALUE</text>
+<pad name="-1" x="-2.3" y="2.3" drill="0.8" diameter="1.8" shape="octagon"/>
+<pad name="+1" x="2.3" y="-2.3" drill="0.8" diameter="1.8" shape="octagon"/>
+<wire x1="-3.81" y1="0" x2="-2.3" y2="2.3" width="1.27" layer="1"/>
+<wire x1="2.3" y1="-2.3" x2="3.81" y2="0" width="1.27" layer="1"/>
+</package>
 </packages>
 </library>
 </libraries>
@@ -648,11 +656,10 @@ design rules under a new name.</description>
 </element>
 <element name="C1" library="resistor" package="C025-024X044" value="100nF" x="25.4" y="39.37" rot="R90"/>
 <element name="C2" library="resistor" package="C025-024X044" value="100nF" x="25.4" y="44.45" rot="R90"/>
-<element name="S2" library="SparkFun" package="TACTILE-PTH" value="" x="29.21" y="31.75" rot="R90"/>
-<element name="S1" library="SparkFun" package="TACTILE-PTH" value="" x="3.81" y="31.75" rot="R270"/>
+<element name="S2" library="SparkFun" package="TACTILE-PTH" value="" x="28.575" y="31.75" rot="R90"/>
+<element name="S1" library="SparkFun" package="TACTILE-PTH" value="" x="4.445" y="31.75" rot="R270"/>
 <element name="C3" library="resistor" package="C025-024X044" value="100nF" x="7.62" y="44.45" rot="R90"/>
 <element name="Q1" library="transistors" package="TO-92" value="" x="16.51" y="73.66" rot="R180"/>
-<element name="SG2" library="SparkFun" package="BUZZER-12MM" value="BUZZERPTH" x="16.51" y="24.13"/>
 <element name="R3" library="rcl" package="0207/10" value="10k" x="8.89" y="59.69" rot="R270"/>
 <element name="LED1" library="SparkFun" package="LED5MM" value="" x="3.81" y="82.55"/>
 <element name="LED2" library="SparkFun" package="LED5MM" value="" x="29.21" y="82.55" rot="R180"/>
@@ -660,6 +667,12 @@ design rules under a new name.</description>
 <element name="BAT1" library="seb" package="BATTERY_2XAAA" value="BATTERY_2XAAA" x="16.51" y="26.67" rot="MR270"/>
 <element name="JP2" library="pinhead" package="2X03" value="" x="27.94" y="15.24" rot="R225"/>
 <element name="U$1" library="buglbr" package="LA4-432" value="VIBRAMOTOR" x="16.51" y="86.36" rot="R90"/>
+<element name="SG1" library="buglbr" package="MULTIBUZZR" value="MULTIBUZZR" x="16.51" y="24.13">
+<attribute name="OC_NEWARK" value="unknown" x="16.51" y="24.13" size="1.778" layer="27" display="off"/>
+<attribute name="MPN" value="" x="16.51" y="24.13" size="1.778" layer="27" display="off"/>
+<attribute name="MF" value="" x="16.51" y="24.13" size="1.778" layer="27" display="off"/>
+<attribute name="OC_FARNELL" value="unknown" x="16.51" y="24.13" size="1.778" layer="27" display="off"/>
+</element>
 </elements>
 <signals>
 <signal name="N$4">
@@ -718,23 +731,25 @@ design rules under a new name.</description>
 <contactref element="S2" pad="4"/>
 <contactref element="C3" pad="1"/>
 <contactref element="JP1" pad="3"/>
-<contactref element="SG2" pad="-"/>
 <contactref element="Q1" pad="1"/>
 <contactref element="BAT1" pad="-"/>
 <contactref element="JP2" pad="6"/>
+<contactref element="SG1" pad="-"/>
+<contactref element="SG1" pad="-1"/>
 <wire x1="20.32" y1="50.8" x2="17.78" y2="73.66" width="0" layer="19" extent="1-1"/>
 <wire x1="23.06" y1="50.42" x2="20.32" y2="50.8" width="0" layer="19" extent="1-1"/>
 <wire x1="25.4" y1="43.18" x2="23.06" y2="50.42" width="0" layer="19" extent="1-1"/>
 <wire x1="25.4" y1="38.1" x2="25.4" y2="43.18" width="0" layer="19" extent="1-1"/>
-<wire x1="31.4706" y1="35.0012" x2="25.4" y2="38.1" width="0" layer="19" extent="1-1"/>
-<wire x1="31.4706" y1="28.4988" x2="31.4706" y2="35.0012" width="0" layer="19" extent="1-1"/>
+<wire x1="30.8356" y1="35.0012" x2="25.4" y2="38.1" width="0" layer="19" extent="1-1"/>
+<wire x1="30.8356" y1="28.4988" x2="30.8356" y2="35.0012" width="0" layer="19" extent="1-1"/>
 <wire x1="12.7" y1="48.26" x2="20.32" y2="50.8" width="0" layer="19" extent="1-1"/>
 <wire x1="7.62" y1="43.18" x2="12.7" y2="48.26" width="0" layer="19" extent="1-1"/>
-<wire x1="1.5494" y1="35.0012" x2="7.62" y2="43.18" width="0" layer="19" extent="1-1"/>
-<wire x1="1.5494" y1="28.4988" x2="1.5494" y2="35.0012" width="0" layer="19" extent="1-1"/>
-<wire x1="13.26" y1="24.13" x2="1.5494" y2="28.4988" width="0" layer="19" extent="1-1"/>
-<wire x1="7.67305" y1="14.453946875" x2="13.26" y2="24.13" width="0" layer="19" extent="1-1"/>
-<wire x1="27.041971875" y1="12.545921875" x2="31.4706" y2="28.4988" width="0" layer="19" extent="1-1"/>
+<wire x1="2.1844" y1="35.0012" x2="7.62" y2="43.18" width="0" layer="19" extent="1-1"/>
+<wire x1="2.1844" y1="28.4988" x2="2.1844" y2="35.0012" width="0" layer="19" extent="1-1"/>
+<wire x1="12.7" y1="24.13" x2="2.1844" y2="28.4988" width="0" layer="19" extent="1-1"/>
+<wire x1="12.71" y1="24.13" x2="12.7" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="7.67305" y1="14.453946875" x2="12.7" y2="24.13" width="0" layer="19" extent="1-1"/>
+<wire x1="27.041971875" y1="12.545921875" x2="30.8356" y2="28.4988" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$17">
 <contactref element="IC1" pad="21"/>
@@ -748,7 +763,7 @@ design rules under a new name.</description>
 <contactref element="S2" pad="1"/>
 <contactref element="IC1" pad="3"/>
 <contactref element="JP1" pad="2"/>
-<wire x1="26.9494" y1="35.0012" x2="26.9494" y2="28.4988" width="0.6096" layer="1"/>
+<wire x1="26.3144" y1="35.0012" x2="26.3144" y2="28.4988" width="0.6096" layer="1"/>
 <wire x1="5.877" y1="16.25" x2="5.877" y2="16.037" width="0.6096" layer="1"/>
 <wire x1="5.877" y1="16.037" x2="3.81" y2="13.97" width="0.6096" layer="1"/>
 <wire x1="3.81" y1="13.97" x2="3.81" y2="11.43" width="0.6096" layer="1"/>
@@ -756,71 +771,96 @@ design rules under a new name.</description>
 <wire x1="5.08" y1="10.16" x2="13.97" y2="10.16" width="0.6096" layer="1"/>
 <wire x1="13.97" y1="10.16" x2="16.51" y2="12.7" width="0.6096" layer="1"/>
 <wire x1="16.51" y1="12.7" x2="16.51" y2="19.05" width="0.6096" layer="1"/>
-<wire x1="16.51" y1="19.05" x2="17.78" y2="20.32" width="0.6096" layer="1"/>
-<wire x1="17.78" y1="20.32" x2="19.05" y2="20.32" width="0.6096" layer="1"/>
-<wire x1="19.05" y1="20.32" x2="26.9494" y2="28.2194" width="0.6096" layer="1"/>
-<wire x1="26.9494" y1="28.2194" x2="26.9494" y2="28.4988" width="0.6096" layer="1"/>
-<wire x1="26.9494" y1="35.0012" x2="12.7" y2="60.96" width="0" layer="19" extent="1-1"/>
+<wire x1="16.51" y1="19.05" x2="19.05" y2="19.05" width="0.6096" layer="1"/>
+<wire x1="19.05" y1="19.05" x2="26.9494" y2="28.2194" width="0.6096" layer="1"/>
+<wire x1="26.9494" y1="28.2194" x2="26.3144" y2="28.4988" width="0.6096" layer="1"/>
+<wire x1="12.7" y1="60.96" x2="10.16" y2="60.96" width="0.6096" layer="16"/>
+<wire x1="10.16" y1="60.96" x2="6.35" y2="57.15" width="0.6096" layer="16"/>
+<wire x1="6.35" y1="57.15" x2="6.35" y2="49.53" width="0.6096" layer="16"/>
+<wire x1="6.35" y1="49.53" x2="10.16" y2="45.72" width="0.6096" layer="16"/>
+<wire x1="10.16" y1="45.72" x2="10.16" y2="20.533" width="0.6096" layer="16"/>
+<wire x1="10.16" y1="20.533" x2="5.877" y2="16.25" width="0.6096" layer="16"/>
 </signal>
 <signal name="RX">
 <contactref element="S1" pad="2"/>
 <contactref element="IC1" pad="2"/>
 <contactref element="S1" pad="1"/>
 <contactref element="JP1" pad="1"/>
-<wire x1="6.0706" y1="35.0012" x2="6.0706" y2="28.4988" width="0.6096" layer="1"/>
-<wire x1="6.0706" y1="28.4988" x2="6.0706" y2="26.3906" width="0.6096" layer="1"/>
+<wire x1="6.7056" y1="35.0012" x2="6.7056" y2="28.4988" width="0.6096" layer="1"/>
+<wire x1="6.7056" y1="28.4988" x2="6.0706" y2="26.3906" width="0.6096" layer="1"/>
 <wire x1="6.0706" y1="26.3906" x2="5.08" y2="25.4" width="0.6096" layer="1"/>
-<wire x1="5.08" y1="25.4" x2="2.54" y2="25.4" width="0.6096" layer="1"/>
-<wire x1="2.54" y1="25.4" x2="1.27" y2="24.13" width="0.6096" layer="1"/>
-<wire x1="1.27" y1="24.13" x2="1.27" y2="20.856996875" width="0.6096" layer="1"/>
-<wire x1="1.27" y1="20.856996875" x2="4.080946875" y2="18.04605" width="0.6096" layer="1"/>
+<wire x1="5.08" y1="25.4" x2="5.08" y2="20.856996875" width="0.6096" layer="1"/>
+<wire x1="5.08" y1="20.856996875" x2="4.080946875" y2="18.04605" width="0.6096" layer="1"/>
 <wire x1="12.7" y1="63.5" x2="10.16" y2="63.5" width="0.6096" layer="16"/>
 <wire x1="10.16" y1="63.5" x2="8.89" y2="62.23" width="0.6096" layer="16"/>
-<wire x1="8.89" y1="62.23" x2="2.54" y2="62.23" width="0.6096" layer="16"/>
-<wire x1="2.54" y1="62.23" x2="2.54" y2="39.37" width="0.6096" layer="16"/>
-<wire x1="2.54" y1="39.37" x2="6.0706" y2="35.8394" width="0.6096" layer="16"/>
-<wire x1="6.0706" y1="35.8394" x2="6.0706" y2="35.0012" width="0.6096" layer="16"/>
+<wire x1="8.89" y1="62.23" x2="5.08" y2="62.23" width="0.6096" layer="16"/>
+<wire x1="5.08" y1="62.23" x2="5.08" y2="39.37" width="0.6096" layer="16"/>
+<wire x1="5.08" y1="39.37" x2="6.0706" y2="35.8394" width="0.6096" layer="16"/>
+<wire x1="6.0706" y1="35.8394" x2="6.7056" y2="35.0012" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$3">
 <contactref element="IC1" pad="23"/>
 <contactref element="LED1" pad="A"/>
-<wire x1="2.54" y1="82.55" x2="2.54" y2="60.96" width="0.6096" layer="1"/>
-<wire x1="2.54" y1="60.96" x2="3.81" y2="59.69" width="0.6096" layer="1"/>
-<wire x1="3.81" y1="59.69" x2="20.32" y2="53.34" width="0" layer="19" extent="1-16"/>
+<wire x1="20.32" y1="53.34" x2="26.67" y2="53.34" width="0.6096" layer="1"/>
+<wire x1="26.67" y1="53.34" x2="26.67" y2="71.12" width="0.6096" layer="1"/>
+<via x="26.67" y="71.12" extent="1-16" drill="0.6"/>
+<via x="8.89" y="71.12" extent="1-16" drill="0.6"/>
+<wire x1="8.89" y1="71.12" x2="8.89" y2="76.2" width="0.6096" layer="1"/>
+<wire x1="8.89" y1="76.2" x2="2.54" y2="82.55" width="0.6096" layer="1"/>
+<wire x1="26.67" y1="71.12" x2="24.13" y2="71.12" width="0.6096" layer="16"/>
+<wire x1="24.13" y1="71.12" x2="22.86" y2="72.39" width="0.6096" layer="16"/>
+<wire x1="22.86" y1="72.39" x2="22.86" y2="74.93" width="0.6096" layer="16"/>
+<wire x1="22.86" y1="74.93" x2="21.59" y2="76.2" width="0.6096" layer="16"/>
+<wire x1="21.59" y1="76.2" x2="12.7" y2="76.2" width="0.6096" layer="16"/>
+<wire x1="12.7" y1="76.2" x2="11.43" y2="74.93" width="0.6096" layer="16"/>
+<wire x1="11.43" y1="74.93" x2="11.43" y2="71.12" width="0.6096" layer="16"/>
+<wire x1="11.43" y1="71.12" x2="8.89" y2="71.12" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$5">
 <contactref element="IC1" pad="25"/>
 <contactref element="LED2" pad="A"/>
-<wire x1="30.48" y1="82.55" x2="30.48" y2="60.96" width="0.6096" layer="1"/>
-<wire x1="30.48" y1="60.96" x2="27.94" y2="58.42" width="0.6096" layer="1"/>
-<wire x1="27.94" y1="58.42" x2="20.32" y2="58.42" width="0.6096" layer="1"/>
+<wire x1="30.48" y1="82.55" x2="24.13" y2="76.2" width="0.6096" layer="1"/>
+<wire x1="24.13" y1="76.2" x2="24.13" y2="58.42" width="0.6096" layer="1"/>
+<wire x1="24.13" y1="58.42" x2="20.32" y2="58.42" width="0.6096" layer="1"/>
 </signal>
 <signal name="N$10">
 <contactref element="LED1" pad="K"/>
 <contactref element="IC1" pad="24"/>
-<wire x1="5.08" y1="82.55" x2="5.08" y2="68.58" width="0.6096" layer="1"/>
-<wire x1="5.08" y1="68.58" x2="20.32" y2="55.88" width="0" layer="19" extent="1-16"/>
+<wire x1="5.08" y1="82.55" x2="10.16" y2="77.47" width="0.6096" layer="1"/>
+<wire x1="20.32" y1="55.88" x2="25.4" y2="55.88" width="0.6096" layer="1"/>
+<wire x1="25.4" y1="55.88" x2="25.4" y2="72.39" width="0.6096" layer="1"/>
+<via x="25.4" y="72.39" extent="1-16" drill="0.6"/>
+<via x="10.16" y="72.39" extent="1-16" drill="0.6"/>
+<wire x1="10.16" y1="72.39" x2="10.16" y2="77.47" width="0.6096" layer="1"/>
+<wire x1="10.16" y1="72.39" x2="10.16" y2="76.2" width="0.6096" layer="16"/>
+<wire x1="10.16" y1="76.2" x2="11.43" y2="77.47" width="0.6096" layer="16"/>
+<wire x1="11.43" y1="77.47" x2="22.86" y2="77.47" width="0.6096" layer="16"/>
+<wire x1="22.86" y1="77.47" x2="25.4" y2="74.93" width="0.6096" layer="16"/>
+<wire x1="25.4" y1="74.93" x2="25.4" y2="72.39" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$11">
 <contactref element="LED2" pad="K"/>
 <contactref element="IC1" pad="26"/>
-<wire x1="20.32" y1="60.96" x2="26.67" y2="60.96" width="0.6096" layer="1"/>
-<wire x1="26.67" y1="60.96" x2="27.94" y2="62.23" width="0.6096" layer="1"/>
-<wire x1="27.94" y1="62.23" x2="27.94" y2="82.55" width="0.6096" layer="1"/>
+<wire x1="27.94" y1="82.55" x2="22.86" y2="77.47" width="0.6096" layer="1"/>
+<wire x1="22.86" y1="77.47" x2="22.86" y2="60.96" width="0.6096" layer="1"/>
+<wire x1="20.32" y1="60.96" x2="22.86" y2="60.96" width="0.6096" layer="1"/>
 </signal>
 <signal name="BUZZR">
-<contactref element="SG2" pad="+"/>
 <contactref element="IC1" pad="16"/>
-<wire x1="19.76" y1="24.13" x2="22.86" y2="27.23" width="0.6096" layer="1"/>
 <wire x1="22.86" y1="27.23" x2="22.86" y2="34.29" width="0.6096" layer="1"/>
 <wire x1="22.86" y1="34.29" x2="21.59" y2="35.56" width="0.6096" layer="1"/>
 <wire x1="21.59" y1="35.56" x2="20.32" y2="35.56" width="0.6096" layer="1"/>
+<contactref element="SG1" pad="+1"/>
+<contactref element="SG1" pad="+"/>
+<wire x1="20.31" y1="24.13" x2="22.86" y2="27.23" width="0" layer="19" extent="1-1"/>
+<wire x1="20.32" y1="24.13" x2="20.31" y2="24.13" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="VIBRATE">
 <contactref element="IC1" pad="15"/>
 <contactref element="Q1" pad="2"/>
-<wire x1="16.51" y1="71.755" x2="16.51" y2="71.12" width="0.6096" layer="1"/>
-<wire x1="16.51" y1="71.12" x2="20.32" y2="33.02" width="0" layer="19" extent="1-16"/>
+<wire x1="16.51" y1="71.755" x2="16.51" y2="34.29" width="0.6096" layer="16"/>
+<wire x1="16.51" y1="34.29" x2="17.78" y2="33.02" width="0.6096" layer="16"/>
+<wire x1="17.78" y1="33.02" x2="20.32" y2="33.02" width="0.6096" layer="16"/>
 </signal>
 <signal name="N$8">
 <contactref element="Q1" pad="3"/>
diff --git a/hardware/pentabug.sch b/hardware/pentabug.sch
index 2aa789c..5976bfa 100644
--- a/hardware/pentabug.sch
+++ b/hardware/pentabug.sch
@@ -410,63 +410,6 @@ Source: avr.lbr</description>
 <pad name="P$3" x="-3.81" y="-2.54" drill="1" shape="square"/>
 <pad name="P$4" x="3.81" y="-2.54" drill="1" shape="square"/>
 </package>
-<package name="BUZZER-12MM">
-<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9" diameter="1.778"/>
-<pad name="+" x="3.25" y="0" drill="0.9" diameter="1.778"/>
-<text x="-2.54" y="2.54" size="0.6096" layer="25" ratio="10">&gt;NAME</text>
-<text x="-3.175" y="-3.048" size="0.6096" layer="27" ratio="10">&gt;VALUE</text>
-</package>
-<package name="BUZZER-CMT1603">
-<wire x1="-8" y1="8" x2="-8" y2="-8" width="0.127" layer="21"/>
-<wire x1="-8" y1="-8" x2="8" y2="-8" width="0.127" layer="21"/>
-<wire x1="8" y1="-8" x2="8" y2="8" width="0.127" layer="21"/>
-<wire x1="8" y1="8" x2="-8" y2="8" width="0.127" layer="21"/>
-<smd name="P$1" x="-9.3" y="0" dx="2.5" dy="3" layer="1"/>
-<smd name="P$2" x="9.3" y="0" dx="2.5" dy="3" layer="1"/>
-</package>
-<package name="BUZZER-CCV">
-<wire x1="2.6" y1="-6" x2="-2.6" y2="-6" width="0.127" layer="51"/>
-<wire x1="2.6" y1="-6" x2="2.6" y2="-3.7" width="0.127" layer="51"/>
-<wire x1="-2.6" y1="-6" x2="-2.6" y2="-3.7" width="0.127" layer="51"/>
-<wire x1="-4.2" y1="1.6" x2="1.27" y2="4.318" width="0.2032" layer="21" curve="-86.141052"/>
-<wire x1="3.048" y1="3.302" x2="4.191" y2="1.651" width="0.2032" layer="21" curve="-25.69541"/>
-<wire x1="4.2" y1="-1.6" x2="2.6" y2="-3.7" width="0.2032" layer="21" curve="-31.605028"/>
-<wire x1="-3.302" y1="-3.048" x2="-2.6" y2="-3.6" width="0.2032" layer="21" curve="12.917633"/>
-<wire x1="-2.6" y1="-6" x2="2.6" y2="-6" width="0.2032" layer="21"/>
-<wire x1="2.6" y1="-6" x2="2.6" y2="-3.7" width="0.2032" layer="21"/>
-<wire x1="-2.6" y1="-6" x2="-2.6" y2="-3.6" width="0.2032" layer="21"/>
-<circle x="0" y="0" radius="4.5" width="0.127" layer="51"/>
-<smd name="-" x="-4" y="0" dx="3.2" dy="2.5" layer="1"/>
-<smd name="+" x="4" y="0" dx="3.2" dy="2.5" layer="1"/>
-<hole x="-3.9" y="-2.25" drill="0.8"/>
-<hole x="2.25" y="3.9" drill="0.8"/>
-</package>
-<package name="BUZZER-CMT1102">
-<wire x1="-5.5" y1="4.5" x2="5.5" y2="4.5" width="0.127" layer="51"/>
-<wire x1="5.5" y1="4.5" x2="5.5" y2="-4.5" width="0.127" layer="51"/>
-<wire x1="5.5" y1="-4.5" x2="-5.5" y2="-4.5" width="0.127" layer="51"/>
-<wire x1="-5.5" y1="-4.5" x2="-5.5" y2="4.5" width="0.127" layer="51"/>
-<wire x1="-5.5" y1="4.5" x2="-5.5" y2="2" width="0.2032" layer="21"/>
-<wire x1="-5.5" y1="4.5" x2="5.5" y2="4.5" width="0.2032" layer="21"/>
-<wire x1="5.5" y1="4.5" x2="5.5" y2="2" width="0.2032" layer="21"/>
-<wire x1="5.5" y1="-2" x2="5.5" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="5.5" y1="-4.5" x2="-5.5" y2="-4.5" width="0.2032" layer="21"/>
-<wire x1="-5.5" y1="-4.5" x2="-5.5" y2="-2" width="0.2032" layer="21"/>
-<smd name="1" x="-6.5" y="0" dx="3" dy="3" layer="1"/>
-<smd name="2" x="6.5" y="0" dx="3" dy="3" layer="1"/>
-</package>
-<package name="BUZZER-12MM-NS">
-<circle x="0" y="0" radius="5.9" width="0.2032" layer="51"/>
-<circle x="0" y="0" radius="1.27" width="0.2032" layer="51"/>
-<pad name="-" x="-3.25" y="0" drill="0.9"/>
-<pad name="+" x="3.25" y="0" drill="0.9"/>
-<text x="-2.54" y="2.54" size="0.6096" layer="25" ratio="10">&gt;NAME</text>
-<text x="-3.175" y="-3.048" size="0.6096" layer="27" ratio="10">&gt;VALUE</text>
-<text x="2.667" y="1.143" size="1.778" layer="51">+</text>
-</package>
 </packages>
 <symbols>
 <symbol name="LED">
@@ -515,31 +458,6 @@ Source: avr.lbr</description>
 <pin name="4" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" swaplevel="1" rot="R180"/>
 <pin name="2" x="-5.08" y="-2.54" visible="pad" length="short" direction="pas" swaplevel="2"/>
 </symbol>
-<symbol name="BUZZER">
-<wire x1="-1.27" y1="1.905" x2="0" y2="1.905" width="0.1524" layer="94"/>
-<wire x1="0" y1="1.905" x2="0" y2="2.54" width="0.1524" layer="94"/>
-<wire x1="0" y1="1.905" x2="0" y2="1.27" width="0.1524" layer="94"/>
-<wire x1="0.635" y1="3.175" x2="0.635" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="0.635" y1="0.635" x2="1.905" y2="0.635" width="0.1524" layer="94"/>
-<wire x1="1.905" y1="0.635" x2="1.905" y2="3.175" width="0.1524" layer="94"/>
-<wire x1="1.905" y1="3.175" x2="0.635" y2="3.175" width="0.1524" layer="94"/>
-<wire x1="2.54" y1="2.54" x2="2.54" y2="1.905" width="0.1524" layer="94"/>
-<wire x1="2.54" y1="1.905" x2="3.81" y2="1.905" width="0.1524" layer="94"/>
-<wire x1="2.54" y1="1.905" x2="2.54" y2="1.27" width="0.1524" layer="94"/>
-<wire x1="5.08" y1="0" x2="5.08" y2="3.81" width="0.254" layer="94"/>
-<wire x1="5.08" y1="3.81" x2="5.715" y2="3.81" width="0.254" layer="94"/>
-<wire x1="5.715" y1="3.81" x2="5.715" y2="4.445" width="0.254" layer="94"/>
-<wire x1="5.715" y1="4.445" x2="-3.175" y2="4.445" width="0.254" layer="94"/>
-<wire x1="-3.175" y1="4.445" x2="-3.175" y2="3.81" width="0.254" layer="94"/>
-<wire x1="-3.175" y1="3.81" x2="-2.54" y2="3.81" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="3.81" x2="-2.54" y2="0" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="3.81" x2="5.08" y2="3.81" width="0.254" layer="94"/>
-<wire x1="-2.54" y1="0" x2="5.08" y2="0" width="0.254" layer="94"/>
-<text x="-2.54" y="5.08" size="1.778" layer="95">&gt;NAME</text>
-<text x="6.35" y="0" size="1.778" layer="96">&gt;VALUE</text>
-<pin name="2" x="2.54" y="-2.54" visible="off" length="short" direction="pas" rot="R90"/>
-<pin name="1" x="0" y="-2.54" visible="off" length="short" direction="pas" rot="R90"/>
-</symbol>
 </symbols>
 <devicesets>
 <deviceset name="LED" prefix="LED" uservalue="yes">
@@ -656,60 +574,6 @@ Button commonly used for reset or general input. Spark Fun Electronics SKU : COM
 </device>
 </devices>
 </deviceset>
-<deviceset name="BUZZER" prefix="SG">
-<description>&lt;b&gt;Buzzer 12mm&lt;/b&gt;
-Spark Fun Electronics SKU : Comp-Buzzer</description>
-<gates>
-<gate name="G$1" symbol="BUZZER" x="0" y="0"/>
-</gates>
-<devices>
-<device name="PTH" package="BUZZER-12MM">
-<connects>
-<connect gate="G$1" pin="1" pad="+"/>
-<connect gate="G$1" pin="2" pad="-"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="SMD" package="BUZZER-CMT1603">
-<connects>
-<connect gate="G$1" pin="1" pad="P$1"/>
-<connect gate="G$1" pin="2" pad="P$2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="SMD2" package="BUZZER-CCV">
-<connects>
-<connect gate="G$1" pin="1" pad="+"/>
-<connect gate="G$1" pin="2" pad="-"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="SMD3" package="BUZZER-CMT1102">
-<connects>
-<connect gate="G$1" pin="1" pad="1"/>
-<connect gate="G$1" pin="2" pad="2"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-<device name="NS" package="BUZZER-12MM-NS">
-<connects>
-<connect gate="G$1" pin="1" pad="+"/>
-<connect gate="G$1" pin="2" pad="-"/>
-</connects>
-<technologies>
-<technology name=""/>
-</technologies>
-</device>
-</devices>
-</deviceset>
 </devicesets>
 </library>
 <library name="supply1">
@@ -5893,6 +5757,23 @@ DIN A4, landscape with location and doc. field</description>
 <vertex x="7.965" y="0.73"/>
 </polygon>
 </package>
+<package name="MULTIBUZZR">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;</description>
+<wire x1="6.096" y1="0.127" x2="7.874" y2="0.127" width="0.1524" layer="21"/>
+<wire x1="6.985" y1="1.016" x2="6.985" y2="-0.762" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="6" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="5.5" width="0.1524" layer="21"/>
+<circle x="0" y="0" radius="1" width="0.1524" layer="21"/>
+<circle x="6.985" y="0.127" radius="1" width="0.1524" layer="21"/>
+<pad name="-" x="-3.8" y="0" drill="0.8" diameter="1.8" shape="octagon"/>
+<pad name="+" x="3.8" y="0" drill="0.8" diameter="1.8" shape="octagon"/>
+<text x="-5.08" y="6.35" size="1.778" layer="25" ratio="10">&gt;NAME</text>
+<text x="-5.08" y="-7.62" size="1.778" layer="27" ratio="10">&gt;VALUE</text>
+<pad name="-1" x="-2.3" y="2.3" drill="0.8" diameter="1.8" shape="octagon"/>
+<pad name="+1" x="2.3" y="-2.3" drill="0.8" diameter="1.8" shape="octagon"/>
+<wire x1="-3.81" y1="0" x2="-2.3" y2="2.3" width="1.27" layer="1"/>
+<wire x1="2.3" y1="-2.3" x2="3.81" y2="0" width="1.27" layer="1"/>
+</package>
 </packages>
 <symbols>
 <symbol name="VIBRAMOTOR">
@@ -5904,6 +5785,18 @@ DIN A4, landscape with location and doc. field</description>
 <pin name="P$1" x="-15.24" y="-2.54" length="middle" direction="pwr"/>
 <pin name="P$2" x="-15.24" y="2.54" length="middle" direction="pwr"/>
 </symbol>
+<symbol name="B">
+<wire x1="-2.54" y1="5.08" x2="5.08" y2="5.08" width="0.254" layer="94" curve="180"/>
+<wire x1="-2.54" y1="5.08" x2="1.27" y2="5.08" width="0.254" layer="94"/>
+<wire x1="1.27" y1="1.27" x2="1.27" y2="5.08" width="0.1524" layer="94"/>
+<wire x1="1.27" y1="5.08" x2="5.08" y2="5.08" width="0.254" layer="94"/>
+<wire x1="2.54" y1="-2.54" x2="2.54" y2="1.397" width="0.1524" layer="94"/>
+<wire x1="0" y1="-2.54" x2="0" y2="1.397" width="0.1524" layer="94"/>
+<text x="-2.54" y="6.35" size="1.778" layer="95">&gt;NAME</text>
+<text x="5.08" y="0" size="1.778" layer="96">&gt;VALUE</text>
+<pin name="-" x="5.08" y="-2.54" visible="pad" length="short" direction="pas" rot="R180"/>
+<pin name="+" x="-2.54" y="-2.54" visible="pad" length="short" direction="pas"/>
+</symbol>
 </symbols>
 <devicesets>
 <deviceset name="VIBRAMOTOR">
@@ -5922,6 +5815,28 @@ DIN A4, landscape with location and doc. field</description>
 </device>
 </devices>
 </deviceset>
+<deviceset name="MULTIBUZZR" prefix="SG">
+<description>&lt;b&gt;BUZZER&lt;/b&gt;&lt;p&gt; Source: Buerklin</description>
+<gates>
+<gate name="G$1" symbol="B" x="0" y="0"/>
+</gates>
+<devices>
+<device name="" package="MULTIBUZZR">
+<connects>
+<connect gate="G$1" pin="+" pad="+ +1"/>
+<connect gate="G$1" pin="-" pad="- -1"/>
+</connects>
+<technologies>
+<technology name="">
+<attribute name="MF" value="" constant="no"/>
+<attribute name="MPN" value="" constant="no"/>
+<attribute name="OC_FARNELL" value="unknown" constant="no"/>
+<attribute name="OC_NEWARK" value="unknown" constant="no"/>
+</technology>
+</technologies>
+</device>
+</devices>
+</deviceset>
 </devicesets>
 </library>
 </libraries>
@@ -5950,7 +5865,6 @@ DIN A4, landscape with location and doc. field</description>
 <part name="C3" library="resistor" deviceset="C-EU" device="025-024X044" value="100nF"/>
 <part name="GND11" library="supply1" deviceset="GND" device=""/>
 <part name="Q1" library="transistors" deviceset="2N700*" device="_TO92" technology="0"/>
-<part name="SG2" library="SparkFun" deviceset="BUZZER" device="PTH"/>
 <part name="R3" library="rcl" deviceset="R-EU_" device="0207/10" value="10k"/>
 <part name="LED1" library="SparkFun" deviceset="LED" device="5MM"/>
 <part name="LED2" library="SparkFun" deviceset="LED" device="5MM"/>
@@ -5964,6 +5878,7 @@ DIN A4, landscape with location and doc. field</description>
 <part name="P+3" library="supply1" deviceset="VCC" device=""/>
 <part name="JP2" library="pinhead" deviceset="PINHD-2X3" device=""/>
 <part name="U$1" library="buglbr" deviceset="VIBRAMOTOR" device=""/>
+<part name="SG1" library="buglbr" deviceset="MULTIBUZZR" device=""/>
 </parts>
 <sheets>
 <sheet>
@@ -6005,7 +5920,6 @@ DIN A4, landscape with location and doc. field</description>
 </instance>
 <instance part="GND11" gate="1" x="2.54" y="25.4" smashed="yes"/>
 <instance part="Q1" gate="G$1" x="116.84" y="20.32"/>
-<instance part="SG2" gate="G$1" x="93.98" y="-2.54" rot="R270"/>
 <instance part="R3" gate="G$1" x="-5.08" y="76.2" rot="R180"/>
 <instance part="LED1" gate="G$1" x="71.12" y="76.2" smashed="yes" rot="R90">
 <attribute name="NAME" x="67.564" y="77.216" size="1.778" layer="95" rot="R180"/>
@@ -6025,6 +5939,7 @@ DIN A4, landscape with location and doc. field</description>
 <instance part="P+3" gate="VCC" x="180.34" y="12.7"/>
 <instance part="JP2" gate="A" x="180.34" y="83.82"/>
 <instance part="U$1" gate="G$1" x="139.7" y="38.1"/>
+<instance part="SG1" gate="G$1" x="96.52" y="0" rot="R270"/>
 </instances>
 <busses>
 </busses>
@@ -6134,9 +6049,9 @@ DIN A4, landscape with location and doc. field</description>
 <pinref part="JP1" gate="A" pin="3"/>
 </segment>
 <segment>
-<wire x1="86.36" y1="-5.08" x2="91.44" y2="-5.08" width="0.1524" layer="91"/>
-<pinref part="SG2" gate="G$1" pin="2"/>
+<wire x1="86.36" y1="-5.08" x2="93.98" y2="-5.08" width="0.1524" layer="91"/>
 <pinref part="GND3" gate="1" pin="GND"/>
+<pinref part="SG1" gate="G$1" pin="-"/>
 </segment>
 <segment>
 <wire x1="116.84" y1="5.08" x2="116.84" y2="10.16" width="0.1524" layer="91"/>
@@ -6229,9 +6144,9 @@ DIN A4, landscape with location and doc. field</description>
 </net>
 <net name="BUZZR" class="0">
 <segment>
-<wire x1="91.44" y1="-2.54" x2="76.2" y2="-2.54" width="0.1524" layer="91"/>
-<label x="78.74" y="-2.54" size="1.778" layer="95"/>
-<pinref part="SG2" gate="G$1" pin="1"/>
+<wire x1="93.98" y1="2.54" x2="86.36" y2="2.54" width="0.1524" layer="91"/>
+<label x="81.28" y="2.54" size="1.778" layer="95"/>
+<pinref part="SG1" gate="G$1" pin="+"/>
 </segment>
 <segment>
 <wire x1="66.04" y1="25.4" x2="53.34" y2="25.4" width="0.1524" layer="91"/>