diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf
index d77f6da..c2bb4a7 100644
--- a/etc/modprobe.d/server-blacklist.conf
+++ b/etc/modprobe.d/server-blacklist.conf
@@ -856,43 +856,9 @@ install dm9601 /bin/false
 install dmard06 /bin/false
 install dmard09 /bin/false
 install dmard10 /bin/false
-install dm-bio-prison /bin/false
-install dm-bufio /bin/false
-install dm-cache /bin/false
-install dm-cache-smq /bin/false
-install dm-clone /bin/false
-install dm-crypt /bin/false
-install dm-delay /bin/false
-install dm-dust /bin/false
 install dme1737 /bin/false
-install dm-ebs /bin/false
-install dm-era /bin/false
 install dmfe /bin/false
-install dm-flakey /bin/false
-install dm-historical-service-time /bin/false
-install dm-integrity /bin/false
-install dm-io-affinity /bin/false
-install dm-log /bin/false
-install dm-log-userspace /bin/false
-install dm-log-writes /bin/false
-install dm-mirror /bin/false
-install dm-mod /bin/false
-install dm-multipath /bin/false
-install dm-persistent-data /bin/false
-install dm-queue-length /bin/false
-install dm-region-hash /bin/false
-install dm-round-robin /bin/false
-install dm-service-time /bin/false
-install dm-snapshot /bin/false
-install dm-switch /bin/false
-install dm-thin-pool /bin/false
-install dm-unstripe /bin/false
-install dm-vdo /bin/false
-install dm-verity /bin/false
-install dm-writecache /bin/false
 install dmx3191d /bin/false
-install dm-zero /bin/false
-install dm-zoned /bin/false
 install dnet /bin/false
 install dns_resolver /bin/false
 install dp83640 /bin/false
@@ -1385,58 +1351,6 @@ install hx8357d /bin/false
 install hycon-hy46xx /bin/false
 install hynitron_cstxxx /bin/false
 install i10nm_edac /bin/false
-install i2c-algo-bit /bin/false
-install i2c-algo-pca /bin/false
-install i2c-ali1535 /bin/false
-install i2c-ali1563 /bin/false
-install i2c-ali15x3 /bin/false
-install i2c-cbus-gpio /bin/false
-install i2c-cht-wc /bin/false
-install i2c-cp2615 /bin/false
-install i2c-cros-ec-tunnel /bin/false
-install i2c-dev /bin/false
-install i2c-diolan-u2c /bin/false
-install i2c-dln2 /bin/false
-install i2c-emev2 /bin/false
-install i2c-gpio /bin/false
-install i2c-hid /bin/false
-install i2c-hid-of /bin/false
-install i2c-i801 /bin/false
-install i2c-isch /bin/false
-install i2c-ismt /bin/false
-install i2c-kempld /bin/false
-install i2c-ljca /bin/false
-install i2c-mchp-pci1xxxx /bin/false
-install i2c-mlxcpld /bin/false
-install i2c-mux /bin/false
-install i2c-mux-gpio /bin/false
-install i2c-mux-ltc4306 /bin/false
-install i2c-mux-mlxcpld /bin/false
-install i2c-mux-pca9541 /bin/false
-install i2c-mux-pca954x /bin/false
-install i2c-mux-reg /bin/false
-install i2c-nforce2 /bin/false
-install i2c-nforce2-s4985 /bin/false
-install i2c-nvidia-gpu /bin/false
-install i2c-ocores /bin/false
-install i2c-parport /bin/false
-install i2c-pca-platform /bin/false
-install i2c-piix4 /bin/false
-install i2c-robotfuzz-osif /bin/false
-install i2c-scmi /bin/false
-install i2c-simtec /bin/false
-install i2c-sis5595 /bin/false
-install i2c-sis630 /bin/false
-install i2c-sis96x /bin/false
-install i2c-slave-eeprom /bin/false
-install i2c-slave-testunit /bin/false
-install i2c-smbus /bin/false
-install i2c-stub /bin/false
-install i2c-taos-evm /bin/false
-install i2c-via /bin/false
-install i2c-viapro /bin/false
-install i2c-viperboard /bin/false
-install i2c-xiic /bin/false
 install i3000_edac /bin/false
 install i3200_edac /bin/false
 install i40e /bin/false
@@ -1773,61 +1687,7 @@ install lanai /bin/false
 install lattice-ecp3-config /bin/false
 install lattice-sysconfig /bin/false
 install lattice-sysconfig-spi /bin/false
-install lcd /bin/false
 install lec /bin/false
-install led-class-flash /bin/false
-install led-class-multicolor /bin/false
-install leds-88pm860x /bin/false
-install leds-adp5520 /bin/false
-install leds-apu /bin/false
-install leds-as3645a /bin/false
-install leds-aw200xx /bin/false
-install leds-bd2606mvv /bin/false
-install leds-bd2802 /bin/false
-install leds-blinkm /bin/false
-install leds-cht-wcove /bin/false
-install leds-da903x /bin/false
-install leds-da9052 /bin/false
-install leds-dac124s085 /bin/false
-install leds-gpio /bin/false
-install leds-is31fl319x /bin/false
-install leds-lm3530 /bin/false
-install leds-lm3532 /bin/false
-install leds-lm3533 /bin/false
-install leds-lm355x /bin/false
-install leds-lm3601x /bin/false
-install leds-lm36274 /bin/false
-install leds-lm3642 /bin/false
-install leds-lp3944 /bin/false
-install leds-lp3952 /bin/false
-install leds-lp50xx /bin/false
-install leds-lp8788 /bin/false
-install leds-lt3593 /bin/false
-install leds-max8997 /bin/false
-install leds-mc13783 /bin/false
-install leds-menf21bmc /bin/false
-install leds-mlxcpld /bin/false
-install leds-mlxreg /bin/false
-install leds-mt6323 /bin/false
-install leds-mt6370-flash /bin/false
-install leds-mt6370-rgb /bin/false
-install leds-nic78bx /bin/false
-install leds-pca9532 /bin/false
-install leds-pca955x /bin/false
-install leds-pca963x /bin/false
-install leds-pca995x /bin/false
-install leds-pwm /bin/false
-install leds-pwm-multicolor /bin/false
-install leds-regulator /bin/false
-install leds-rt8515 /bin/false
-install leds-sgm3140 /bin/false
-install leds-ss4200 /bin/false
-install leds-tca6507 /bin/false
-install leds-ti-lmu-common /bin/false
-install leds-tlc591xx /bin/false
-install leds-tps6105x /bin/false
-install leds-wm831x-status /bin/false
-install leds-wm8350 /bin/false
 install lenovo-ymc /bin/false
 install lenovo-yogabook /bin/false
 install lg2160 /bin/false
diff --git a/etc/modprobe.d/vps-blacklist.conf b/etc/modprobe.d/vps-blacklist.conf
index 1f22ec1..f0c742e 100644
--- a/etc/modprobe.d/vps-blacklist.conf
+++ b/etc/modprobe.d/vps-blacklist.conf
@@ -779,36 +779,10 @@ install dm1105 /bin/false
 install dm9601 /bin/false
 install dma-axi-dmac /bin/false
 install dmard10 /bin/false
-install dm-bio-prison /bin/false
 install dmc520_edac /bin/false
-install dm-cache /bin/false
-install dm-cache-smq /bin/false
-install dm-clone /bin/false
-install dm-crypt /bin/false
-install dm-delay /bin/false
-install dm-dust /bin/false
 install dme1737 /bin/false
-install dm-ebs /bin/false
-install dm-era /bin/false
 install dmfe /bin/false
-install dm-flakey /bin/false
-install dm-historical-service-time /bin/false
-install dm-integrity /bin/false
-install dm-io-affinity /bin/false
-install dm-log-userspace /bin/false
-install dm-log-writes /bin/false
-install dm-multipath /bin/false
-install dm-persistent-data /bin/false
-install dm-queue-length /bin/false
-install dm-round-robin /bin/false
-install dm-service-time /bin/false
-install dm-switch /bin/false
-install dm-thin-pool /bin/false
-install dm-unstripe /bin/false
-install dm-verity /bin/false
-install dm-writecache /bin/false
 install dmx3191d /bin/false
-install dm-zoned /bin/false
 install dnet /bin/false
 install dns_resolver /bin/false
 install dp83640 /bin/false
diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf
index 6033298..d5c26b2 100644
--- a/etc/modprobe.d/workstation-blacklist.conf
+++ b/etc/modprobe.d/workstation-blacklist.conf
@@ -1227,45 +1227,11 @@ install dma-axi-dmac /bin/false
 install dmard06 /bin/false
 install dmard09 /bin/false
 install dmard10 /bin/false
-install dm-bio-prison /bin/false
-install dm-bufio /bin/false
 install dmc520_edac /bin/false
-install dm-cache /bin/false
-install dm-cache-smq /bin/false
-install dm-clone /bin/false
-install dm-crypt /bin/false
-install dm-delay /bin/false
-install dm-dust /bin/false
 install dme1737 /bin/false
-install dm-ebs /bin/false
-install dm-era /bin/false
 install dmfe /bin/false
-install dm-flakey /bin/false
-install dm-historical-service-time /bin/false
-install dm-integrity /bin/false
-install dm-io-affinity /bin/false
-install dm-log /bin/false
-install dm-log-userspace /bin/false
-install dm-log-writes /bin/false
 install dmm32at /bin/false
-install dm-mirror /bin/false
-install dm-mod /bin/false
-install dm-multipath /bin/false
-install dm-persistent-data /bin/false
-install dm-queue-length /bin/false
-install dm-region-hash /bin/false
-install dm-round-robin /bin/false
-install dm-service-time /bin/false
-install dm-snapshot /bin/false
-install dm-switch /bin/false
-install dm-thin-pool /bin/false
-install dm-unstripe /bin/false
-install dm-vdo /bin/false
-install dm-verity /bin/false
-install dm-writecache /bin/false
 install dmx3191d /bin/false
-install dm-zero /bin/false
-install dm-zoned /bin/false
 install dnet /bin/false
 install dp83640 /bin/false
 install dp83822 /bin/false
@@ -2129,101 +2095,6 @@ install hycon-hy46xx /bin/false
 install hynitron_cstxxx /bin/false
 install hyperbus-core /bin/false
 install i10nm_edac /bin/false
-install i2c-algo-bit /bin/false
-install i2c-algo-pca /bin/false
-install i2c-ali1535 /bin/false
-install i2c-ali1563 /bin/false
-install i2c-ali15x3 /bin/false
-install i2c-altera /bin/false
-install i2c-arb-gpio-challenge /bin/false
-install i2c-atr /bin/false
-install i2c-bcm2835 /bin/false
-install i2c-cadence /bin/false
-install i2c-cbus-gpio /bin/false
-install i2c-ccgx-ucsi /bin/false
-install i2c-cht-wc /bin/false
-install i2c-cp2615 /bin/false
-install i2c-cros-ec-tunnel /bin/false
-install i2c-demux-pinctrl /bin/false
-install i2c-designware-pci /bin/false
-install i2c-dev /bin/false
-install i2c-diolan-u2c /bin/false
-install i2c-dln2 /bin/false
-install i2c-emev2 /bin/false
-install i2c-fsi /bin/false
-install i2c-gpio /bin/false
-install i2c-hid /bin/false
-install i2c-hid-of /bin/false
-install i2c-hid-of-elan /bin/false
-install i2c-hid-of-goodix /bin/false
-install i2c-hisi /bin/false
-install i2c-hix5hd2 /bin/false
-install i2c-i801 /bin/false
-install i2c-imx /bin/false
-install i2c-imx-lpi2c /bin/false
-install i2c-isch /bin/false
-install i2c-ismt /bin/false
-install i2c-kempld /bin/false
-install i2c-ljca /bin/false
-install i2c-matroxfb /bin/false
-install i2c-mchp-pci1xxxx /bin/false
-install i2c-meson /bin/false
-install i2c-mlxbf /bin/false
-install i2c-mlxcpld /bin/false
-install i2c-mt65xx /bin/false
-install i2c-mux /bin/false
-install i2c-mux-gpio /bin/false
-install i2c-mux-gpmux /bin/false
-install i2c-mux-ltc4306 /bin/false
-install i2c-mux-mlxcpld /bin/false
-install i2c-mux-pca9541 /bin/false
-install i2c-mux-pca954x /bin/false
-install i2c-mux-pinctrl /bin/false
-install i2c-mux-reg /bin/false
-install i2c-mv64xxx /bin/false
-install i2c-nforce2 /bin/false
-install i2c-nforce2-s4985 /bin/false
-install i2c-nomadik /bin/false
-install i2c-npcm7xx /bin/false
-install i2c-ocores /bin/false
-install i2c-omap /bin/false
-install i2c-owl /bin/false
-install i2c-parport /bin/false
-install i2c-pasemi-core /bin/false
-install i2c-pasemi-platform /bin/false
-install i2c-pca-platform /bin/false
-install i2c-piix4 /bin/false
-install i2c-pxa /bin/false
-install i2c-qup /bin/false
-install i2c-rcar /bin/false
-install i2c-riic /bin/false
-install i2c-rk3x /bin/false
-install i2c-robotfuzz-osif /bin/false
-install i2c-rzv2m /bin/false
-install i2c-scmi /bin/false
-install i2c-sh_mobile /bin/false
-install i2c-simtec /bin/false
-install i2c-sis5595 /bin/false
-install i2c-sis630 /bin/false
-install i2c-sis96x /bin/false
-install i2c-slave-eeprom /bin/false
-install i2c-slave-testunit /bin/false
-install i2c-smbus /bin/false
-install i2c-stm32f4 /bin/false
-install i2c-stm32f7-drv /bin/false
-install i2c-stub /bin/false
-install i2c-synquacer /bin/false
-install i2c-taos-evm /bin/false
-install i2c-tegra /bin/false
-install i2c-tegra-bpmp /bin/false
-install i2c-thunderx /bin/false
-install i2c-versatile /bin/false
-install i2c-via /bin/false
-install i2c-viapro /bin/false
-install i2c-viperboard /bin/false
-install i2c-xgene-slimpro /bin/false
-install i2c-xiic /bin/false
-install i2c-xlp9xx /bin/false
 install i3000_edac /bin/false
 install i3200_edac /bin/false
 install i3c /bin/false
@@ -2667,90 +2538,7 @@ install lattice-ecp3-config /bin/false
 install lattice-sysconfig /bin/false
 install lattice-sysconfig-spi /bin/false
 install layerscape_edac_mod /bin/false
-install lcd /bin/false
-install lcd2s /bin/false
 install lec /bin/false
-install led_bl /bin/false
-install led-class-flash /bin/false
-install led-class-multicolor /bin/false
-install leds-88pm860x /bin/false
-install leds-aat1290 /bin/false
-install leds-adp5520 /bin/false
-install leds-an30259a /bin/false
-install leds-apu /bin/false
-install leds-as3645a /bin/false
-install leds-aw200xx /bin/false
-install leds-aw2013 /bin/false
-install leds-bcm6328 /bin/false
-install leds-bcm6358 /bin/false
-install leds-bd2606mvv /bin/false
-install leds-bd2802 /bin/false
-install leds-blinkm /bin/false
-install leds-cht-wcove /bin/false
-install leds-cpcap /bin/false
-install leds-cr0014114 /bin/false
-install leds-da903x /bin/false
-install leds-da9052 /bin/false
-install leds-dac124s085 /bin/false
-install leds-el15203000 /bin/false
-install leds-gpio /bin/false
-install leds-group-multicolor /bin/false
-install leds-is31fl319x /bin/false
-install leds-is31fl32xx /bin/false
-install leds-ktd202x /bin/false
-install leds-ktd2692 /bin/false
-install leds-lm3530 /bin/false
-install leds-lm3532 /bin/false
-install leds-lm3533 /bin/false
-install leds-lm355x /bin/false
-install leds-lm3601x /bin/false
-install leds-lm36274 /bin/false
-install leds-lm3642 /bin/false
-install leds-lm3692x /bin/false
-install leds-lm3697 /bin/false
-install leds-lp3944 /bin/false
-install leds-lp3952 /bin/false
-install leds-lp50xx /bin/false
-install leds-lp5521 /bin/false
-install leds-lp5523 /bin/false
-install leds-lp5562 /bin/false
-install leds-lp55xx-common /bin/false
-install leds-lp8501 /bin/false
-install leds-lp8788 /bin/false
-install leds-lp8860 /bin/false
-install leds-lt3593 /bin/false
-install leds-max5970 /bin/false
-install leds-max77650 /bin/false
-install leds-max77693 /bin/false
-install leds-max8997 /bin/false
-install leds-mc13783 /bin/false
-install leds-menf21bmc /bin/false
-install leds-mlxcpld /bin/false
-install leds-mlxreg /bin/false
-install leds-mt6323 /bin/false
-install leds-mt6360 /bin/false
-install leds-mt6370-flash /bin/false
-install leds-mt6370-rgb /bin/false
-install leds-nic78bx /bin/false
-install leds-pca9532 /bin/false
-install leds-pca955x /bin/false
-install leds-pca963x /bin/false
-install leds-pca995x /bin/false
-install leds-pwm /bin/false
-install leds-pwm-multicolor /bin/false
-install leds-regulator /bin/false
-install leds-rt4505 /bin/false
-install leds-rt8515 /bin/false
-install leds-sc27xx-bltc /bin/false
-install leds-sgm3140 /bin/false
-install leds-spi-byte /bin/false
-install leds-ss4200 /bin/false
-install leds-tca6507 /bin/false
-install leds-ti-lmu-common /bin/false
-install leds-tlc591xx /bin/false
-install leds-tps6105x /bin/false
-install leds-wm831x-status /bin/false
-install leds-wm8350 /bin/false
 install lenovo-ymc /bin/false
 install lenovo-yogabook /bin/false
 install lg2160 /bin/false
diff --git a/kmod-whitelist-bare-metal-start b/kmod-whitelist-bare-metal-start
index d65f16f..743b61f 100644
--- a/kmod-whitelist-bare-metal-start
+++ b/kmod-whitelist-bare-metal-start
@@ -1,4 +1,7 @@
 dell-
 dell_
+i2c
+lcd
+led
 ledtrig
 processor_thermal
diff --git a/kmod-whitelist-start b/kmod-whitelist-start
index b1ee14b..fae7a22 100644
--- a/kmod-whitelist-start
+++ b/kmod-whitelist-start
@@ -3,6 +3,7 @@ arp_tables
 arpt_mangle
 btrfs
 cifs
+dm-
 dm_
 ebtables
 ebtable_