diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf
index e46da59..47049aa 100644
--- a/etc/modprobe.d/server-blacklist.conf
+++ b/etc/modprobe.d/server-blacklist.conf
@@ -1577,7 +1577,6 @@ install hid-roccat-pyra /bin/false
 install hid-roccat-ryos /bin/false
 install hid-roccat-savu /bin/false
 install hid-saitek /bin/false
-install hid-samsung /bin/false
 install hid-semitek /bin/false
 install hid-sensor-accel-3d /bin/false
 install hid-sensor-als /bin/false
@@ -1596,7 +1595,6 @@ install hid-sensor-temperature /bin/false
 install hid-sensor-trigger /bin/false
 install hid-sigmamicro /bin/false
 install hid-sjoy /bin/false
-install hid-sony /bin/false
 install hid-speedlink /bin/false
 install hid-steam /bin/false
 install hid-steelseries /bin/false
@@ -1758,8 +1756,6 @@ install ice /bin/false
 install icp10100 /bin/false
 install icplus /bin/false
 install ics932s401 /bin/false
-install ideapad-laptop /bin/false
-install ideapad_slidebar /bin/false
 install idma64 /bin/false
 install idmouse /bin/false
 install idpf /bin/false
@@ -2036,7 +2032,6 @@ install ir-rcmm-decoder /bin/false
 install ir-sanyo-decoder /bin/false
 install irsd200 /bin/false
 install ir-sharp-decoder /bin/false
-install ir-sony-decoder /bin/false
 install ir_toy /bin/false
 install ir-usb /bin/false
 install ir-xmp-decoder /bin/false
@@ -3866,10 +3861,6 @@ install saa7164 /bin/false
 install saa717x /bin/false
 install saa7706h /bin/false
 install safe_serial /bin/false
-install samsung-keypad /bin/false
-install samsung-laptop /bin/false
-install samsung-q10 /bin/false
-install samsung-sxgbe /bin/false
 install sb1000 /bin/false
 install sbc60xxwdt /bin/false
 install sbc_epx_c3 /bin/false
@@ -4654,8 +4645,6 @@ install softing /bin/false
 install softing_cs /bin/false
 install solo6x10 /bin/false
 install solos-pci /bin/false
-install sony-btf-mpx /bin/false
-install sony-laptop /bin/false
 install soundwire-amd /bin/false
 install soundwire-bus /bin/false
 install soundwire-cadence /bin/false
@@ -4961,7 +4950,6 @@ install test_power /bin/false
 install tg3 /bin/false
 install thermal-generic-adc /bin/false
 install think-lmi /bin/false
-install thinkpad_acpi /bin/false
 install thmc50 /bin/false
 install thp7312 /bin/false
 install thunder_bgx /bin/false
@@ -5016,10 +5004,6 @@ install tmp421 /bin/false
 install tmp464 /bin/false
 install tmp513 /bin/false
 install topstar-laptop /bin/false
-install toshiba_acpi /bin/false
-install toshiba_bluetooth /bin/false
-install toshiba_haps /bin/false
-install toshiba-wmi /bin/false
 install toshsd /bin/false
 install touchit213 /bin/false
 install touchright /bin/false
diff --git a/etc/modprobe.d/vps-blacklist.conf b/etc/modprobe.d/vps-blacklist.conf
index 8f69764..8ba8a81 100644
--- a/etc/modprobe.d/vps-blacklist.conf
+++ b/etc/modprobe.d/vps-blacklist.conf
@@ -749,6 +749,17 @@ install dcdbas /bin/false
 install ddbridge /bin/false
 install ddbridge-dummy-fe /bin/false
 install de2104x /bin/false
+install dell-laptop /bin/false
+install dell-rbtn /bin/false
+install dell-smbios /bin/false
+install dell-smm-hwmon /bin/false
+install dell-smo8800 /bin/false
+install dell-wmi /bin/false
+install dell-wmi-aio /bin/false
+install dell-wmi-ddv /bin/false
+install dell-wmi-descriptor /bin/false
+install dell-wmi-led /bin/false
+install dell-wmi-sysman /bin/false
 install delta-ahe50dc-fan /bin/false
 install designware_i2s /bin/false
 install device_dax /bin/false
diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf
index 90c9c4d..afa4452 100644
--- a/etc/modprobe.d/workstation-blacklist.conf
+++ b/etc/modprobe.d/workstation-blacklist.conf
@@ -1475,7 +1475,6 @@ install hid-roccat-pyra /bin/false
 install hid-roccat-ryos /bin/false
 install hid-roccat-savu /bin/false
 install hid-saitek /bin/false
-install hid-samsung /bin/false
 install hid-semitek /bin/false
 install hid-sensor-accel-3d /bin/false
 install hid-sensor-als /bin/false
@@ -1491,7 +1490,6 @@ install hid-sensor-temperature /bin/false
 install hid-sensor-trigger /bin/false
 install hid-sigmamicro /bin/false
 install hid-sjoy /bin/false
-install hid-sony /bin/false
 install hid-speedlink /bin/false
 install hid-steam /bin/false
 install hid-steelseries /bin/false
@@ -1674,8 +1672,6 @@ install icp10100 /bin/false
 install icplus /bin/false
 install icssg-prueth /bin/false
 install icss_iep /bin/false
-install ideapad-laptop /bin/false
-install ideapad_slidebar /bin/false
 install idma64 /bin/false
 install idmouse /bin/false
 install idpf /bin/false
@@ -1970,7 +1966,6 @@ install ir-rc6-decoder /bin/false
 install ir-rcmm-decoder /bin/false
 install ir-sanyo-decoder /bin/false
 install ir-sharp-decoder /bin/false
-install ir-sony-decoder /bin/false
 install ir-spi /bin/false
 install ir_toy /bin/false
 install ir-usb /bin/false
@@ -2856,14 +2851,6 @@ install panel-raspberrypi-touchscreen /bin/false
 install panel-raydium-rm68200 /bin/false
 install panel-raydium-rm692e5 /bin/false
 install panel-ronbo-rb070d30 /bin/false
-install panel-samsung-atna33xc20 /bin/false
-install panel-samsung-db7430 /bin/false
-install panel-samsung-ld9040 /bin/false
-install panel-samsung-s6e3ha2 /bin/false
-install panel-samsung-s6e63j0x03 /bin/false
-install panel-samsung-s6e88a0-ams452ef01 /bin/false
-install panel-samsung-s6e8aa0 /bin/false
-install panel-samsung-sofef00 /bin/false
 install panel-seiko-43wvf1g /bin/false
 install panel-sharp-lq101r1sx01 /bin/false
 install panel-sharp-ls043t1le01 /bin/false
@@ -2871,7 +2858,6 @@ install panel-simple /bin/false
 install panel-sitronix-st7701 /bin/false
 install panel-sitronix-st7703 /bin/false
 install panel-sitronix-st7789v /bin/false
-install panel-sony-tulip-truly-nt35521 /bin/false
 install panel-startek-kd070fhfid015 /bin/false
 install panel-tpo-tpg110 /bin/false
 install panel-truly-nt35597 /bin/false
@@ -3782,9 +3768,6 @@ install saa717x /bin/false
 install saa7185 /bin/false
 install saa7706h /bin/false
 install safe_serial /bin/false
-install samsung-dsim /bin/false
-install samsung-laptop /bin/false
-install samsung-q10 /bin/false
 install sbc_fitpc2_wdt /bin/false
 install sb_edac /bin/false
 install sbp_target /bin/false
@@ -4578,8 +4561,6 @@ install socinfo /bin/false
 install softdog /bin/false
 install solo6x10 /bin/false
 install solos-pci /bin/false
-install sony-btf-mpx /bin/false
-install sony-laptop /bin/false
 install soundwire-amd /bin/false
 install soundwire-bus /bin/false
 install soundwire-cadence /bin/false
@@ -4922,7 +4903,6 @@ install teranetics /bin/false
 install tg3 /bin/false
 install thermal_mmio /bin/false
 install think-lmi /bin/false
-install thinkpad_acpi /bin/false
 install thmc50 /bin/false
 install ths7303 /bin/false
 install ths8200 /bin/false
@@ -4981,10 +4961,6 @@ install tmp421 /bin/false
 install tmp464 /bin/false
 install tmp513 /bin/false
 install topstar-laptop /bin/false
-install toshiba_acpi /bin/false
-install toshiba_bluetooth /bin/false
-install toshiba_haps /bin/false
-install toshiba-wmi /bin/false
 install toshsd /bin/false
 install touchit213 /bin/false
 install touchright /bin/false
diff --git a/generate-kmod-blacklist-aggregate.sh b/generate-kmod-blacklist-aggregate.sh
index 5b6e690..8817ad4 100755
--- a/generate-kmod-blacklist-aggregate.sh
+++ b/generate-kmod-blacklist-aggregate.sh
@@ -70,6 +70,16 @@ while read -r KMOD; do
 sed -i "s/.*${KMOD}.*//gm" blacklist.txt
 done < kmod-whitelist-all
 
+if [ "${dataset}" != 'vps' ]; then
+    while read -r KMOD; do
+    sed -i "s/^${KMOD}.*//gm" blacklist.txt
+    done < kmod-whitelist-hw-vendors-start
+
+    while read -r KMOD; do
+    sed -i "s/.*${KMOD}.*//gm" blacklist.txt
+    done < kmod-whitelist-hw-vendors-all
+fi
+
 # Delete empty lines
 sed -i '/^$/d' blacklist.txt
 
diff --git a/kmod-whitelist-hw-vendors-all b/kmod-whitelist-hw-vendors-all
new file mode 100644
index 0000000..952ee8f
--- /dev/null
+++ b/kmod-whitelist-hw-vendors-all
@@ -0,0 +1,3 @@
+samsung
+sony
+wmi
\ No newline at end of file
diff --git a/kmod-whitelist-hw-vendors-start b/kmod-whitelist-hw-vendors-start
new file mode 100644
index 0000000..e15118a
--- /dev/null
+++ b/kmod-whitelist-hw-vendors-start
@@ -0,0 +1,7 @@
+dell-
+dell_
+lg_laptop
+ideapad
+toshiba
+thinkpad
+system76
\ No newline at end of file
diff --git a/kmod-whitelist-start b/kmod-whitelist-start
index 21497d5..42a21b0 100644
--- a/kmod-whitelist-start
+++ b/kmod-whitelist-start
@@ -1,6 +1,4 @@
 cifs
-dell-
-dell_
 ebtables
 ebtable_
 ebt_