diff --git a/gpstracker-cache.lib b/gpstracker-cache.lib
index 70b1c56..44a2b8e 100644
--- a/gpstracker-cache.lib
+++ b/gpstracker-cache.lib
@@ -94,10 +94,10 @@ ENDDEF
 #
 # 24LC16
 #
-DEF ~24LC16 U 0 30 Y Y 1 F N
+DEF 24LC16 U 0 30 Y Y 1 F N
 F0 "U" -250 250 50 H V C CNN
-F1 "24LC16" 200 250 50 H I C CNN
-F2 "SOIC-8_3.9x4.9mm_Pitch1.27mm" 50 -250 50 H I L CNN
+F1 "24LC16" 50 250 50 H V L CNN
+F2 "Package_SOIC:SOIC-8_3.9x4.9mm_P1.27mm" 50 -250 50 H I L CNN
 F3 "" 0 -100 50 H I C CNN
 ALIAS 24LC00 24LC01 24LC02 24LC04 24LC08 24LC32 24LC64 24LC128 24LC256 24LC512 24LC1025
 $FPLIST
@@ -106,7 +106,7 @@ $ENDFPLIST
 DRAW
 X GND 4 0 -300 100 U 50 50 0 0 W
 X VCC 8 0 300 100 D 50 50 0 0 W
-S -300 200 300 -200 1 1 0 f
+S -300 200 300 -200 1 1 10 f
 X A0 1 -400 100 100 R 50 50 1 1 I
 X A1 2 -400 0 100 R 50 50 1 1 I
 X A2 3 -400 -100 100 R 50 50 1 1 I
@@ -282,7 +282,7 @@ ENDDEF
 DEF DS3231 U 0 30 Y Y 1 F N
 F0 "U" -100 475 50 H V R CNN
 F1 "DS3231" -100 400 50 H V R CNN
-F2 "Housings_SOIC:SOIC-16_7.5x10.3mm_Pitch1.27mm" 50 -400 50 H I L CNN
+F2 "Package_SOIC:SOIC-16_7.5x10.3mm_P1.27mm" 50 -400 50 H I L CNN
 F3 "" 270 250 50 H I C CNN
 $FPLIST
  SOIC-*_7.5x10.3mm_Pitch1.27mm*
@@ -336,10 +336,10 @@ ENDDEF
 DEF FT231XS U 0 40 Y Y 1 F N
 F0 "U" -550 800 50 H V L CNN
 F1 "FT231XS" 300 800 50 H V L CNN
-F2 "SSOP-20" 0 0 50 H I C CNN
+F2 "Package_SSOP:SSOP-20_3.9x8.7mm_P0.635mm" 600 -950 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
 $FPLIST
- SSOP*
+ *SSOP*3.9x8.7mm*P0.635mm*
 $ENDFPLIST
 DRAW
 S -550 750 550 -750 0 1 10 f
@@ -507,6 +507,7 @@ DRAW
 C 65 0 111 0 1 10 N
 C 100 -70 11 0 1 0 F
 C 100 70 11 0 1 0 F
+P 2 0 1 0 2 0 10 0 N
 P 2 0 1 0 30 -70 100 -70 N
 P 2 0 1 10 30 -50 30 -90 N
 P 2 0 1 0 30 0 100 0 N
@@ -521,7 +522,7 @@ P 4 0 1 0 90 0 50 -15 50 15 90 0 F
 P 4 0 1 0 100 -70 130 -70 130 70 100 70 N
 P 4 0 1 0 110 -20 115 -15 145 -15 150 -10 N
 P 4 0 1 0 130 -15 115 10 145 10 130 -15 N
-X G 1 -200 0 210 R 50 50 1 1 I
+X G 1 -200 0 200 R 50 50 1 1 I
 X D 2 100 200 100 D 50 50 1 1 P
 X S 3 100 -200 100 U 50 50 1 1 P
 ENDDRAW
diff --git a/gpstracker-interface.sch b/gpstracker-interface.sch
index 602ab83..ca1db63 100644
--- a/gpstracker-interface.sch
+++ b/gpstracker-interface.sch
@@ -2,73 +2,66 @@ EESchema Schematic File Version 2
 LIBS:SIM808
 LIBS:freetronics_schematic
 LIBS:custom-power
-LIBS:74xgxx
-LIBS:74xx
-LIBS:ac-dc
-LIBS:actel
-LIBS:adc-dac
-LIBS:allegro
-LIBS:Altera
-LIBS:analog_devices
+LIBS:custom-charge
+LIBS:Amplifier_Audio
+LIBS:Amplifier_Buffer
+LIBS:Amplifier_Current
+LIBS:Amplifier_Difference
+LIBS:Amplifier_Instrumentation
+LIBS:Amplifier_Operational
+LIBS:Amplifier_Video
+LIBS:Analog
+LIBS:Analog_ADC
+LIBS:Analog_DAC
 LIBS:Analog_Switch
-LIBS:analog_switches
-LIBS:atmel
 LIBS:Audio
 LIBS:Battery_Management
-LIBS:bbd
-LIBS:bosch
-LIBS:brooktre
-LIBS:cmos_ieee
-LIBS:cmos4000
-LIBS:conn
+LIBS:Comparator
 LIBS:Connector_Generic
 LIBS:Connector_Generic_Shielded
 LIBS:Connector_Specialized
-LIBS:contrib
 LIBS:Converter_DCDC
 LIBS:CPLD_Altera
-LIBS:cypress
-LIBS:dc-dc
-LIBS:device
-LIBS:digital-audio
+LIBS:CPU
+LIBS:Device
 LIBS:Diode
-LIBS:display
+LIBS:Diode_Laser
 LIBS:Display_Character
 LIBS:Display_Graphic
 LIBS:Driver_Display
 LIBS:Driver_FET
 LIBS:Driver_LED
-LIBS:dsp
+LIBS:Driver_Motor
+LIBS:Driver_Relay
 LIBS:DSP_Freescale
 LIBS:DSP_Microchip_DSPIC33
 LIBS:DSP_Texas
-LIBS:elec-unifil
-LIBS:ESD_Protection
 LIBS:FPGA_Actel
-LIBS:ftdi
-LIBS:gennum
 LIBS:Graphic
-LIBS:hc11
-LIBS:intel
-LIBS:interface
+LIBS:Interface
 LIBS:Interface_CAN_LIN
+LIBS:Interface_CurrentLoop
 LIBS:Interface_Ethernet
+LIBS:Interface_Expansion
+LIBS:Interface_HID
+LIBS:Interface_LineDriver
+LIBS:Interface_Optical
 LIBS:Interface_Telecom
+LIBS:Interface_UART
 LIBS:Interface_USB
-LIBS:ir
-LIBS:Lattice
+LIBS:Isolator
+LIBS:Isolator_Analog
+LIBS:Jumper
 LIBS:LED
-LIBS:leds
-LIBS:linear
 LIBS:Logic_74xgxx
 LIBS:Logic_74xx
 LIBS:Logic_CMOS_4000
 LIBS:Logic_CMOS_IEEE
+LIBS:Logic_LevelTranslator
 LIBS:Logic_Programmable
 LIBS:Logic_TTL_IEEE
-LIBS:logo
-LIBS:maxim
 LIBS:MCU_AnalogDevices
+LIBS:MCU_Cypress
 LIBS:MCU_Infineon
 LIBS:MCU_Microchip_PIC10
 LIBS:MCU_Microchip_PIC12
@@ -76,6 +69,9 @@ LIBS:MCU_Microchip_PIC16
 LIBS:MCU_Microchip_PIC18
 LIBS:MCU_Microchip_PIC24
 LIBS:MCU_Microchip_PIC32
+LIBS:MCU_Microchip_SAME
+LIBS:MCU_Microchip_SAML
+LIBS:MCU_NXP_HC11
 LIBS:MCU_NXP_Kinetis
 LIBS:MCU_NXP_LPC
 LIBS:MCU_NXP_S08
@@ -84,58 +80,38 @@ LIBS:MCU_SiFive
 LIBS:MCU_SiliconLabs
 LIBS:MCU_ST_STM8
 LIBS:MCU_ST_STM32
+LIBS:MCU_Texas
 LIBS:MCU_Texas_MSP430
 LIBS:Mechanical
-LIBS:memory
+LIBS:Memory_Controller
 LIBS:Memory_EEPROM
 LIBS:Memory_Flash
 LIBS:Memory_NVRAM
 LIBS:Memory_RAM
-LIBS:microchip
-LIBS:microchip_dspic33dsc
-LIBS:microchip_pic10mcu
-LIBS:microchip_pic12mcu
-LIBS:microchip_pic16mcu
-LIBS:microchip_pic18mcu
-LIBS:microchip_pic24mcu
-LIBS:microchip_pic32mcu
-LIBS:microcontrollers
-LIBS:modules
+LIBS:Memory_UniqueID
 LIBS:Motor
-LIBS:motor_drivers
-LIBS:motorola
-LIBS:motors
-LIBS:msp430
-LIBS:nordicsemi
-LIBS:nxp
-LIBS:nxp_armmcu
-LIBS:onsemi
-LIBS:opto
 LIBS:Oscillator
-LIBS:Oscillators
-LIBS:philips
 LIBS:Potentiometer_Digital
 LIBS:power
 LIBS:Power_Management
 LIBS:Power_Protection
-LIBS:powerint
+LIBS:Power_Supervisor
 LIBS:pspice
 LIBS:Reference_Current
 LIBS:Reference_Voltage
-LIBS:references
-LIBS:regul
 LIBS:Regulator_Controller
 LIBS:Regulator_Current
 LIBS:Regulator_Linear
 LIBS:Regulator_SwitchedCapacitor
 LIBS:Regulator_Switching
 LIBS:Relay
-LIBS:relays
+LIBS:Relay_SolidState
 LIBS:RF_AM_FM
 LIBS:RF_Bluetooth
+LIBS:RF_Mixer
 LIBS:RF_Module
+LIBS:RF_RFID
 LIBS:RF_WiFi
-LIBS:rfcom
 LIBS:Sensor
 LIBS:Sensor_Audio
 LIBS:Sensor_Current
@@ -146,37 +122,20 @@ LIBS:Sensor_Motion
 LIBS:Sensor_MultiFunction
 LIBS:Sensor_Optical
 LIBS:Sensor_Pressure
+LIBS:Sensor_Proximity
 LIBS:Sensor_Temperature
 LIBS:Sensor_Touch
 LIBS:Sensor_Voltage
-LIBS:sensors
-LIBS:silabs
-LIBS:siliconi
-LIBS:stm8
-LIBS:stm32
-LIBS:supertex
 LIBS:Switch
-LIBS:switches
-LIBS:texas
 LIBS:Timer
-LIBS:transf
+LIBS:Timer_RTC
 LIBS:Transformer
+LIBS:Transistor_Array
 LIBS:Transistor_BJT
 LIBS:Transistor_FET
 LIBS:Transistor_IGBT
-LIBS:transistors
-LIBS:triac_thyristor
-LIBS:ttl_ieee
 LIBS:Valve
-LIBS:valves
-LIBS:video
-LIBS:wiznet
-LIBS:Worldsemi
-LIBS:Xicor
-LIBS:xilinx
-LIBS:zetex
-LIBS:Zilog
-LIBS:custom-charge
+LIBS:Video
 LIBS:gpstracker-cache
 EELAYER 25 0
 EELAYER END
@@ -200,6 +159,9 @@ F 0 "U6" H 2250 3100 50  0000 L CNN
 F 1 "FT231XS" H 3100 3100 50  0000 L CNN
 F 2 "Housings_SSOP:SSOP-20_4.4x6.5mm_Pitch0.65mm" H 2800 2300 50  0001 C CNN
 F 3 "" H 2800 2300 50  0001 C CNN
+F 4 "FTDI" H 2800 2300 60  0001 C CNN "Manufacturer"
+F 5 "FT231XS-U" H 2800 2300 60  0001 C CNN "Manufacturer part number"
+F 6 "SSOP-20" H 2800 2300 60  0001 C CNN "Package"
 	1    2800 2300
 	1    0    0    -1  
 $EndComp
@@ -211,6 +173,9 @@ F 0 "C12" H 2025 2650 50  0000 L CNN
 F 1 "0.1uF" H 2025 2450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2038 2400 50  0001 C CNN
 F 3 "" H 2000 2550 50  0001 C CNN
+F 4 "Kemet" H 2000 2550 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 2000 2550 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 2000 2550 60  0001 C CNN "Package"
 	1    2000 2550
 	1    0    0    -1  
 $EndComp
@@ -222,6 +187,9 @@ F 0 "C13" H 1375 2400 50  0000 L CNN
 F 1 "47pF" H 1375 2200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1388 2150 50  0001 C CNN
 F 3 "" H 1350 2300 50  0001 C CNN
+F 4 "Kemet" H 1350 2300 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 1350 2300 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 1350 2300 60  0001 C CNN "Package"
 	1    1350 2300
 	1    0    0    -1  
 $EndComp
@@ -233,6 +201,9 @@ F 0 "C14" H 1625 1650 50  0000 L CNN
 F 1 "0.1uF" H 1625 1450 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1638 1400 50  0001 C CNN
 F 3 "" H 1600 1550 50  0001 C CNN
+F 4 "Kemet" H 1600 1550 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 1600 1550 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 1600 1550 60  0001 C CNN "Package"
 	1    1600 1550
 	1    0    0    -1  
 $EndComp
@@ -266,6 +237,9 @@ F 0 "C11" H 1025 2400 50  0000 L CNN
 F 1 "47pF" H 1025 2200 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1038 2150 50  0001 C CNN
 F 3 "" H 1000 2300 50  0001 C CNN
+F 4 "Kemet" H 1000 2300 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 1000 2300 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 1000 2300 60  0001 C CNN "Package"
 	1    1000 2300
 	1    0    0    -1  
 $EndComp
@@ -365,6 +339,8 @@ F 0 "J1" H 900 1450 50  0000 L CNN
 F 1 "Molex 47346-0001" H 900 1350 50  0001 L CNN
 F 2 "Connectors_USB:USB_Micro-B_Molex_47346-0001" H 1250 950 50  0001 C CNN
 F 3 "" H 1250 950 50  0001 C CNN
+F 4 "Molex" H 1100 1000 60  0001 C CNN "Manufacturer"
+F 5 "47346-0001" H 1100 1000 60  0001 C CNN "Manufacturer part number"
 	1    1100 1000
 	0    1    1    0   
 $EndComp
@@ -525,13 +501,16 @@ Wire Wire Line
 	1300 1350 1700 1350
 Connection ~ 1300 1350
 $Comp
-L CP C10
+L C C10
 U 1 1 5A371566
 P 1300 1550
 F 0 "C10" H 1325 1650 50  0000 L CNN
 F 1 "4.7uF" H 1325 1450 50  0000 L CNN
-F 2 "Capacitors_SMD:C_1210_HandSoldering" H 1338 1400 50  0001 C CNN
+F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1338 1400 50  0001 C CNN
 F 3 "" H 1300 1550 50  0001 C CNN
+F 4 "Kemet" H 1300 1550 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 1300 1550 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 1300 1550 60  0001 C CNN "Package"
 	1    1300 1550
 	1    0    0    -1  
 $EndComp
diff --git a/gpstracker.sch b/gpstracker.sch
index 48501ae..9ca79ee 100644
--- a/gpstracker.sch
+++ b/gpstracker.sch
@@ -2,73 +2,66 @@ EESchema Schematic File Version 2
 LIBS:SIM808
 LIBS:freetronics_schematic
 LIBS:custom-power
-LIBS:74xgxx
-LIBS:74xx
-LIBS:ac-dc
-LIBS:actel
-LIBS:adc-dac
-LIBS:allegro
-LIBS:Altera
-LIBS:analog_devices
+LIBS:custom-charge
+LIBS:Amplifier_Audio
+LIBS:Amplifier_Buffer
+LIBS:Amplifier_Current
+LIBS:Amplifier_Difference
+LIBS:Amplifier_Instrumentation
+LIBS:Amplifier_Operational
+LIBS:Amplifier_Video
+LIBS:Analog
+LIBS:Analog_ADC
+LIBS:Analog_DAC
 LIBS:Analog_Switch
-LIBS:analog_switches
-LIBS:atmel
 LIBS:Audio
 LIBS:Battery_Management
-LIBS:bbd
-LIBS:bosch
-LIBS:brooktre
-LIBS:cmos_ieee
-LIBS:cmos4000
-LIBS:conn
+LIBS:Comparator
 LIBS:Connector_Generic
 LIBS:Connector_Generic_Shielded
 LIBS:Connector_Specialized
-LIBS:contrib
 LIBS:Converter_DCDC
 LIBS:CPLD_Altera
-LIBS:cypress
-LIBS:dc-dc
-LIBS:device
-LIBS:digital-audio
+LIBS:CPU
+LIBS:Device
 LIBS:Diode
-LIBS:display
+LIBS:Diode_Laser
 LIBS:Display_Character
 LIBS:Display_Graphic
 LIBS:Driver_Display
 LIBS:Driver_FET
 LIBS:Driver_LED
-LIBS:dsp
+LIBS:Driver_Motor
+LIBS:Driver_Relay
 LIBS:DSP_Freescale
 LIBS:DSP_Microchip_DSPIC33
 LIBS:DSP_Texas
-LIBS:elec-unifil
-LIBS:ESD_Protection
 LIBS:FPGA_Actel
-LIBS:ftdi
-LIBS:gennum
 LIBS:Graphic
-LIBS:hc11
-LIBS:intel
-LIBS:interface
+LIBS:Interface
 LIBS:Interface_CAN_LIN
+LIBS:Interface_CurrentLoop
 LIBS:Interface_Ethernet
+LIBS:Interface_Expansion
+LIBS:Interface_HID
+LIBS:Interface_LineDriver
+LIBS:Interface_Optical
 LIBS:Interface_Telecom
+LIBS:Interface_UART
 LIBS:Interface_USB
-LIBS:ir
-LIBS:Lattice
+LIBS:Isolator
+LIBS:Isolator_Analog
+LIBS:Jumper
 LIBS:LED
-LIBS:leds
-LIBS:linear
 LIBS:Logic_74xgxx
 LIBS:Logic_74xx
 LIBS:Logic_CMOS_4000
 LIBS:Logic_CMOS_IEEE
+LIBS:Logic_LevelTranslator
 LIBS:Logic_Programmable
 LIBS:Logic_TTL_IEEE
-LIBS:logo
-LIBS:maxim
 LIBS:MCU_AnalogDevices
+LIBS:MCU_Cypress
 LIBS:MCU_Infineon
 LIBS:MCU_Microchip_PIC10
 LIBS:MCU_Microchip_PIC12
@@ -76,6 +69,9 @@ LIBS:MCU_Microchip_PIC16
 LIBS:MCU_Microchip_PIC18
 LIBS:MCU_Microchip_PIC24
 LIBS:MCU_Microchip_PIC32
+LIBS:MCU_Microchip_SAME
+LIBS:MCU_Microchip_SAML
+LIBS:MCU_NXP_HC11
 LIBS:MCU_NXP_Kinetis
 LIBS:MCU_NXP_LPC
 LIBS:MCU_NXP_S08
@@ -84,58 +80,38 @@ LIBS:MCU_SiFive
 LIBS:MCU_SiliconLabs
 LIBS:MCU_ST_STM8
 LIBS:MCU_ST_STM32
+LIBS:MCU_Texas
 LIBS:MCU_Texas_MSP430
 LIBS:Mechanical
-LIBS:memory
+LIBS:Memory_Controller
 LIBS:Memory_EEPROM
 LIBS:Memory_Flash
 LIBS:Memory_NVRAM
 LIBS:Memory_RAM
-LIBS:microchip
-LIBS:microchip_dspic33dsc
-LIBS:microchip_pic10mcu
-LIBS:microchip_pic12mcu
-LIBS:microchip_pic16mcu
-LIBS:microchip_pic18mcu
-LIBS:microchip_pic24mcu
-LIBS:microchip_pic32mcu
-LIBS:microcontrollers
-LIBS:modules
+LIBS:Memory_UniqueID
 LIBS:Motor
-LIBS:motor_drivers
-LIBS:motorola
-LIBS:motors
-LIBS:msp430
-LIBS:nordicsemi
-LIBS:nxp
-LIBS:nxp_armmcu
-LIBS:onsemi
-LIBS:opto
 LIBS:Oscillator
-LIBS:Oscillators
-LIBS:philips
 LIBS:Potentiometer_Digital
 LIBS:power
 LIBS:Power_Management
 LIBS:Power_Protection
-LIBS:powerint
+LIBS:Power_Supervisor
 LIBS:pspice
 LIBS:Reference_Current
 LIBS:Reference_Voltage
-LIBS:references
-LIBS:regul
 LIBS:Regulator_Controller
 LIBS:Regulator_Current
 LIBS:Regulator_Linear
 LIBS:Regulator_SwitchedCapacitor
 LIBS:Regulator_Switching
 LIBS:Relay
-LIBS:relays
+LIBS:Relay_SolidState
 LIBS:RF_AM_FM
 LIBS:RF_Bluetooth
+LIBS:RF_Mixer
 LIBS:RF_Module
+LIBS:RF_RFID
 LIBS:RF_WiFi
-LIBS:rfcom
 LIBS:Sensor
 LIBS:Sensor_Audio
 LIBS:Sensor_Current
@@ -146,37 +122,20 @@ LIBS:Sensor_Motion
 LIBS:Sensor_MultiFunction
 LIBS:Sensor_Optical
 LIBS:Sensor_Pressure
+LIBS:Sensor_Proximity
 LIBS:Sensor_Temperature
 LIBS:Sensor_Touch
 LIBS:Sensor_Voltage
-LIBS:sensors
-LIBS:silabs
-LIBS:siliconi
-LIBS:stm8
-LIBS:stm32
-LIBS:supertex
 LIBS:Switch
-LIBS:switches
-LIBS:texas
 LIBS:Timer
-LIBS:transf
+LIBS:Timer_RTC
 LIBS:Transformer
+LIBS:Transistor_Array
 LIBS:Transistor_BJT
 LIBS:Transistor_FET
 LIBS:Transistor_IGBT
-LIBS:transistors
-LIBS:triac_thyristor
-LIBS:ttl_ieee
 LIBS:Valve
-LIBS:valves
-LIBS:video
-LIBS:wiznet
-LIBS:Worldsemi
-LIBS:Xicor
-LIBS:xilinx
-LIBS:zetex
-LIBS:Zilog
-LIBS:custom-charge
+LIBS:Video
 LIBS:gpstracker-cache
 EELAYER 25 0
 EELAYER END
@@ -200,6 +159,9 @@ F 0 "U2" H 1300 5550 50  0000 L BNN
 F 1 "ATMEGA328P-AU" H 2450 2900 50  0000 L BNN
 F 2 "Housings_QFP:TQFP-32_7x7mm_Pitch0.8mm" H 2050 4300 50  0001 C CIN
 F 3 "" H 2050 4300 50  0001 C CNN
+F 4 "Atmel" H 2050 4300 60  0001 C CNN "Manufacturer"
+F 5 "ATMEGA328P-AU" H 2050 4300 60  0001 C CNN "Manufacturer part number"
+F 6 "TQFP-32" H 2050 4300 60  0001 C CNN "Package"
 	1    2050 4300
 	1    0    0    -1  
 $EndComp
@@ -213,6 +175,9 @@ F 0 "C1" H 675 1200 50  0000 L CNN
 F 1 "4.7uF" H 675 1000 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 688 950 50  0001 C CNN
 F 3 "" H 650 1100 50  0001 C CNN
+F 4 "Kemet" H 650 1100 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 650 1100 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 650 1100 60  0001 C CNN "Package"
 	1    650  1100
 	-1   0    0    1   
 $EndComp
@@ -224,6 +189,9 @@ F 0 "C3" H 2425 1800 50  0000 L CNN
 F 1 "4.7uF" H 2425 1600 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 2438 1550 50  0001 C CNN
 F 3 "" H 2400 1700 50  0001 C CNN
+F 4 "Kemet" H 2400 1700 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 2400 1700 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 2400 1700 60  0001 C CNN "Package"
 	1    2400 1700
 	1    0    0    -1  
 $EndComp
@@ -268,6 +236,9 @@ F 0 "C5" H 4375 5000 50  0000 L CNN
 F 1 "0.1uF" H 4375 4800 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4388 4750 50  0001 C CNN
 F 3 "" H 4350 4900 50  0001 C CNN
+F 4 "Kemet" H 4350 4900 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 4350 4900 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 4350 4900 60  0001 C CNN "Package"
 	1    4350 4900
 	1    0    0    -1  
 $EndComp
@@ -428,6 +399,8 @@ F 0 "C2" H 1025 4100 50  0000 L CNN
 F 1 "0.1uF" H 1025 3900 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 1038 3850 50  0001 C CNN
 F 3 "" H 1000 4000 50  0001 C CNN
+F 4 "Kemet" H 1000 4000 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 1000 4000 60  0001 C CNN "Manufacturer part number"
 	1    1000 4000
 	1    0    0    -1  
 $EndComp
@@ -541,6 +514,9 @@ F 0 "C8" H 5525 1300 50  0000 L CNN
 F 1 "1uF" H 5525 1100 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 5538 1050 50  0001 C CNN
 F 3 "" H 5500 1200 50  0001 C CNN
+F 4 "Kemet" H 5500 1200 60  0001 C CNN "Manufacturer"
+F 5 "C0805C105K4RACTU" H 5500 1200 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 5500 1200 60  0001 C CNN "Package"
 	1    5500 1200
 	1    0    0    -1  
 $EndComp
@@ -563,6 +539,9 @@ F 0 "C6" H 4675 1300 50  0000 L CNN
 F 1 "1uF" H 4675 1100 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4688 1050 50  0001 C CNN
 F 3 "" H 4650 1200 50  0001 C CNN
+F 4 "Kemet" H 4650 1200 60  0001 C CNN "Manufacturer"
+F 5 "C0805C105K4RACTU" H 4650 1200 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 4650 1200 60  0001 C CNN "Package"
 	1    4650 1200
 	1    0    0    -1  
 $EndComp
@@ -602,6 +581,9 @@ F 0 "C4" H 3875 6900 50  0000 L CNN
 F 1 "0.1uF" V 3800 6550 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 3888 6650 50  0001 C CNN
 F 3 "" H 3850 6800 50  0001 C CNN
+F 4 "Kemet" H 3850 6800 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 3850 6800 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 3850 6800 60  0001 C CNN "Package"
 	1    3850 6800
 	0    1    1    0   
 $EndComp
@@ -790,6 +772,9 @@ F 0 "C7" H 4875 6700 50  0000 L CNN
 F 1 "0.1uF" H 4875 6500 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 4888 6450 50  0001 C CNN
 F 3 "" H 4850 6600 50  0001 C CNN
+F 4 "Kemet" H 4850 6600 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 4850 6600 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 4850 6600 60  0001 C CNN "Package"
 	1    4850 6600
 	1    0    0    -1  
 $EndComp
@@ -1030,11 +1015,8 @@ F 0 "IC1" H 8999 5754 50  0000 L BNN
 F 1 "SIM808" H 8998 742 50  0000 L BNN
 F 2 "SIM808:QFN100P2400X2400X260-68N" H 9600 3350 50  0001 L BNN
 F 3 "Module: GPS/GSM; GPRS; 2G; 1800MHz, 900MHz; GPIO, Serial, USB; SMD" H 9600 3350 50  0001 L BNN
-F 4 "Simcom" H 9600 3350 50  0001 L BNN "MF"
-F 5 "Unavailable" H 9600 3350 50  0001 L BNN "Availability"
-F 6 "18.48 USD" H 9600 3350 50  0001 L BNN "Price"
-F 7 "SIM808" H 9600 3350 50  0001 L BNN "MP"
-F 8 "None" H 9600 3350 50  0001 L BNN "Package"
+F 4 "Simcom" H 9600 3350 50  0001 L BNN "Manufacturer"
+F 5 "SIM808" H 9600 3350 50  0001 L BNN "Manufacturer part number"
 	1    9600 3350
 	1    0    0    -1  
 $EndComp
@@ -1140,9 +1122,12 @@ L C C9
 U 1 1 5A3A0698
 P 10700 1450
 F 0 "C9" H 10725 1550 50  0000 L CNN
-F 1 "10uF" H 10725 1350 50  0000 L CNN
+F 1 "4.7uF" H 10725 1350 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 10738 1300 50  0001 C CNN
 F 3 "" H 10700 1450 50  0001 C CNN
+F 4 "Kemet" H 10700 1450 60  0001 C CNN "Manufacturer"
+F 5 "C0805X475C4RACTU" H 10700 1450 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 10700 1450 60  0001 C CNN "Package"
 	1    10700 1450
 	1    0    0    -1  
 $EndComp
@@ -1358,6 +1343,9 @@ F 0 "C15" H 825 3600 50  0000 L CNN
 F 1 "0.1uF" H 825 3400 50  0000 L CNN
 F 2 "Capacitors_SMD:C_0805_HandSoldering" H 838 3350 50  0001 C CNN
 F 3 "" H 800 3500 50  0001 C CNN
+F 4 "Kemet" H 800 3500 60  0001 C CNN "Manufacturer"
+F 5 "C0805C104M3RACTU" H 800 3500 60  0001 C CNN "Manufacturer part number"
+F 6 "0805" H 800 3500 60  0001 C CNN "Package"
 	1    800  3500
 	1    0    0    -1  
 $EndComp