diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c
index 9fac11764..cdf1f1a56 100644
--- a/src/scsi/scsi_aha154x.c
+++ b/src/scsi/scsi_aha154x.c
@@ -1141,181 +1141,258 @@ aha_init(const device_t *info)
 // clang-format off
 static const device_config_t aha_154xb_config[] = {
     {
-        "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 },
-        {
-            { "None",      0 },
-            { "0x330", 0x330 },
-            { "0x334", 0x334 },
-            { "0x230", 0x230 },
-            { "0x234", 0x234 },
-            { "0x130", 0x130 },
-            { "0x134", 0x134 },
-            { ""             }
+        .name = "base",
+        .description = "Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0x334,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "None",  .value =     0 },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x234", .value = 0x234 },
+            { .description = "0x130", .value = 0x130 },
+            { .description = "0x134", .value = 0x134 },
+            { .description = ""                      }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 },
-        {
-            { "IRQ 9", 9 },
-            { "IRQ 10", 10 },
-            { "IRQ 11", 11 },
-            { "IRQ 12", 12 },
-            { "IRQ 14", 14 },
-            { "IRQ 15", 15 },
-            { ""           }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 11,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                    }
         },
     },
     {
-        "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 },
-        {
-            { "DMA 5", 5 },
-            { "DMA 6", 6 },
-            { "DMA 7", 7 },
-            { ""         }
+        .name = "dma",
+        .description = "DMA channel",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 6,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
         },
     },
     {
-        "hostid", "Host ID", CONFIG_SELECTION, "", 7, "", { 0 },
-        {
-            { "0", 0 },
-            { "1", 1 },
-            { "2", 2 },
-            { "3", 3 },
-            { "4", 4 },
-            { "5", 5 },
-            { "6", 6 },
-            { "7", 7 },
-            { ""     }
+        .name = "hostid",
+        .description = "Host ID",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 7,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "0", .value = 0 },
+            { .description = "1", .value = 1 },
+            { .description = "2", .value = 2 },
+            { .description = "3", .value = 3 },
+            { .description = "4", .value = 4 },
+            { .description = "5", .value = 5 },
+            { .description = "6", .value = 6 },
+            { .description = "7", .value = 7 },
+            { .description = ""              }
         },
     },
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 },
-        {
-            { "Disabled", 0 },
-            { "C800H", 0xc8000 },
-            { "D000H", 0xd0000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
         },
     },
-    {
-        "", "", -1
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t aha_154x_config[] = {
     {
-        "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 },
-        {
-            { "None",      0 },
-            { "0x330", 0x330 },
-            { "0x334", 0x334 },
-            { "0x230", 0x230 },
-            { "0x234", 0x234 },
-            { "0x130", 0x130 },
-            { "0x134", 0x134 },
-            { ""             }
+        .name = "base",
+        .description = "Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0x334,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "None",  .value =     0 },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x234", .value = 0x234 },
+            { .description = "0x130", .value = 0x130 },
+            { .description = "0x134", .value = 0x134 },
+            { .description = ""                      }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 },
-        {
-            { "IRQ 9", 9 },
-            { "IRQ 10", 10 },
-            { "IRQ 11", 11 },
-            { "IRQ 12", 12 },
-            { "IRQ 14", 14 },
-            { "IRQ 15", 15 },
-            { ""           }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 11,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                    }
         },
     },
     {
-        "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 },
-        {
-            { "DMA 5", 5 },
-            { "DMA 6", 6 },
-            { "DMA 7", 7 },
-            { ""         }
+        .name = "dma",
+        .description = "DMA channel",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 6,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
         },
     },
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 },
-        {
-            { "Disabled", 0 },
-            { "C800H", 0xc8000 },
-            { "D000H", 0xd0000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
             },
         },
-    {
-        "", "", -1
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
-
 static const device_config_t aha_154xcf_config[] = {
     {
-        "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 },
-        {
-            { "None",      0 },
-            { "0x330", 0x330 },
-            { "0x334", 0x334 },
-            { "0x230", 0x230 },
-            { "0x234", 0x234 },
-            { "0x130", 0x130 },
-            { "0x134", 0x134 },
-            { ""             }
+        .name = "base",
+        .description = "Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0x334,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "None",  .value =     0 },
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x234", .value = 0x234 },
+            { .description = "0x130", .value = 0x130 },
+            { .description = "0x134", .value = 0x134 },
+            { .description = ""                      }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 },
-        {
-            { "IRQ 9", 9 },
-            { "IRQ 10", 10 },
-            { "IRQ 11", 11 },
-            { "IRQ 12", 12 },
-            { "IRQ 14", 14 },
-            { "IRQ 15", 15 },
-            { ""           }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 11,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = ""                    }
         },
     },
     {
-        "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 },
-        {
-            { "DMA 5", 5 },
-            { "DMA 6", 6 },
-            { "DMA 7", 7 },
-            { ""         }
+        .name = "dma",
+        .description = "DMA channel",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 6,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = ""                  }
         },
     },
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 },
-        {
-            { "Disabled", 0 },
-            { "C800H", 0xc8000 },
-            { "CC00H", 0xcc000 },
-            { "D000H", 0xd0000 },
-            { "D400H", 0xd4000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D400H",    .value = 0xd4000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
         },
     },
     {
-        "fdc_addr", "FDC address", CONFIG_HEX16, "", 0, "", { 0 },
-        {
-            { "None",  0                  },
-            { "0x3f0", FDC_PRIMARY_ADDR   },
-            { "0x370", FDC_SECONDARY_ADDR },
-            { ""                          }
+        .name = "fdc_addr",
+        .description = "FDC address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "None",  .value = 0                  },
+            { .description = "0x3f0", .value = FDC_PRIMARY_ADDR   },
+            { .description = "0x370", .value = FDC_SECONDARY_ADDR },
+            { .description = ""                                   }
         },
     },
-    {
-        "", "", -1
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c
index 79a019821..e8c4dde57 100644
--- a/src/scsi/scsi_buslogic.c
+++ b/src/scsi/scsi_buslogic.c
@@ -1805,54 +1805,84 @@ buslogic_init(const device_t *info)
 // clang-format off
 static const device_config_t BT_ISA_Config[] = {
     {
-        "base", "Address", CONFIG_HEX16, "", 0x334, "", { 0 },
-        {
-            { "0x330", 0x330 },
-            { "0x334", 0x334 },
-            { "0x230", 0x230 },
-            { "0x234", 0x234 },
-            { "0x130", 0x130 },
-            { "0x134", 0x134 },
-            { "", 0 }
+        .name = "base",
+        .description = "Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0x334,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "0x330", .value = 0x330 },
+            { .description = "0x334", .value = 0x334 },
+            { .description = "0x230", .value = 0x230 },
+            { .description = "0x234", .value = 0x234 },
+            { .description = "0x130", .value = 0x130 },
+            { .description = "0x134", .value = 0x134 },
+            { .description = "",      .value =     0 }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 11, "", { 0 },
-        {
-            { "IRQ 9", 9 },
-            { "IRQ 10", 10 },
-            { "IRQ 11", 11 },
-            { "IRQ 12", 12 },
-            { "IRQ 14", 14 },
-            { "IRQ 15", 15 },
-            { "", 0 }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 11,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 9",  .value =  9 },
+            { .description = "IRQ 10", .value = 10 },
+            { .description = "IRQ 11", .value = 11 },
+            { .description = "IRQ 12", .value = 12 },
+            { .description = "IRQ 14", .value = 14 },
+            { .description = "IRQ 15", .value = 15 },
+            { .description = "", 0                 }
         },
     },
     {
-        "dma", "DMA channel", CONFIG_SELECTION, "", 6, "", { 0 },
-        {
-            { "DMA 5", 5 },
-            { "DMA 6", 6 },
-            { "DMA 7", 7 },
-            { "", 0 }
+        .name = "dma",
+        .description = "DMA channel",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 6,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "DMA 5", .value = 5 },
+            { .description = "DMA 6", .value = 6 },
+            { .description = "DMA 7", .value = 7 },
+            { .description = "",      .value = 0 }
         },
     },
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0, "", { 0 },
-        {
-            { "Disabled", 0       },
-            { "C800H",    0xc8000 },
-            { "D000H",    0xd0000 },
-            { "D800H",    0xd8000 },
-            { "", 0 }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "D000H",    .value = 0xd0000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "",         .value =       0 }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t BT958D_Config[] = {
-    { "bios", "Enable BIOS", CONFIG_BINARY, "",  0 },
-    { "",     "",                               -1 }
+    {
+        .name = "bios",
+        .description = "Enable BIOS",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 0
+    },
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c
index 1fa91f8c7..1b05b1a88 100644
--- a/src/scsi/scsi_ncr5380.c
+++ b/src/scsi/scsi_ncr5380.c
@@ -1594,116 +1594,180 @@ corel_ls2000_available(void)
 // clang-format off
 static const device_config_t ncr5380_mmio_config[] = {
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 },
-        {
-            { "C800H", 0xc8000 },
-            { "CC00H", 0xcc000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xD8000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
-        {
-            { "IRQ 3", 3 },
-            { "IRQ 5", 5 },
-            { "IRQ 7", 7 },
-            { ""         }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 5,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t rancho_config[] = {
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 },
-        {
-            { "C800H", 0xc8000 },
-            { "CC00H", 0xcc000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xD8000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
-        {
-            { "IRQ 3", 3 },
-            { "IRQ 5", 5 },
-            { "IRQ 7", 7 },
-            { ""         }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 5,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
         },
     },
     {
-        "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 },
-        {
-            { "8.20R", 1 },
-            { "8.10R", 0 },
-            { ""         }
+        .name = "bios_ver",
+        .description = "BIOS Version",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 1,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "8.20R", .value = 1 },
+            { .description = "8.10R", .value = 0 },
+            { .description = ""                  }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t t130b_config[] = {
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 },
-        {
-            { "Disabled", 0 },
-            { "C800H", 0xc8000 },
-            { "CC00H", 0xcc000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xD8000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "Disabled", .value =       0 },
+            { .description = "C800H",    .value = 0xc8000 },
+            { .description = "CC00H",    .value = 0xcc000 },
+            { .description = "D800H",    .value = 0xd8000 },
+            { .description = "DC00H",    .value = 0xdc000 },
+            { .description = ""                           }
         },
     },
     {
-        "base", "Address", CONFIG_HEX16, "", 0x0350, "", { 0 },
-        {
-            { "240H", 0x0240 },
-            { "250H", 0x0250 },
-            { "340H", 0x0340 },
-            { "350H", 0x0350 },
-            { ""             }
+        .name = "base",
+        .description = "Address",
+        .type = CONFIG_HEX16,
+        .default_string = "",
+        .default_int = 0x0350,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "240H", .value = 0x0240 },
+            { .description = "250H", .value = 0x0250 },
+            { .description = "340H", .value = 0x0340 },
+            { .description = "350H", .value = 0x0350 },
+            { .description = ""                      }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
-        {
-            { "IRQ 3", 3 },
-            { "IRQ 5", 5 },
-            { "IRQ 7", 7 },
-            { ""         }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 5,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 
 static const device_config_t t128_config[] = {
     {
-        "bios_addr", "BIOS Address", CONFIG_HEX20, "", 0xD8000, "", { 0 },
-        {
-            { "C800H", 0xc8000 },
-            { "CC00H", 0xcc000 },
-            { "D800H", 0xd8000 },
-            { "DC00H", 0xdc000 },
-            { ""               }
+        .name = "bios_addr",
+        .description = "BIOS Address",
+        .type = CONFIG_HEX20,
+        .default_string = "",
+        .default_int = 0xD8000,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "C800H", .value = 0xc8000 },
+            { .description = "CC00H", .value = 0xcc000 },
+            { .description = "D800H", .value = 0xd8000 },
+            { .description = "DC00H", .value = 0xdc000 },
+            { .description = ""                        }
         },
     },
     {
-        "irq", "IRQ", CONFIG_SELECTION, "", 5, "", { 0 },
-        {
-            { "IRQ 3", 3 },
-            { "IRQ 5", 5 },
-            { "IRQ 7", 7 },
-            { ""         }
+        .name = "irq",
+        .description = "IRQ",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 5,
+        .file_filter = "",
+        .spinner ={ 0 },
+        .selection = {
+            { .description = "IRQ 3", .value = 3 },
+            { .description = "IRQ 5", .value = 5 },
+            { .description = "IRQ 7", .value = 7 },
+            { .description = ""                  }
         },
     },
     {
-        "boot", "Enable Boot ROM", CONFIG_BINARY, "", 1
+        .name = "boot",
+        .description = "Enable Boot ROM",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 1
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 };
 // clang-format on
 
diff --git a/src/scsi/scsi_ncr53c8xx.c b/src/scsi/scsi_ncr53c8xx.c
index f438a342c..999948648 100644
--- a/src/scsi/scsi_ncr53c8xx.c
+++ b/src/scsi/scsi_ncr53c8xx.c
@@ -2636,15 +2636,21 @@ ncr53c8xx_close(void *priv)
 static const device_config_t ncr53c8xx_pci_config[] = {
 // clang-format off
     {
-        "bios", "BIOS", CONFIG_SELECTION, "", 1, "", { 0 },
-        {
-            { "SDMS 4.x BIOS", 2 },
-            { "SDMS 3.x BIOS", 1 },
-            { "Disable BIOS",  0 },
-            { ""                 }
+        .name = "bios",
+        .description = "BIOS",
+        .type = CONFIG_SELECTION,
+        .default_string = "",
+        .default_int = 1,
+        .file_filter = "",
+        .spinner = { 0 },
+        .selection = {
+            { .description = "SDMS 4.x BIOS", .value = 2 },
+            { .description = "SDMS 3.x BIOS", .value = 1 },
+            { .description = "Disable BIOS",  .value = 0 },
+            { .description = ""                          }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };
 
diff --git a/src/scsi/scsi_pcscsi.c b/src/scsi/scsi_pcscsi.c
index 74011b21b..57fcc2469 100644
--- a/src/scsi/scsi_pcscsi.c
+++ b/src/scsi/scsi_pcscsi.c
@@ -2002,11 +2002,13 @@ esp_close(void *priv)
 static const device_config_t bios_enable_config[] = {
 // clang-format off
     {
-        "bios", "Enable BIOS", CONFIG_BINARY, "", 0
+        .name = "bios",
+        .description = "Enable BIOS",
+        .type = CONFIG_BINARY,
+        .default_string = "",
+        .default_int = 0
     },
-    {
-        "", "", -1
-    }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };
 
diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c
index f00782983..8b5bde94a 100644
--- a/src/scsi/scsi_spock.c
+++ b/src/scsi/scsi_spock.c
@@ -1159,14 +1159,20 @@ spock_available(void)
 static const device_config_t spock_rom_config[] = {
 // clang-format off
     {
-        "bios_ver", "BIOS Version", CONFIG_SELECTION, "", 1, "", { 0 },
-        {
-            { "1991 BIOS (>1GB)", 1 },
-            { "1990 BIOS",        0 },
-            { "" }
+        .name = "bios_ver",
+		.description = "BIOS Version",
+		.type = CONFIG_SELECTION,
+		.default_string = "",
+		.default_int = 1,
+		.file_filter = "",
+		.spinner = { 0 },
+        .selection = {
+            { .description = "1991 BIOS (>1GB)", .value = 1 },
+            { .description = "1990 BIOS",        .value = 0 },
+            { .description = ""                             }
         },
     },
-    { "", "", -1 }
+    { .name = "", .description = "", .type = CONFIG_END }
 // clang-format on
 };