diff --git a/src/video/vid_et4000.c b/src/video/vid_et4000.c
index c17495c1e..608cc9601 100644
--- a/src/video/vid_et4000.c
+++ b/src/video/vid_et4000.c
@@ -57,7 +57,7 @@
 #define ET4000_TYPE_ISA      1 /* ISA ET4000AX */
 #define ET4000_TYPE_MCA      2 /* MCA ET4000AX */
 #define ET4000_TYPE_KOREAN   3 /* Korean ET4000 */
-#define ET4000_TYPE_TRIGEM   4 /* Trigem 286M ET4000 */
+#define ET4000_TYPE_TRIGEM   4 /* TriGem 286M ET4000 */
 #define ET4000_TYPE_KASAN    5 /* Kasan ET4000 */
 
 #define BIOS_ROM_PATH          "roms/video/et4000/ET4000.BIN"
@@ -829,7 +829,7 @@ et4000_init(const device_t *info)
             break;
 
         case ET4000_TYPE_KOREAN: /* Korean ET4000 */
-        case ET4000_TYPE_TRIGEM: /* Trigem 286M ET4000 */
+        case ET4000_TYPE_TRIGEM: /* TriGem 286M ET4000 */
             dev->vram_size                      = device_get_config_int("memory") << 10;
             dev->port_22cb_val                  = 0x60;
             dev->port_32cb_val                  = 0;
@@ -1133,7 +1133,7 @@ const device_t et4000_mca_device = {
 };
 
 const device_t et4000k_isa_device = {
-    .name          = "Trigem Korean VGA (Tseng Labs ET4000AX Korean)",
+    .name          = "TriGem Korean VGA (Tseng Labs ET4000AX Korean)",
     .internal_name = "tgkorvga",
     .flags         = DEVICE_ISA,
     .local         = ET4000_TYPE_KOREAN,
@@ -1147,7 +1147,7 @@ const device_t et4000k_isa_device = {
 };
 
 const device_t et4000k_tg286_isa_device = {
-    .name          = "Trigem Korean VGA (Trigem 286M)",
+    .name          = "TriGem Korean VGA (TriGem 286M)",
     .internal_name = "et4000k_tg286_isa",
     .flags         = DEVICE_ISA,
     .local         = ET4000_TYPE_TRIGEM,
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index 3e637f158..096bfd6ee 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -73,6 +73,7 @@ video_cards[] = {
     { .device = &compaq_cga_2_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &cpqega_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &g2_gc205_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &genius_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &hercules_device,                               .flags = VIDEO_FLAG_TYPE_MDA  },
     { .device = &herculesplus_device,                           .flags = VIDEO_FLAG_TYPE_MDA  },
     { .device = &incolor_device,                                .flags = VIDEO_FLAG_TYPE_NONE },
@@ -85,7 +86,6 @@ video_cards[] = {
     { .device = &iskra_ega_device,                              .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &jega_device,                                   .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &et4000_kasan_isa_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &genius_device,                                 .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &nga_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &nec_sv9000_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &ogc_device,                                    .flags = VIDEO_FLAG_TYPE_NONE },
@@ -183,6 +183,10 @@ video_cards[] = {
     { .device = &tgui9400cxi_device,                            .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &tgui9440_vlb_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     /* PCI */
+    { .device = &voodoo_banshee_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_1000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_2000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &mach32_pci_device,                             .flags = VIDEO_FLAG_TYPE_8514 },
     { .device = &mach64gx_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &mach64ct_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
@@ -197,10 +201,12 @@ video_cards[] = {
     { .device = &gd5446_pci_device,                             .flags = VIDEO_FLAG_TYPE_SECONDARY },
     { .device = &gd5446_stb_pci_device,                         .flags = VIDEO_FLAG_TYPE_SECONDARY },
     { .device = &gd5480_pci_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &et4000w32p_cardex_revc_pci_device,             .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &et4000w32p_generic_revd_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &et4000w32p_cardex_revd_pci_device,             .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &et4000w32p_diamond_revd_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &creative_voodoo_banshee_device,                .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &millennium_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &millennium_ii_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mystique_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &mystique_220_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &quantum3d_raven_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &s3_elsa_winner1000_86c928_pci_device,          .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &s3_spea_mercury_lite_86c928_pci_device,        .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &s3_diamond_stealth64_964_pci_device,           .flags = VIDEO_FLAG_TYPE_NONE },
@@ -234,36 +240,30 @@ video_cards[] = {
     { .device = &s3_virge_385_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &s3_virge_357_pci_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &s3_trio3d2x_pci_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &millennium_device,                             .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &millennium_ii_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &mystique_device,                               .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &mystique_220_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &tgui9440_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &tgui9660_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &tgui9680_pci_device,                           .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_banshee_device,                         .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &creative_voodoo_banshee_device,                .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &quantum3d_raven_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_3_1000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_3_2000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_3_3000_device,                          .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_cardex_revc_pci_device,             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_generic_revd_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_cardex_revd_pci_device,             .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &et4000w32p_diamond_revd_pci_device,            .flags = VIDEO_FLAG_TYPE_NONE },
     /* AGP */
-    { .device = &s3_virge_357_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &s3_diamond_stealth_4000_agp_device,            .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &s3_trio3d2x_agp_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
-#ifdef USE_G100
-    { .device = &productiva_g100_device,                        .flags = VIDEO_FLAG_TYPE_SPECIAL },
-#endif /*USE_G100 */
+    { .device = &voodoo_3_3500_agp_pal_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &compaq_voodoo_3_3500_agp_device,               .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &voodoo_3_3500_se_agp_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &velocity_100_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &velocity_200_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &voodoo_3_1000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &voodoo_3_2000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &voodoo_3_3000_agp_device,                      .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &voodoo_3_3500_agp_ntsc_device,                 .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_3_3500_agp_pal_device,                  .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &compaq_voodoo_3_3500_agp_device,               .flags = VIDEO_FLAG_TYPE_NONE },
-    { .device = &voodoo_3_3500_se_agp_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = &voodoo_3_3500_si_agp_device,                   .flags = VIDEO_FLAG_TYPE_NONE },
+#ifdef USE_G100
+    { .device = &productiva_g100_device,                        .flags = VIDEO_FLAG_TYPE_SPECIAL },
+#endif /*USE_G100 */
+    { .device = &s3_virge_357_agp_device,                       .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_diamond_stealth_4000_agp_device,            .flags = VIDEO_FLAG_TYPE_NONE },
+    { .device = &s3_trio3d2x_agp_device,                        .flags = VIDEO_FLAG_TYPE_NONE },
     { .device = NULL,                                           .flags = VIDEO_FLAG_TYPE_NONE }
   // clang-format on
 };