diff --git a/device.mk b/device.mk
index 3ccd6ed..2b9f62a 100644
--- a/device.mk
+++ b/device.mk
@@ -121,6 +121,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \
     frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml
 
+# Dex
+PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER := everything
+
 # Display
 PRODUCT_PACKAGES += \
     disable_configstore \
diff --git a/system.prop b/system.prop
index 46aa3e5..cbcd5ad 100644
--- a/system.prop
+++ b/system.prop
@@ -1,3 +1,7 @@
+# ART
+dalvik.vm.dex2oat-filter=everything
+dalvik.vm.image-dex2oat-filter=everything
+
 # Audio
 media.stagefright.audio.sink=384
 af.fast.track.multiplier=2