diff --git a/BoardConfig.mk b/BoardConfig.mk
index c92e703..be627dc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -88,7 +88,6 @@ BOARD_NO_CHARGER_LED := true
 
 # CMHW
 BOARD_USES_CYANOGEN_HARDWARE := true
-BOARD_HARDWARE_CLASS += hardware/cyanogen/cmhw
 
 # Crypto
 TARGET_HW_DISK_ENCRYPTION := true
diff --git a/device.mk b/device.mk
index 35f5e5a..ff765af 100644
--- a/device.mk
+++ b/device.mk
@@ -176,6 +176,14 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     lights.msm8953
 
+# Display Calibration
+PRODUCT_PACKAGES += \
+    libjni_livedisplay
+
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_boe_1080p_520.xml:system/etc/qdcm_calib_data_mipi_mot_vid_boe_1080p_520.xml \
+    $(LOCAL_PATH)/configs/qdcm_calib_data_mipi_mot_vid_tianma_1080p_520.xml:system/etc/qdcm_calib_data_mipi_mot_vid_tianma_1080p_520.xml
+
 # Media
 PRODUCT_PACKAGES += \
     libc2dcolorconvert
diff --git a/overlay/vendor/cmsdk/cm/res/res/values/config.xml b/overlay/vendor/cmsdk/cm/res/res/values/config.xml
index e4e43fd..bb1ca9f 100644
--- a/overlay/vendor/cmsdk/cm/res/res/values/config.xml
+++ b/overlay/vendor/cmsdk/cm/res/res/values/config.xml
@@ -50,7 +50,10 @@
         <item>Comfort:astronomy</item>
     </string-array>
 
+    <!-- Turn on LiveDisplay auto mode by default -->
+    <integer name="config_defaultLiveDisplayMode">0</integer>
+
     <!-- Should we filter any display modes which are unampped? -->
-    <bool name="config_filterDisplayModes">true</bool>
+    <bool name="config_filterDisplayModes">false</bool>
 
 </resources>