diff --git a/1-click-bom.tsv b/1-click-bom.tsv
index 342b243..1e19bf4 100644
--- a/1-click-bom.tsv
+++ b/1-click-bom.tsv
@@ -3,7 +3,7 @@ AE1	1																											Leave empty
 AUDIO1	1					CP-43516SJCT-ND							CUI				www.cui.com			SJ-43516-SMT-TR			490-SJ-43516-SMT-TR 				www.mouser.com	
 B0, B1, B2, B3, B4, B5, B6	7					CKN9088CT-ND											www.ckswitches.com			PTS645SL50SMTR92 LFS			611-PTS645SL50SMTR92				www.mouser.com	
 BAT1	1		https://cdn.harwin.com/pdfs/S8201R.pdf			BK-885-ND		36-3000CT-ND	952-1662-1-ND				Keystone	MPD		Harwin	www.keyelco.com	www.memoryprotectiondevices.com	www.harwin.com	3000TR	BK-885	S8201-46R	855-S8201-46R		534-3000TR			
-C1, C3, C4, C5, C7, C8, C9, C11, C12, C15, C21, C54, C55, C58	14					1276-2413-1-ND		1276-2412-1-ND									www.yageo.com			CC0805ZKY5V5BB226 			810-C2012X5R1A226M-2		81-GRM219R61C226ME5L	81-GRM188C60J226ME0J		
+C1, C3, C4, C5, C7, C8, C9, C11, C12, C15, C21, C54, C55, C58	14					1276-2413-1-ND		1276-2412-1-ND									www.yageo.com			CC0805ZKY5V5BB226 			81-GRM21BR61A226ME1L		81-GRM219R61C226ME5L	81-GRM188C60J226ME0J		
 C2, C6, C10, C18	4					399-9086-1-ND											www.yageo.com			CS0603KRX7R9BB471			603-CS0603KRX79BB471					
 C13, C16, C17, C19, C20, C22, C23, C24, C46, C47	10					1276-2903-1-ND											www.yageo.com			CC0805MRX5R6BB225			603-CC805MRX5R6BB225					
 C14, C36, C37, C38, C39, C40, C41, C42, C43, C44, C45, C59, C60	13					1276-1112-1-ND											www.yageo.com			CC0603KRX7R8BB224			81-GCM188R71E224K55D		603-CC603KRX7R6BB224			
@@ -29,13 +29,13 @@ L4	1					CV201210-330KCT-ND											www.bourns.com			CV201210-330K			652-CV201
 OLED1	1																www.displaymodule.com			DM-OLEDC095-626							www.mouser.com	Leave empty
 Q1	1					TBC857BLMCT-ND											www.nxp.com			BC857			863-BC857BLT1G				www.mouser.com	
 Q2	1					2N7002K-TPMSCT-ND											www.nxp.com			2N7002P,215			757-T2N7002AKLM		512-2N7002L		www.mouser.com	
-R1, R3, R4, R25, R26, R30, RB2	7					YAG3613CT-ND						Leave empty					www.yageo.com			AC0603FR-104K7L			603-AC0603FR-074K7L		603-RC0603FR-074K7L			
+R1, R3, R4, R25, R26, R30, RB2	7					YAG3613CT-ND						Leave empty					www.yageo.com			AC0603FR-104K7L			755-SFR03EZPF4701		603-RC0603FR-074K7L	603-AC0603FR-074K7L		
 R2, RB1	2					 311-18.0KHRCT-ND											www.yageo.com			RC0603FR-1018KL			71-CRCW060318K0FKEAC					
 R5	1					P2.20MHCT-ND						Leave empty					www.yageo.com			RC0603FR-132M2L			603-AC0603FR-072M2L					
 R6, R8, R14, R18, R29, R40, R54, R57, R66	9					311-1.20KHRCT-ND						Leave empty					www.yageo.com			RC0603FR-101K2L			603-AC0603JR-071K2L					
 R7, R10, R17, R21, R39, R51, R60	7					311-150HRCT-ND											www.yageo.com			AC0603FR-07150RL			603-AC0603FR-07150RL					
-R9, R11, R12, R13, R27, R28, R31, R32, R33, R34, R55, R63, R64, RA1, RA2, RA3	16					YAG3569CT-ND											www.yageo.com			RC0603FR-1015KL			603-RC0603FR-1015KL					
-R15, R19, R35, R36, R37, R41, R42, R43, R44, R45, R46, R47, R48, R58, R61, R62, R65	17					311-680HRCT-ND											www.yageo.com			RC0603FR-10680RL			603-RC0603FR-10680RL					
+R9, R11, R12, R13, R27, R28, R31, R32, R33, R34, R55, R63, R64, RA1, RA2, RA3	16					YAG3569CT-ND											www.yageo.com			RC0603FR-1015KL			603-RC0603FR-1315KL		603-RC0603FR-1015KL			
+R15, R19, R35, R36, R37, R41, R42, R43, R44, R45, R46, R47, R48, R58, R61, R62, R65	17					311-680HRCT-ND											www.yageo.com			RC0603FR-10680RL			603-RC0603FR-1315KL		603-RC0603FR-10680RL			
 R16, R20, R59	3					YAG1298CT-ND											www.yageo.com			RC0603JR-07330RP			603-RC0603JR-07330RP					
 R22, R23, RB3	3					YAG3605CT-ND											www.yageo.com			RT0603FRE073K3L			603-RC0603FR-103K3L					
 R24	1					P100KHCT-ND						Leave empty					www.yageo.com			AC0603FR-10100KL			71-RCA0603100KJNEC		71-CRCW0603100KFKEAC			
diff --git a/analog.sch b/analog.sch
index dbcab8f..43e1544 100644
--- a/analog.sch
+++ b/analog.sch
@@ -76,7 +76,8 @@ F 1 "680" V 3750 2050 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 3680 2050 50  0001 C CNN
 F 3 "" H 3750 2050 50  0000 C CNN
 F 4 "RC0603FR-10680RL" V 3750 2050 50  0001 C CNN "MPN"
-F 5 "603-RC0603FR-10680RL" V 3750 2050 50  0001 C CNN "Mouser"
+F 5 "603-RC0603FR-1315KL" V 3750 2050 50  0001 C CNN "Mouser"
+F 6 "603-RC0603FR-10680RL" V 3750 2050 50  0001 C CNN "Mouser2"
 	1    3750 2050
 	0    1    1    0   
 $EndComp
diff --git a/doc/ulx3s_bom.csv b/doc/ulx3s_bom.csv
index 842331a..aa451e4 100644
--- a/doc/ulx3s_bom.csv
+++ b/doc/ulx3s_bom.csv
@@ -5,7 +5,7 @@ Component,Description,Part,References,Value,Footprint,Quantity Per PCB,Datasheet
 4,Unpolarized capacitor,C,C13 C16 C17 C19 C20 C22 C23 C24 C46 C47,2.2uF,C_0805_2012Metric,10,,www.yageo.com,CC0805MRX5R6BB225,,1276-2903-1-ND,,603-CC805MRX5R6BB225,,,,,,,,,,,,,,,,
 5,Unpolarized capacitor,C,C14 C36 C37 C38 C39 C40 C41 C42 C43 C44 C45 C59 C60,220nF,C_0603_1608Metric,13,,www.yageo.com,CC0603KRX7R8BB224,,1276-1112-1-ND,,81-GCM188R71E224K55D,,,,,,,,,,603-CC603KRX7R6BB224,,,,,,
 6,Unpolarized capacitor,C,C25 C26 C27 C28 C29 C30 C31 C32 C33 C34 C35 C48 C49 C50 C51 C52 C53,22nF,C_0603_1608Metric,17,,www.yageo.com,CX0603MRX7R8BB223,,1276-2000-1-ND,,603-AC603KRX7R7BB223,,,,,,,,,,,,,,,,
-7,Unpolarized capacitor,C,C1 C3 C4 C5 C7 C8 C9 C11 C12 C15 C21 C54 C55 C58,22uF,C_0805_2012Metric,14,,www.yageo.com,CC0805ZKY5V5BB226,,1276-2413-1-ND,,810-C2012X5R1A226M-2,1276-2412-1-ND,,,,,,,,,81-GRM219R61C226ME5L,81-GRM188C60J226ME0J,,,,,
+7,Unpolarized capacitor,C,C1 C3 C4 C5 C7 C8 C9 C11 C12 C15 C21 C54 C55 C58,22uF,C_0805_2012Metric,14,,www.yageo.com,CC0805ZKY5V5BB226,,1276-2413-1-ND,,81-GRM21BR61A226ME1L,1276-2412-1-ND,,,,,,,,,81-GRM219R61C226ME5L,81-GRM188C60J226ME0J,,,,,
 8,Unpolarized capacitor,C,C56 C57,3.3pF,C_0603_1608Metric,2,,www.yageo.com,CC0603CRNPO9BN3R3,,311-3848-1-ND,,710-885012006048,311-3855-1-ND,,,,,,,,,,,,,,,
 9,Unpolarized capacitor,C,C2 C6 C10 C18,470pF,C_0603_1608Metric,4,,www.yageo.com,CS0603KRX7R9BB471,,399-9086-1-ND,,603-CS0603KRX79BB471,,,,,,,,,,,,,,,,
 10,Diode,D,D10 D13 D14 D16 D17 D23 D24 D25 D26 D27 D28 D29,1N4148,D_SOD-323_HandSoldering,12,,www.fairchildsemi.com,1N4148WS,,1N4148WXTPMSCT-ND,www.mouser.com,863-MMDL914T1G,1N4148WSFSCT-ND,,,,,,,,,512-1N4148WS,,Leave empty,,,,
@@ -25,14 +25,14 @@ Component,Description,Part,References,Value,Footprint,Quantity Per PCB,Datasheet
 24,Resistor,R,R6 R8 R14 R18 R29 R40 R54 R57 R66,1.2k,R_0603_1608Metric,9,,www.yageo.com,RC0603FR-101K2L,,311-1.20KHRCT-ND,,603-AC0603JR-071K2L,,,,,,,,,,,,Leave empty,,,,
 25,Resistor,R,R24,100k,R_0603_1608Metric,1,,www.yageo.com,AC0603FR-10100KL,,P100KHCT-ND,,71-RCA0603100KJNEC,,,,,,,,,,71-CRCW0603100KFKEAC,,Leave empty,,,,
 26,Resistor,R,R7 R10 R17 R21 R39 R51 R60,150,R_0603_1608Metric,7,,www.yageo.com,AC0603FR-07150RL,,311-150HRCT-ND,,603-AC0603FR-07150RL,,,,,,,,,,,,,,,,
-27,Resistor,R,R9 R11 R12 R13 R27 R28 R31 R32 R33 R34 R55 R63 R64 RA1 RA2 RA3,15k,R_0603_1608Metric,16,,www.yageo.com,RC0603FR-1015KL,,YAG3569CT-ND,,603-RC0603FR-1015KL,,,,,,,,,,,,,,,,
+27,Resistor,R,R9 R11 R12 R13 R27 R28 R31 R32 R33 R34 R55 R63 R64 RA1 RA2 RA3,15k,R_0603_1608Metric,16,,www.yageo.com,RC0603FR-1015KL,,YAG3569CT-ND,,603-RC0603FR-1315KL,,,,,,,,,,603-RC0603FR-1015KL,,,,,,
 28,Resistor,R,R2 RB1,18k,R_0603_1608Metric,2,,www.yageo.com,RC0603FR-1018KL,,311-18.0KHRCT-ND,,71-CRCW060318K0FKEAC,,,,,,,,,,,,,,,,
 29,Resistor,R,R5,2.2M,R_0603_1608Metric,1,,www.yageo.com,RC0603FR-132M2L,,P2.20MHCT-ND,,603-AC0603FR-072M2L,,,,,,,,,,,,Leave empty,,,,
 30,Resistor,R,R49 R50 R52 R53,27,R_0603_1608Metric,4,,www.yageo.com,AC0603JR-0727RL,,311-27.0HRCT-ND,,603-AC0603JR-0727RL,,,,,,,,,,,,,,,,
 31,Resistor,R,R22 R23 RB3,3.3k,R_0603_1608Metric,3,,www.yageo.com,RT0603FRE073K3L,,YAG3605CT-ND,,603-RC0603FR-103K3L,,,,,,,,,,,,,,,,
 32,Resistor,R,R16 R20 R59,330,R_0603_1608Metric,3,,www.yageo.com,RC0603JR-07330RP,,YAG1298CT-ND,,603-RC0603JR-07330RP,,,,,,,,,,,,,,,,
-33,Resistor,R,R1 R3 R4 R25 R26 R30 RB2,4.7k,R_0603_1608Metric,7,,www.yageo.com,AC0603FR-104K7L,,YAG3613CT-ND,,603-AC0603FR-074K7L,,,,,,,,,,603-RC0603FR-074K7L,,Leave empty,,,,
-34,Resistor,R,R15 R19 R35 R36 R37 R41 R42 R43 R44 R45 R46 R47 R48 R58 R61 R62 R65,680,R_0603_1608Metric,17,,www.yageo.com,RC0603FR-10680RL,,311-680HRCT-ND,,603-RC0603FR-10680RL,,,,,,,,,,,,,,,,
+33,Resistor,R,R1 R3 R4 R25 R26 R30 RB2,4.7k,R_0603_1608Metric,7,,www.yageo.com,AC0603FR-104K7L,,YAG3613CT-ND,,755-SFR03EZPF4701,,,,,,,,,,603-RC0603FR-074K7L,603-AC0603FR-074K7L,Leave empty,,,,
+34,Resistor,R,R15 R19 R35 R36 R37 R41 R42 R43 R44 R45 R46 R47 R48 R58 R61 R62 R65,680,R_0603_1608Metric,17,,www.yageo.com,RC0603FR-10680RL,,311-680HRCT-ND,,603-RC0603FR-1315KL,,,,,,,,,,603-RC0603FR-10680RL,,,,,,
 35,"Jumper, normally closed",Jumper_NC_Small,RV3,0,R_0805_2012Metric_Pad1.29x1.40mm_HandSolder,1,,www.yageo.com,RC0805JR-070RL,,YAG1327CT-ND,www.mouser.com,71-RCG08050000Z0EA,,,,,,,,,,,,,,,,
 36,Micro SD Card Socket with CD,Micro_SD_Card_CD,SD1,SCHD3A0100,SCHD3A100,1,https://www.relayspec.com/catalogs/001285/2010/SCHD.pdf,www.on-stars.com,SCHD3A0100,,WM6698DKR-ND,,538-47219-2001,,,,47219-2001,,,,,www.molex.com,688-SCHD3A0100,,,https://www.molex.com/pdm_docs/sd/472192001_sd.pdf,,,
 37,"4x DIP Switch, Single Pole Single Throw (SPST) switch, small symbol",SW_DIP_x04,SW1,SW_DIP_x04,SW_DIP_x4_W8.61mm_Slide_LowProfile,1,https://www.ctscorp.com/wp-content/uploads/219.pdf,www.jameco.com,219-4MST,,CT2194MST-ND,,774-2194MST,,,,,,,,,,,,,,,,
@@ -60,6 +60,6 @@ Number of PCBs:,1
 Total components:,194
 Schematic Version:,2.1.2
 Schematic Date:,
-BoM Date:,"etvrtak, 23. kolovoza 2018. 22:25:56 CEST"
+BoM Date:,"petak, 24. kolovoza 2018. 20:10:50 CEST"
 Schematic Source:,/home/davor/src/circuits/fpga/ulx3s/ulx3s.sch
 KiCad Version:,Eeschema 5.0.0+dfsg1-2
diff --git a/power.bak b/power.bak
index 95305b5..7b49f05 100644
--- a/power.bak
+++ b/power.bak
@@ -69,7 +69,7 @@ F 1 "22uF" H 7425 3600 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric" H 7438 3550 50  0001 C CNN
 F 3 "" H 7400 3700 50  0000 C CNN
 F 4 "CC0805ZKY5V5BB226 " H 7400 3700 50  0001 C CNN "MPN"
-F 5 "810-C2012X5R1A226M-2" H 7400 3700 50  0001 C CNN "Mouser"
+F 5 "81-GRM21BR61A226ME1L" H 7400 3700 50  0001 C CNN "Mouser"
 F 6 "81-GRM219R61C226ME5L" H 7400 3700 50  0001 C CNN "Mouser2"
 F 7 "81-GRM188C60J226ME0J" H 7400 3700 50  0001 C CNN "Mouser3"
 F 8 "1276-2413-1-ND" H 7400 3700 50  0001 C CNN "Digikey"
@@ -462,9 +462,10 @@ F 1 "4.7k" V 4300 4700 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4230 4700 50  0001 C CNN
 F 3 "" H 4300 4700 50  0000 C CNN
 F 4 "AC0603FR-104K7L" V 4300 4700 50  0001 C CNN "MPN"
-F 5 "603-AC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser"
+F 5 "755-SFR03EZPF4701" V 4300 4700 50  0001 C CNN "Mouser"
 F 6 "603-RC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser2"
-F 7 "YAG3613CT-ND" V 4300 4700 50  0001 C CNN "Digikey"
+F 7 "603-AC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser3"
+F 8 "YAG3613CT-ND" V 4300 4700 50  0001 C CNN "Digikey"
 	1    4300 4700
 	1    0    0    -1  
 $EndComp
@@ -822,8 +823,9 @@ F 3 "https://assets.nexperia.com/documents/data_sheet/2N7002.pdf" H 4000 5600 50
 F 4 "www.nxp.com" H 4000 5600 50  0001 C CNN "MNF1_URL"
 F 5 "2N7002P,215" H 4000 5600 60  0001 C CNN "MPN"
 F 6 "www.mouser.com" H 4000 5600 60  0001 C CNN "Mouser_URL"
-F 7 "512-2N7002L" H 4000 5600 60  0001 C CNN "Mouser"
-F 8 "2N7002K-TPMSCT-ND" H 4000 5600 50  0001 C CNN "Digikey"
+F 7 "757-T2N7002AKLM" H 4000 5600 50  0001 C CNN "Mouser"
+F 8 "512-2N7002L" H 4000 5600 60  0001 C CNN "Mouser2"
+F 9 "2N7002K-TPMSCT-ND" H 4000 5600 50  0001 C CNN "Digikey"
 	1    4000 5600
 	1    0    0    -1  
 $EndComp
diff --git a/power.sch b/power.sch
index 59a7d14..7b49f05 100644
--- a/power.sch
+++ b/power.sch
@@ -69,7 +69,7 @@ F 1 "22uF" H 7425 3600 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0805_2012Metric" H 7438 3550 50  0001 C CNN
 F 3 "" H 7400 3700 50  0000 C CNN
 F 4 "CC0805ZKY5V5BB226 " H 7400 3700 50  0001 C CNN "MPN"
-F 5 "810-C2012X5R1A226M-2" H 7400 3700 50  0001 C CNN "Mouser"
+F 5 "81-GRM21BR61A226ME1L" H 7400 3700 50  0001 C CNN "Mouser"
 F 6 "81-GRM219R61C226ME5L" H 7400 3700 50  0001 C CNN "Mouser2"
 F 7 "81-GRM188C60J226ME0J" H 7400 3700 50  0001 C CNN "Mouser3"
 F 8 "1276-2413-1-ND" H 7400 3700 50  0001 C CNN "Digikey"
@@ -462,9 +462,10 @@ F 1 "4.7k" V 4300 4700 50  0000 C CNN
 F 2 "Resistor_SMD:R_0603_1608Metric" V 4230 4700 50  0001 C CNN
 F 3 "" H 4300 4700 50  0000 C CNN
 F 4 "AC0603FR-104K7L" V 4300 4700 50  0001 C CNN "MPN"
-F 5 "603-AC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser"
+F 5 "755-SFR03EZPF4701" V 4300 4700 50  0001 C CNN "Mouser"
 F 6 "603-RC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser2"
-F 7 "YAG3613CT-ND" V 4300 4700 50  0001 C CNN "Digikey"
+F 7 "603-AC0603FR-074K7L" V 4300 4700 50  0001 C CNN "Mouser3"
+F 8 "YAG3613CT-ND" V 4300 4700 50  0001 C CNN "Digikey"
 	1    4300 4700
 	1    0    0    -1  
 $EndComp
diff --git a/usb.bak b/usb.bak
index b4a45a9..ef770f6 100644
--- a/usb.bak
+++ b/usb.bak
@@ -291,8 +291,9 @@ F 2 "Resistor_SMD:R_0603_1608Metric" V 4630 3600 50  0001 C CNN
 F 3 "" H 4700 3600 50  0000 C CNN
 F 4 "www.yageo.com" V 4700 3600 50  0001 C CNN "MNF1_URL"
 F 5 "RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "MPN"
-F 6 "603-RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "Mouser"
-F 7 "YAG3569CT-ND" V 4700 3600 50  0001 C CNN "Digikey"
+F 6 "603-RC0603FR-1315KL" V 4700 3600 50  0001 C CNN "Mouser"
+F 7 "603-RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "Mouser2"
+F 8 "YAG3569CT-ND" V 4700 3600 50  0001 C CNN "Digikey"
 	1    4700 3600
 	0    1    1    0   
 $EndComp
diff --git a/usb.sch b/usb.sch
index b4a45a9..ef770f6 100644
--- a/usb.sch
+++ b/usb.sch
@@ -291,8 +291,9 @@ F 2 "Resistor_SMD:R_0603_1608Metric" V 4630 3600 50  0001 C CNN
 F 3 "" H 4700 3600 50  0000 C CNN
 F 4 "www.yageo.com" V 4700 3600 50  0001 C CNN "MNF1_URL"
 F 5 "RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "MPN"
-F 6 "603-RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "Mouser"
-F 7 "YAG3569CT-ND" V 4700 3600 50  0001 C CNN "Digikey"
+F 6 "603-RC0603FR-1315KL" V 4700 3600 50  0001 C CNN "Mouser"
+F 7 "603-RC0603FR-1015KL" V 4700 3600 50  0001 C CNN "Mouser2"
+F 8 "YAG3569CT-ND" V 4700 3600 50  0001 C CNN "Digikey"
 	1    4700 3600
 	0    1    1    0   
 $EndComp