diff --git a/profiles/lightleak-bk7231n-type1-addr1-xor.json b/profiles/lightleak-bk7231n-type1-addr1-xor.json
index 5b77c88d..570f3ae5 100644
--- a/profiles/lightleak-bk7231n-type1-addr1-xor.json
+++ b/profiles/lightleak-bk7231n-type1-addr1-xor.json
@@ -1,5 +1,5 @@
 {
-	"name": "Lightleak - BK7231N - Type 1 / Addr 1 (XOR)",
+	"name": "Lightleak - BK7231N - Type 1 (XOR) / Addr 1",
 	"type": "LIGHTLEAK",
 	"icon": "cloud-download-outline",
 	"data": {
diff --git a/profiles/lightleak-bk7231n-type1-addrx-xor.json b/profiles/lightleak-bk7231n-type1-addr2-xor.json
similarity index 86%
rename from profiles/lightleak-bk7231n-type1-addrx-xor.json
rename to profiles/lightleak-bk7231n-type1-addr2-xor.json
index 23a8b476..af2ba849 100644
--- a/profiles/lightleak-bk7231n-type1-addrx-xor.json
+++ b/profiles/lightleak-bk7231n-type1-addr2-xor.json
@@ -1,5 +1,5 @@
 {
-	"name": "Lightleak - BK7231N - Type 1 / Addr X (XOR JTAG)",
+	"name": "Lightleak - BK7231N - Type 1 (XOR) / Addr 2",
 	"type": "LIGHTLEAK",
 	"icon": "cloud-download-outline",
 	"data": {
@@ -29,30 +29,30 @@
 			{
 				"name": "ddev_open",
 				"intf_offset": 4,
-				"address": "0x14781",
+				"address": "0x14579",
 				"branch_offset": "0x08"
 			},
 			{
 				"name": "ddev_close",
 				"intf_offset": 8,
-				"address": "0x14889",
+				"address": "0x14681",
 				"branch_offset": "0x1C"
 			},
 			{
 				"name": "ddev_read",
 				"intf_offset": 12,
-				"address": "0x14919"
+				"address": "0x14711"
 			},
 			{
 				"name": "ddev_write",
 				"intf_offset": 16,
-				"address": "0x14951",
+				"address": "0x14749",
 				"branch_offset": "0x12"
 			},
 			{
 				"name": "ddev_control",
 				"intf_offset": 20,
-				"address": "0x14989",
+				"address": "0x14781",
 				"branch_offset": "0x18"
 			},
 			{
diff --git a/profiles/lightleak-bk7231n-type1-addr3-xor.json b/profiles/lightleak-bk7231n-type1-addr3-xor.json
new file mode 100644
index 00000000..0176ab3c
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type1-addr3-xor.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 1 (XOR) / Addr 3",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-xor.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x14571",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x14679",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14709"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14741",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x14779",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type1-addr4-xor.json b/profiles/lightleak-bk7231n-type1-addr4-xor.json
new file mode 100644
index 00000000..f50c8613
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type1-addr4-xor.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 1 (XOR) / Addr 4",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-xor.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x147C1",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x148C9",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14959"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14991",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x149C9",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type2-addr1-standard.json b/profiles/lightleak-bk7231n-type2-addr1-standard.json
index 7ece0891..53a2d7ec 100644
--- a/profiles/lightleak-bk7231n-type2-addr1-standard.json
+++ b/profiles/lightleak-bk7231n-type2-addr1-standard.json
@@ -1,5 +1,5 @@
 {
-	"name": "Lightleak - BK7231N - Type 2 / Addr 1 (Standard)",
+	"name": "Lightleak - BK7231N - Type 2 (Standard) / Addr 1",
 	"type": "LIGHTLEAK",
 	"icon": "cloud-download-outline",
 	"data": {
diff --git a/profiles/lightleak-bk7231n-type2-addr2-standard.json b/profiles/lightleak-bk7231n-type2-addr2-standard.json
new file mode 100644
index 00000000..e49b2529
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type2-addr2-standard.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 2 (Standard) / Addr 2",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-standard.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x14579",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x14681",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14711"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14749",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x14781",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type2-addr3-standard.json b/profiles/lightleak-bk7231n-type2-addr3-standard.json
new file mode 100644
index 00000000..c18a1305
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type2-addr3-standard.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 2 (Standard) / Addr 3",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-standard.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x14571",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x14679",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14709"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14741",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x14779",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type2-addr4-standard.json b/profiles/lightleak-bk7231n-type2-addr4-standard.json
new file mode 100644
index 00000000..aa1c93c2
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type2-addr4-standard.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 2 (Standard) / Addr 4",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-standard.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x147C1",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x148C9",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14959"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14991",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x149C9",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type3-addr1-ip.json b/profiles/lightleak-bk7231n-type3-addr1-ip.json
index 5058deb7..d2034473 100644
--- a/profiles/lightleak-bk7231n-type3-addr1-ip.json
+++ b/profiles/lightleak-bk7231n-type3-addr1-ip.json
@@ -1,5 +1,5 @@
 {
-	"name": "Lightleak - BK7231N - Type 3 / Addr 1 (IP)",
+	"name": "Lightleak - BK7231N - Type 3 (IP) / Addr 1",
 	"type": "LIGHTLEAK",
 	"icon": "cloud-download-outline",
 	"data": {
diff --git a/profiles/lightleak-bk7231n-type3-addr2-ip.json b/profiles/lightleak-bk7231n-type3-addr2-ip.json
new file mode 100644
index 00000000..054f7dae
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type3-addr2-ip.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 3 (IP) / Addr 2",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-ip.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x14579",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x14681",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14711"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14749",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x14781",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type3-addr3-ip.json b/profiles/lightleak-bk7231n-type3-addr3-ip.json
new file mode 100644
index 00000000..9f0e1fc2
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type3-addr3-ip.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 3 (IP) / Addr 3",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-ip.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x14571",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x14679",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14709"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14741",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x14779",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}
diff --git a/profiles/lightleak-bk7231n-type3-addr4-ip.json b/profiles/lightleak-bk7231n-type3-addr4-ip.json
new file mode 100644
index 00000000..367c6daf
--- /dev/null
+++ b/profiles/lightleak-bk7231n-type3-addr4-ip.json
@@ -0,0 +1,65 @@
+{
+	"name": "Lightleak - BK7231N - Type 3 (IP) / Addr 4",
+	"type": "LIGHTLEAK",
+	"icon": "cloud-download-outline",
+	"data": {
+		"type": "BK7231N",
+		"bins": {
+			"stager": "bk7231n-stager-v1-ip.bin",
+			"proper": "bk7231n-proper-v1.bin"
+		},
+		"address_map": {
+			"stager": "0x1B5AC1",
+			"buffer": "0x42E000",
+			"handle": "0x42E800",
+			"temp": "0x42E804",
+			"intf": "0x42E810"
+		},
+		"gadgets": [
+			{
+				"name": "proper",
+				"address": "0x120001",
+				"branch_offset": "0x02"
+			},
+			{
+				"name": "finish",
+				"address": "0x0",
+				"branch_offset": "0x1F"
+			},
+			{
+				"name": "ddev_open",
+				"intf_offset": 4,
+				"address": "0x147C1",
+				"branch_offset": "0x08"
+			},
+			{
+				"name": "ddev_close",
+				"intf_offset": 8,
+				"address": "0x148C9",
+				"branch_offset": "0x1C"
+			},
+			{
+				"name": "ddev_read",
+				"intf_offset": 12,
+				"address": "0x14959"
+			},
+			{
+				"name": "ddev_write",
+				"intf_offset": 16,
+				"address": "0x14991",
+				"branch_offset": "0x12"
+			},
+			{
+				"name": "ddev_control",
+				"intf_offset": 20,
+				"address": "0x149C9",
+				"branch_offset": "0x18"
+			},
+			{
+				"name": "crc32",
+				"intf_offset": 24,
+				"address": "0x73CC"
+			}
+		]
+	}
+}