diff --git a/data/manufacturer_data.py b/data/manufacturer_data.py
index 50e7bae9..76aa90c7 100644
--- a/data/manufacturer_data.py
+++ b/data/manufacturer_data.py
@@ -199,7 +199,7 @@
   (0x01A6, "Hengmei Lighting Technology Co., Ltd."),
   (0x01A8, "ZongDa Photoelectricity Science and Technology Co., Ltd."),
   (0x01A9, "Shenzhen Uniview LED Ltd. Co."),
-  (0x01AA, "Vitec Videocom Inc."),
+  (0x01AA, "Videndum Production Solutions Inc."),
   (0x01AB, "Shanghai Euchips Industrial Co., Ltd."),
   (0x01AC, "DongGuan  Phcistar Optoelectronics Technology Co., Ltd."),
   (0x01AF, "Hunan Minghe Opto Tech Co., Ltd."),
@@ -260,6 +260,7 @@
   (0x025B, "Imlight-Showtechnic"),
   (0x026F, "Acuity Brands Lighting Inc."),
   (0x0280, "Arrigo Lighting"),
+  (0x0286, "RMLX"),
   (0x028F, "GRE Alpha Electronics Ltd."),
   (0x02A0, "LLC Likhoslavl Plant of Lighting Engineering (Svetotehnika)"),
   (0x02A1, "LLC Moscow Experimental Lighting Plant (TeleMechanic)"),
@@ -314,8 +315,11 @@
   (0x03A2, "licht.team"),
   (0x03A8, "ARTFOX"),
   (0x03AA, "AIGA Electronic (GuangZhou) Co., Ltd."),
+  (0x03AB, "ABMICROLONDON"),
   (0x03D5, "eX Systems"),
   (0x03D6, "i-Lumen"),
+  (0x03DA, "QST LED"),
+  (0x03F0, "jpbaye.de"),
   (0x03FA, "ART-DMX"),
   (0x0402, "Exato"),
   (0x0404, "Luminxa"),
@@ -327,10 +331,13 @@
   (0x044E, "Ben Peoples Industries, LLC"),
   (0x044F, "B2 Co., Ltd."),
   (0x0455, "Lamp & Pencil"),
+  (0x047C, "LedsGo"),
+  (0x0480, "ASUSTeK Computer Inc."),
   (0x048E, "Krisledz Pte. Ltd."),
   (0x048F, "Grand Canyon LED Lighting System (Suzhou) Co., Ltd."),
   (0x04A6, "MEB Veranstaltungstechnik GmbH"),
   (0x04A9, "Edward J. Keefe Jr."),
+  (0x04B2, "Shenzhen Meiyad Optoelectronics Co., Ltd"),
   (0x04B4, "SKT Inc."),
   (0x04B5, "Major"),
   (0x04B6, "IntiLED"),
@@ -339,8 +346,11 @@
   (0x04D7, "Targetti Sankey Spa"),
   (0x04D8, "Guangzhou Hong Yuan Electronic Technology Co., LTD."),
   (0x04DD, "Topstriving Photoelectricity Technology Co., Ltd."),
+  (0x04EE, "Tivoli Lighting"),
   (0x04F0, "SIGMA NET"),
+  (0x04F4, "Zeraus"),
   (0x04FC, "Syncrolite LLC"),
+  (0x0504, "MYHP Limited"),
   (0x050A, "ChamSys Ltd."),
   (0x051C, "Ambitsel, Inc."),
   (0x0520, "ANLC Ltd"),
@@ -357,8 +367,10 @@
   (0x0586, "K 5600, Inc."),
   (0x0588, "GuangZhou XiangMing Light Limited"),
   (0x0592, "MIRAGE B.V."),
+  (0x0596, "ReveLux"),
   (0x05A0, "Stage Smarts AB"),
   (0x05A4, "IMMOLAS"),
+  (0x05A8, "Owl Labs"),
   (0x05AB, "Shenzhen Lesan Lighting Co., Ltd."),
   (0x05B5, "Turkowski GmbH"),
   (0x05BC, "CantoUSA"),
@@ -389,6 +401,7 @@
   (0x063C, "LaserNet"),
   (0x0644, "COLEDER DISPLAY CO., LTD."),
   (0x0645, "MATSUMURA ELECTRIC MFG. CO. , LTD."),
+  (0x064D, "KXD LIGHTING CO., LIMITED"),
   (0x0650, "RDC, Inc. d.b.a. LynTec"),
   (0x0653, "USAI, LLC"),
   (0x0654, "HUNAN XIANG CAIXU FILM AND TELEVISION CULTURE CO.LTD"),
@@ -404,7 +417,10 @@
   (0x0684, "LEDART LLC"),
   (0x0685, "IBL/ESD-Datentechnik GmbH"),
   (0x0687, "INSMARINE LLC"),
+  (0x0689, "GUANGDONG DONE POWER TECHNOLOGY CO"),
+  (0x068C, "Hitmusic SAS"),
   (0x068E, "GUANGZHOU TEANMA STAGE LIGHTING FACTORY"),
+  (0x068F, "LEDEC GROUP LIMITED"),
   (0x0696, "SHENZHEN HOION LIGHTING CO.,LTD"),
   (0x0697, "Shenzhen LED Innovator Technology Co., Ltd"),
   (0x0698, "Techni-Lux"),
@@ -417,6 +433,7 @@
   (0x06B3, "NANOLUMENS, INC."),
   (0x06B6, "GUANGDONG VSHINE LIGHTING TECHNOLOGY CO.,LTD"),
   (0x06B9, "GUANGZHOU DASEN LIGHTING CORPORATION LIMITED"),
+  (0x06BB, "IQ COMPANY Ltd."),
   (0x06C4, "RHENAC Systems GmbH"),
   (0x06C7, "L&L Luce&Light"),
   (0x06CE, "American-Pro International"),
@@ -431,14 +448,18 @@
   (0x06F0, "CTG sp. z o.o."),
   (0x06F1, "Aqualux Lighting"),
   (0x06F8, "CHONGQING XINYUANHUI OPTOELECTRONIC TECHNOLOGY CO.,LTD"),
+  (0x0700, "OXYGEN SMD Ltd"),
   (0x0702, "Drinelec"),
+  (0x0706, "LINEAR TECHNOLOGIE"),
   (0x0707, "Conceptinetics Technologies and Consultancy Ltd."),
   (0x0708, "AK-LIGHT"),
   (0x070C, "Pixout SIA"),
   (0x070D, "Lumenwerx ULC"),
+  (0x070E, "PragmaLab"),
   (0x070F, "Theatrelight New Zealand"),
   (0x0710, "D.T.S. Illuminazione srl"),
   (0x0712, "Laser Imagineering GmbH"),
+  (0x071A, "YHX Visual"),
   (0x071F, "Moss LED Inc"),
   (0x0724, "PHC Lighting & BMS Sp. z o.o."),
   (0x072B, "NEWSUBSTANCE Ltd."),
@@ -449,6 +470,7 @@
   (0x0734, "CPOINT"),
   (0x073B, "Corsair Technology Ltd."),
   (0x0740, "Arkalumen"),
+  (0x0744, "DMX Pro Sales, LLC"),
   (0x0745, "Guangzhou Wingo Stage Light Co., Ltd"),
   (0x074F, "Panasonic Corporation"),
   (0x0753, "F&V Europe B.V."),
@@ -473,6 +495,8 @@
   (0x07B1, "TBF-PyroTec GmbH"),
   (0x07B3, "Shenzhen Fabulux Technology Co., Ltd"),
   (0x07B5, "ARM Automation, Inc"),
+  (0x07B6, "Minleon USA"),
+  (0x07B8, "Zhuhai Demi Technology Co., Ltd."),
   (0x07BB, "Shenzhen SOSEN Electronics Co., Ltd."),
   (0x07BE, "Sanko Device Co.Ltd."),
   (0x07C0, "Code Mercenaries GmbH"),
@@ -489,6 +513,9 @@
   (0x07E8, "ROCKETSIGN Technology HK Ltd"),
   (0x07E9, "TechLink Co., Ltd."),
   (0x07EA, "Le Maitre Ltd"),
+  (0x07EF, "Guangzhou V-Show Pro Lighting Co., Ltd."),
+  (0x07F0, "Lifud Technology Co., Ltd"),
+  (0x07F2, "CB Electronics"),
   (0x07F3, "Sam Light"),
   (0x07F4, "LED Flex Ltd."),
   (0x07F5, "Shenzhen ATENTI Technologies Co., Ltd"),
@@ -496,12 +523,17 @@
   (0x07F7, "Dakco Technologies Co., Ltd."),
   (0x07F8, "Ultimate Technology Solutions GmbH"),
   (0x07F9, "Bion Technologies GmbH"),
+  (0x07FA, "Shenzhen Pony Systems Tech Co., Ltd."),
   (0x07FD, "THELIGHT Luminary for Cine and TV S.L."),
   (0x07FE, "Shenzhen Apexls Optoelectronic Co., Ltd."),
   (0x07FF, "Guangzhou HOMEI LIGHT Manufacturer"),
   (0x0800, "Hongyeah Light"),
   (0x0801, "Guangzhou Favolite Stage Lighting Co., Ltd."),
   (0x0802, "AstralPool"),
+  (0x0803, "Guangzhou FutureColor Electronic Technology Co., Ltd."),
+  (0x0804, "K&G Visual Technology"),
+  (0x0805, "T.C.M. Light-Solutions"),
+  (0x0806, "Air Giants Limited"),
   (0x0807, "Event Lighting Pty, Ltd."),
   (0x0808, "Cooper Lighting - Zero 88"),
   (0x0809, "mumoco GmbH"),
@@ -514,14 +546,18 @@
   (0x0813, "Shenzhen Scenico Optoelectronic Co., Ltd."),
   (0x0814, "squareV"),
   (0x081C, "MR Electronics Ltd."),
+  (0x081E, "LOBO Electronic GmbH"),
   (0x0823, "Opito Labs GmbH"),
   (0x0824, "Almotechnos CO.,LTD."),
   (0x0827, "PIXREAL"),
   (0x0832, "Shenzhen EXC-LED Technology Co.,Ltd"),
+  (0x0838, "LaserAV"),
   (0x083A, "Bright Ideas Custom Electronics Inc."),
+  (0x083C, "TDT Productions"),
   (0x083E, "Guangdong Hua Chen Film & Television Stage Project Co., Ltd."),
   (0x083F, "Shenzhen LeiFei Lighting Technologies Co.,Ltd."),
   (0x0840, "Shenzhen Zwich Science and Technology Co.Ltd."),
+  (0x0841, "Guangzhou ICON Lighting Co.,Ltd"),
   (0x0845, "Cush Light LLC"),
   (0x0846, "LDR - Luci della Ribalta Srl"),
   (0x084B, "Neon Circus Ltd"),
@@ -531,6 +567,7 @@
   (0x0851, "Junction Inc. Ltd"),
   (0x0854, "Sharp NEC Display Solutions, Ltd."),
   (0x0855, "GODOX Photo Equipment Co., Ltd."),
+  (0x0856, "Ctrl Element ehf"),
   (0x0858, "Juno Lighting Group"),
   (0x085A, "Guangzhou Ming Jing Stage Light Equipment Co., Ltd."),
   (0x085B, "Tolifo (Dongguan) Photographic Equipment Co. Ltd"),
@@ -548,6 +585,7 @@
   (0x086E, "Guangzhou Hi-LTTE Electronics Technology Co.,Ltd"),
   (0x086F, "MARTINI RUS LLC"),
   (0x0870, "Hunan YESTECH Optoelectronic Co., Ltd"),
+  (0x0871, "Changsha Maya Special Effects Equipment Co., Ltd"),
   (0x0873, "Guangzhou BKLite Stage Lighting Equipment Co.,LTD"),
   (0x0874, "Snow Professional Lighting"),
   (0x0875, "ARC Solid-State Lighting Corp."),
@@ -555,6 +593,7 @@
   (0x0877, "Skaff New Zealand Ltd"),
   (0x0878, "OTTEC Technology GmbH"),
   (0x087A, "Dextra Group Plc"),
+  (0x087B, "About Time Technologies"),
   (0x087C, "Telectran International Pty Ltd."),
   (0x087D, "TPV Technology Group"),
   (0x0880, "GuangZhou LiDang Technology Inc."),
@@ -581,8 +620,10 @@
   (0x08A2, "Guangzhou Gesida Light Equipment Co., Ltd."),
   (0x08A3, "Redot Visual Effect Technologies (Shenzhen) Co., Ltd"),
   (0x08A4, "Adam Hall GmbH"),
+  (0x08A5, "White Wing Logic"),
   (0x08A6, "impulswerk.de"),
   (0x08A7, "GuangZhou Deliya Opto-electronic Tech Co., Ltd"),
+  (0x08A8, "Guangzhou Yunpeng Lighting Equipment Co. Ltd."),
   (0x08AA, "PiXL Factory"),
   (0x08AB, "Qdot Lighting Limited"),
   (0x08AC, "Bushveld Labs"),
@@ -590,6 +631,7 @@
   (0x08AE, "Technical Audio Group Pty Ltd"),
   (0x08AF, "AAdyn Technology"),
   (0x08B0, "KIM Lighting"),
+  (0x08B1, "Fujian Starnet Evideo Information System Co.,Ltd."),
   (0x08B2, "MCI Group"),
   (0x08B3, "Stealth Light srl"),
   (0x08B5, "ShenZhen Sunny Xiao Technology Co., Ltd."),
@@ -601,6 +643,7 @@
   (0x08BD, "Lug Light Factory Sp. z o. o."),
   (0x08BE, "Shenzhen FloatStone Technology Co., Ltd."),
   (0x08BF, "Times Square Stage Lighting Inc."),
+  (0x08C0, "Real Tech International LTD."),
   (0x08C1, "Project SSSHH Incorporated"),
   (0x08C3, "Guangzhou Spark Stage Equipment Co. Ltd"),
   (0x08C4, "Jacek Wagner"),
@@ -609,6 +652,7 @@
   (0x08C9, "LEDitgo Videowall Germany GmbH"),
   (0x08CA, "Foshan City Xuandao Optoelectronics Equipment Co., Ltd"),
   (0x08CC, "Guangzhou Santu Stage Lighting Equipment Co.Ltd"),
+  (0x08D0, "Image Engineering"),
   (0x08D1, "Shenzhen Leqi Network Technology Co., Ltd."),
   (0x08D3, "SVI Public Company Limited"),
   (0x08D4, "Sensa-Lite Ltd."),
@@ -625,13 +669,16 @@
   (0x08E4, "LMP Lichttechnik Vertriebsgesellschaft GmbH & Co KG"),
   (0x08E6, "Shenzhen VisionMax Technology Co., Ltd"),
   (0x08E7, "3A Guangzhou Electronics Co., Ltd"),
+  (0x08E8, "North Engineering"),
   (0x08EA, "Changchun Cedar Electronic Technology Co.,Ltd."),
+  (0x08EB, "Guangzhou Lixin Lighting Co., Ltd."),
   (0x08EC, "Marvin Nadrowski"),
   (0x08ED, "ShowLED"),
   (0x08EE, "Spacelights"),
   (0x08EF, "Guangzhou RuiYang lighting technology co. LTD."),
   (0x08F0, "Guang Dong LMJ Lighting Co., Ltd"),
   (0x08F1, "SanDevices, LLC"),
+  (0x08F2, "Virtualny Agronom Ltd."),
   (0x08F3, "Outdoor Lasers Ltd."),
   (0x08F4, "MC Electronic Technology(GZ) Co., Ltd."),
   (0x08F5, "Fufeng lighting"),
@@ -642,6 +689,7 @@
   (0x08FA, "Phaton Lighting Co., Ltd."),
   (0x08FB, "RPA Electronic Solutions Inc."),
   (0x08FC, "Lights By Brian"),
+  (0x08FD, "Koto Electric Co., Ltd."),
   (0x08FE, "Zhuhai Shengchang Electronics Co., Ltd."),
   (0x0900, "nox multimedia GmbH"),
   (0x0901, "GermTec GmbH & Co. KG"),
@@ -685,6 +733,7 @@
   (0x0931, "Cristal Controles"),
   (0x0932, "GUANGZHOU BORAY ELECTRON CO.,LTD"),
   (0x0933, "Beyond Lighting WLL"),
+  (0x0934, "Zenopix Electronic Limited Company"),
   (0x0935, "Guangzhou Huadu District Richa Lighting Equipment Factory"),
   (0x0936, "AquaTronic"),
   (0x0937, "Huizhou Zhonghan Electronic Technology Co., Ltd"),
@@ -706,15 +755,19 @@
   (0x094B, "Invisua Lighting BV"),
   (0x0951, "Guangzhou GTD Lighting Technology Co., Ltd"),
   (0x0952, "Guangzhou Sunway Entertainment Equipment Co., Ltd."),
+  (0x0953, "Boumakers Techniek"),
   (0x0954, "Ledtop Visual Ltd."),
+  (0x0957, "White Light Ltd"),
   (0x0958, "Illum Technology LLC (previously Verde Designs, Inc.)"),
   (0x0959, "Urbs Lighting, LLC"),
   (0x095A, "kLabs Research UK"),
   (0x095B, "Wuhan Zhongtian Jiaye Mechanical and Electrical Engineering Co. LTD"),
+  (0x095C, "Thomas Neumann Licht und Tontechnik"),
   (0x095E, "Hondel Lighting Limited"),
   (0x095F, "Elaborated Networks GmbH"),
   (0x0960, "Fineline Solutions Ltd."),
   (0x0962, "Finland Lighting Oy"),
+  (0x0964, "Inventions Guite Inc."),
   (0x0965, "Fontana Fountains"),
   (0x0967, "Arcus Licht- und Praesentationstechnik GmbH"),
   (0x0968, "Guangzhou Beyond Lighting Co., Limited."),
@@ -750,12 +803,15 @@
   (0x099A, "Aixz International (S)"),
   (0x099E, "LLC Lighting Technologies production"),
   (0x09A0, "Rnet Lighting Technology Limited"),
+  (0x09A1, "Veranstaltungstechnik Konig"),
   (0x09A2, "Fountain People"),
   (0x09A3, "Shenzhen Lightlink Display Technology Co., Ltd"),
   (0x09A5, "Prolight Concepts Ltd."),
   (0x09AA, "Rushstage Show Lighting Limited"),
+  (0x09AD, "Dongguan Ensure Electronic Technology Co., LTD"),
   (0x09AE, "Robert Juliat"),
   (0x09AF, "Autotech Co."),
+  (0x09B0, "Luminii"),
   (0x09B2, "Guangzhou Hedong Electronics Co., LTD"),
   (0x09B3, "Aquatique Show Int."),
   (0x09B4, "Brompton Technology Ltd."),
@@ -764,6 +820,7 @@
   (0x09B8, "Prolites S.A.L."),
   (0x09BB, "Guangzhou Yiyi Technology Co., Ltd."),
   (0x09BD, "Shenzhen Zhongbo Photoelectric Co., Ltd"),
+  (0x09BE, "Arctos Showlasertechnik GmbH"),
   (0x09C0, "Guangzhou Rainbow Lighting Equipment CO.,LTD"),
   (0x09C1, "Argetron Elektrik Elektronik Organizasyon Gida San. ve Dis Tic. Ltd. Sti."),
   (0x09C3, "Velleman nv"),
@@ -773,12 +830,14 @@
   (0x09C8, "Crystal Fountains Inc."),
   (0x09CC, "Motomuto Aps"),
   (0x09D1, "Environmental Lights"),
+  (0x09D2, "Shenzhen Siwelo Technology Co., LTD"),
   (0x09D3, "WLPS Wodielite Production Services"),
   (0x09D4, "Guangzhou Yilaiming Photoelectric Technology Co., Ltd"),
   (0x09D5, "Shenzhen ImagineVision Technology Limited"),
   (0x09D6, "Mittomakers"),
   (0x09D7, "Unilumin Group"),
   (0x09D8, "Pioneer Lighting Solutions India Pvt Ltd"),
+  (0x09DD, "Planet Innovation Products Inc"),
   (0x09DE, "Matthias Bauch Software"),
   (0x09E9, "Starway"),
   (0x09EE, "Suzhou Pinzong Electronic Technology, CO.,Ltd"),
@@ -822,6 +881,7 @@
   (0x1490, "Grid Show Systems Inc."),
   (0x14A0, "Intense Lighting, LLC"),
   (0x14AC, "Zaklad Elektroniczny AGAT s.c."),
+  (0x1501, "Artixium France SAS"),
   (0x1506, "v2 Lighting Group, Inc."),
   (0x1507, "LC Handels GmbH"),
   (0x1508, "TommyDMX"),
@@ -881,6 +941,7 @@
   (0x2011, "Gantom Lighting & Controls"),
   (0x207F, "Padura Elektronik GmbH"),
   (0x20A6, "ALADIN Architekturlicht GmbH"),
+  (0x20AB, "IlluminaPi SAS"),
   (0x20AD, "AZ e-lite Pte Ltd"),
   (0x20B6, "Alkalite LED Technology Corp"),
   (0x20B8, "Electron SA"),
@@ -894,6 +955,7 @@
   (0x20C0, "KappaStyle Productions."),
   (0x20C1, "BrightBeats, LLC"),
   (0x20C2, "Demilight"),
+  (0x20C3, "PIXILAB Technologies AB"),
   (0x2121, "Brother,Brother & Sons Aps"),
   (0x2122, "BEGLEC NV"),
   (0x2130, "Bart van Stiphout Electronics & Software"),
@@ -915,6 +977,9 @@
   (0x22AB, "EVC"),
   (0x22B9, "Etherlight"),
   (0x2337, "Focon Showtechnic"),
+  (0x2338, "Humanlitech Co., Ltd."),
+  (0x2339, "Sky-Skan Europe GmbHA"),
+  (0x233A, "4 Frames Lost UG"),
   (0x23B2, "Gekko Technology Ltd."),
   (0x2421, "HB-Laserkomponenten GmbH"),
   (0x242A, "Hungaroflash"),
@@ -990,11 +1055,14 @@
   (0x3535, "Changsha Spark Technology Electronics Ltd."),
   (0x3536, "Cindy Professional Lighting Co., Ltd."),
   (0x3537, "Novacorp Inc."),
+  (0x3538, "Lightnet sp. z o. o."),
   (0x361D, "Lumishore Ltd. UK"),
   (0x3638, "Lumenpulse Lighting Inc."),
   (0x37D0, "Boogy Brothers Showequipment"),
   (0x37D7, "Lichttechnik & Sonderbau"),
   (0x37DD, "Sehr gute GmbH"),
+  (0x3800, "OndeLight LTD"),
+  (0x3801, "SFX Controllers Sweden AB"),
   (0x3805, "Yifeng Lighting Co., Ltd."),
   (0x3806, "ACME EFFECTS LTD."),
   (0x3868, "LanBolight Technology Co., LTD."),
@@ -1082,6 +1150,7 @@
   (0x464C, "Flashlight/Ampco Holding"),
   (0x4653, "IT & Eventtechnik Fabian Stumpf"),
   (0x4656, "Flexvisual"),
+  (0x4657, "The Fountain Workshop Ltd."),
   (0x4658, "MAGIC FX B.V."),
   (0x4678, "Global Special Effects"),
   (0x4744, "Goddard Design Co."),
@@ -1089,6 +1158,7 @@
   (0x4747, "G&G LED Lighting"),
   (0x474C, "G-LEC Europe GmbH"),
   (0x4750, "DES"),
+  (0x4752, "Greenlite"),
   (0x4753, "Guangzhou Haoyang Electronic Co., Ltd."),
   (0x476C, "General Luminaire (Shanghai) Ltd."),
   (0x4800, "VOD VISUAL.CO. (UK) Ltd."),
@@ -1366,6 +1436,7 @@
   (0x6FEB, "Insight Lighting"),
   (0x6FEC, "Arc Lighting Co. Ltd."),
   (0x6FED, "Explorentis"),
+  (0x6FEE, "fos design sp. z o.o."),
   (0x7000, "Nippon Ceramic Co., Ltd."),
   (0x700A, "Guangzhou Leemc Lighting Tech., Co., Ltd."),
   (0x700B, "Vice Lighting DWC LLC"),
diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py
index 979974ca..e66da2c2 100644
--- a/data/manufacturer_links.py
+++ b/data/manufacturer_links.py
@@ -28,14 +28,14 @@
   (0x00A9, "http://www.richter-lt.de"),
   (0x00B0, "http://www.arenaluci.com/"),
   (0x00B9, "http://en.gzsjlight.com/"),
-  (0x0104, "https://www.blizzardlighting.com/"),
+  (0x0104, "https://www.blizzardpro.com/"),
   (0x01CC, "https://portmanlights.com/"),
   (0x01CD, "http://www.compulite.com/"),
   (0x01D8, "https://daniellarge.co.uk/"),
   (0x0206, "http://www.studiodue.com/"),
   (0x026F, "https://www.acuitybrands.com/"),
   (0x02B0, "https://dmxcontrol-projects.org/"),
-  (0x02E1, "http://www.taittowers.com/"),
+  (0x02E1, "https://www.taittowers.com/"),
   (0x02EA, "https://www.disguise.one/"),
   (0x02EC, "https://www.lutron.com/en-US/Pages/default.aspx"),  # Their redirects don't play nicely with Python
   # (0x02ED, "http://www.openlx.org.uk/"),  # Website currently gone
@@ -67,6 +67,7 @@
   (0x08A6, "https://impulswerk.de"),
   (0x08EA, "https://www.cedarled.com/"),
   (0x08C5, "https://ehrgeiz.glp.de/"),
+  (0x0960, "https://www.whitelight.ltd.uk/"),
   (0x0960, "https://fineline.solutions/"),
   (0x097A, "http://teamboyce.com/"),
   (0x097F, "https://raumzeitlabor.de/"),
@@ -146,7 +147,7 @@
   (0x544C, "http://tempest.biz/"),
   (0x564C, "http://www.vari-lite.com/"),
   (0x5753, "http://wirelessdmx.com"),
-  # (0x5759, "https://www.wybron.com/"),  # SSL cert expired
+  (0x5759, "https://www.wybron.com/"),
   (0x586D, "http://www.doityourselfchristmas.com/"),
   (0x6205, "http://www.ltechonline.com/"),
   (0x6364, "http://www.lanbox.com/"),
@@ -159,7 +160,7 @@
   (0x6A6B, "https://dmxking.com/"),
   (0x6D62, "http://www.proled.com/"),
   (0x7068, "https://www.pharoscontrols.com/"),
-  (0x736C, "https://www.strandlighting.com/"),
+  # (0x736C, "https://www.strandlighting.com/"),  # Now part of Vari-Lite
   (0x780E, "https://www.mole.com/"),
   (0x7A70, "https://www.openlighting.org/"),
   (0x7FF0, "https://tsp.esta.org/tsp/working_groups/CP/cp.html"),
diff --git a/tools/make_manufacturer_data.sh b/tools/make_manufacturer_data.sh
index 804e6690..32864829 100755
--- a/tools/make_manufacturer_data.sh
+++ b/tools/make_manufacturer_data.sh
@@ -56,8 +56,10 @@ tr "\240" " " | \
 sed -r -e 's/[\xe2\x80\x93\xe2\x80\x94]/-/g' | \
 sed -r -e 's/[\xef\xbc\x88]/(/g' | \
 sed -r -e 's/[\xef\xbc\x89]/)/g' | \
-sed -r -e 's/\xc5\x9f/s/g' | \
+sed -r -e 's/\xc3\xa9/e/g' | \
+sed -r -e 's/\xc3\xb6/o/g' | \
 sed -r -e 's/\xc4\xb1/i/g' | \
+sed -r -e 's/\xc5\x9f/s/g' | \
 tr "\300-\305" "[A*]" | tr "\310-\313" "[E*]" | tr "\314-\317" "[I*]" | tr "\322-\326" "[O*]" | tr "\331-\334" "[U*]" | \
 tr "\340-\345" "[a*]" | tr "\350-\353" "[e*]" | tr "\354-\357" "[i*]" | tr "\362-\366" "[o*]" | tr "\371-\374" "[u*]" | \
 uniq | \