diff --git a/src/os_list.json b/src/os_list.json
index 14ade2d..fedc395 100644
--- a/src/os_list.json
+++ b/src/os_list.json
@@ -255,296 +255,296 @@
 		}
 	],
 	"imager": {
-		"manuafcturers": [
+		"devices": [
 			{
-				"manufacturer": "Anbernic",
-					"productList": [
-						{
-							"name": "Anbernic RG40XXH",
-							"tags": ["rg40xxh"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG40XX%20H.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG40XXV",
-							"tags": ["rg40xxv"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG40XX%20V.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG35XXH",
-							"tags": ["rg35xxh"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20H.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG35XX Plus",
-							"tags": ["rg35xx_plus"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20-%20PLUS.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG35XX SP",
-							"tags": ["rg35xx_sp"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20SP.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG35XX 2024",
-							"tags": ["rg35xx_2024"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20-%202024.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG28XX",
-							"tags": ["rg28xx"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG28XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG351P",
-							"tags": ["rg351p"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG351M",
-							"tags": ["rg351m"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG351V",
-							"tags": ["rg351v"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG353P",
-							"tags": ["rg353p"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG353M",
-							"tags": ["rg353m"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG353V",
-							"tags": ["rg353v"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG353VS",
-							"tags": ["rg353vs"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG353PS",
-							"tags": ["rg353ps"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG503",
-							"tags": ["rg503"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG Arc-D",
-							"tags": ["rg_arc_d"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG Arc-S",
-							"tags": ["rg_arc_s"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Anbernic RG552",
-							"tags": ["rg552"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Anbernic",
+				"subitems": [
+					{
+						"name": "Anbernic RG40XXH",
+						"tags": ["rg40xxh"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG40XX%20H.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG40XXV",
+						"tags": ["rg40xxv"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG40XX%20V.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG35XXH",
+						"tags": ["rg35xxh"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20H.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG35XX Plus",
+						"tags": ["rg35xx_plus"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20-%20PLUS.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG35XX SP",
+						"tags": ["rg35xx_sp"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20SP.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG35XX 2024",
+						"tags": ["rg35xx_2024"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX%20-%202024.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG28XX",
+						"tags": ["rg28xx"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG28XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG351P",
+						"tags": ["rg351p"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG351M",
+						"tags": ["rg351m"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG351V",
+						"tags": ["rg351v"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG353P",
+						"tags": ["rg353p"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG353M",
+						"tags": ["rg353m"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG353V",
+						"tags": ["rg353v"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG353VS",
+						"tags": ["rg353vs"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG353PS",
+						"tags": ["rg353ps"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG503",
+						"tags": ["rg503"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG Arc-D",
+						"tags": ["rg_arc_d"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG Arc-S",
+						"tags": ["rg_arc_s"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Unbranded",
-					"productList": [
-						{
-							"name": "Game Console R33S",
-							"tags": ["r33s"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Game Console R35S",
-							"tags": ["r35s"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Game Console R36S",
-							"tags": ["r36s"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Game Console",
+				"subitems": [
+					{
+						"name": "Game Console R33S",
+						"tags": ["r33s"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Game Console R35S",
+						"tags": ["r35s"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Game Console R36S",
+						"tags": ["r36s"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "ODROID",
-					"productList": [
-						{
-							"name": "ODROID Go Advance",
-							"tags": ["oga"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "ODROID Go Super",
-							"tags": ["ogs"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "ODROID Go Ultra",
-							"tags": ["ogu"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "ODROID N2",
-							"tags": ["on2"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "ODROID N2 Plus",
-							"tags": ["on2_plus"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "ODROID N2L",
-							"tags": ["on2l"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "ODROID",
+				"subitems": [
+					{
+						"name": "ODROID Go Advance",
+						"tags": ["oga"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "ODROID Go Super",
+						"tags": ["ogs"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "ODROID N2",
+						"tags": ["on2"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "ODROID N2 Plus",
+						"tags": ["on2_plus"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "ODROID N2L",
+						"tags": ["on2l"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "MagicX",
-					"productList": [
-						{
-							"name": "MagicX XU10",
-							"tags": ["xu10"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "MagicX XU Mini M",
-							"tags": ["xu_mini_m"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "MagicX",
+				"subitems": [
+					{
+						"name": "MagicX XU10",
+						"tags": ["xu10"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "MagicX XU Mini M",
+						"tags": ["xu_mini_m"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Powkiddy",
-					"productList": [
-						{
-							"name": "Powkiddy V10",
-							"tags": ["v10"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RGB10",
-							"tags": ["rgb10"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RK2023",
-							"tags": ["rk2023"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RGB10 Max 3",
-							"tags": ["rgb10_max_3"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RGB30",
-							"tags": ["rgb30"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RGB20SX",
-							"tags": ["rgb20sx"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy RGB10 Max 3 Pro",
-							"tags": ["rgb10_max_3_pro"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Powkiddy X55",
-							"tags": ["x55"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Powkiddy",
+				"subitems": [
+					{
+						"name": "Powkiddy V10",
+						"tags": ["v10"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RGB10",
+						"tags": ["rgb10"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RK2023",
+						"tags": ["rk2023"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RGB10 Max 3",
+						"tags": ["rgb10_max_3"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RGB30",
+						"tags": ["rgb30"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RGB20SX",
+						"tags": ["rgb20sx"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Anbernic RG552",
+						"tags": ["rg552"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "ODROID Go Ultra",
+						"tags": ["ogu"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy RGB10 Max 3 Pro",
+						"tags": ["rgb10_max_3_pro"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Powkiddy X55",
+						"tags": ["x55"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Gameforce",
-					"productList": [
-						{
-							"name": "Gameforce Ace (default)",
-							"tags": ["ace"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Gameforce",
+				"subitems": [
+					{
+						"name": "Gameforce Ace (default)",
+						"tags": ["ace"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Orange Pi",
-					"productList": [
-						{
-							"name": "Orange Pi 5",
-							"tags": ["orange_pi_5"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Orange Pi 5 Plus",
-							"tags": ["orange_pi_5_plus"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Orange Pi",
+				"subitems": [
+					{
+						"name": "Orange Pi 5",
+						"tags": ["orange_pi_5"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Orange Pi 5 Plus",
+						"tags": ["orange_pi_5_plus"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Radxa",
-					"productList": [
-						{
-							"name": "Radxa Rock 5a",
-							"tags": ["radxa_rock_5a"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Radxa Rock 5b",
-							"tags": ["radxa_rock_5b"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Radxa Rock 5b Plus",
-							"tags": ["radxa_rock_5b_plus"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Radxa Rock CM5",
-							"tags": ["radxa_rock_cm5"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Radxa",
+				"subitems": [
+					{
+						"name": "Radxa Rock 5a",
+						"tags": ["radxa_rock_5a"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Radxa Rock 5b",
+						"tags": ["radxa_rock_5b"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Radxa Rock 5b Plus",
+						"tags": ["radxa_rock_5b_plus"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Radxa Rock CM5",
+						"tags": ["radxa_rock_cm5"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Indiedroid",
-					"productList": [
-						{
-							"name": "Indiedroid Nova (Must set dtb in extlinuix.conf)",
-							"tags": ["nova"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Indiedroid",
+				"subitems": [
+					{
+						"name": "Indiedroid Nova (Must set dtb in extlinuix.conf)",
+						"tags": ["nova"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			},
 			{
-				"manufacturer": "Retroid",
-					"productList": [
-						{
-							"name": "Retroid Pocket Mini",
-							"tags": ["rpmini"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						},
-						{
-							"name": "Retroid Pocket 5",
-							"tags": ["rp5"],
-							"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
-						}
-					]
+				"name": "Retroid",
+				"subitems": [
+					{
+						"name": "Retroid Pocket Mini",
+						"tags": ["rpmini"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					},
+					{
+						"name": "Retroid Pocket 5",
+						"tags": ["rp5"],
+						"icon": "https://github.com/cmclark00/retro-imager/blob/fix/src/icons/RG35XX.png?raw=true"
+					}
+				]
 			}
 		]
 	}