diff --git a/boards/_base/pcb/afw121t.json b/boards/_base/pcb/afw121t.json
index b6e1bbea2..c3b606893 100644
--- a/boards/_base/pcb/afw121t.json
+++ b/boards/_base/pcb/afw121t.json
@@ -1,6 +1,11 @@
 {
 	"pcb": {
-		"templates": ["99iot-21p", "pcb-blue-light", "rf-type1"],
+		"templates": [
+			"99iot-21p",
+			"pcb-blue-light",
+			"rf-type1"
+		],
+		"scale": 16,
 		"vars": {
 			"TRACE_COLOR": "#FAFD9D"
 		},
diff --git a/boards/templates/99iot-21p.json b/boards/templates/99iot-21p.json
index eafde9487..6d0c05061 100644
--- a/boards/templates/99iot-21p.json
+++ b/boards/templates/99iot-21p.json
@@ -40,7 +40,7 @@
 			"id": "left_b",
 			"name": "r_pins_vert",
 			"repeat": 7,
-			"pos": "0,11.4",
+			"pos": "0,12.8",
 			"vars": {
 				"PINDIR": "left"
 			}
@@ -50,7 +50,7 @@
 			"id": "right_b",
 			"name": "r_pins_vert",
 			"repeat": 10,
-			"pos": "18,8.77",
+			"pos": "18,9.2",
 			"vars": {
 				"PINDIR": "right"
 			}
@@ -60,7 +60,7 @@
 			"id": "right_t",
 			"name": "r_pins_vert",
 			"repeat": 1,
-			"pos": "18,6.57",
+			"pos": "18,7",
 			"vars": {
 				"PINDIR": "right"
 			}
@@ -89,7 +89,7 @@
 			"id": "left_b",
 			"name": "r_pins_vert",
 			"repeat": 7,
-			"pos": "0,11.4",
+			"pos": "0,12.8",
 			"vars": {
 				"PINDIR": "left"
 			}
@@ -99,7 +99,7 @@
 			"id": "right_b",
 			"name": "r_pins_vert",
 			"repeat": 10,
-			"pos": "18,8.77",
+			"pos": "18,9.2",
 			"vars": {
 				"PINDIR": "right"
 			}
@@ -109,7 +109,7 @@
 			"id": "right_t",
 			"name": "r_pins_vert",
 			"repeat": 1,
-			"pos": "18,6.57",
+			"pos": "18,7",
 			"vars": {
 				"PINDIR": "right"
 			}
diff --git a/boards/variants/afw121t.c b/boards/variants/afw121t.c
index ab993d0a3..12b634593 100644
--- a/boards/variants/afw121t.c
+++ b/boards/variants/afw121t.c
@@ -9,27 +9,27 @@
 // clang-format off
 PinInfo lt_arduino_pin_info_list[PINS_COUNT] = {
 	// D0: PA14, PWM0, SWCLK
-	{PA_14, , PIN_NONE, 0},
+	{PA_14, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
 	// D1: PA15, PWM1, SWDIO
-	{PA_15, , PIN_NONE, 0},
+	{PA_15, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_SWD,                                PIN_NONE, 0},
 	// D2: PA00, PWM2
-	{PA_0,  , PIN_NONE, 0},
+	{PA_0,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
 	// D3: PA12, PWM3
-	{PA_12, , PIN_NONE, 0},
+	{PA_12, PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
 	// D4: PA29, UART2_RX, I2C0_SCL, PWM4
-	{PA_29, , PIN_NONE, 0},
+	{PA_29, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
 	// D5: PA05, PWM4, WAKE1
-	{PA_5,  , PIN_NONE, 0},
+	{PA_5,  PIN_GPIO | PIN_IRQ | PIN_PWM,                                          PIN_NONE, 0},
 	// D6: PA18, UART0_RX, SPI0_SCK, SPI1_SCK, I2C1_SCL, SD_D2, TMR4_TRIG, I2S0_MCK, WAKE0
-	{PA_18, , PIN_NONE, 0},
+	{PA_18, PIN_GPIO | PIN_IRQ | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART,           PIN_NONE, 0},
 	// D7: PA19, ADC1, UART0_CTS, SPI0_CS, SPI1_CS, I2C0_SDA, SD_D3, TMR5_TRIG, I2S0_TX
-	{PA_19, , PIN_NONE, 0},
+	{PA_19, PIN_GPIO | PIN_IRQ | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART,           PIN_NONE, 0},
 	// D8: PA22, UART0_RTS, SPI0_MISO, SPI1_MISO, I2C0_SCL, SD_D0, PWM5, I2S0_WS, WAKE2
-	{PA_22, , PIN_NONE, 0},
+	{PA_22, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_I2S | PIN_SPI | PIN_UART, PIN_NONE, 0},
 	// D9: PA23, UART0_TX, SPI0_MOSI, SPI1_MOSI, I2C1_SDA, SD_D1, PWM0, WAKE3
-	{PA_23, , PIN_NONE, 0},
+	{PA_23, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_SPI | PIN_UART,           PIN_NONE, 0},
 	// D10: PA30, UART2_TX, I2C0_SDA, PWM4
-	{PA_30, , PIN_NONE, 0},
+	{PA_30, PIN_GPIO | PIN_IRQ | PIN_PWM | PIN_I2C | PIN_UART,                     PIN_NONE, 0},
 };
 
 PinInfo *lt_arduino_pin_gpio_map[] = {