diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 221c27a..add6390 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -57,7 +57,7 @@ SYSTEM="video"
 SERIAL="ttyO0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 
 conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
 #
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 960f3d4..43957bb 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -58,7 +58,7 @@ SERIAL="ttyO0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 conf_optargs="capemgr.disable_partno=BB-BONE-EMMC-2G"
-USE_KMS=1
+di_kms_mode=enable
 
 conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power."
 #
diff --git a/hwpack/imx51-babbage.conf b/hwpack/imx51-babbage.conf
index a27ca2c..09fc447 100644
--- a/hwpack/imx51-babbage.conf
+++ b/hwpack/imx51-babbage.conf
@@ -58,5 +58,5 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 di_serial_mode=enable
diff --git a/hwpack/imx53-qsb.conf b/hwpack/imx53-qsb.conf
index 60aa5de..ade11cc 100644
--- a/hwpack/imx53-qsb.conf
+++ b/hwpack/imx53-qsb.conf
@@ -59,5 +59,5 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="VGA-1"
diff --git a/hwpack/imx53-qsrb.conf b/hwpack/imx53-qsrb.conf
index b8644d3..221f7ff 100644
--- a/hwpack/imx53-qsrb.conf
+++ b/hwpack/imx53-qsrb.conf
@@ -59,5 +59,5 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="VGA-1"
diff --git a/hwpack/imx6dl-udoo.conf b/hwpack/imx6dl-udoo.conf
index 9a625ff..7513726 100644
--- a/hwpack/imx6dl-udoo.conf
+++ b/hwpack/imx6dl-udoo.conf
@@ -60,5 +60,5 @@ SYSTEM="video"
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
diff --git a/hwpack/imx6q-sabrelite.conf b/hwpack/imx6q-sabrelite.conf
index 982049b..45b106b 100644
--- a/hwpack/imx6q-sabrelite.conf
+++ b/hwpack/imx6q-sabrelite.conf
@@ -54,6 +54,6 @@ SYSTEM="video"
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 
 conf_note_bootloader="http://eewiki.net/display/linuxonarm/i.MX6x+SABRE+Lite+SPI+Flash+Recovery"
diff --git a/hwpack/imx6q-sabresd.conf b/hwpack/imx6q-sabresd.conf
index fee381b..bad97a9 100644
--- a/hwpack/imx6q-sabresd.conf
+++ b/hwpack/imx6q-sabresd.conf
@@ -59,6 +59,6 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 #video broken...
 di_serial_mode=enable
diff --git a/hwpack/imx6q-udoo.conf b/hwpack/imx6q-udoo.conf
index df9a4c5..7b1869f 100644
--- a/hwpack/imx6q-udoo.conf
+++ b/hwpack/imx6q-udoo.conf
@@ -60,5 +60,5 @@ SYSTEM="video"
 SERIAL="ttymxc1"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
diff --git a/hwpack/omap3-beagle-xm.conf b/hwpack/omap3-beagle-xm.conf
index 6aa0a25..879300f 100644
--- a/hwpack/omap3-beagle-xm.conf
+++ b/hwpack/omap3-beagle-xm.conf
@@ -57,5 +57,5 @@ SYSTEM="video"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
diff --git a/hwpack/omap3-beagle.conf b/hwpack/omap3-beagle.conf
index 09406ca..900deeb 100644
--- a/hwpack/omap3-beagle.conf
+++ b/hwpack/omap3-beagle.conf
@@ -57,6 +57,6 @@ SYSTEM="video-musb"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
 di_serial_mode=enable
diff --git a/hwpack/omap4-panda-a4.conf b/hwpack/omap4-panda-a4.conf
index a8fe602..3bf57e3 100644
--- a/hwpack/omap4-panda-a4.conf
+++ b/hwpack/omap4-panda-a4.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
 di_serial_mode=enable
diff --git a/hwpack/omap4-panda-es.conf b/hwpack/omap4-panda-es.conf
index 4306bec..a9b7b59 100644
--- a/hwpack/omap4-panda-es.conf
+++ b/hwpack/omap4-panda-es.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
 di_serial_mode=enable
diff --git a/hwpack/omap4-panda.conf b/hwpack/omap4-panda.conf
index aaad78e..2efc1fe 100644
--- a/hwpack/omap4-panda.conf
+++ b/hwpack/omap4-panda.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="DVI-D-1"
 di_serial_mode=enable
diff --git a/hwpack/omap5-uevm.conf b/hwpack/omap5-uevm.conf
index ed8b7fb..2af5ff5 100644
--- a/hwpack/omap5-uevm.conf
+++ b/hwpack/omap5-uevm.conf
@@ -61,6 +61,6 @@ SYSTEM="video"
 SERIAL="ttyO2"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
 di_serial_mode=enable
diff --git a/hwpack/wandboard-dual.conf b/hwpack/wandboard-dual.conf
index ee11e22..133a244 100644
--- a/hwpack/wandboard-dual.conf
+++ b/hwpack/wandboard-dual.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
 drm_read_edid_broken="enable"
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
index 75ba5f8..4758ba1 100644
--- a/hwpack/wandboard-quad.conf
+++ b/hwpack/wandboard-quad.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
 drm_read_edid_broken="enable"
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index ebbb6ca..5bb57ef 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -60,6 +60,6 @@ SYSTEM="video"
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-USE_KMS=1
+di_kms_mode=enable
 drm_device_identifier="HDMI-A-1"
 drm_read_edid_broken="enable"
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 3fb87a7..f5e37b7 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -491,7 +491,7 @@ tweak_boot_scripts () {
 	#Set the Serial Console
 	sed -i -e 's:SERIAL_CONSOLE:'$SERIAL_CONSOLE':g' ${TEMPDIR}/bootscripts/${ALL}
 
-	if [ "${USE_KMS}" ] && [ ! "x${di_serial_mode}" = "xenable" ] ; then
+	if [ "x${di_kms_mode}" = "xenable" ] && [ ! "x${di_serial_mode}" = "xenable" ] ; then
 		#optargs=VIDEO_CONSOLE
 		sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${ALL}
 
@@ -510,7 +510,7 @@ tweak_boot_scripts () {
 		sed -i -e 's:kms_force_mode:#kms_force_mode:g' ${TEMPDIR}/bootscripts/${NET}
 
 		#Unlike the debian-installer, normal boot will boot fine with the display enabled...
-		if [ "${USE_KMS}" ] ; then
+		if [ "x${di_kms_mode}" = "xenable" ] ; then
 			#optargs=VIDEO_CONSOLE
 			sed -i -e 's:VIDEO_CONSOLE:console=tty0:g' ${TEMPDIR}/bootscripts/${FINAL}
 		fi