diff --git a/edg/abstract_parts/AbstractCapacitor.py b/edg/abstract_parts/AbstractCapacitor.py
index 498ef4882..69603a8f6 100644
--- a/edg/abstract_parts/AbstractCapacitor.py
+++ b/edg/abstract_parts/AbstractCapacitor.py
@@ -4,6 +4,7 @@
 import math
 
 from ..electronics_model import *
+from .ESeriesUtil import ESeriesUtil
 from .PartsTable import PartsTableColumn, PartsTableRow, PartsTable
 from .PartsTablePart import PartsTableSelector
 from .Categories import *
@@ -196,6 +197,10 @@ def _row_filter(self, row: PartsTableRow) -> bool:
   def _row_filter_capacitance(self, row: PartsTableRow) -> bool:
     return row[self.CAPACITANCE].fuzzy_in(self.get(self.capacitance))
 
+  @classmethod
+  def _row_sort_by(cls, row: PartsTableRow) -> Any:
+    return (ESeriesUtil.series_of(row[cls.NOMINAL_CAPACITANCE], default=ESeriesUtil.SERIES_MAX + 1),
+            super()._row_sort_by(row))
 
 @non_library
 class TableDeratingCapacitor(TableCapacitor):
diff --git a/edg/abstract_parts/AbstractResistor.py b/edg/abstract_parts/AbstractResistor.py
index 0240609e8..c2e27d932 100644
--- a/edg/abstract_parts/AbstractResistor.py
+++ b/edg/abstract_parts/AbstractResistor.py
@@ -1,7 +1,8 @@
 import re
-from typing import Optional, cast, Mapping, Dict
+from typing import Optional, cast, Mapping, Dict, Any
 
 from ..electronics_model import *
+from .ESeriesUtil import ESeriesUtil
 from .PartsTable import PartsTableColumn, PartsTableRow
 from .PartsTablePart import PartsTableSelector
 from .Categories import *
@@ -120,6 +121,11 @@ def _row_generate(self, row: PartsTableRow) -> None:
     self.assign(self.actual_power_rating, row[self.POWER_RATING])
     self.assign(self.actual_voltage_rating, row[self.VOLTAGE_RATING])
 
+  @classmethod
+  def _row_sort_by(cls, row: PartsTableRow) -> Any:
+    return (ESeriesUtil.series_of(row[cls.RESISTANCE].center(), default=ESeriesUtil.SERIES_MAX + 1),
+            super()._row_sort_by(row))
+
 
 class PullupResistor(DiscreteApplication):
   """Pull-up resistor with an VoltageSink for automatic implicit connect to a Power line."""
diff --git a/edg/abstract_parts/ESeriesUtil.py b/edg/abstract_parts/ESeriesUtil.py
index ceb936022..ab632a72b 100644
--- a/edg/abstract_parts/ESeriesUtil.py
+++ b/edg/abstract_parts/ESeriesUtil.py
@@ -2,11 +2,14 @@
 import math
 from abc import ABCMeta, abstractmethod
 from collections import deque
-from typing import Sequence, Optional, TypeVar, Tuple, List, Generic, Type
+from typing import Sequence, Optional, TypeVar, Tuple, List, Generic, Type, Union, overload
 
 from ..electronics_model import *
 
 
+SeriesDefaultType = TypeVar('SeriesDefaultType')
+
+
 class ESeriesUtil:
   """Helper methods for working with the E series of preferred numbers."""
   @staticmethod
@@ -59,9 +62,10 @@ def choose_preferred_number(cls, within: Range, series: Sequence[float], toleran
 
   ROUND_DIGITS = 5
 
+  SERIES_MAX = 192
+
   E24_DIFF = {  # series as difference from prior series
-    1: [1.0],
-    3: [2.2, 4.7],
+    3: [1.0, 2.2, 4.7],
     6: [1.5, 3.3, 6.8],
     12: [1.2, 1.8, 2.7, 3.9, 5.6, 8.2],
     24: [1.1, 1.3, 1.6, 2.0, 2.4, 3.0, 3.6, 4.3, 5.1, 6.2, 7.5, 9.1],
@@ -87,26 +91,36 @@ def choose_preferred_number(cls, within: Range, series: Sequence[float], toleran
   }
 
   SERIES = {  # whole series in zigzag order
-    1: list(itertools.chain(E24_DIFF[1])),
-    3: list(itertools.chain(E24_DIFF[1], E24_DIFF[3])),
-    6: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6])),
-    12: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6], E24_DIFF[12])),
-    24: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6], E24_DIFF[12], E24_DIFF[24])),
+    3: list(itertools.chain(E24_DIFF[3])),
+    6: list(itertools.chain(E24_DIFF[3], E24_DIFF[6])),
+    12: list(itertools.chain(E24_DIFF[3], E24_DIFF[6], E24_DIFF[12])),
+    24: list(itertools.chain(E24_DIFF[3], E24_DIFF[6], E24_DIFF[12], E24_DIFF[24])),
 
     # These are E192 without the E24 series
     48: list(itertools.chain(E192_DIFF[48])),
     96: list(itertools.chain(E192_DIFF[48], E192_DIFF[96])),
     192: list(itertools.chain(E192_DIFF[48], E192_DIFF[96], E192_DIFF[192])),
-
-    # These are E24 + E192, prioritizing E24
-    2448: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6], E24_DIFF[12], E24_DIFF[24],
-                               E192_DIFF[48])),
-    2496: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6], E24_DIFF[12], E24_DIFF[24],
-                               E192_DIFF[48], E192_DIFF[96])),
-    24192: list(itertools.chain(E24_DIFF[1], E24_DIFF[3], E24_DIFF[6], E24_DIFF[12], E24_DIFF[24],
-                                E192_DIFF[48], E192_DIFF[96], E192_DIFF[192])),
   }
 
+  # reverse mapping of value to series, reverse SERIES so lower series preferred
+  VALUE_SERIES = {v: k for k, series in reversed(SERIES.items()) for v in series}
+
+  @classmethod
+  @overload
+  def series_of(cls, value: float) -> Optional[int]: ...
+  @classmethod
+  @overload
+  def series_of(cls, value: float, *, default: SeriesDefaultType) -> Union[int, SeriesDefaultType]: ...
+
+  @classmethod
+  def series_of(cls, value: float, *, default: Optional[SeriesDefaultType] = None) -> Union[None, int, SeriesDefaultType]:
+    """Returns the E-series that contains the given value, or None if not found.
+    Performs limited rounding to account for floating point issues."""
+    if value <= 0:
+      return default
+    normalized_value = value * math.pow(10, -math.floor(math.log10(value)))
+    return cls.VALUE_SERIES.get(cls.round_sig(normalized_value, cls.ROUND_DIGITS), default)
+
 
 ESeriesRatioValueType = TypeVar('ESeriesRatioValueType', bound='ESeriesRatioValue')
 class ESeriesRatioValue(Generic[ESeriesRatioValueType], metaclass=ABCMeta):
diff --git a/edg/abstract_parts/test_e_series.py b/edg/abstract_parts/test_e_series.py
index 69bf66056..2e04b9146 100644
--- a/edg/abstract_parts/test_e_series.py
+++ b/edg/abstract_parts/test_e_series.py
@@ -41,8 +41,6 @@ def test_preferred_number(self) -> None:
                      1000)
     self.assertEqual(ESeriesUtil.choose_preferred_number(Range(220, 820), ESeriesUtil.SERIES[24], 0.01),
                      470)
-    self.assertEqual(ESeriesUtil.choose_preferred_number(Range(220, 820), ESeriesUtil.SERIES[24192], 0.01),
-                     470)
 
     # Test dynamic range edge cases
     self.assertEqual(ESeriesUtil.choose_preferred_number(Range(999, 1500), ESeriesUtil.SERIES[24], 0.01),
@@ -58,3 +56,14 @@ def test_ratio_product(self):
                       (2, 1), (1, 2), (2, 2),
                       (3, 1), (1, 3), (3, 2), (2, 3), (3, 3),
                       (4, 1), (1, 4), (4, 2), (2, 4), (4, 3), (3, 4), (4, 4)])
+
+  def test_series_of(self):
+    self.assertEqual(ESeriesUtil.series_of(1.0), 3)
+    self.assertEqual(ESeriesUtil.series_of(2.2), 3)
+    self.assertEqual(ESeriesUtil.series_of(6.8), 6)
+    self.assertEqual(ESeriesUtil.series_of(6800), 6)
+    self.assertEqual(ESeriesUtil.series_of(0.91), 24)
+    self.assertEqual(ESeriesUtil.series_of(0.01), 3)
+    self.assertEqual(ESeriesUtil.series_of(9.88), 192)
+    self.assertEqual(ESeriesUtil.series_of(0.42), None)
+    self.assertEqual(ESeriesUtil.series_of(0.42, default=1000), 1000)
diff --git a/edg/abstract_parts/test_resistive_divider.py b/edg/abstract_parts/test_resistive_divider.py
index 26a74f027..2a5e74674 100644
--- a/edg/abstract_parts/test_resistive_divider.py
+++ b/edg/abstract_parts/test_resistive_divider.py
@@ -38,7 +38,7 @@ def test_resistor_divider(self) -> None:
       (820, 100))
 
   def test_impossible(self) -> None:
-    e1_calculator = ESeriesRatioUtil(ESeriesUtil.SERIES[1], 0.01, DividerValues)
+    e1_calculator = ESeriesRatioUtil([1.0], 0.01, DividerValues)
 
     with self.assertRaises(ESeriesRatioUtil.NoMatchException) as error:
       self.assertEqual(
diff --git a/edg/parts/Oled_Er_Oled_091_3.py b/edg/parts/Oled_Er_Oled_091_3.py
index 699670978..1e255e1cf 100644
--- a/edg/parts/Oled_Er_Oled_091_3.py
+++ b/edg/parts/Oled_Er_Oled_091_3.py
@@ -94,12 +94,12 @@ def contents(self):
         self.iref_res = self.Block(Resistor(resistance=560*kOhm(tol=0.05)))  # TODO dynamic sizing
         self.connect(self.iref_res.a, self.device.iref)
         self.connect(self.iref_res.b.adapt_to(Ground()), self.gnd)
-        self.vcomh_cap = self.Block(DecouplingCapacitor((2.2*.8, 20)*uFarad)).connected(self.gnd, self.device.vcomh)
+        self.vcomh_cap = self.Block(DecouplingCapacitor((2.2*.8, 10)*uFarad)).connected(self.gnd, self.device.vcomh)
 
         self.vdd_cap1 = self.Block(DecouplingCapacitor(capacitance=0.1*uFarad(tol=0.2))).connected(self.gnd, self.pwr)
         self.vdd_cap2 = self.Block(DecouplingCapacitor(capacitance=4.7*uFarad(tol=0.2))).connected(self.gnd, self.pwr)
 
         self.vcc_cap1 = self.Block(DecouplingCapacitor(capacitance=0.1*uFarad(tol=0.2)))\
             .connected(self.gnd, self.device.vcc)
-        self.vcc_cap2 = self.Block(DecouplingCapacitor(capacitance=(4.7*.8, 20)*uFarad))\
+        self.vcc_cap2 = self.Block(DecouplingCapacitor(capacitance=4.7*uFarad(tol=0.2)))\
             .connected(self.gnd, self.device.vcc)
diff --git a/edg/parts/Oled_Er_Oled_096_1_1.py b/edg/parts/Oled_Er_Oled_096_1_1.py
index 216361649..479039fb8 100644
--- a/edg/parts/Oled_Er_Oled_096_1_1.py
+++ b/edg/parts/Oled_Er_Oled_096_1_1.py
@@ -110,7 +110,7 @@ def contents(self):
             .connected(self.gnd, self.device.vdd)
         self.vbat_cap = self.Block(DecouplingCapacitor(capacitance=1*uFarad(tol=0.2)))\
             .connected(self.gnd, self.device.vbat)
-        self.vcc_cap = self.Block(DecouplingCapacitor(capacitance=(2.2*0.8, 20)*uFarad))\
+        self.vcc_cap = self.Block(DecouplingCapacitor(capacitance=(2.2*0.8, 10)*uFarad))\
             .connected(self.gnd, self.device.vcc)
 
     def generate(self):
diff --git a/examples/BldcController/BldcController.net b/examples/BldcController/BldcController.net
index 786abef1c..702141292 100644
--- a/examples/BldcController/BldcController.net
+++ b/examples/BldcController/BldcController.net
@@ -488,8 +488,8 @@
   (property (name "edg_path") (value "isense_clamp.res"))
   (property (name "edg_short_path") (value "isense_clamp"))
   (property (name "edg_refdes") (value "R18"))
-  (property (name "edg_part") (value "0603WAF3602T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 36kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF1002T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 10kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "205a04f4"))
 (comp (ref "U4")
diff --git a/examples/DeskController/DeskController.net b/examples/DeskController/DeskController.net
index 9e69da083..c0d173827 100644
--- a/examples/DeskController/DeskController.net
+++ b/examples/DeskController/DeskController.net
@@ -488,8 +488,8 @@
   (property (name "edg_path") (value "oled.iref_res"))
   (property (name "edg_short_path") (value "oled.iref_res"))
   (property (name "edg_refdes") (value "DR5"))
-  (property (name "edg_part") (value "0603WAF4303T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 430kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4703T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 470kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/oled/") (tstamps "/043201a5/"))
   (tstamps "0ed90350"))
 (comp (ref "DC8")
diff --git a/examples/EspLora/EspLora.net b/examples/EspLora/EspLora.net
index 167bc66fe..3c43b1939 100644
--- a/examples/EspLora/EspLora.net
+++ b/examples/EspLora/EspLora.net
@@ -572,8 +572,8 @@
   (property (name "edg_path") (value "lora.balun.c"))
   (property (name "edg_short_path") (value "lora.balun.c"))
   (property (name "edg_refdes") (value "LC15"))
-  (property (name "edg_part") (value "0603CG3R0C500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 3pF C0G ±0.25pF 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C2R7CB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 2.7pF C0G ±0.25pF 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/lora/balun/") (tstamps "/044601af/060f0213/"))
   (tstamps "00640064"))
 (comp (ref "LC16")
@@ -824,8 +824,8 @@
   (property (name "edg_path") (value "oled.iref_res"))
   (property (name "edg_short_path") (value "oled.iref_res"))
   (property (name "edg_refdes") (value "LR11"))
-  (property (name "edg_part") (value "0603WAF4303T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 430kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4703T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 470kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/oled/") (tstamps "/043201a5/"))
   (tstamps "0ed90350"))
 (comp (ref "LC21")
@@ -1052,8 +1052,8 @@
   (property (name "edg_path") (value "nfc.xtal.cap_a"))
   (property (name "edg_short_path") (value "nfc.xtal.cap_a"))
   (property (name "edg_refdes") (value "LC34"))
-  (property (name "edg_part") (value "0603CG6R8C500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 6.8pF C0G ±0.25pF 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C100JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 10pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/xtal/") (tstamps "/027c0138/046e01ba/"))
   (tstamps "05e701f5"))
 (comp (ref "LC35")
@@ -1064,8 +1064,8 @@
   (property (name "edg_path") (value "nfc.xtal.cap_b"))
   (property (name "edg_short_path") (value "nfc.xtal.cap_b"))
   (property (name "edg_refdes") (value "LC35"))
-  (property (name "edg_part") (value "0603CG6R8C500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 6.8pF C0G ±0.25pF 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C100JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 10pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/xtal/") (tstamps "/027c0138/046e01ba/"))
   (tstamps "05e801f6"))
 (comp (ref "LR13")
@@ -1148,8 +1148,8 @@
   (property (name "edg_path") (value "nfc.emc.c1"))
   (property (name "edg_short_path") (value "nfc.emc.c1"))
   (property (name "edg_refdes") (value "LC38"))
-  (property (name "edg_part") (value "TCC0603X7R511K500CT (CCTC)"))
-  (property (name "edg_value") (value "50V 510pF X7R ±10% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "TCC0603COG471J500CT (CCTC)"))
+  (property (name "edg_value") (value "50V 470pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/emc/") (tstamps "/027c0138/026f0136/"))
   (tstamps "00f90095"))
 (comp (ref "LC39")
@@ -1160,8 +1160,8 @@
   (property (name "edg_path") (value "nfc.emc.c2"))
   (property (name "edg_short_path") (value "nfc.emc.c2"))
   (property (name "edg_refdes") (value "LC39"))
-  (property (name "edg_part") (value "TCC0603X7R511K500CT (CCTC)"))
-  (property (name "edg_value") (value "50V 510pF X7R ±10% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "TCC0603COG471J500CT (CCTC)"))
+  (property (name "edg_value") (value "50V 470pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/emc/") (tstamps "/027c0138/026f0136/"))
   (tstamps "00fa0096"))
 (comp (ref "LANT1")
@@ -1184,8 +1184,8 @@
   (property (name "edg_path") (value "nfc.damp.r1"))
   (property (name "edg_short_path") (value "nfc.damp.r1"))
   (property (name "edg_refdes") (value "LR15"))
-  (property (name "edg_part") (value "RTT032R55FTP (RALEC)"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±200ppm/℃ -55℃~+155℃ 2.55Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "RC0603FR-072R61L (YAGEO)"))
+  (property (name "edg_value") (value "±1% 100mW Thick Film Resistors 75V ±200ppm/℃ -55℃~+155℃ 2.61Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/nfc/damp/") (tstamps "/027c0138/040101a3/"))
   (tstamps "011700a4"))
 (comp (ref "LR16")
@@ -1196,8 +1196,8 @@
   (property (name "edg_path") (value "nfc.damp.r2"))
   (property (name "edg_short_path") (value "nfc.damp.r2"))
   (property (name "edg_refdes") (value "LR16"))
-  (property (name "edg_part") (value "RTT032R55FTP (RALEC)"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±200ppm/℃ -55℃~+155℃ 2.55Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "RC0603FR-072R61L (YAGEO)"))
+  (property (name "edg_value") (value "±1% 100mW Thick Film Resistors 75V ±200ppm/℃ -55℃~+155℃ 2.61Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/nfc/damp/") (tstamps "/027c0138/040101a3/"))
   (tstamps "011800a5"))
 (comp (ref "LC40")
@@ -1232,8 +1232,8 @@
   (property (name "edg_path") (value "nfc.match.cp1"))
   (property (name "edg_short_path") (value "nfc.match.cp1"))
   (property (name "edg_refdes") (value "LC42"))
-  (property (name "edg_part") (value "CL10C560JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 56pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C470JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 47pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/match/") (tstamps "/027c0138/0634020e/"))
   (tstamps "023d0105"))
 (comp (ref "LC43")
@@ -1244,8 +1244,8 @@
   (property (name "edg_path") (value "nfc.match.cp2"))
   (property (name "edg_short_path") (value "nfc.match.cp2"))
   (property (name "edg_refdes") (value "LC43"))
-  (property (name "edg_part") (value "CL10C560JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 56pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C470JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 47pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/nfc/match/") (tstamps "/027c0138/0634020e/"))
   (tstamps "023e0106"))
 (comp (ref "LC44")
@@ -1256,8 +1256,8 @@
   (property (name "edg_path") (value "tx_cpack.cap"))
   (property (name "edg_short_path") (value "tx_cpack"))
   (property (name "edg_refdes") (value "LC44"))
-  (property (name "edg_part") (value "0603CG8R2C500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 8.2pF C0G ±0.25pF 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C100JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 10pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/") (tstamps "/"))
   (tstamps "0f2d034e")))
 (nets
diff --git a/examples/EspProgrammer/EspProgrammer.net b/examples/EspProgrammer/EspProgrammer.net
index 90ddfaecb..fc70beb63 100644
--- a/examples/EspProgrammer/EspProgrammer.net
+++ b/examples/EspProgrammer/EspProgrammer.net
@@ -260,8 +260,8 @@
   (property (name "edg_path") (value "led.res"))
   (property (name "edg_short_path") (value "led.res"))
   (property (name "edg_refdes") (value "UR5"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led/") (tstamps "/02750136/"))
   (tstamps "0296014b"))
 (comp (ref "UD3")
@@ -284,8 +284,8 @@
   (property (name "edg_path") (value "led_en.res"))
   (property (name "edg_short_path") (value "led_en.res"))
   (property (name "edg_refdes") (value "UR6"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_en/") (tstamps "/086c0268/"))
   (tstamps "0296014b")))
 (nets
diff --git a/examples/Fcml/Fcml.net b/examples/Fcml/Fcml.net
index fb80d6ef9..e70c3ac69 100644
--- a/examples/Fcml/Fcml.net
+++ b/examples/Fcml/Fcml.net
@@ -1652,8 +1652,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_refdes") (value "C59"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "C60")
@@ -1664,8 +1664,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_refdes") (value "C60"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "SW2")
diff --git a/examples/IotFan/IotFan.net b/examples/IotFan/IotFan.net
index 1b8021eb4..f3102d1fb 100644
--- a/examples/IotFan/IotFan.net
+++ b/examples/IotFan/IotFan.net
@@ -452,8 +452,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_refdes") (value "FC17"))
-  (property (name "edg_part") (value "CL10C150JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 15pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "FC18")
@@ -464,8 +464,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_refdes") (value "FC18"))
-  (property (name "edg_part") (value "CL10C150JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 15pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "FJ2")
diff --git a/examples/IotLedDriver/IotLedDriver.net b/examples/IotLedDriver/IotLedDriver.net
index ea20a20de..22d0779ab 100644
--- a/examples/IotLedDriver/IotLedDriver.net
+++ b/examples/IotLedDriver/IotLedDriver.net
@@ -176,8 +176,8 @@
   (property (name "edg_path") (value "reg_3v3.en_res"))
   (property (name "edg_short_path") (value "reg_3v3.en_res"))
   (property (name "edg_refdes") (value "LR3"))
-  (property (name "edg_part") (value "0402WGF3003TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 300kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2203TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 220kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/reg_3v3/") (tstamps "/0aba027a/"))
   (tstamps "0899027d"))
 (comp (ref "LTP3")
@@ -392,8 +392,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_refdes") (value "LC15"))
-  (property (name "edg_part") (value "0402CG180J500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 18pF C0G ±5% 0402 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "0402CG220J500NT (FH(Guangdong Fenghua Advanced Tech))"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0402 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "LC16")
@@ -404,8 +404,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_refdes") (value "LC16"))
-  (property (name "edg_part") (value "0402CG180J500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 18pF C0G ±5% 0402 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "0402CG220J500NT (FH(Guangdong Fenghua Advanced Tech))"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0402 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "LJ2")
@@ -464,8 +464,8 @@
   (property (name "edg_path") (value "ledr.res"))
   (property (name "edg_short_path") (value "ledr.res"))
   (property (name "edg_refdes") (value "LR5"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/ledr/") (tstamps "/041d01a8/"))
   (tstamps "0296014b"))
 (comp (ref "LR6")
diff --git a/examples/Keyboard/Keyboard.net b/examples/Keyboard/Keyboard.net
index 95ae9b7e9..da9b7b48c 100644
--- a/examples/Keyboard/Keyboard.net
+++ b/examples/Keyboard/Keyboard.net
@@ -200,8 +200,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_refdes") (value "C9"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "C10")
@@ -212,8 +212,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_refdes") (value "C10"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "SW1")
diff --git a/examples/Multimeter/Multimeter.net b/examples/Multimeter/Multimeter.net
index 9a29def13..d7d1580ab 100644
--- a/examples/Multimeter/Multimeter.net
+++ b/examples/Multimeter/Multimeter.net
@@ -668,8 +668,8 @@
   (property (name "edg_path") (value "spk_drv.inp_res"))
   (property (name "edg_short_path") (value "spk_drv.inp_res"))
   (property (name "edg_refdes") (value "R15"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0bb902f1"))
 (comp (ref "C13")
@@ -692,8 +692,8 @@
   (property (name "edg_path") (value "spk_drv.inn_res"))
   (property (name "edg_short_path") (value "spk_drv.inn_res"))
   (property (name "edg_refdes") (value "R16"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0baf02ef"))
 (comp (ref "C14")
diff --git a/examples/PcbBot/PcbBot.net b/examples/PcbBot/PcbBot.net
index 3ec9e8055..36abe4106 100644
--- a/examples/PcbBot/PcbBot.net
+++ b/examples/PcbBot/PcbBot.net
@@ -356,8 +356,8 @@
   (property (name "edg_path") (value "charger.prog_res"))
   (property (name "edg_short_path") (value "charger.prog_res"))
   (property (name "edg_refdes") (value "R6"))
-  (property (name "edg_part") (value "0603WAF4991T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 4.99kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4701T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 4.7kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/charger/") (tstamps "/0b4a02dd/"))
   (tstamps "0f520362"))
 (comp (ref "D6")
diff --git a/examples/PicoProbe/PicoProbe.net b/examples/PicoProbe/PicoProbe.net
index 3f96cad81..235d90ca1 100644
--- a/examples/PicoProbe/PicoProbe.net
+++ b/examples/PicoProbe/PicoProbe.net
@@ -404,8 +404,8 @@
   (property (name "edg_path") (value "led_tgt.res"))
   (property (name "edg_short_path") (value "led_tgt.res"))
   (property (name "edg_refdes") (value "SR5"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_tgt/") (tstamps "/0b6702e4/"))
   (tstamps "0296014b"))
 (comp (ref "SD3")
@@ -428,8 +428,8 @@
   (property (name "edg_path") (value "led_usb.res"))
   (property (name "edg_short_path") (value "led_usb.res"))
   (property (name "edg_refdes") (value "SR6"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_usb/") (tstamps "/0b7002df/"))
   (tstamps "0296014b"))
 (comp (ref "SR7")
@@ -476,8 +476,8 @@
   (property (name "edg_path") (value "led_target.res"))
   (property (name "edg_short_path") (value "led_target.res"))
   (property (name "edg_refdes") (value "SR8"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_target/") (tstamps "/1660041c/"))
   (tstamps "0296014b"))
 (comp (ref "SR9")
diff --git a/examples/ProtectedCharger/ProtectedCharger.net b/examples/ProtectedCharger/ProtectedCharger.net
index 3531ecf75..4ae50a758 100644
--- a/examples/ProtectedCharger/ProtectedCharger.net
+++ b/examples/ProtectedCharger/ProtectedCharger.net
@@ -200,8 +200,8 @@
   (property (name "edg_path") (value "charger.prog_res"))
   (property (name "edg_short_path") (value "charger.prog_res"))
   (property (name "edg_refdes") (value "R5"))
-  (property (name "edg_part") (value "0603WAF4991T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 4.99kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4701T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 4.7kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/charger/") (tstamps "/0b4a02dd/"))
   (tstamps "0f520362"))
 (comp (ref "D1")
diff --git a/examples/RobotCrawler/RobotCrawler.net b/examples/RobotCrawler/RobotCrawler.net
index 6a4934151..668ab554d 100644
--- a/examples/RobotCrawler/RobotCrawler.net
+++ b/examples/RobotCrawler/RobotCrawler.net
@@ -1136,8 +1136,8 @@
   (property (name "edg_path") (value "oled.vsl_res"))
   (property (name "edg_short_path") (value "oled.vsl_res"))
   (property (name "edg_refdes") (value "RR13"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/oled/") (tstamps "/043201a5/"))
   (tstamps "0c1e02ff"))
 (comp (ref "RD8")
diff --git a/examples/RobotDriver/RobotDriver.net b/examples/RobotDriver/RobotDriver.net
index c2dd5af5c..921e3799d 100644
--- a/examples/RobotDriver/RobotDriver.net
+++ b/examples/RobotDriver/RobotDriver.net
@@ -704,8 +704,8 @@
   (property (name "edg_path") (value "spk_drv.inp_res"))
   (property (name "edg_short_path") (value "spk_drv.inp_res"))
   (property (name "edg_refdes") (value "R12"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0bb902f1"))
 (comp (ref "C19")
@@ -728,8 +728,8 @@
   (property (name "edg_path") (value "spk_drv.inn_res"))
   (property (name "edg_short_path") (value "spk_drv.inn_res"))
   (property (name "edg_refdes") (value "R13"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0baf02ef"))
 (comp (ref "C20")
diff --git a/examples/SevenSegment/SevenSegment.net b/examples/SevenSegment/SevenSegment.net
index 19324bc6e..5e600e8d5 100644
--- a/examples/SevenSegment/SevenSegment.net
+++ b/examples/SevenSegment/SevenSegment.net
@@ -2012,8 +2012,8 @@
   (property (name "edg_path") (value "spk_drv.inp_res"))
   (property (name "edg_short_path") (value "spk_drv.inp_res"))
   (property (name "edg_refdes") (value "CR9"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0bb902f1"))
 (comp (ref "CC74")
@@ -2036,8 +2036,8 @@
   (property (name "edg_path") (value "spk_drv.inn_res"))
   (property (name "edg_short_path") (value "spk_drv.inn_res"))
   (property (name "edg_refdes") (value "CR10"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0baf02ef"))
 (comp (ref "CC75")
diff --git a/examples/SwdDebugger/SwdDebugger.net b/examples/SwdDebugger/SwdDebugger.net
index 1fbf43e39..e2a3118ba 100644
--- a/examples/SwdDebugger/SwdDebugger.net
+++ b/examples/SwdDebugger/SwdDebugger.net
@@ -308,8 +308,8 @@
   (property (name "edg_path") (value "led_tgt.res"))
   (property (name "edg_short_path") (value "led_tgt.res"))
   (property (name "edg_refdes") (value "SR4"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_tgt/") (tstamps "/0b6702e4/"))
   (tstamps "0296014b"))
 (comp (ref "SD3")
@@ -332,8 +332,8 @@
   (property (name "edg_path") (value "led_usb.res"))
   (property (name "edg_short_path") (value "led_usb.res"))
   (property (name "edg_refdes") (value "SR5"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_usb/") (tstamps "/0b7002df/"))
   (tstamps "0296014b"))
 (comp (ref "SR6")
@@ -464,8 +464,8 @@
   (property (name "edg_path") (value "led_target.res"))
   (property (name "edg_short_path") (value "led_target.res"))
   (property (name "edg_refdes") (value "SR13"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/led_target/") (tstamps "/1660041c/"))
   (tstamps "0296014b"))
 (comp (ref "SR14")
diff --git a/examples/TofArray/TofArray.net b/examples/TofArray/TofArray.net
index 1ad2183f0..05fba6b3f 100644
--- a/examples/TofArray/TofArray.net
+++ b/examples/TofArray/TofArray.net
@@ -296,8 +296,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_a"))
   (property (name "edg_refdes") (value "C9"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "C10")
@@ -308,8 +308,8 @@
   (property (name "edg_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_short_path") (value "mcu.crystal.cap_b"))
   (property (name "edg_refdes") (value "C10"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/mcu/crystal/") (tstamps "/02850146/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "SW1")
@@ -776,8 +776,8 @@
   (property (name "edg_path") (value "spk_drv.inp_res"))
   (property (name "edg_short_path") (value "spk_drv.inp_res"))
   (property (name "edg_refdes") (value "R7"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0bb902f1"))
 (comp (ref "C25")
@@ -800,8 +800,8 @@
   (property (name "edg_path") (value "spk_drv.inn_res"))
   (property (name "edg_short_path") (value "spk_drv.inn_res"))
   (property (name "edg_refdes") (value "R8"))
-  (property (name "edg_part") (value "0603WAF3002T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 30kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF3302T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 33kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/spk_drv/") (tstamps "/0be502fa/"))
   (tstamps "0baf02ef"))
 (comp (ref "C26")
diff --git a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net
index 0b39df874..486757695 100644
--- a/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net
+++ b/examples/UsbFpgaProgrammer/UsbFpgaProgrammer.net
@@ -284,8 +284,8 @@
   (property (name "edg_path") (value "ft232.crystal.cap_a"))
   (property (name "edg_short_path") (value "ft232.crystal.cap_a"))
   (property (name "edg_refdes") (value "FC11"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/ft232/crystal/") (tstamps "/05010172/0c1b0303/"))
   (tstamps "05e701f5"))
 (comp (ref "FC12")
@@ -296,8 +296,8 @@
   (property (name "edg_path") (value "ft232.crystal.cap_b"))
   (property (name "edg_short_path") (value "ft232.crystal.cap_b"))
   (property (name "edg_refdes") (value "FC12"))
-  (property (name "edg_part") (value "CL10C330JB8NNNC (Samsung Electro-Mechanics)"))
-  (property (name "edg_value") (value "50V 33pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "CL10C220JB8NNNC (Samsung Electro-Mechanics)"))
+  (property (name "edg_value") (value "50V 22pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/ft232/crystal/") (tstamps "/05010172/0c1b0303/"))
   (tstamps "05e801f6"))
 (comp (ref "FU2")
diff --git a/examples/UsbKey/UsbKey.net b/examples/UsbKey/UsbKey.net
index d0ff920ec..a67392cce 100644
--- a/examples/UsbKey/UsbKey.net
+++ b/examples/UsbKey/UsbKey.net
@@ -116,8 +116,8 @@
   (property (name "edg_path") (value "rgb.red_res"))
   (property (name "edg_short_path") (value "rgb.red_res"))
   (property (name "edg_refdes") (value "R1"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/rgb/") (tstamps "/0289013c/"))
   (tstamps "0b8602e5"))
 (comp (ref "R2")
@@ -128,8 +128,8 @@
   (property (name "edg_path") (value "rgb.green_res"))
   (property (name "edg_short_path") (value "rgb.green_res"))
   (property (name "edg_refdes") (value "R2"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/rgb/") (tstamps "/0289013c/"))
   (tstamps "128e03bb"))
 (comp (ref "R3")
@@ -140,8 +140,8 @@
   (property (name "edg_path") (value "rgb.blue_res"))
   (property (name "edg_short_path") (value "rgb.blue_res"))
   (property (name "edg_refdes") (value "R3"))
-  (property (name "edg_part") (value "0402WGF2401TCE (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.4kΩ 0402 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0402WGF2201TCE (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/16W Thick Film Resistors 50V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0402 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/rgb/") (tstamps "/0289013c/"))
   (tstamps "0ed20352"))
 (comp (ref "R4")
diff --git a/examples/UsbSourceMeasure/UsbSourceMeasure.net b/examples/UsbSourceMeasure/UsbSourceMeasure.net
index dc8ed41f3..3f8ddde11 100644
--- a/examples/UsbSourceMeasure/UsbSourceMeasure.net
+++ b/examples/UsbSourceMeasure/UsbSourceMeasure.net
@@ -968,8 +968,8 @@
   (property (name "edg_path") (value "reg_vcontrol.cf"))
   (property (name "edg_short_path") (value "reg_vcontrol.cf"))
   (property (name "edg_refdes") (value "C33"))
-  (property (name "edg_part") (value "0603CG750J500NT (FH(Guangdong Fenghua Advanced Tech))"))
-  (property (name "edg_value") (value "50V 75pF C0G ±5% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
+  (property (name "edg_part") (value "0603CG680G500NT (FH(Guangdong Fenghua Advanced Tech))"))
+  (property (name "edg_value") (value "50V 68pF C0G ±2% 0603 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS"))
   (sheetpath (names "/reg_vcontrol/") (tstamps "/20ad0515/"))
   (tstamps "012e00ca"))
 (comp (ref "D7")
@@ -1364,8 +1364,8 @@
   (property (name "edg_path") (value "control.hvclamp.res"))
   (property (name "edg_short_path") (value "control.hvclamp"))
   (property (name "edg_refdes") (value "R34"))
-  (property (name "edg_part") (value "0603WAF3602T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 36kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF1003T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 100kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/control/") (tstamps "/0bec0302/"))
   (tstamps "0baf02ec"))
 (comp (ref "D10")
@@ -1448,8 +1448,8 @@
   (property (name "edg_path") (value "control.isense.ranges[0].pwr_sw.res"))
   (property (name "edg_short_path") (value "control.isense.ranges[0].pwr_sw.res"))
   (property (name "edg_refdes") (value "R36"))
-  (property (name "edg_part") (value "0603WAF3000T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 300Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4700T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 470Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/control/isense/ranges[0]/pwr_sw/") (tstamps "/0bec0302/08e40288/12120369/093b02a3/"))
   (tstamps "0296014b"))
 (comp (ref "R37")
@@ -1472,8 +1472,8 @@
   (property (name "edg_path") (value "control.isense.ranges[0].clamp.res"))
   (property (name "edg_short_path") (value "control.isense.ranges[0].clamp"))
   (property (name "edg_refdes") (value "R38"))
-  (property (name "edg_part") (value "0603WAF2701T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 2.7kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF2201T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/control/isense/ranges[0]/") (tstamps "/0bec0302/08e40288/12120369/"))
   (tstamps "0611020e"))
 (comp (ref "U12")
@@ -1520,8 +1520,8 @@
   (property (name "edg_path") (value "control.isense.ranges[1].pwr_sw.res"))
   (property (name "edg_short_path") (value "control.isense.ranges[1].pwr_sw.res"))
   (property (name "edg_refdes") (value "R39"))
-  (property (name "edg_part") (value "0603WAF3000T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 300Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF4700T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 470Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/control/isense/ranges[1]/pwr_sw/") (tstamps "/0bec0302/08e40288/1214036a/093b02a3/"))
   (tstamps "0296014b"))
 (comp (ref "R40")
@@ -1544,8 +1544,8 @@
   (property (name "edg_path") (value "control.isense.ranges[1].clamp.res"))
   (property (name "edg_short_path") (value "control.isense.ranges[1].clamp"))
   (property (name "edg_refdes") (value "R41"))
-  (property (name "edg_part") (value "0603WAF2701T5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 2.7kΩ 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF2201T5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 2.2kΩ 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/control/isense/ranges[1]/") (tstamps "/0bec0302/08e40288/1214036a/"))
   (tstamps "0611020e"))
 (comp (ref "U14")
@@ -2492,8 +2492,8 @@
   (property (name "edg_path") (value "tp_cv.res"))
   (property (name "edg_short_path") (value "tp_cv.res"))
   (property (name "edg_refdes") (value "R68"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_cv/") (tstamps "/0662021d/"))
   (tstamps "0296014b"))
 (comp (ref "J8")
@@ -2516,8 +2516,8 @@
   (property (name "edg_path") (value "tp_cisrc.res"))
   (property (name "edg_short_path") (value "tp_cisrc.res"))
   (property (name "edg_refdes") (value "R69"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_cisrc/") (tstamps "/0f250358/"))
   (tstamps "0296014b"))
 (comp (ref "J9")
@@ -2540,8 +2540,8 @@
   (property (name "edg_path") (value "tp_cisnk.res"))
   (property (name "edg_short_path") (value "tp_cisnk.res"))
   (property (name "edg_refdes") (value "R70"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_cisnk/") (tstamps "/0f25035c/"))
   (tstamps "0296014b"))
 (comp (ref "U27")
@@ -2660,8 +2660,8 @@
   (property (name "edg_path") (value "tp_vcen.res"))
   (property (name "edg_short_path") (value "tp_vcen.res"))
   (property (name "edg_refdes") (value "R73"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_vcen/") (tstamps "/0be702f0/"))
   (tstamps "0296014b"))
 (comp (ref "R74")
@@ -2708,8 +2708,8 @@
   (property (name "edg_path") (value "tp_mi.res"))
   (property (name "edg_short_path") (value "tp_mi.res"))
   (property (name "edg_refdes") (value "R75"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_mi/") (tstamps "/0669021a/"))
   (tstamps "0296014b"))
 (comp (ref "R76")
@@ -2756,8 +2756,8 @@
   (property (name "edg_path") (value "tp_mv.res"))
   (property (name "edg_short_path") (value "tp_mv.res"))
   (property (name "edg_refdes") (value "R77"))
-  (property (name "edg_part") (value "0603WAF499JT5E (UNI-ROYAL(Uniroyal Elec))"))
-  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 49.9Ω 0603 Chip Resistor - Surface Mount ROHS"))
+  (property (name "edg_part") (value "0603WAF510JT5E (UNI-ROYAL(Uniroyal Elec))"))
+  (property (name "edg_value") (value "±1% 1/10W Thick Film Resistors 75V ±100ppm/℃ -55℃~+155℃ 51Ω 0603 Chip Resistor - Surface Mount ROHS"))
   (sheetpath (names "/tp_mv/") (tstamps "/06760227/"))
   (tstamps "0296014b"))
 (comp (ref "R78")
diff --git a/examples/test_usb_source_measure.py b/examples/test_usb_source_measure.py
index cbacf24f9..ce73202c0 100644
--- a/examples/test_usb_source_measure.py
+++ b/examples/test_usb_source_measure.py
@@ -50,7 +50,7 @@ def contents(self):
     self.import_kicad(self.file_path("resources", f"{self.__class__.__name__}.kicad_sch"),
                       locals={
                         'clamp': {
-                          'clamp_current': (2.5, 25)*mAmp,
+                          'clamp_current': (5, 25)*mAmp,
                           'clamp_target': (0, float('inf'))*Volt,
                           'zero_out': True
                         },