vendor.ids: sort + sort tool

Signed-off-by: Burt P <pburt0@gmail.com>

2 files changed, 1023 insertions, 996 deletions

diff --git a/deps/sysobj_early/data/sort_vendors.pl b/deps/sysobj_early/data/sort_vendors.pl
new file mode 100644
index 00000000..6ed69e58
--- /dev/null
+++ b/deps/sysobj_early/data/sort_vendors.pl
@@ -0,0 +1,43 @@
+#!/usr/bin/perl
+
+# Usage:
+#   sort_vendors.pl <some_path/vendor.ids>
+# Output goes to stdout.
+
+use utf8;
+use strict;
+#use File::Slurp::Unicode qw(read_file);
+sub read_file {
+    my $file = shift;
+    return do {
+        local $/ = undef;
+        open my $fh, "<", $file || die "Could not open $file: $!";
+        <$fh>;
+    };
+}
+
+my $file = shift;
+die "Invalid file: $file" unless (-f $file && -r $file);
+my $raw = read_file($file);
+$raw =~ s/^\n*|\n*$//g;
+
+my $c = 0;
+my @coms = ();
+my %vendors = ();
+SEC: foreach my $s (split(/\n{2,}/, $raw)) {
+    my @lines = split(/\n/, $s);
+    foreach my $l (@lines) {
+        if ($l =~ /^name\s+(.*)/) {
+            $vendors{"$1_$c"} = $s;
+            $c++;
+            next SEC;
+        }
+    }
+    push @coms, $s;
+}
+foreach (@coms) {
+    print "$_\n\n";
+}
+foreach (sort { lc $a cmp lc $b } keys %vendors) {
+    print "$vendors{$_}\n\n";
+}
diff --git a/deps/sysobj_early/data/vendor.ids b/deps/sysobj_early/data/vendor.ids
index ac133ece..ba1635d9 100644
--- a/deps/sysobj_early/data/vendor.ids
+++ b/deps/sysobj_early/data/vendor.ids
@@ -26,48 +26,38 @@
 #    match_string_num_prefix_case - prefix next character must be a digit, consider case
 #
 # Except for the newline, trailing whitespace is included in the string.
-# Match strings should be unique.
+# Match strings must be unique. Name does not need to be unique.
 #
 
-name Lenovo Group
-    name_short Lenovo
-    url www.lenovo.com
-    url_support support.lenovo.com
-    wikipedia Lenovo
-    ansi_color 0;97;41
-    match_string lenovo
-    note EDID vendor: LEN
-    match_string_exact LEN
+name 3Com
+    url www.3com.com
+    wikipedia 3Com
+    ansi_color 0;97;40
+    match_string 3Com
 
-name Union Memory (Shenzhen)
-    name_short Union Memory
-    url unionmem.com
-    ansi_color 0;35;107
-    match_string Union Memory (Shenzhen)
+name A4tech
+    url www.a4tech.com
+    wikipedia A4Tech
+    ansi_color 0;33;40
+    match_string A4Tech
 
-name SSK Corporation (Shenzhen)
-    name_short SSK飚王
-    url www.ssk.cn
-    ansi_color 0;91;107
-    match_string SSK (Shenzhen)
-    match_string_case SSK
+name AboCom Systems
+    url www.abocom.com.tw
+    match_string AboCom Systems
+    match_string AboCom
 
-name ASUSTeK Computer
-    name_short ASUS
-    url www.asus.com
-    wikipedia Asus
-    ansi_color 0;30;47
-    match_string ASUSTek
-    match_string ASUS
+name Acer
+    name_short acer
+    url www.acer.com
+    ansi_color 0;32;107
+    match_string Acer
+    note EDID vendor: ACR
+    match_string_exact ACR
 
-# PCI Vendor 1022
-name Advanced Micro Devices
-    name_short AMD
-    url www.amd.com
-    wikipedia Advanced Micro Devices
-    ansi_color 0;97;41
-    match_string Advanced Micro Devices
-    match_string_case AMD
+name ADATA Technology
+    name_short ADATA
+    ansi_color 0;34;47
+    match_string_case ADATA
 
 # PCI Vendor 1002 (used for GPUs)
 name Advanced Micro Devices (formerly ATI)
@@ -80,80 +70,55 @@ name Advanced Micro Devices (formerly ATI)
     match_string_case AMD/ATI
     match_string_case ATI
 
-name nVidia Corporation
-    name_short nVidia
-    url www.nvidia.com
-    wikipedia Nvidia
-    ansi_color 0;97;42
-    match_string nVidia
-
-name G.Skill International Enterprise
-    name_short G.Skill
-    url www.gskill.com
-    wikipedia G.Skill
-    ansi_color 0;31;107
-    match_string G.Skill
-    match_string G-Skill
-    match_string G Skill
+name Advanced Micro Devices
+    name_short AMD
+    url www.amd.com
+    wikipedia Advanced Micro Devices
+    ansi_color 0;97;41
+    note x86 processor vendor ID
+    match_string AMDisbetter!
+    match_string AuthenticAMD
 
-name XFX Pine Group
-    name_short XFX
-    url www.xfxforce.com
-    wikipedia XFX
-    ansi_color 0;30;42
-    match_string_case XFX
+# PCI Vendor 1022
+name Advanced Micro Devices
+    name_short AMD
+    url www.amd.com
+    wikipedia Advanced Micro Devices
+    ansi_color 0;97;41
+    match_string Advanced Micro Devices
+    match_string_case AMD
 
-name 3Com
-    url www.3com.com
-    wikipedia 3Com
-    ansi_color 0;97;40
-    match_string 3Com
+name Alcor Life Extension Foundation
+# Makes devices?
+    name_short Alcor
+    url www.alcor.org
+    match_string ALCOR
 
-name Intel Corporation
-    name_short Intel
-    url www.intel.com
-    wikipedia Intel Corporation
+name Allwinner Technology
+    name_short AllWinner
+    url www.allwinnertech.com
+    wikipedia Allwinner Technology
     ansi_color 0;97;44
-    match_string Intel
-
-name Cirrus Logic
-    url www.cirrus.com
-    match_string Cirrus Logic
+    match_string AllWinner
 
-name VIA Technologies
-    name_short VIA
-    url www.via.com.tw
-    ansi_color 0;36;107
-    match_string_case VIA
+name American Megatrends
+    name_short AMI
+    url www.ami.com
+    ansi_color 0;31;47
+    match_string American Megatrends
 
-name NEC Corporation
-    name_short NEC
-    url www.nec.com
+name Amlogic
+    name_short AMLogic
+    url www.amlogic.com
+    wikipedia Amlogic
     ansi_color 0;94;107
-    note EDID vendor: NEC
-    match_string_case NEC
-
-name Realtek Semiconductor
-    name_short Realtek
-    url www.realtek.com.tw
-    ansi_color 0;34;107
-    match_string Realtek
-
-name Toshiba Corporation
-# styled in all-caps
-    name_short TOSHIBA
-    url www.toshiba.com
-    ansi_color 0;91;47
-    match_string Toshiba
-    note EDID vendor: TSB
-    match_string_exact TSB
+    match_string Amlogic
 
-name Vizio
-    name_short VIZIO
-    ansi_color 0;30;107
-    match_string Vizio
-    note EDID vendor: VIZ
-    match_string_exact VIZ
+name Angelbird Technologies
+    name_short Angelbird
+    url www.angelbird.com
+    ansi_color 0;97;100
+    match_string Angelbird
 
 name AOC International
     name_short AOC
@@ -165,32 +130,57 @@ name AOC International
     match_string Admiral Overseas Corporation
     match_string Admiral
 
-name Magewell
-    url www.magewell.com
-    ansi_color 0;34;107
-    match_string Magewell
-
-name Harman International
-    name_short Harman
-    url www.harman.com
-    ansi_color 0;34;107
-    match_string Harman International
-    match_string Harman
+name Apacer Technology
+    name_short Apacer
+    match_string Apacer
 
-name Oculus VR
-    name_short Oculus
-    url www.oculus.com
+name Apple Computer
+    name_short Apple
+    url www.apple.com
     ansi_color 0;97;100
-    wikipedia Oculus VR
-    match_string Oculus VR
-    match_string Oculus
+    match_string Apple
+    note EDID vendor: APP
+    match_string_exact APP
 
-name Yamaha Corporation
-    name_short Yamaha
-    url www.yamaha.com
-    wikipedia Yamaha Corporation
-    ansi_color 0;35;107
-    match_string Yamaha
+name Applied Micro Circuits
+    name_short APM
+    wikipedia Applied Micro Circuits Corporation
+    match_string Applied Micro Circuits
+    match_string AppliedMicro
+    match_string_case APM
+    match_string_case AMCC
+
+name Arch Linux
+    name_short Arch
+    url www.archlinux.org
+    ansi_color 0;36;107
+    match_string arch linux
+
+name Arm Holdings
+# styled lower-case "arm"
+    name_short arm
+    url arm.com
+    ansi_color 0;36;107
+    match_string ARM
+
+name ASMedia Technology
+    name_short ASMedia
+    url www.asmedia.com.tw
+    ansi_color 0;30;46
+    match_string_case ASMedia
+
+name ASRock
+    url www.asrock.com
+    ansi_color 0;32;107
+    match_string ASRock
+
+name ASUSTeK Computer
+    name_short ASUS
+    url www.asus.com
+    wikipedia Asus
+    ansi_color 0;30;47
+    match_string ASUSTek
+    match_string ASUS
 
 name AU Optronics Corporation
     name_short AUO
@@ -200,221 +190,141 @@ name AU Optronics Corporation
     match_string AU Optronics
     match_string_case AUO
 
-name Planar
-    name_short PLANAR
-    url www.planar.com
-    ansi_color 0;91;40
-    match_string Planar
+name AVerMedia Technologies
+    name_short AVerMedia
+    url www.aver.com
+    match_string Avermedia
 
-name Seiko Epson Corporation
-    name_short EPSON
-    url epson.com
-    wikipedia Seiko Epson
-    ansi_color 0;34;107
-    match_string Seiko Epson
-    match_string Epson
-    match_string Seiko
+name Award Software International
+    name_short Award
+    url www.award-bios.com
+    ansi_color 0;93;44
+    match_string Award
 
-# Company defunct, now brand name of Chinese company
-name Eastman Kodak Company
-    name_short Kodak
-    wikipedia Kodak
-    ansi_color 0;31;43
-    match_string Kodak
+name BenQ (formerly Acer Peripherals)
+    name_short BenQ/acer
+    url www.benq.com
+    ansi_color 0;35;107
+    match_string Acer Peripherals
+    match_string Acer Peripherals Inc. (now BenQ Corp.)
 
-# Company defunct, now brand name of Chinese company
-name Westinghouse Electronics
-    name_short W
-    wikipedia Westinghouse Electronics
-    ansi_color 0;97;44
-    match_string Westinghouse
+name BenQ
+    url www.benq.com
+    ansi_color 0;35;107
+    match_string BENQ
 
-name ViewSonic Corporation
-    name_short ViewSonic
-    url www.viewsonic.com
-    ansi_color 0;35;103
-    match_string ViewSonic
-    note EDID vendor: VSC
-    match_string_exact VSC
+name Biostar Microtech International
+    name_short BIOSTAR
+    url www.biostar.tw
+    ansi_color 0;31;40
+    match_string Biostar
 
-name LITE-ON
-    url www.liteonit.com
-    ansi_color 0;97;104
-    match_string_case LITE-ON
+name Bright Micron Technology
+    name_short BMT
+    match_string Bright Micron
 
-name Maxtor
-    url www.maxtor.com
-    match_string Maxtor
+name Broadcom Corporation
+    name_short Broadcom
+    url www.broadcom.com
+    ansi_color 0;30;41
+    match_string Broadcom
 
-name Samsung
-    url www.samsung.com
-    ansi_color 0;47;30
-    match_string Samsung
-    note EDID vendor: SAM
-    match_string_exact SAM
+name Brother Industries
+    name_short Brother
+    url www.brother.com
+    wikipedia Brother Industries
+    ansi_color 0;34;107
+    match_string Brother
 
-name Pioneer
-    url www.pioneer-eur.com
-    match_string Pioneer
-    note EDID vendor: PIO
-    match_string_exact PIO
+name C-guys
+    url www.c-guys.net
+    match_string C-guys
 
-name Plextor
-    url www.plextor.be
-    match_string Plextor
+name C-Media Electronics
+    name_short C-Media
+    url www.cmedia.com.tw
+    match_string C-Media
 
-name LG Electronics
-    name_short LG
-    url www.lge.com
-    ansi_color 0;97;41
-    match_string LG Electronics [Lucky Goldstar Co. Ltd]
-    match_string Lucky Goldstar
-    match_string Lucky-Goldstar
-    match_string LG Semi
-    match_string_case LG
+name Cambridge Silicon Radio
+    name_short CSR
+    url www.csr.com
+    wikipedia Cambridge Silicon Radio
+    ansi_color 0;34;107
+    match_string Cambridge Silicon Radio
 
-name LG Electronics (formerly Goldstar)
-    name_short LG (Goldstar)
-    url www.lge.com
-    ansi_color 0;97;41
-    match_string Goldstar
+name Canon
+    url www.canon.com
+    ansi_color 0;31;107
+    match_string Canon
 
-name LG Display
-    name_short LG Display
-    url www.lgdisplay.com
-    ansi_color 0;97;41
-    match_string LG Display
-    match_string LG.Philips
-    note EDID vendor: LGD
-    match_string_exact LGD
+name Canonical
+    url www.canonical.com
+    ansi_color 0;97;45
+    match_string canonical
 
-name LIG Nex1
-    wikipedia LIG Nex1
-    match_string LIG Nex1
-    match_string LG Innotek
-    match_string NEX1 Future
+name CDEmu
+    url cdemu.sourceforge.io
+    match_string CDEmu
 
-name Hitachi-LG Data Storage
-    name_short HLDS
-    url http://hlds.co.kr
-    wikipedia Hitachi-LG Data Storage
-    ansi_color 0;97;105
-    match_string_case HL-DT-ST
-    match_string_case HLDS
-    match_string_case H-L Data Storage
-    match_string Hitachi-LG
-    match_string Hitachi LG
-    match_string LG (HLDS)
+name Chengdu Haiguang Integrated Circuit Design
+    name_short Hygon
+    ansi_color 0;97;104
+    match_string Hygon
+    match_string Higon
+    note x86 processor vendor ID
+    match_string HygonGenuine
 
-name Hitachi Global Storage Technologies
-    name_short HGST
-    url hgst.com
-    ansi_color 0;97;40
-    match_string HGST a Western Digital Company
-    match_string Hitachi Global Storage
-    match_string_case HGST
+name Chicony
+    url www.chicony.com.tw
+    wikipedia Chicony Electronics
+    ansi_color 0;36;107
+    match_string Chicony
 
-name Hitachi
-    name_short HITACHI
-    url www.hitachi.com
-    ansi_color 0;30;47
-    match_string Hitachi
-    note EDID vendor: HTC
-    match_string_exact HTC
+name Cirrus Logic
+    url www.cirrus.com
+    match_string Cirrus Logic
 
-name Lexmark
-    url www.lexmark.com
-    match_string Lexmark
+name Coreboot Project
+    name_short Coreboot
+    url www.coreboot.org
+    match_string coreboot
+
+name Corsair Components
+    name_short Corsair
+    url www.corsair.com
+    wikipedia Corsair Components
+    ansi_color 0;30;43
+    match_string Corsair
+    match_string_num_prefix Force MP
+    match_string_num_prefix Force LE
 
 name Creative Labs
     url www.creative.com
     match_string Creative Labs
 
-name NXP Semiconductors
-    name_short NXP
-    url www.nxp.com
-    match_string_case NXP
-
-name Synaptics (formerly Brooktree)
-    name_short Synaptics (Brooktree)
-    url www.synaptics.com
-    match_string Brooktree
-
-name Synaptics (formerly Conexant Systems)
-    name_short Synaptics (Conexant)
-    url www.synaptics.com
-    match_string Conexant
-
-name Synaptics
-    url www.synaptics.com
-    match_string Synaptics
-
-name TDK-Micronas
-    url www.micronas.com
-    match_string Micronas
-
-name Apacer Technology
-    name_short Apacer
-    match_string Apacer
-
-name Bright Micron Technology
-    name_short BMT
-    match_string Bright Micron
-
-name HT Micron
-    match_string HT Micron
-
-name Intellitech
-    match_string Intellitech
-
-name Harmony Semiconductor
-    name_short Harmony
-    match_string Harmony
-
-name Qualcomm (formerly Atheros)
-    name_short Qualcomm (Atheros)
-    url www.qualcomm.com
-    wikipedia Qualcomm Atheros
-    ansi_color 0;94;47
-    match_string Qualcomm Atheros
-    match_string Atheros
-
-name Panasonic Industry Company
-# AKA: Matsushita Electric Industrial
-    name_short Panasonic
-    url www.panasonic.com
-    ansi_color 0;30;107
-    match_string Panasonic
-    match_string Matsushita
-    match_string MATSHITA
-    note EDID vendor: MEI
-    match_string_exact MEI
-
-name Silicon Image
-    url www.siliconimage.com
-    match_string Silicon Image
-    match_string Silicon Integrated Image
+name Crucial (Micron)
+    name_short Crucial
+    url www.crucial.com
+    ansi_color 0;37;44
+    match_string Crucial
+    match_string Micron/Crucial
 
-name Broadcom Corporation
-    name_short Broadcom
-    url www.broadcom.com
-    ansi_color 0;30;41
-    match_string Broadcom
+name Cypress Semiconductor
+    name_short Cypress
+    url cypress.com
+    wikipedia Cypress Semiconductor
+    ansi_color 0;36;107
+    match_string Cypress
 
-name Apple Computer
-    name_short Apple
-    url www.apple.com
-    ansi_color 0;97;100
-    match_string Apple
-    note EDID vendor: APP
-    match_string_exact APP
+name D-Link
+    url www.dlink.com.tw
+    ansi_color 0;97;44
+    match_string D-Link
 
-name International Business Machines Corporation
-    name_short IBM
-    url www.ibm.com
-    ansi_color 0;94;107
-    match_string International Business Machines
-    match_string_case IBM
+name Debian
+    url www.debian.org
+    ansi_color 0;31;107
+    match_string debian
 
 name Dell Computer
     name_short Dell
@@ -426,11 +336,60 @@ name Dell Computer
     note EDID vendor: DEL
     match_string_exact DEL
 
-name Logitech International
-    name_short logitech
-    ansi_color 0;30;107
-    url www.logitech.com
-    match_string Logitech
+name Digital Equipment Corporation
+    name_short DEC
+    note Dead; various parts to Intel, Compaq, HP
+    match_string_case DEC
+    match_string Digital Equipment
+    match_string_exact Digital
+
+name DMP Electronics
+    note x86 processor vendor ID
+    match_string Vortex86 SoC
+
+# Company defunct, now brand name of Chinese company
+name Eastman Kodak Company
+    name_short Kodak
+    wikipedia Kodak
+    ansi_color 0;31;43
+    match_string Kodak
+
+name Elitegroup Computer Systems
+    name_short ECS
+    ansi_color 0;36;41
+    match_string_case ECS
+
+name Embest Technology
+    name_short Embest
+    url www.embest-tech.com
+    ansi_color 0;96;44
+    match_string Embest
+
+name eMPIA Technology
+    url www.empiatech.com.tw
+    match_string_case eMPIA
+
+name Ericsson-LG
+    wikipedia Ericsson-LG
+    ansi_color 0;97;43
+    match_string Ericsson-LG
+    match_string LG-Ericsson
+
+name EVGA
+    url www.evga.com
+    ansi_color 0;34;107
+    match_string EVGA
+
+name ExcelStor Technology
+    url www.excelstor.com
+    match_string ExcelStor
+
+name Faraday Technology
+    name_short Faraday
+    url www.faraday-tech.com
+    wikipedia Faraday Technology
+    match_string Faraday Technology
+    match_string Faraday
 
 name Fujitsu
     name_short FUJITSU
@@ -440,36 +399,30 @@ name Fujitsu
     name_short Fujitsu/Siemens
     match_string Fujitsu Siemens
 
-name Sony
-    name_short SONY
-    url www.sony.com
-    ansi_color 0;30;107
-    match_string Sony
-#   match_string_case CDU
-    note EDID vendor: SNY
-    match_string_exact SNY
-
-name Sony Mobile
-    name_short SONY
-    url www.sony.com
-    ansi_color 0;30;107
-    match_string Sony Mobile
-    name_short SONY/Ericsson
-    match_string Sony Ericsson
+name Fuzhou Rockchip Electronics
+    name_short Rockchip
+    url www.rock-chips.com
+    ansi_color 0;34;43
+    match_string Rockchip
 
-name SanDisk
-    url www.sandisk.com
-    ansi_color 0;31;40
-    match_string SanDisk
+name G.Skill International Enterprise
+    name_short G.Skill
+    url www.gskill.com
+    wikipedia G.Skill
+    ansi_color 0;31;107
+    match_string G.Skill
+    match_string G-Skill
+    match_string G Skill
 
-name ExcelStor Technology
-    url www.excelstor.com
-    match_string ExcelStor
+name GCT Semiconductor
+    name_short GCT
+    url www.gctsemi.com
+    match_string GCT Semiconductor
+    match_string_case GCT
 
-name D-Link
-    url www.dlink.com.tw
-    ansi_color 0;97;44
-    match_string D-Link
+name Genius
+    url www.genius.ru
+    match_string Genius
 
 name Gigabyte Technology
     name_short Gigabyte
@@ -478,58 +431,25 @@ name Gigabyte Technology
     match_string Giga-byte
     match_string Gigabyte
 
-name Micro-Star International
-    name_short MSI
-    url www.msi.com
-    url_support www.msi.com/support
-    ansi_color 0;97;40
-    match_string Micro-Star Int'l Co.,Ltd.
-    match_string Micro Star
-    match_string_case MSI
-
-name ZOTAC International
-    name_short ZOTAC
-    url www.zotac.com
-    url_support www.zotac.com/support/
-    ansi_color 0;90;43
-    match_string ZOTAC
-
-name C-Media Electronics
-    name_short C-Media
-    url www.cmedia.com.tw
-    match_string C-Media
-
-name AVerMedia Technologies
-    name_short AVerMedia
-    url www.aver.com
-    match_string Avermedia
-
-name Koninklijke Philips
-    name_short PHILIPS
-    url www.philips.com
-    match_string Philips
-    ansi_color 0;30;107
-    match_string Philips
-    note EDID vendor: PHL
-    match_string_exact PHL
+# NOT Globalsat Group
+name Globalsat Technology
+    match_string Globalsat Technology
 
-name Sharp Corporation
-    name_short SHARP
-    ansi_color 0;31;107
-    match_string Sharp
-    note EDID vendor: SHP
-    match_string_exact SHP
+name Google
+    url www.google.com
+    ansi_color 0;34;107
+    match_string Google
 
-name Ralink Technology
-    name_short Ralink
-    url www.ralinktech.com
-    ansi_color 0;36;107
-    match_string RaLink
+name Harman International
+    name_short Harman
+    url www.harman.com
+    ansi_color 0;34;107
+    match_string Harman International
+    match_string Harman
 
-name Siemens AG
-    name_short Siemens
-    url www.siemens.com
-    match_string Siemens
+name Harmony Semiconductor
+    name_short Harmony
+    match_string Harmony
 
 name Hewlett-Packard
     name_short HP
@@ -542,80 +462,103 @@ name Hewlett-Packard
     note SCSI vendor: hp
     match_string_exact hp
 
-name TEAC Corporation
-    name_short TEAC
-    url www.teac.com
-    ansi_color 0;34;107
-    match_string_case TEAC
-
-name Microsoft
-    url www.microsoft.com
+name Hitachi Global Storage Technologies
+    name_short HGST
+    url hgst.com
     ansi_color 0;97;40
-    match_string Microsoft
+    match_string HGST a Western Digital Company
+    match_string Hitachi Global Storage
+    match_string_case HGST
 
-name Memorex Products
-    name_short Memorex
-    url www.memorex.com
-    match_string Memorex
+name Hitachi-LG Data Storage
+    name_short HLDS
+    url http://hlds.co.kr
+    wikipedia Hitachi-LG Data Storage
+    ansi_color 0;97;105
+    match_string_case HL-DT-ST
+    match_string_case HLDS
+    match_string_case H-L Data Storage
+    match_string Hitachi-LG
+    match_string Hitachi LG
+    match_string LG (HLDS)
 
-name eMPIA Technology
-    url www.empiatech.com.tw
-    match_string_case eMPIA
+name Hitachi
+    name_short HITACHI
+    url www.hitachi.com
+    ansi_color 0;30;47
+    match_string Hitachi
+    note EDID vendor: HTC
+    match_string_exact HTC
 
-name Canon
-    url www.canon.com
-    ansi_color 0;31;107
-    match_string Canon
+name Holtek Semiconductor
+    name_short Holtek
+    url www.holtek.com
+    ansi_color 0;34;107
+    match_string Holtek
 
-name A4tech
-    url www.a4tech.com
-    wikipedia A4Tech
-    ansi_color 0;33;40
-    match_string A4Tech
+name Hoodman Corporation
+    name_short Hoodman
+    url www.hoodmanusa.com
+    ansi_color 0;30;43
+    match_string Hoodman
 
-name Alcor Life Extension Foundation
-# Makes devices?
-    name_short Alcor
-    url www.alcor.org
-    match_string ALCOR
+name HT Micron
+    match_string HT Micron
 
-name Vimicro
-    url www.vimicro.com
-    match_string Vimicro
+# JEDEC mfgr [0][64]
+name Infineon Technologies
+    name_short infineon
+    url www.infineon.com
+    wikipedia Infineon Technologies
+    ansi_color 0;34;107
+    match_string Infineon
+    match_string Infineon (former Siemens)
 
-name Ours Technology
-    url www.oti.com.tw
-    match_string_case OTi
+name Insyde Software
+    name_short Insyde
+    url www.insyde.com
+    ansi_color 0;30;42
+    match_string Insyde
 
-name BenQ
-    url www.benq.com
-    ansi_color 0;35;107
-    match_string BENQ
+name Intel Corporation
+    name_short Intel
+    url www.intel.com
+    wikipedia Intel Corporation
+    ansi_color 0;97;44
+    match_string Intel
 
-name BenQ (formerly Acer Peripherals)
-    name_short BenQ/acer
-    url www.benq.com
-    ansi_color 0;35;107
-    match_string Acer Peripherals
-    match_string Acer Peripherals Inc. (now BenQ Corp.)
+name Intel Corporation
+    name_short Intel
+    url www.intel.com
+    url_support ark.intel.com
+    ansi_color 0;97;44
+    note x86 processor vendor ID
+    match_string GenuineIntel
 
-name Holtek Semiconductor
-    name_short Holtek
-    url www.holtek.com
-    ansi_color 0;34;107
-    match_string Holtek
+name Intellitech
+    match_string Intellitech
 
-name Acer
-    name_short acer
-    url www.acer.com
-    ansi_color 0;32;107
-    match_string Acer
-    note EDID vendor: ACR
-    match_string_exact ACR
+name International Business Machines Corporation
+    name_short IBM
+    url www.ibm.com
+    ansi_color 0;94;107
+    match_string International Business Machines
+    match_string_case IBM
 
-name Quantum
-    url www.quantum.com
-    match_string QUANTUM
+name JMicron Technology
+    name_short JMicron
+    url www.jmicron.com
+    wikipedia JMicron
+    ansi_color 0;34;107
+    match_string JMicron Technology
+    match_string JMicron USA Technology
+    match_string JMicron
+
+name KDE
+    url www.kde.org
+    wikipedia KDE
+    ansi_color 0;97;104
+    match_string_case KDE
 
 name Kingston Technology
     name_short Kingston
@@ -623,75 +566,172 @@ name Kingston Technology
     ansi_color 0;31;40
     match_string Kingston
 
-name Chicony
-    url www.chicony.com.tw
-    wikipedia Chicony Electronics
-    ansi_color 0;36;107
-    match_string Chicony
-
-name Phison Electronics Corporation
-    name_short Phison
-    url www.phison.com
-    wikipedia Phison
-    ansi_color 0;33;44
-    match_string Phison
-
-name Corsair Components
-    name_short Corsair
-    url www.corsair.com
-    wikipedia Corsair Components
-    ansi_color 0;30;43
-    match_string Corsair
-    match_string_num_prefix Force MP
-    match_string_num_prefix Force LE
+name Koninklijke Philips
+    name_short PHILIPS
+    url www.philips.com
+    match_string Philips
+    ansi_color 0;30;107
+    match_string Philips
+    note EDID vendor: PHL
+    match_string_exact PHL
 
-name Genius
-    url www.genius.ru
-    match_string Genius
+name KVM
+    url www.linux-kvm.org
+    match_string KVMKVMKVM
 
 name KYE Systems
     name_short KYE
     url www.genius-kye.com
     match_string_case KYE
 
-name STMicroelectronics
-    name_short ST
-    url www.st.com
+name Lenovo Group
+    name_short Lenovo
+    url www.lenovo.com
+    url_support support.lenovo.com
+    wikipedia Lenovo
+    ansi_color 0;97;41
+    match_string lenovo
+    note EDID vendor: LEN
+    match_string_exact LEN
+
+name Lexmark
+    url www.lexmark.com
+    match_string Lexmark
+
+name LG Display
+    name_short LG Display
+    url www.lgdisplay.com
+    ansi_color 0;97;41
+    match_string LG Display
+    match_string LG.Philips
+    note EDID vendor: LGD
+    match_string_exact LGD
+
+name LG Electronics (formerly Goldstar)
+    name_short LG (Goldstar)
+    url www.lge.com
+    ansi_color 0;97;41
+    match_string Goldstar
+
+name LG Electronics
+    name_short LG
+    url www.lge.com
+    ansi_color 0;97;41
+    match_string LG Electronics [Lucky Goldstar Co. Ltd]
+    match_string Lucky Goldstar
+    match_string Lucky-Goldstar
+    match_string LG Semi
+    match_string_case LG
+
+name LIG Nex1
+    wikipedia LIG Nex1
+    match_string LIG Nex1
+    match_string LG Innotek
+    match_string NEX1 Future
+
+name Linaro
+    url linaro.org
+    wikipedia Linaro
+    ansi_color 0;32;107
+    match_string Linaro
+
+name Linux Foundation
+    name_short Linux
+    ansi_color 0;33;40
+    match_string Linux Foundation
+    match_string Linux
+
+name LITE-ON
+    url www.liteonit.com
     ansi_color 0;97;104
-    match_string STMicroelectronics
-    match_string ST Micro
+    match_string_case LITE-ON
 
-name ST-Ericsson
-    wikipedia ST-Ericsson
-    ansi_color 0;97;43
-    match_string ST-Ericsson
-    match_string ST Ericsson
-    match_string STEricsson
+name Logitech International
+    name_short logitech
+    ansi_color 0;30;107
+    url www.logitech.com
+    match_string Logitech
 
-name Ericsson-LG
-    wikipedia Ericsson-LG
+name Longsys (formerly Micron Lexar)
+    name_short longsys/Lexar
+    url lexar.com
+    wikipedia Lexar
+    ansi_color 0;31;40
+    match_string Lexar
+
+name Longsys
+    name_short longsys
+    url longsys.com
+    ansi_color 0;31;107
+    match_string Longsys
+
+name Magewell
+    url www.magewell.com
+    ansi_color 0;34;107
+    match_string Magewell
+
+name Marvell (formerly Cavium)
+    name_short Marvell (Cavium)
+    url cavium.com
+    wikipedia Cavium
+    ansi_color 0;97;41
+    match_string Cavium
+
+name Marvell Technology Group
+    name_short Marvell
+    url www.marvell.com
+    wikipedia Marvell Technology Group
+    ansi_color 0;97;41
+    match_string Marvell
+
+name Maxtor
+    url www.maxtor.com
+    match_string Maxtor
+
+name MediaTek
+    url www.mediatek.com
+    wikipedia MediaTek
     ansi_color 0;97;43
-    match_string Ericsson-LG
-    match_string LG-Ericsson
+    match_string MediaTek
 
-name Telefonaktiebolaget LM Ericsson
-    name_short Ericsson
-    url ericsson.com
-    wikipedia Ericsson
-    ansi_color 0;94;107
-    match_string Ericsson
+name Memorex Products
+    name_short Memorex
+    url www.memorex.com
+    match_string Memorex
 
-name Socket Mobile
-    url www.socketmobile.com
-    match_string Socket Communications
-    match_string Socket Mobile
-    match_string Socket
+name Micro-Star International
+    name_short MSI
+    url www.msi.com
+    url_support www.msi.com/support
+    ansi_color 0;97;40
+    match_string Micro-Star Int'l Co.,Ltd.
+    match_string Micro Star
+    match_string_case MSI
 
-name GCT Semiconductor
-    name_short GCT
-    url www.gctsemi.com
-    match_string GCT Semiconductor
-    match_string_case GCT
+name Microchip Technology (formerly Standard Microsystems)
+    name_short SMC
+    ansi_color 0;37;40
+    match_string Standard Microsystems
+
+name Micron Technology
+    name_short Micron
+    url www.micron.com
+    ansi_color 0;34;47
+    match_string Micron
+
+name Microsoft Hyper-V
+    url www.microsoft.com
+    match_string Microsoft Hv
+
+name Microsoft
+    url www.microsoft.com
+    ansi_color 0;97;40
+    match_string Microsoft
+
+name Murata Manufacturing (formerly SyChip Electronic Technology)
+    name_short Murata (SyChip)
+    ansi_color 0;31;107
+    match_string SyChip
 
 name Murata Manufacturing
     name_short Murata
@@ -700,93 +740,134 @@ name Murata Manufacturing
     ansi_color 0;31;107
     match_string Murata
 
-name Murata Manufacturing (formerly SyChip Electronic Technology)
-    name_short Murata (SyChip)
-    ansi_color 0;31;107
-    match_string SyChip
+name National Semiconductor
+    name_short NSC
+    note x86 processor vendor ID
+    match_string Geode by NSC
 
-name Spectec Computer
-    name_short Spectec
-    url spectec.com.tw
-    match_string Spectec
+name NEC Corporation
+    name_short NEC
+    url www.nec.com
+    ansi_color 0;94;107
+    note EDID vendor: NEC
+    match_string_case NEC
 
-name Siano Mobile Silicon
-    match_string Siano Mobile Silicon
+name NexGen
+    note x86 processor vendor ID
+    match_string NexGenDriven
 
-# NOT Globalsat Group
-name Globalsat Technology
-    match_string Globalsat Technology
+name nVidia Corporation
+    name_short nVidia
+    url www.nvidia.com
+    wikipedia Nvidia
+    ansi_color 0;97;42
+    match_string nVidia
 
-name C-guys
-    url www.c-guys.net
-    match_string C-guys
+name NXP Semiconductors
+    name_short NXP
+    url www.nxp.com
+    match_string_case NXP
 
-name Ricoh
-    url www.ricoh.com
-    wikipedia Ricoh
-    ansi_color 0;91;107
-    match_string Ricoh
+name Oculus VR
+    name_short Oculus
+    url www.oculus.com
+    ansi_color 0;97;100
+    wikipedia Oculus VR
+    match_string Oculus VR
+    match_string Oculus
 
-name Brother Industries
-    name_short Brother
-    url www.brother.com
-    wikipedia Brother Industries
-    ansi_color 0;34;107
-    match_string Brother
+name Oracle Corporation (formerly InnoTek Systemberatung)
+    name_short Oracle (InnoTek)
+    url www.virtualbox.org/wiki/innotek
+    url_support www.virtualbox.org
+    ansi_color 0;97;41
+    match_string InnoTek
+    match_string VirtualBox
+    match_string_case VBOX
 
-name AboCom Systems
-    url www.abocom.com.tw
-    match_string AboCom Systems
-    match_string AboCom
+name Oracle Corporation (formerly Sun Microsystems)
+    name_short Oracle (Sun)
+    url www.oracle.com
+    wikipedia Sun Microsystems
+    ansi_color 0;97;41
+    match_string Sun Microsystems
+    match_string Oracle Corporation (former Sun Microsystems)
 
-name Micron Technology
-    name_short Micron
-    url www.micron.com
-    ansi_color 0;34;47
-    match_string Micron
+name Oracle Corporation
+    name_short Oracle
+    url www.oracle.com
+    ansi_color 0;97;41
+    match_string Oracle
 
-name Crucial (Micron)
-    name_short Crucial
-    url www.crucial.com
-    ansi_color 0;37;44
-    match_string Crucial
-    match_string Micron/Crucial
+name Ours Technology
+    url www.oti.com.tw
+    match_string_case OTi
 
-name Toshiba Samsung Storage Technology
-    name_short TSST
-    url www.tsst.co.kr
-    wikipedia Toshiba Samsung Storage Technology
-    ansi_color 0;34;107
-    match_string Toshiba Samsung Storage
-    match_string TSSTcorp
-    match_string_case TSST
+name Panasonic Industry Company
+# AKA: Matsushita Electric Industrial
+    name_short Panasonic
+    url www.panasonic.com
+    ansi_color 0;30;107
+    match_string Panasonic
+    match_string Matsushita
+    match_string MATSHITA
+    note EDID vendor: MEI
+    match_string_exact MEI
 
-name Seagate Technology
-    name_short SEAGATE
-    url www.seagate.com
-    ansi_color 0;92;100
-    match_string Seagate
-    match_string_num_prefix_case ST
+name Parallels
+    url www.parallels.com
+    match_string lrpepyh vr
 
-name Silicon Integrated Systems Corporation
-    name_short SIS
-    url www.sis.com
-    match_string Silicon Integrated Systems
-    match_string_case SIS
+name Patriot Memory
+    name_short Patriot
+    url www.patriotmemory.com
+    wikipedia Patriot Memory
+    ansi_color 0;97;44
+    match_string Patriot Memory
 
-name S3 Graphics
-    name_short VIA/S3
-    url www.s3graphics.com
-    url_support www.s3graphics.com/en/drivers
-    ansi_color 0;30;103
-    match_string S3 Graphics
-    match_string_case VIA/S3
+name Phison Electronics Corporation
+    name_short Phison
+    url www.phison.com
+    wikipedia Phison
+    ansi_color 0;33;44
+    match_string Phison
 
-name Fuzhou Rockchip Electronics
-    name_short Rockchip
-    url www.rock-chips.com
-    ansi_color 0;34;43
-    match_string Rockchip
+name Phoenix Technologies
+    name_short Phoenix
+    url www.phoenix.com
+    ansi_color 0;31;47
+    match_string Phoenix
+
+name Pioneer
+    url www.pioneer-eur.com
+    match_string Pioneer
+    note EDID vendor: PIO
+    match_string_exact PIO
+
+name Planar
+    name_short PLANAR
+    url www.planar.com
+    ansi_color 0;91;40
+    match_string Planar
+
+name Plextor
+    url www.plextor.be
+    match_string Plextor
+
+name PNY Technologies
+    name_short PNY
+    url www.pny.com
+    wikipedia PNY Technologies
+    ansi_color 0;97;100
+    match_string_case PNY
+
+name Qualcomm (formerly Atheros)
+    name_short Qualcomm (Atheros)
+    url www.qualcomm.com
+    wikipedia Qualcomm Atheros
+    ansi_color 0;94;47
+    match_string Qualcomm Atheros
+    match_string Atheros
 
 name Qualcomm Incorporated
     name_short Qualcomm
@@ -794,41 +875,21 @@ name Qualcomm Incorporated
     ansi_color 0;94;47
     match_string Qualcomm
 
-name Arm Holdings
-# styled lower-case "arm"
-    name_short arm
-    url arm.com
-    ansi_color 0;36;107
-    match_string ARM
-
-name Microchip Technology (formerly Standard Microsystems)
-    name_short SMC
-    ansi_color 0;37;40
-    match_string Standard Microsystems
-
-name Linux Foundation
-    name_short Linux
-    ansi_color 0;33;40
-    match_string Linux Foundation
-    match_string Linux
-
-name ASMedia Technology
-    name_short ASMedia
-    url www.asmedia.com.tw
-    ansi_color 0;30;46
-    match_string_case ASMedia
+name Quantum
+    url www.quantum.com
+    match_string QUANTUM
 
-name Sapphire Technology
-    name_short SAPPHIRE
-    url www.sapphiretech.com
-    ansi_color 0;30;107
-    match_string sapphire tech
-    match_string sapphire technology
+name RaidSonic Technology
+    name_short RaidSonic
+    url www.raidsonic.de
+    ansi_color 0;31;107
+    match_string ICY BOX
 
-name Synopsys
-    url www.synopsys.com
-    ansi_color 0;35;107
-    match_string Synopsys
+name Ralink Technology
+    name_short Ralink
+    url www.ralinktech.com
+    ansi_color 0;36;107
+    match_string RaLink
 
 name Raspberry Pi Foundation
     name_short Raspberry Pi
@@ -837,41 +898,22 @@ name Raspberry Pi Foundation
     match_string RaspberryPi
     match_string Raspberry Pi
 
-name Embest Technology
-    name_short Embest
-    url www.embest-tech.com
-    ansi_color 0;96;44
-    match_string Embest
-
-# JEDEC mfgr [1][78]
-name Transcend Information
-    name_short Transcend
-    url transcend-info.com
-    ansi_color 0;31;47
-    match_string Transcend Information
-    # More likely this one is T. Information than T. Technology
-    match_string Transcend
-
-# JEDEC mfgr [7][105]
-name Transcend Technology
-    name_short Transcend
-    match_string Transcend Technology
+name Raspbian
+    url www.raspberrypi.org/downloads/raspbian/
+    ansi_color 0;97;101
+    match_string raspbian
 
-# JEDEC mfgr [0][64]
-name Infineon Technologies
-    name_short infineon
-    url www.infineon.com
-    wikipedia Infineon Technologies
+name Realtek Semiconductor
+    name_short Realtek
+    url www.realtek.com.tw
     ansi_color 0;34;107
-    match_string Infineon
-    match_string Infineon (former Siemens)
+    match_string Realtek
 
-name Cypress Semiconductor
-    name_short Cypress
-    url cypress.com
-    wikipedia Cypress Semiconductor
-    ansi_color 0;36;107
-    match_string Cypress
+name Red Hat
+    url www.redhat.com
+    ansi_color 0;31;40
+    match_string Red Hat
+    match_string RedHat
 
 name Renesas Electronics
     name_short Renesas
@@ -880,47 +922,24 @@ name Renesas Electronics
     ansi_color 0;97;44
     match_string Renesas
 
-name ADATA Technology
-    name_short ADATA
-    ansi_color 0;34;47
-    match_string_case ADATA
-
-name Victor Company of Japan
-    name_short JVC
-    url www.victor.co.jp
+name Ricoh
+    url www.ricoh.com
+    wikipedia Ricoh
     ansi_color 0;91;107
-    match_string_case JVC
-    match_string Victor
-
-name ASRock
-    url www.asrock.com
-    ansi_color 0;32;107
-    match_string ASRock
-
-name Biostar Microtech International
-    name_short BIOSTAR
-    url www.biostar.tw
-    ansi_color 0;31;40
-    match_string Biostar
-
-name EVGA
-    url www.evga.com
-    ansi_color 0;34;107
-    match_string EVGA
+    match_string Ricoh
 
-name Elitegroup Computer Systems
-    name_short ECS
-    ansi_color 0;36;41
-    match_string_case ECS
+name Rise Technology
+    name_short Rise
+    note x86 processor vendor ID
+    match_string RiseRiseRise
 
-name JMicron Technology
-    name_short JMicron
-    url www.jmicron.com
-    wikipedia JMicron
-    ansi_color 0;34;107
-    match_string JMicron Technology
-    match_string JMicron USA Technology
-    match_string JMicron
+name S3 Graphics
+    name_short VIA/S3
+    url www.s3graphics.com
+    url_support www.s3graphics.com/en/drivers
+    ansi_color 0;30;103
+    match_string S3 Graphics
+    match_string_case VIA/S3
 
 name Sabrent
     url www.sabrent.com
@@ -929,75 +948,76 @@ name Sabrent
     match_string Sabrent
     match_string Arkview
 
+name Samsung
+    url www.samsung.com
+    ansi_color 0;47;30
+    match_string Samsung
+    note EDID vendor: SAM
+    match_string_exact SAM
+
+name SanDisk
+    url www.sandisk.com
+    ansi_color 0;31;40
+    match_string SanDisk
+
 name Sanyo Electric
     name_short SANYO
     url www.sanyo.com
     match_string SANYO
 
-name Cambridge Silicon Radio
-    name_short CSR
-    url www.csr.com
-    wikipedia Cambridge Silicon Radio
-    ansi_color 0;34;107
-    match_string Cambridge Silicon Radio
-
-name Suprema
-    url www.supremainc.com
-    ansi_color 0;31;107
-    match_string suprema
+name Sapphire Technology
+    name_short SAPPHIRE
+    url www.sapphiretech.com
+    ansi_color 0;30;107
+    match_string sapphire tech
+    match_string sapphire technology
 
-name Patriot Memory
-    name_short Patriot
-    url www.patriotmemory.com
-    wikipedia Patriot Memory
-    ansi_color 0;97;44
-    match_string Patriot Memory
+name Seagate Technology
+    name_short SEAGATE
+    url www.seagate.com
+    ansi_color 0;92;100
+    match_string Seagate
+    match_string_num_prefix_case ST
 
-name SK Hynix
-    name_short SK hynix
-    url www.skhynix.com
-    wikipedia SK Hynix
-    ansi_color 0;31;43
-    match_string Hynix
-    match_string Hyundai
+name Seiko Epson Corporation
+    name_short EPSON
+    url epson.com
+    wikipedia Seiko Epson
+    ansi_color 0;34;107
+    match_string Seiko Epson
+    match_string Epson
+    match_string Seiko
 
-name PNY Technologies
-    name_short PNY
-    url www.pny.com
-    wikipedia PNY Technologies
-    ansi_color 0;97;100
-    match_string_case PNY
+name Sharp Corporation
+    name_short SHARP
+    ansi_color 0;31;107
+    match_string Sharp
+    note EDID vendor: SHP
+    match_string_exact SHP
 
-name Linaro
-    url linaro.org
-    wikipedia Linaro
-    ansi_color 0;32;107
-    match_string Linaro
+name Siano Mobile Silicon
+    match_string Siano Mobile Silicon
 
-name Longsys
-    name_short longsys
-    url longsys.com
-    ansi_color 0;31;107
-    match_string Longsys
+name Siemens AG
+    name_short Siemens
+    url www.siemens.com
+    match_string Siemens
 
-name Longsys (formerly Micron Lexar)
-    name_short longsys/Lexar
-    url lexar.com
-    wikipedia Lexar
-    ansi_color 0;31;40
-    match_string Lexar
+name Silicon Image
+    url www.siliconimage.com
+    match_string Silicon Image
+    match_string Silicon Integrated Image
 
-name Angelbird Technologies
-    name_short Angelbird
-    url www.angelbird.com
-    ansi_color 0;97;100
-    match_string Angelbird
+name Silicon Integrated Systems Corporation
+    name_short SIS
+    url www.sis.com
+    match_string Silicon Integrated Systems
+    match_string_case SIS
 
-name Hoodman Corporation
-    name_short Hoodman
-    url www.hoodmanusa.com
-    ansi_color 0;30;43
-    match_string Hoodman
+name Silicon Integrated Systems
+    name_short SIS
+    note x86 processor vendor ID
+    match_string SiS SiS SiS
 
 name Silicon Power
     name_short SP
@@ -1006,167 +1026,179 @@ name Silicon Power
     ansi_color 0;97;40
     match_string Silicon Power
 
-name Google
-    url www.google.com
-    ansi_color 0;34;107
-    match_string Google
+name SK Hynix
+    name_short SK hynix
+    url www.skhynix.com
+    wikipedia SK Hynix
+    ansi_color 0;31;43
+    match_string Hynix
+    match_string Hyundai
 
-name RaidSonic Technology
-    name_short RaidSonic
-    url www.raidsonic.de
-    ansi_color 0;31;107
-    match_string ICY BOX
+name Slackware
+    url www.slackware.com
+    ansi_color 0;30;107
+    match_string Slackware
 
-#
-# BIOS manufacturers
-#
+name Socket Mobile
+    url www.socketmobile.com
+    match_string Socket Communications
+    match_string Socket Mobile
+    match_string Socket
 
-name American Megatrends
-    name_short AMI
-    url www.ami.com
-    ansi_color 0;31;47
-    match_string American Megatrends
+name Sony Mobile
+    name_short SONY
+    url www.sony.com
+    ansi_color 0;30;107
+    match_string Sony Mobile
+    name_short SONY/Ericsson
+    match_string Sony Ericsson
 
-name Award Software International
-    name_short Award
-    url www.award-bios.com
-    ansi_color 0;93;44
-    match_string Award
+name Sony
+    name_short SONY
+    url www.sony.com
+    ansi_color 0;30;107
+    match_string Sony
+#   match_string_case CDU
+    note EDID vendor: SNY
+    match_string_exact SNY
 
-name Phoenix Technologies
-    name_short Phoenix
-    url www.phoenix.com
-    ansi_color 0;31;47
-    match_string Phoenix
+name Spectec Computer
+    name_short Spectec
+    url spectec.com.tw
+    match_string Spectec
 
-name Insyde Software
-    name_short Insyde
-    url www.insyde.com
-    ansi_color 0;30;42
-    match_string Insyde
+name SSK Corporation (Shenzhen)
+    name_short SSK飚王
+    url www.ssk.cn
+    ansi_color 0;91;107
+    match_string SSK (Shenzhen)
+    match_string_case SSK
 
-name Coreboot Project
-    name_short Coreboot
-    url www.coreboot.org
-    match_string coreboot
+name ST-Ericsson
+    wikipedia ST-Ericsson
+    ansi_color 0;97;43
+    match_string ST-Ericsson
+    match_string ST Ericsson
+    match_string STEricsson
 
-#
-# Linux
-#
+name STMicroelectronics
+    name_short ST
+    url www.st.com
+    ansi_color 0;97;104
+    match_string STMicroelectronics
+    match_string ST Micro
 
-name Debian
-    url www.debian.org
+name Suprema
+    url www.supremainc.com
     ansi_color 0;31;107
-    match_string debian
-
-name Raspbian
-    url www.raspberrypi.org/downloads/raspbian/
-    ansi_color 0;97;101
-    match_string raspbian
+    match_string suprema
 
-name Canonical
-    url www.canonical.com
-    ansi_color 0;97;45
-    match_string canonical
+name Synaptics (formerly Brooktree)
+    name_short Synaptics (Brooktree)
+    url www.synaptics.com
+    match_string Brooktree
 
-name Ubuntu
-    url www.ubuntu.com
-    url_support www.ubuntu.com/support/community-support
-    ansi_color 0;97;45
-    match_string ubuntu
+name Synaptics (formerly Conexant Systems)
+    name_short Synaptics (Conexant)
+    url www.synaptics.com
+    match_string Conexant
 
-name Arch Linux
-    name_short Arch
-    url www.archlinux.org
-    ansi_color 0;36;107
-    match_string arch linux
+name Synaptics
+    url www.synaptics.com
+    match_string Synaptics
 
-name Red Hat
-    url www.redhat.com
-    ansi_color 0;31;40
-    match_string Red Hat
-    match_string RedHat
+name Synopsys
+    url www.synopsys.com
+    ansi_color 0;35;107
+    match_string Synopsys
 
-name Oracle Corporation
-    name_short Oracle
-    url www.oracle.com
-    ansi_color 0;97;41
-    match_string Oracle
+name TDK-Micronas
+    url www.micronas.com
+    match_string Micronas
 
-name Oracle Corporation (formerly Sun Microsystems)
-    name_short Oracle (Sun)
-    url www.oracle.com
-    wikipedia Sun Microsystems
-    ansi_color 0;97;41
-    match_string Sun Microsystems
-    match_string Oracle Corporation (former Sun Microsystems)
+name TEAC Corporation
+    name_short TEAC
+    url www.teac.com
+    ansi_color 0;34;107
+    match_string_case TEAC
 
-name Oracle Corporation (formerly InnoTek Systemberatung)
-    name_short Oracle (InnoTek)
-    url www.virtualbox.org/wiki/innotek
-    url_support www.virtualbox.org
-    ansi_color 0;97;41
-    match_string InnoTek
-    match_string VirtualBox
-    match_string_case VBOX
+name Telefonaktiebolaget LM Ericsson
+    name_short Ericsson
+    url ericsson.com
+    wikipedia Ericsson
+    ansi_color 0;94;107
+    match_string Ericsson
 
-name Slackware
-    url www.slackware.com
-    ansi_color 0;30;107
-    match_string Slackware
+name Texas Instruments
+    name_short TI
+    url ti.com
+    wikipedia Texas Instruments
+    ansi_color 0;97;40
+    match_string Texas Instruments
+    match_string_case TI
 
-name KDE
-    url www.kde.org
-    wikipedia KDE
-    ansi_color 0;97;104
-    match_string_case KDE
+name Toshiba Corporation
+# styled in all-caps
+    name_short TOSHIBA
+    url www.toshiba.com
+    ansi_color 0;91;47
+    match_string Toshiba
+    note EDID vendor: TSB
+    match_string_exact TSB
 
-name CDEmu
-    url cdemu.sourceforge.io
-    match_string CDEmu
+name Toshiba Samsung Storage Technology
+    name_short TSST
+    url www.tsst.co.kr
+    wikipedia Toshiba Samsung Storage Technology
+    ansi_color 0;34;107
+    match_string Toshiba Samsung Storage
+    match_string TSSTcorp
+    match_string_case TSST
 
-name X.Org Foundation
-    name_short X.Org
-    url www.x.org
-    wikipedia X.Org Foundation
-    ansi_color 0;30;43
-    match_string X.Org
+# JEDEC mfgr [1][78]
+name Transcend Information
+    name_short Transcend
+    url transcend-info.com
+    ansi_color 0;31;47
+    match_string Transcend Information
+    # More likely this one is T. Information than T. Technology
+    match_string Transcend
 
-#
-# x86 vendor strings
-#
+# JEDEC mfgr [7][105]
+name Transcend Technology
+    name_short Transcend
+    match_string Transcend Technology
 
-name Advanced Micro Devices
-    name_short AMD
-    url www.amd.com
-    wikipedia Advanced Micro Devices
-    ansi_color 0;97;41
+name Transmeta Corporation
+    name_short Transmeta
     note x86 processor vendor ID
-    match_string AMDisbetter!
-    match_string AuthenticAMD
+    match_string TransmetaCPU
+    match_string GenuineTMx86
 
-name Intel Corporation
-    name_short Intel
-    url www.intel.com
-    url_support ark.intel.com
-    ansi_color 0;97;44
-    note x86 processor vendor ID
-    match_string GenuineIntel
+name Ubuntu
+    url www.ubuntu.com
+    url_support www.ubuntu.com/support/community-support
+    ansi_color 0;97;45
+    match_string ubuntu
 
-name Chengdu Haiguang Integrated Circuit Design
-    name_short Hygon
-    ansi_color 0;97;104
-    match_string Hygon
-    match_string Higon
-    note x86 processor vendor ID
-    match_string HygonGenuine
+name Union Memory (Shenzhen)
+    name_short Union Memory
+    url unionmem.com
+    ansi_color 0;35;107
+    match_string Union Memory (Shenzhen)
 
-name VIA Technologies
-    name_short VIA
-    url www.via.tw
-    ansi_color 0;36;107
+name United Microelectronics Corporation
+    name_short UMC
     note x86 processor vendor ID
-    match_string VIA VIA VIA
+    match_string UMC UMC UMC
+
+name Valve Corporation
+    name_short VALVE
+    url valvesoftware.com
+    wikipedia Valve Corporation
+    ansi_color 0;97;41
+    match_string Valve Corporation
+    match_string Valve
 
 name VIA (formerly Centaur Technology)
     name_short VIA (Centaur)
@@ -1182,46 +1214,52 @@ name VIA (formerly Cyrix)
     note x86 processor vendor ID
     match_string CyrixInstead
 
-name Transmeta Corporation
-    name_short Transmeta
-    note x86 processor vendor ID
-    match_string TransmetaCPU
-    match_string GenuineTMx86
-
-name National Semiconductor
-    name_short NSC
-    note x86 processor vendor ID
-    match_string Geode by NSC
+name VIA Technologies
+    name_short VIA
+    url www.via.com.tw
+    ansi_color 0;36;107
+    match_string_case VIA
 
-name NexGen
+name VIA Technologies
+    name_short VIA
+    url www.via.tw
+    ansi_color 0;36;107
     note x86 processor vendor ID
-    match_string NexGenDriven
+    match_string VIA VIA VIA
 
-name Rise Technology
-    name_short Rise
-    note x86 processor vendor ID
-    match_string RiseRiseRise
+name Victor Company of Japan
+    name_short JVC
+    url www.victor.co.jp
+    ansi_color 0;91;107
+    match_string_case JVC
+    match_string Victor
 
-name Silicon Integrated Systems
-    name_short SIS
-    note x86 processor vendor ID
-    match_string SiS SiS SiS
+name ViewSonic Corporation
+    name_short ViewSonic
+    url www.viewsonic.com
+    ansi_color 0;35;103
+    match_string ViewSonic
+    note EDID vendor: VSC
+    match_string_exact VSC
 
-name United Microelectronics Corporation
-    name_short UMC
-    note x86 processor vendor ID
-    match_string UMC UMC UMC
+name Vimicro
+    url www.vimicro.com
+    match_string Vimicro
 
-name DMP Electronics
-    note x86 processor vendor ID
-    match_string Vortex86 SoC
+name Vizio
+    name_short VIZIO
+    ansi_color 0;30;107
+    match_string Vizio
+    note EDID vendor: VIZ
+    match_string_exact VIZ
 
-name Digital Equipment Corporation
-    name_short DEC
-    note Dead; various parts to Intel, Compaq, HP
-    match_string_case DEC
-    match_string Digital Equipment
-    match_string_exact Digital
+name VMware
+    url www.vmware.com
+    wikipedia VMware
+    ansi_color 0;90;47
+    match_string VMware
+    note x86 VM vendor string
+    match_string VMwareVMware
 
 name Western Digital
     name_short WD
@@ -1233,95 +1271,41 @@ name Western Digital
     match_string_case WDC
     match_string_num_prefix_case WD
 
-name Marvell Technology Group
-    name_short Marvell
-    url www.marvell.com
-    wikipedia Marvell Technology Group
-    ansi_color 0;97;41
-    match_string Marvell
-
-name Marvell (formerly Cavium)
-    name_short Marvell (Cavium)
-    url cavium.com
-    wikipedia Cavium
-    ansi_color 0;97;41
-    match_string Cavium
-
-name Applied Micro Circuits
-    name_short APM
-    wikipedia Applied Micro Circuits Corporation
-    match_string Applied Micro Circuits
-    match_string AppliedMicro
-    match_string_case APM
-    match_string_case AMCC
-
-name Faraday Technology
-    name_short Faraday
-    url www.faraday-tech.com
-    wikipedia Faraday Technology
-    match_string Faraday Technology
-    match_string Faraday
-
-name Texas Instruments
-    name_short TI
-    url ti.com
-    wikipedia Texas Instruments
-    ansi_color 0;97;40
-    match_string Texas Instruments
-    match_string_case TI
-
-name Allwinner Technology
-    name_short AllWinner
-    url www.allwinnertech.com
-    wikipedia Allwinner Technology
+# Company defunct, now brand name of Chinese company
+name Westinghouse Electronics
+    name_short W
+    wikipedia Westinghouse Electronics
     ansi_color 0;97;44
-    match_string AllWinner
-
-name Amlogic
-    name_short AMLogic
-    url www.amlogic.com
-    wikipedia Amlogic
-    ansi_color 0;94;107
-    match_string Amlogic
-
-name MediaTek
-    url www.mediatek.com
-    wikipedia MediaTek
-    ansi_color 0;97;43
-    match_string MediaTek
-
-name Valve Corporation
-    name_short VALVE
-    url valvesoftware.com
-    wikipedia Valve Corporation
-    ansi_color 0;97;41
-    match_string Valve Corporation
-    match_string Valve
-
-#
-# x86 VM vendor strings
-#
-
-name VMware
-    url www.vmware.com
-    wikipedia VMware
-    ansi_color 0;90;47
-    match_string VMware
-    note x86 VM vendor string
-    match_string VMwareVMware
-
-name KVM
-    url www.linux-kvm.org
-    match_string KVMKVMKVM
-
-name Microsoft Hyper-V
-    url www.microsoft.com
-    match_string Microsoft Hv
+    match_string Westinghouse
 
-name Parallels
-    url www.parallels.com
-    match_string lrpepyh vr
+name X.Org Foundation
+    name_short X.Org
+    url www.x.org
+    wikipedia X.Org Foundation
+    ansi_color 0;30;43
+    match_string X.Org
 
 name Xen HVM
     url www.xenproject.org
     match_string XenVMMXenVMM
+
+name XFX Pine Group
+    name_short XFX
+    url www.xfxforce.com
+    wikipedia XFX
+    ansi_color 0;30;42
+    match_string_case XFX
+
+name Yamaha Corporation
+    name_short Yamaha
+    url www.yamaha.com
+    wikipedia Yamaha Corporation
+    ansi_color 0;35;107
+    match_string Yamaha
+
+name ZOTAC International
+    name_short ZOTAC
+    url www.zotac.com
+    url_support www.zotac.com/support/
+    ansi_color 0;90;43
+    match_string ZOTAC