diff --git a/src/preferences/screen/ScreenMode.cpp b/src/preferences/screen/ScreenMode.cpp
index 116b897f69..d710995940 100644
--- a/src/preferences/screen/ScreenMode.cpp
+++ b/src/preferences/screen/ScreenMode.cpp
@@ -35,7 +35,7 @@
 
 
 
-// Vendors.h is generated using this commands:
+// Vendors.h is generated using these commands (plus a bit of manual editing):
 /*
  * wget https://uefi.org/uefi-pnp-export -O Vendors.h.tmp
  * if [ $? -eq 0 ]; then
diff --git a/src/preferences/screen/Vendors.h b/src/preferences/screen/Vendors.h
index 4bfcf252ab..7a67227d27 100644
--- a/src/preferences/screen/Vendors.h
+++ b/src/preferences/screen/Vendors.h
@@ -113,7 +113,7 @@
  { "AMO", "Amino Technologies PLC and Amino Communications Limited" },
  { "AMP", "AMP Inc" },
  { "AMR", "AmTRAN Technology Co., Ltd." },
- { "AMS ", "ARMSTEL, Inc." },
+ { "AMS", "ARMSTEL, Inc." },
  { "AMT", "AMT International Industry" },
  { "AMX", "AMX LLC" },
  { "ANA", "Anakron" },
@@ -193,7 +193,7 @@
  { "AUD", "AudioControl" },
  { "AUG", "August Home, Inc." },
  { "AUI", "ALPS ALPINE CO., LTD." },
- { "AUO", "DO NOT USE - AUO" },
+ { "AUO", "AU Optronics" },
  { "AUR", "Aureal Semiconductor" },
  { "AUS", "ASUSTek COMPUTER INC" },
  { "AUT", "Autotime Corporation" },
@@ -434,7 +434,7 @@
  { "CRE", "Creative Labs Inc" },
  { "CRH", "Contemporary Research Corp." },
  { "CRI", "Crio Inc." },
- { "CRL", "Creative Logic  " },
+ { "CRL", "Creative Logic" },
  { "CRM", "CORSAIR MEMORY Inc." },
  { "CRN", "Cornerstone Imaging" },
  { "CRO", "Extraordinary Technologies PTY Limited" },
@@ -692,7 +692,7 @@
  { "ENT", "Enterprise Comm. & Computing Inc" },
  { "EON", "Eon Instrumentation, Inc." },
  { "EPC", "Empac" },
- { "EPH ", "Epiphan Systems Inc. " },
+ { "EPH", "Epiphan Systems Inc." },
  { "EPI", "Envision Peripherals, Inc" },
  { "EPN", "EPiCON Inc." },
  { "EPS", "KEPS" },
@@ -1265,7 +1265,7 @@
  { "LOL", "Litelogic Operations Ltd" },
  { "LPE", "El-PUSK Co., Ltd." },
  { "LPI", "Design Technology" },
- { "LPL", "DO NOT USE - LPL" },
+ { "LPL", "LG.Philips" },
  { "LSC", "LifeSize Communications" },
  { "LSD", "Intersil Corporation" },
  { "LSI", "Loughborough Sound Images" },
@@ -1624,7 +1624,7 @@
  { "OTB", "outsidetheboxstuff.com" },
  { "OTI", "Orchid Technology" },
  { "OTK", "OmniTek" },
- { "OTM", "Optoma Corporation          " },
+ { "OTM", "Optoma Corporation" },
  { "OTT", "OPTO22, Inc." },
  { "OUK", "OUK Company Ltd" },
  { "OVR", "Oculus VR, Inc." },
@@ -1680,7 +1680,7 @@
  { "PGS", "Princeton Graphic Systems" },
  { "PHC", "Pijnenburg Beheer N.V." },
  { "PHE", "Philips Medical Systems Boeblingen GmbH" },
- { "PHI", "DO NOT USE - PHI" },
+ { "PHI", "PHI" },
  { "PHL", "Philips Consumer Electronics Company" },
  { "PHO", "Photonics Systems Inc." },
  { "PHS", "Philips Communication Systems" },
@@ -1757,9 +1757,9 @@
  { "PTI", "Promise Technology Inc" },
  { "PTL", "Pantel Inc" },
  { "PTS", "Plain Tree Systems Inc" },
- { "PTW", "DO NOT USE - PTW" },
+ { "PTW", "PTW" },
  { "PUL", "Pulse-Eight Ltd" },
- { "PVC", "DO NOT USE - PVC" },
+ { "PVC", "PVC" },
  { "PVG", "Proview Global Co., Ltd" },
  { "PVI", "Prime view international Co., Ltd" },
  { "PVM", "Penta Studiotechnik GmbH" },
@@ -1866,7 +1866,7 @@
  { "RSX", "Rapid Tech Corporation" },
  { "RTC", "Relia Technologies" },
  { "RTI", "Rancho Tech Inc" },
- { "RTK", "DO NOT USE - RTK" },
+ { "RTK", "RTK" },
  { "RTL", "Realtek Semiconductor Company Ltd" },
  { "RTS", "Raintree Systems" },
  { "RUN", "RUNCO International" },
@@ -1924,7 +1924,7 @@
  { "SEB", "system elektronik GmbH" },
  { "SEC", "Seiko Epson Corporation" },
  { "SEE", "SeeColor Corporation" },
- { "SEG", "DO NOT USE - SEG" },
+ { "SEG", "SEG" },
  { "SEI", "Seitz & Associates Inc" },
  { "SEL", "Way2Call Communications" },
  { "SEM", "Samsung Electronics Company Ltd" },
@@ -2195,7 +2195,7 @@
  { "TMT", "T-Metrics Inc." },
  { "TMX", "Thermotrex Corporation" },
  { "TNC", "TNC Industrial Company Ltd" },
- { "TNJ", "DO NOT USE - TNJ" },
+ { "TNJ", "TNJ" },
  { "TNM", "TECNIMAGEN SA" },
  { "TNY", "Tennyson Tech Pty Ltd" },
  { "TOE", "TOEI Electronics Co., Ltd." },
@@ -2299,9 +2299,9 @@
  { "UNA", "Unisys DSD" },
  { "UNB", "Unisys Corporation" },
  { "UNC", "Unisys Corporation" },
- { "UND", "DO NOT USE - UND" },
- { "UNE", "DO NOT USE - UNE" },
- { "UNF", "DO NOT USE - UNF" },
+ { "UND", "UND" },
+ { "UNE", "UNE" },
+ { "UNF", "UNF" },
  { "UNI", "Uniform Industry Corp." },
  { "UNM", "Unisys Corporation" },
  { "UNO", "Unisys Corporation" },
@@ -2399,7 +2399,7 @@
  { "VWB", "Vweb Corp." },
  { "WAC", "Wacom Tech" },
  { "WAL", "Wave Access" },
- { "WAN", "DO NOT USE - WAN" },
+ { "WAN", "WAN" },
  { "WAV", "Wavephore" },
  { "WBN", "MicroSoftWare" },
  { "WBS", "WB Systemtechnik GmbH" },
@@ -2409,7 +2409,7 @@
  { "WDE", "Westinghouse Digital Electronics" },
  { "WEB", "WebGear Inc" },
  { "WEC", "Winbond Electronics Corporation" },
- { "WEL ", "W-DEV" },
+ { "WEL", "W-DEV" },
  { "WEY", "WEY Design AG" },
  { "WHI", "Whistle Communications" },
  { "WII", "Innoware Inc" },
@@ -2446,7 +2446,7 @@
  { "XAC", "XAC Automation Corp" },
  { "XAD", "Alpha Data" },
  { "XDM", "XDM Ltd." },
- { "XER", "DO NOT USE - XER" },
+ { "XER", "XER" },
  { "XES", "Extreme Engineering Solutions, Inc." },
  { "XFG", "Jan Strapko - FOTO" },
  { "XFO", "EXFO Electro Optical Engineering" },
@@ -2457,7 +2457,7 @@
  { "XLX", "Xilinx, Inc." },
  { "XMM", "C3PO S.L." },
  { "XNT", "XN Technologies, Inc." },
- { "XOC", "DO NOT USE - XOC" },
+ { "XOC", "XOC" },
  { "XQU", "SHANGHAI SVA-DAV ELECTRONICS CO., LTD" },
  { "XRC", "Xircom Inc" },
  { "XRO", "XORO ELECTRONICS (CHENGDU) LIMITED" },