diff --git a/boards/_base/pcb/bw12.json b/boards/_base/pcb/bw12.json
index 8f5e850..5347eca 100644
--- a/boards/_base/pcb/bw12.json
+++ b/boards/_base/pcb/bw12.json
@@ -2,13 +2,11 @@
 	"pcb": {
 		"templates": [
 			"esp12s",
-			"esp12s-shield",
+			"pcb-black",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_black",
-			"TRACE_COLOR": "#FAFD9D",
-			"SILK_COLOR": "white"
+			"TRACE_COLOR": "#FAFD9D"
 		},
 		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
 		"pinout": {
diff --git a/boards/_base/pcb/cb2l.json b/boards/_base/pcb/cb2l.json
index 1110aa8..575a497 100644
--- a/boards/_base/pcb/cb2l.json
+++ b/boards/_base/pcb/cb2l.json
@@ -2,14 +2,9 @@
 	"pcb": {
 		"templates": [
 			"tuya2l",
-			"rf-type1",
-			"tuya2l-shield"
+			"pcb-white",
+			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		},
 		"pinout_hidden": "I2S,I2C,JTAG,FLASH",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/cb2s.json b/boards/_base/pcb/cb2s.json
index af4c2cf..67f05af 100644
--- a/boards/_base/pcb/cb2s.json
+++ b/boards/_base/pcb/cb2s.json
@@ -2,14 +2,9 @@
 	"pcb": {
 		"templates": [
 			"tuya2",
-			"rf-type1",
-			"tuya2-shield"
+			"pcb-blue-light",
+			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		},
 		"pinout_hidden": "I2S,JTAG,FLASH",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/cb3l.json b/boards/_base/pcb/cb3l.json
index 21cea39..8a4f260 100644
--- a/boards/_base/pcb/cb3l.json
+++ b/boards/_base/pcb/cb3l.json
@@ -2,14 +2,12 @@
 	"pcb": {
 		"templates": [
 			"esp12s",
-			"esp12e-shield",
+			"pcb-white",
 			"tuya-16x24",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
+			"PINHOLE": 1
 		},
 		"pinout_hidden": "I2S,SD,SPI,I2C,JTAG,FLASH",
 		"pinout": {
diff --git a/boards/_base/pcb/cb3s.json b/boards/_base/pcb/cb3s.json
index ea3f3aa..22b4dc0 100644
--- a/boards/_base/pcb/cb3s.json
+++ b/boards/_base/pcb/cb3s.json
@@ -2,14 +2,12 @@
 	"pcb": {
 		"templates": [
 			"esp12e-22",
-			"esp12e-shield-nohole",
+			"pcb-blue-light",
 			"tuya-16x24",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
+			"PINHOLE": 0
 		},
 		"pinout_hidden": "I2S,SD,SPI,SCL2",
 		"pinout": {
diff --git a/boards/_base/pcb/cb3se.json b/boards/_base/pcb/cb3se.json
index f19a0a1..fc8566f 100644
--- a/boards/_base/pcb/cb3se.json
+++ b/boards/_base/pcb/cb3se.json
@@ -2,14 +2,12 @@
 	"pcb": {
 		"templates": [
 			"esp12e-22",
-			"esp12e-shield-nohole",
+			"pcb-blue-light",
 			"tuya-16x24",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
+			"PINHOLE": 0
 		},
 		"pinout_hidden": "I2S,SD,JTAG,FLASH,SCL1",
 		"pinout": {
diff --git a/boards/_base/pcb/cblc5.json b/boards/_base/pcb/cblc5.json
index c47ef65..dc549ce 100644
--- a/boards/_base/pcb/cblc5.json
+++ b/boards/_base/pcb/cblc5.json
@@ -1,13 +1,9 @@
 {
 	"pcb": {
 		"templates": [
-			"tuyalc5"
+			"tuyalc5",
+			"pcb-white"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		},
 		"pinout_hidden": "I2S,JTAG,FLASH,SDA1",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/cbu-test.json b/boards/_base/pcb/cbu-test.json
index 909c394..fe46880 100644
--- a/boards/_base/pcb/cbu-test.json
+++ b/boards/_base/pcb/cbu-test.json
@@ -1,6 +1,5 @@
 {
 	"pcb": {
-		"scale": 11,
 		"test_pads": {
 			"TCSN": "cbu.back.csn.anchor"
 		},
diff --git a/boards/_base/pcb/cbu.json b/boards/_base/pcb/cbu.json
index 517fd7d..fa24293 100644
--- a/boards/_base/pcb/cbu.json
+++ b/boards/_base/pcb/cbu.json
@@ -2,15 +2,10 @@
 	"pcb": {
 		"templates": [
 			"tuyau",
-			"tuyau-shield",
+			"pcb-white",
 			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		},
-		"pinout_hidden": "I2S,JTAG,FLASH,USB,SD",
+		"pinout_hidden": "I2S,USB,SD,FLASH",
 		"pinout": {
 			"1": {
 				"IC": 11,
diff --git a/boards/_base/pcb/lsc-lma35.json b/boards/_base/pcb/lsc-lma35.json
index 2649819..2879718 100644
--- a/boards/_base/pcb/lsc-lma35.json
+++ b/boards/_base/pcb/lsc-lma35.json
@@ -2,13 +2,9 @@
 	"pcb": {
 		"templates": [
 			"custom-20x24-22",
+			"pcb-blue-light",
 			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		},
 		"pinout_hidden": "I2S,JTAG,FLASH,SD,SPI,SDA1",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/wb2l.json b/boards/_base/pcb/wb2l.json
index 08d5df9..9e234d2 100644
--- a/boards/_base/pcb/wb2l.json
+++ b/boards/_base/pcb/wb2l.json
@@ -2,14 +2,9 @@
 	"pcb": {
 		"templates": [
 			"tuya2l",
-			"rf-type1",
-			"tuya2l-shield"
+			"pcb-white",
+			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		},
 		"pinout_hidden": "I2S",
 		"pinout": {
 			"1": {
@@ -42,7 +37,7 @@
 				"GND": null
 			},
 			"TRST": {
-				"CTRL": "^RST"
+				"IC": 21
 			},
 			"TRX1": {
 				"IC": 26,
diff --git a/boards/_base/pcb/wb2s.json b/boards/_base/pcb/wb2s.json
index cb6d8ba..45d1a74 100644
--- a/boards/_base/pcb/wb2s.json
+++ b/boards/_base/pcb/wb2s.json
@@ -3,14 +3,9 @@
 		"scale": 10.5,
 		"templates": [
 			"tuya2",
-			"rf-type1",
-			"tuya2-shield"
+			"pcb-blue-light",
+			"rf-type1"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		},
 		"pinout_hidden": "I2S,FLASH",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/wb3l.json b/boards/_base/pcb/wb3l.json
index 0ef51f9..85e197b 100644
--- a/boards/_base/pcb/wb3l.json
+++ b/boards/_base/pcb/wb3l.json
@@ -2,14 +2,12 @@
 	"pcb": {
 		"templates": [
 			"esp12e-21",
-			"esp12e-shield-nohole",
+			"pcb-white",
 			"tuya-16x24",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
+			"PINHOLE": 0
 		},
 		"pinout_hidden": "I2S,SD,SPI",
 		"pinout": {
diff --git a/boards/_base/pcb/wb3s.json b/boards/_base/pcb/wb3s.json
index 1d37c3c..9896ad4 100644
--- a/boards/_base/pcb/wb3s.json
+++ b/boards/_base/pcb/wb3s.json
@@ -2,14 +2,12 @@
 	"pcb": {
 		"templates": [
 			"esp12e-22",
-			"esp12e-shield-nohole",
+			"pcb-blue-light",
 			"tuya-16x24",
 			"rf-type1"
 		],
 		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
+			"PINHOLE": 0
 		},
 		"pinout_hidden": "I2S,SD,SPI",
 		"pinout": {
diff --git a/boards/_base/pcb/wblc5.json b/boards/_base/pcb/wblc5.json
index 8e179af..85112f0 100644
--- a/boards/_base/pcb/wblc5.json
+++ b/boards/_base/pcb/wblc5.json
@@ -1,13 +1,9 @@
 {
 	"pcb": {
 		"templates": [
-			"tuyalc5"
+			"tuyalc5",
+			"pcb-white"
 		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		},
 		"pinout_hidden": "I2S",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/wr2-base.json b/boards/_base/pcb/wr2-base.json
index 249b49c..1997844 100644
--- a/boards/_base/pcb/wr2-base.json
+++ b/boards/_base/pcb/wr2-base.json
@@ -2,13 +2,8 @@
 	"pcb": {
 		"templates": [
 			"tuya2",
-			"rf-type1",
-			"tuya2-shield"
-		],
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		}
+			"pcb-blue-light",
+			"rf-type1"
+		]
 	}
 }
diff --git a/boards/_base/pcb/wr2l-base.json b/boards/_base/pcb/wr2l-base.json
index dcb5d7e..ae89345 100644
--- a/boards/_base/pcb/wr2l-base.json
+++ b/boards/_base/pcb/wr2l-base.json
@@ -2,13 +2,8 @@
 	"pcb": {
 		"templates": [
 			"tuya2l",
-			"rf-type1",
-			"tuya2l-shield"
-		],
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		}
+			"pcb-blue-light",
+			"rf-type1"
+		]
 	}
 }
diff --git a/boards/_base/pcb/wr3-base.json b/boards/_base/pcb/wr3-base.json
index bebdbcf..2015c67 100644
--- a/boards/_base/pcb/wr3-base.json
+++ b/boards/_base/pcb/wr3-base.json
@@ -2,14 +2,8 @@
 	"pcb": {
 		"templates": [
 			"esp12s",
-			"esp12s-shield",
 			"tuya-16x24",
 			"rf-type1"
-		],
-		"vars": {
-			"MASK_PRESET": "mask_black",
-			"TRACE_COLOR": "#505050",
-			"SILK_COLOR": "white"
-		}
+		]
 	}
 }
diff --git a/boards/_base/pcb/wr3.json b/boards/_base/pcb/wr3.json
index e859d98..92b641f 100644
--- a/boards/_base/pcb/wr3.json
+++ b/boards/_base/pcb/wr3.json
@@ -1,5 +1,8 @@
 {
 	"pcb": {
+		"templates": [
+			"pcb-black"
+		],
 		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/wr3e.json b/boards/_base/pcb/wr3e.json
index beec0a1..62732a3 100644
--- a/boards/_base/pcb/wr3e.json
+++ b/boards/_base/pcb/wr3e.json
@@ -1,10 +1,8 @@
 {
 	"pcb": {
-		"vars": {
-			"MASK_PRESET": "mask_blue_light",
-			"TRACE_COLOR": "#58839B",
-			"SILK_COLOR": "white"
-		},
+		"templates": [
+			"pcb-blue-light"
+		],
 		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD",
 		"pinout": {
 			"1": {
diff --git a/boards/_base/pcb/wr3l-base.json b/boards/_base/pcb/wr3l-base.json
index 71350e8..c0ba943 100644
--- a/boards/_base/pcb/wr3l-base.json
+++ b/boards/_base/pcb/wr3l-base.json
@@ -2,14 +2,9 @@
 	"pcb": {
 		"templates": [
 			"esp12s",
-			"esp12e-shield",
+			"pcb-white",
 			"tuya-16x24",
 			"rf-type1"
-		],
-		"vars": {
-			"MASK_PRESET": "mask_white",
-			"TRACE_COLOR": "#E0E0E0",
-			"SILK_COLOR": "black"
-		}
+		]
 	}
 }
diff --git a/boards/_base/pcb/wr3n.json b/boards/_base/pcb/wr3n.json
index d391c4b..d93d908 100644
--- a/boards/_base/pcb/wr3n.json
+++ b/boards/_base/pcb/wr3n.json
@@ -1,5 +1,8 @@
 {
 	"pcb": {
+		"templates": [
+			"pcb-black"
+		],
 		"pinout_hidden": "I2S,TRIG,WAKE,CTS,RTS,SD,SPI",
 		"pinout": {
 			"1": {