diff --git a/config/common.mk b/config/common.mk
index 2b1e0cd..0f6800a 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -10,15 +10,15 @@
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=android-google
 else
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
 # general properties
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
@@ -27,7 +27,7 @@
 
 # Tethering - allow without requiring a provisioning app
 # (for devices that check this)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     net.tethering.noprovisioning=true
 
 # enable ADB authentication if not on eng build
@@ -36,7 +36,7 @@
 endif
 
 # Enforce privapp-permissions whitelist
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.control_privapp_permissions=enforce
 
 PRODUCT_COPY_FILES += \
@@ -74,7 +74,7 @@
     vendor/omni/prebuilt/etc/permissions/privapp-permissions-elgoog.xml:system/etc/permissions/privapp-permissions-elgoog.xml
 
 # custom omni sounds
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.ringtone=omni_ringtone1.ogg \
     ro.config.notification_sound=omni_notification1.ogg \
     ro.config.alarm_alert=omni_alarm1.ogg
@@ -99,7 +99,7 @@
     vendor/omni/prebuilt/etc/mkshrc:system/etc/mkshrc
 
 # whitelist packages for location providers not in system
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.services.whitelist.packagelist=com.google.android.gms
 
 # Additional packages
@@ -110,30 +110,3 @@
 
 # Add our overlays
 DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
-
-# Enable dexpreopt for all nightlies
-ifeq ($(ROM_BUILDTYPE),NIGHTLY)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-        WITH_DEXPREOPT_PIC := true
-    endif
-endif
-# and weeklies
-ifeq ($(ROM_BUILDTYPE),WEEKLY)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-        WITH_DEXPREOPT_PIC := true
-    endif
-endif
-# and security releases
-ifeq ($(ROM_BUILDTYPE),SECURITY_RELEASE)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-        WITH_DEXPREOPT_PIC := true
-    endif
-endif
-# but not homemades
-ifeq ($(ROM_BUILDTYPE),HOMEMADE)
-    WITH_DEXPREOPT := true
-    WITH_DEXPREOPT_PIC := true
-endif
diff --git a/config/packages.mk b/config/packages.mk
index e3bc832..3731b3a 100644
--- a/config/packages.mk
+++ b/config/packages.mk
@@ -1,19 +1,21 @@
 # Additional apps
 PRODUCT_PACKAGES += \
     MonthCalendarWidget \
-    OpenDelta \
     OmniSwitch \
     Chromium \
     OmniJaws \
     OmniStyle \
     OmniClockOSS \
     MusicFX \
+    Phonograph \
+    MatLog \
+    OmniChange
+
+#PRODUCT_PACKAGES += \
+    OpenDelta \
     audio_effects.conf \
     libcyanogen-dsp \
-    Phonograph \
     Turbo \
-    MatLog \
-    OmniChange \
     OmniBrain
 
 # Additional tools
@@ -83,7 +85,7 @@
     PrimaryDarkBlue
 
 # Textclassifiers
-PRODUCT_PACKAGES += \
+#PRODUCT_PACKAGES += \
     textclassifier.langid.model \
     textclassifier.smartselection.bundle1 \
     textclassifier.smartselection.ar.model \
@@ -96,12 +98,12 @@
     textclassifier.smartselection.zh.model \
     textclassifier.smartselection.zh-Hant.model
 
-PRODUCT_PACKAGES += \
+#PRODUCT_PACKAGES += \
     Launcher3Dark
 
 # for fun
 PRODUCT_PACKAGES += \
     EggGame
 
-PRODUCT_PACKAGES += \
+#PRODUCT_PACKAGES += \
     ExtraFonts
diff --git a/config/phone-xxhdpi-2048-dalvik-heap.mk b/config/phone-xxhdpi-2048-dalvik-heap.mk
index 9489593..c79c250 100644
--- a/config/phone-xxhdpi-2048-dalvik-heap.mk
+++ b/config/phone-xxhdpi-2048-dalvik-heap.mk
@@ -17,7 +17,7 @@
 # Provides overrides to configure the Dalvik heap for a 2G phone
 # 192m of RAM gives enough space for 5 8 megapixel camera bitmaps in RAM.
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=192m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxhdpi-2048-hwui-memory.mk b/config/phone-xxhdpi-2048-hwui-memory.mk
index b4226bc..22e5343 100644
--- a/config/phone-xxhdpi-2048-hwui-memory.mk
+++ b/config/phone-xxhdpi-2048-hwui-memory.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the HWUI memory limits
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.hwui.texture_cache_size=72 \
     ro.hwui.layer_cache_size=48 \
     ro.hwui.r_buffer_cache_size=8 \
diff --git a/config/phone-xxhdpi-4096-dalvik-heap.mk b/config/phone-xxhdpi-4096-dalvik-heap.mk
index 469c278..c865ddb 100644
--- a/config/phone-xxhdpi-4096-dalvik-heap.mk
+++ b/config/phone-xxhdpi-4096-dalvik-heap.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the Dalvik heap for a 3G phone
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=256m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxxhdpi-3072-dalvik-heap.mk b/config/phone-xxxhdpi-3072-dalvik-heap.mk
index 7127ff4..3d4ed79 100644
--- a/config/phone-xxxhdpi-3072-dalvik-heap.mk
+++ b/config/phone-xxxhdpi-3072-dalvik-heap.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the Dalvik heap for a 3G phone
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     dalvik.vm.heapstartsize=16m \
     dalvik.vm.heapgrowthlimit=256m \
     dalvik.vm.heapsize=512m \
diff --git a/config/phone-xxxhdpi-3072-hwui-memory.mk b/config/phone-xxxhdpi-3072-hwui-memory.mk
index 8123fa0..fbe8df5 100644
--- a/config/phone-xxxhdpi-3072-hwui-memory.mk
+++ b/config/phone-xxxhdpi-3072-hwui-memory.mk
@@ -16,7 +16,7 @@
 
 # Provides overrides to configure the HWUI memory limits
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.hwui.texture_cache_size=88 \
     ro.hwui.layer_cache_size=58 \
     ro.hwui.path_cache_size=32 \
diff --git a/config/version.mk b/config/version.mk
index 62cba49..97e5de9 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -19,10 +19,10 @@
 endif
 
 # Apply it to build.prop
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.modversion=OmniROM-$(ROM_VERSION) \
     ro.omni.version=$(ROM_VERSION)
 
 ROM_FINGERPRINT := OmniROM/$(PLATFORM_VERSION)/$(TARGET_PRODUCT_SHORT)/$(shell date +%Y%m%d.%H:%M)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.omni.fingerprint=$(ROM_FINGERPRINT)
diff --git a/google/Android.mk b/google/Android.mk
index 20bfbaf..389e8be 100644
--- a/google/Android.mk
+++ b/google/Android.mk
@@ -25,4 +25,4 @@
 # if some modules are built directly from this directory (not subdirectories),
 # their rules should be written here.
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+#include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
index f3dfcf6..af09559 100644
--- a/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/common/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -27,4 +27,8 @@
     <!-- Control whether status bar should distinguish HSPA data icon form UMTS
     data icon on devices -->
     <bool name="config_hspa_data_distinguishable">true</bool>
+
+    <!-- let people decide if they want keyguard shortcuts or not -->
+    <bool name="config_keyguardShowLeftAffordance">true</bool>
+    <bool name="config_keyguardShowCameraAffordance">true</bool>
 </resources>
diff --git a/sepolicy/common/adbd.te b/sepolicy/common/adbd.te
deleted file mode 100644
index 9546c1a..0000000
--- a/sepolicy/common/adbd.te
+++ /dev/null
@@ -1 +0,0 @@
-set_prop(adbd, ctl_mdnsd_prop);
diff --git a/sepolicy/common/app.te b/sepolicy/common/app.te
deleted file mode 100644
index f76d836..0000000
--- a/sepolicy/common/app.te
+++ /dev/null
@@ -1,5 +0,0 @@
-# Access OBBs (sdcard_posix) mounted by vold
-# File write access allowed for FDs returned through Storage Access Framework
-#allow appdomain sdcard_posix:dir r_dir_perms;
-#allow appdomain sdcard_posix:file rw_file_perms;
-
diff --git a/sepolicy/common/drmserver.te b/sepolicy/common/drmserver.te
deleted file mode 100644
index b7f4f3f..0000000
--- a/sepolicy/common/drmserver.te
+++ /dev/null
@@ -1 +0,0 @@
-allow drmserver fuse_device:file r_file_perms;
diff --git a/sepolicy/common/file.te b/sepolicy/common/file.te
deleted file mode 100644
index 52c58d8..0000000
--- a/sepolicy/common/file.te
+++ /dev/null
@@ -1,12 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-#type sysfs_ioscheduler, fs_type, sysfs_type;
-#type sysfs_zram, fs_type, sysfs_type;
-#type sysfs_ksm, fs_type, sysfs_type;
-type debugsfs_wakelock, fs_type, debugfs_type;
-# Filesystems
-type exfat, sdcard_type, fs_type, mlstrustedobject;
-#type fuse_device, sdcard_type, fs_type, mlstrustedobject;
-type ntfs, sdcard_type, fs_type, mlstrustedobject;
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
deleted file mode 100644
index 1233804..0000000
--- a/sepolicy/common/file_contexts
+++ /dev/null
@@ -1,21 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-# performance-related sysfs files
-/sys/block/zram(/.*)?       u:object_r:sysfs_zram:s0
-
-# mkfs
-/system/bin/mkfs\.exfat   u:object_r:mkfs_exec:s0
-/system/bin/mkfs\.ntfs    u:object_r:mkfs_exec:s0
-
-# fsck
-/system/bin/fsck\.ntfs                          u:object_r:fsck_exec:s0
-/system/bin/fsck\.exfat                          u:object_r:fsck_exec:s0
-
-# mount
-/system/bin/mount\.exfat                         u:object_r:fsck_exec:s0
-/system/bin/mount\.ntfs                         u:object_r:fsck_exec:s0
-
-# wakelocks
-/sys/kernel/debug/wakeup_sources     u:object_r:debugsfs_wakelock:s0
diff --git a/sepolicy/common/fsck_untrusted.te b/sepolicy/common/fsck_untrusted.te
deleted file mode 100644
index c1ba526..0000000
--- a/sepolicy/common/fsck_untrusted.te
+++ /dev/null
@@ -1,19 +0,0 @@
-# External storage
-allow fsck_untrusted self:capability sys_admin;
-
-#OTG Mount
-allow fsck_untrusted mnt_media_rw_stub_file:dir { rw_file_perms mounton };
-allow fsck_untrusted mnt_media_rw_file:dir rw_dir_perms;
-allow fsck_untrusted mnt_media_rw_file:file rw_file_perms;
-allow fsck_untrusted fuse_device:chr_file { read write open getattr };
-allow fsck_untrusted fuse_device:filesystem mount;
-allow fsck_untrusted block_device:dir getattr;
-allow fsck_untrusted media_rw_data_file:dir { search getattr };
-allow fsck_untrusted tmpfs:dir { search };
-
-allow fsck_untrusted toolbox_exec:file entrypoint;
-allow fsck_untrusted toolbox_exec:file r_file_perms;
-allow fsck_untrusted exfat:filesystem mount;
-allow fsck_untrusted self:capability sys_rawio;
-allow fsck_untrusted ntfs:filesystem mount;
-
diff --git a/sepolicy/common/fuse_device.te b/sepolicy/common/fuse_device.te
deleted file mode 100644
index b8e1631..0000000
--- a/sepolicy/common/fuse_device.te
+++ /dev/null
@@ -1,6 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-#Exfat OTG
-allow fuse_device self:filesystem associate;
-
diff --git a/sepolicy/common/genfs_contexts b/sepolicy/common/genfs_contexts
deleted file mode 100644
index a9d564a..0000000
--- a/sepolicy/common/genfs_contexts
+++ /dev/null
@@ -1,9 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-# treat fuseblk as sdcard_external
-genfscon fuseblk / u:object_r:fuse_device:s0
-genfscon exfat / u:object_r:exfat:s0
-genfscon ntfs / u:object_r:ntfs:s0
-genfscon sdcard_posix / u:object_r:sdcard_posix:s0
diff --git a/sepolicy/common/healthd.te b/sepolicy/common/healthd.te
deleted file mode 100644
index 4711cf5..0000000
--- a/sepolicy/common/healthd.te
+++ /dev/null
@@ -1 +0,0 @@
-allow healthd self:capability { dac_override dac_read_search };
diff --git a/sepolicy/common/init.te b/sepolicy/common/init.te
deleted file mode 100644
index 0fef3e7..0000000
--- a/sepolicy/common/init.te
+++ /dev/null
@@ -1,6 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-# damn!
-#allow init sysfs_ioscheduler:file rw_file_perms;
diff --git a/sepolicy/common/installd.te b/sepolicy/common/installd.te
deleted file mode 100644
index cef2730..0000000
--- a/sepolicy/common/installd.te
+++ /dev/null
@@ -1,4 +0,0 @@
-# Allow querying of asec size on SD card
-allow installd sdcard_type:dir { search };
-allow installd sdcard_type:file { getattr };
-allow installd sdcard_posix:filesystem quotaget;
diff --git a/sepolicy/common/isolated_app.te b/sepolicy/common/isolated_app.te
deleted file mode 100644
index 8fb3a60..0000000
--- a/sepolicy/common/isolated_app.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow isolated_app app_data_file:dir { search getattr };
-allow isolated_app shell_data_file:dir search;
diff --git a/sepolicy/common/mediaprovider.te b/sepolicy/common/mediaprovider.te
deleted file mode 100644
index 201692f..0000000
--- a/sepolicy/common/mediaprovider.te
+++ /dev/null
@@ -1,6 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-# non-fuse sdcard mediaprovider access
-allow mediaprovider sdcard_posix:dir r_dir_perms;
-allow mediaprovider sdcard_posix:file r_file_perms;
diff --git a/sepolicy/common/mediaserver.te b/sepolicy/common/mediaserver.te
deleted file mode 100644
index 356219e..0000000
--- a/sepolicy/common/mediaserver.te
+++ /dev/null
@@ -1,5 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-#exfat OTG
-allow mediaserver fuse_device:file { read getattr };
diff --git a/sepolicy/common/mkfs.te b/sepolicy/common/mkfs.te
deleted file mode 100644
index 6b35e95..0000000
--- a/sepolicy/common/mkfs.te
+++ /dev/null
@@ -1,11 +0,0 @@
-type mkfs, domain;
-type mkfs_exec, exec_type, file_type;
-
-not_full_treble(`
-   init_daemon_domain(mkfs);
-')
-
-# Allow formatting userdata or cache partitions
-allow mkfs block_device:dir search;
-allow mkfs userdata_block_device:blk_file rw_file_perms;
-allow mkfs cache_block_device:blk_file rw_file_perms;
diff --git a/sepolicy/common/platform_app.te b/sepolicy/common/platform_app.te
deleted file mode 100644
index bb66d50..0000000
--- a/sepolicy/common/platform_app.te
+++ /dev/null
@@ -1,26 +0,0 @@
-# Direct access to vold-mounted storage under /mnt/media_rw
-# This is a performance optimization that allows platform apps to bypass the FUSE layer
-#allow platform_app sdcard_posix:dir create_dir_perms;
-#allow platform_app sdcard_posix:file create_file_perms;
-
-# gallery2 crop avatar
-allow platform_app system_app_data_file:file { create_file_perms rw_file_perms };
-
-# gallery2 renderscript
-allow platform_app app_data_file:file { execute };
-
-#exfat/ntfs OTG
-allow platform_app fuse_device:dir { rw_dir_perms create_dir_perms };
-allow platform_app fuse_device:file { rw_file_perms create_file_perms };
-allow platform_app fuse_device:filesystem getattr;
-
-# MatLog calls dmesg
-allow platform_app kernel:system syslog_read;
-
-# no-fuse
-allow platform_app exfat:dir { rw_dir_perms create_dir_perms };
-allow platform_app exfat:file { rw_file_perms create_file_perms };
-allow platform_app ntfs:dir { rw_dir_perms create_dir_perms };
-allow platform_app ntfs:file { rw_file_perms create_file_perms };
-allow platform_app sdcard_posix:dir create_dir_perms;
-allow platform_app sdcard_posix:file create_file_perms;
diff --git a/sepolicy/common/priv_app.te b/sepolicy/common/priv_app.te
deleted file mode 100644
index 3178323..0000000
--- a/sepolicy/common/priv_app.te
+++ /dev/null
@@ -1,15 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-# exfat
-allow priv_app fuse_device:dir { search r_file_perms };
-allow priv_app fuse_device:file r_file_perms;
-allow priv_app fuse_device:filesystem { getattr };
-
-# posix-type fs
-allow priv_app sdcard_posix:dir r_dir_perms;
-allow priv_app sdcard_posix:file rw_file_perms;
-
-# MatLog calls dmesg
-allow priv_app kernel:system syslog_read;
-
diff --git a/sepolicy/common/sdcardd.te b/sepolicy/common/sdcardd.te
deleted file mode 100644
index 4afc302..0000000
--- a/sepolicy/common/sdcardd.te
+++ /dev/null
@@ -1,7 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-# exfat
-allow sdcardd fuse_device:dir { remove_name add_name search create rw_file_perms };
-allow sdcardd fuse_device:file { rename unlink create rw_file_perms };
-allow sdcardd fuse_device:filesystem { getattr };
diff --git a/sepolicy/common/system_app.te b/sepolicy/common/system_app.te
deleted file mode 100644
index bff1e64..0000000
--- a/sepolicy/common/system_app.te
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-allow system_app sysfs_lowmemorykiller:file rw_file_perms;
-
-# Read /sys/kernel/debug/wakeup_sources.
-allow system_app debugsfs_wakelock:file r_file_perms;
-
-#selinux status
-allow system_app selinuxfs:file r_file_perms;
-
-
diff --git a/sepolicy/common/system_server.te b/sepolicy/common/system_server.te
deleted file mode 100644
index 52d9291..0000000
--- a/sepolicy/common/system_server.te
+++ /dev/null
@@ -1,5 +0,0 @@
-allow system_server storage_stub_file:dir { getattr };
-set_prop(system_server, shell_prop)
-
-#batterystats
-allow system_server debugsfs_wakelock:file { read open getattr };
diff --git a/sepolicy/common/ueventd.te b/sepolicy/common/ueventd.te
deleted file mode 100644
index fc0fb23..0000000
--- a/sepolicy/common/ueventd.te
+++ /dev/null
@@ -1,8 +0,0 @@
-# ueventd needs to relabel files that pop in and out of sysfs
-allow ueventd sysfs:file relabelfrom;
-# ueventd will set permissions on cpufreq nodes
-allow ueventd sysfs_devices_system_cpu:file setattr;
-
-# ueventd loads audio firmware on many devices
-allow ueventd audio_data_file:dir r_dir_perms;
-allow ueventd audio_data_file:file r_file_perms;
diff --git a/sepolicy/common/untrusted_app.te b/sepolicy/common/untrusted_app.te
deleted file mode 100644
index a81f2b2..0000000
--- a/sepolicy/common/untrusted_app.te
+++ /dev/null
@@ -1,13 +0,0 @@
-###########################
-# OmniROM common sepolicy
-
-# exfat OTG
-allow untrusted_app mnt_media_rw_file:dir getattr;
-allow untrusted_app asec_apk_file:dir getattr;
-allow untrusted_app fuse_device:file { getattr read write open };
-allow untrusted_app fuse_device:dir { search };
-allow untrusted_app sdcard_posix:dir r_dir_perms;
-allow untrusted_app sdcard_posix:file rw_file_perms;
-
-# profile picture
-allow untrusted_app system_app_data_file:file { append };
diff --git a/sepolicy/common/untrusted_app_25.te b/sepolicy/common/untrusted_app_25.te
deleted file mode 100644
index 43c704e..0000000
--- a/sepolicy/common/untrusted_app_25.te
+++ /dev/null
@@ -1,6 +0,0 @@
-allow untrusted_app_25 mnt_media_rw_file:dir getattr;
-allow untrusted_app_25 asec_apk_file:dir getattr;
-allow untrusted_app_25 fuse_device:file { getattr read write open };
-allow untrusted_app_25 fuse_device:dir { search };
-allow untrusted_app_25 sdcard_posix:dir r_dir_perms;
-allow untrusted_app_25 sdcard_posix:file rw_file_perms;
diff --git a/sepolicy/common/vold.te b/sepolicy/common/vold.te
deleted file mode 100644
index 4ee8613..0000000
--- a/sepolicy/common/vold.te
+++ /dev/null
@@ -1,28 +0,0 @@
-###########################
-# OmniROM common sepolicy
-#
-
-domain_trans(init, rootfs, vold)
-
-# Allow vold to manage ASEC
-allow vold sdcard_type:file create_file_perms;
-#allow vold vold_tmpfs:file create_file_perms;
-
-# Allow vold to access fuse for fuse-based fs
-allow vold fuse_device:chr_file rw_file_perms;
-
-# NTFS-3g wants to drop permission
-allow vold self:capability { setgid setuid };
-# External storage
-allow vold storage_stub_file:dir { rw_file_perms search add_name };
-allow vold mnt_media_rw_stub_file:dir r_dir_perms;
-allow vold mkfs_exec:file { execute read open getattr execute_no_trans };
-
-allow vold fuse_device:dir getattr;
-allow vold fuse_device:filesystem unmount;
-
-allow vold fsck_exec:lnk_file { read };
-
-# Posix sdcard fs relabeling
-allow vold labeledfs:filesystem { relabelfrom relabelto };
-allow vold sdcard_posix:filesystem { relabelfrom relabelto };
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
deleted file mode 100644
index 40295bb..0000000
--- a/sepolicy/private/file_contexts
+++ /dev/null
@@ -1,4 +0,0 @@
-# Postinstall
-/system/bin/backuptool_ab\.functions              u:object_r:otapreopt_chroot_exec:s0
-/system/bin/backuptool_ab\.sh                     u:object_r:otapreopt_chroot_exec:s0
-/system/bin/backuptool_postinstall\.sh            u:object_r:otapreopt_chroot_exec:s0
diff --git a/sepolicy/private/priv_app.te b/sepolicy/private/priv_app.te
deleted file mode 100644
index 1d7fca2..0000000
--- a/sepolicy/private/priv_app.te
+++ /dev/null
@@ -1 +0,0 @@
-allow priv_app ota_package_file:dir create_dir_perms;
diff --git a/sepolicy/private/rootfs.te b/sepolicy/private/rootfs.te
deleted file mode 100644
index 7cfb964..0000000
--- a/sepolicy/private/rootfs.te
+++ /dev/null
@@ -1 +0,0 @@
-allow rootfs labeledfs:filesystem associate;
diff --git a/sepolicy/private/sdcardfs.te b/sepolicy/private/sdcardfs.te
deleted file mode 100644
index 245f9a8..0000000
--- a/sepolicy/private/sdcardfs.te
+++ /dev/null
@@ -1 +0,0 @@
-allow sdcardfs labeledfs:filesystem associate;
diff --git a/sepolicy/private/shell.te b/sepolicy/private/shell.te
deleted file mode 100644
index 20a5c60..0000000
--- a/sepolicy/private/shell.te
+++ /dev/null
@@ -1,2 +0,0 @@
-allow shell otapreopt_chroot_exec:file getattr;
-
diff --git a/sepolicy/private/update_engine.te b/sepolicy/private/update_engine.te
deleted file mode 100644
index 309699a..0000000
--- a/sepolicy/private/update_engine.te
+++ /dev/null
@@ -1,13 +0,0 @@
-allow update_engine self:capability { dac_override dac_read_search sys_rawio };
-
-r_dir_file(update_engine, mnt_user_file)
-r_dir_file(update_engine, storage_file)
-
-allow update_engine self:capability { chown fsetid sys_rawio };
-
-allow update_engine labeledfs:filesystem { mount unmount };
-
-allow update_engine { media_rw_data_file rootfs sdcardfs system_data_file system_file }:dir create_dir_perms;
-allow update_engine { media_rw_data_file rootfs sdcardfs system_data_file system_file }:{ file lnk_file } create_file_perms;
-allow update_engine { otapreopt_chroot_exec rootfs system_file toolbox_exec }:file rx_file_perms;
-allow update_engine { rootfs system_file }:file { relabelfrom relabelto };
diff --git a/sepolicy/sepolicy.mk b/sepolicy/sepolicy.mk
deleted file mode 100644
index f4bab81..0000000
--- a/sepolicy/sepolicy.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This policy configuration will be used by all products that
-# inherit from Omni
-#
-
-BOARD_SEPOLICY_DIRS += \
-    vendor/omni/sepolicy/common
-
-BOARD_PLAT_PRIVATE_SEPOLICY_DIR += vendor/omni/sepolicy/private
diff --git a/utils/emulator/GoldfishParts/Android.mk b/utils/emulator/GoldfishParts/Android.mk
index 34d1c0f..29c3764 100644
--- a/utils/emulator/GoldfishParts/Android.mk
+++ b/utils/emulator/GoldfishParts/Android.mk
@@ -18,6 +18,7 @@
 
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_DEX_PREOPT := false
+LOCAL_PRIVATE_PLATFORM_APIS := true
 
 include $(BUILD_PACKAGE)
 
diff --git a/utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java b/utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
index 1a4534e..e6b562a 100644
--- a/utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
+++ b/utils/emulator/GoldfishParts/src/org/omnirom/device/KeyHandler.java
@@ -22,7 +22,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 
-import com.android.internal.os.DeviceKeyHandler;
+import com.android.internal.util.omni.DeviceKeyHandler;
 
 public class KeyHandler implements DeviceKeyHandler {
 
@@ -30,10 +30,9 @@
     private static final boolean DEBUG = true;
 
     public KeyHandler(Context context) {
-    if (DEBUG) Log.i(TAG, "KeyHandler");
+        if (DEBUG) Log.i(TAG, "KeyHandler");
     }
 
-
     @Override
     public boolean handleKeyEvent(KeyEvent event) {
         if (DEBUG) Log.i(TAG, "scanCode=" + event.getScanCode());
@@ -42,26 +41,31 @@
 
     @Override
     public boolean canHandleKeyEvent(KeyEvent event) {
+        if (DEBUG) Log.i(TAG, "canHandleKeyEvent=" + event.getScanCode());
         return false;
     }
 
     @Override
     public boolean isDisabledKeyEvent(KeyEvent event) {
+        if (DEBUG) Log.i(TAG, "isDisabledKeyEvent=" + event.getScanCode());
         return false;
     }
 
     @Override
     public boolean isCameraLaunchEvent(KeyEvent event) {
+        if (DEBUG) Log.i(TAG, "isCameraLaunchEvent=" + event.getScanCode());
         return false;
     }
 
     @Override
     public boolean isWakeEvent(KeyEvent event){
+        if (DEBUG) Log.i(TAG, "isWakeEvent=" + event.getScanCode());
         return false;
     }
 
     @Override
     public Intent isActivityLaunchEvent(KeyEvent event) {
+        if (DEBUG) Log.i(TAG, "isActivityLaunchEvent=" + event.getScanCode());
         return null;
     }
 }
diff --git a/utils/emulator/advancedFeatures.ini b/utils/emulator/advancedFeatures.ini
index 8bc0cf5..7f0bfe9 100644
--- a/utils/emulator/advancedFeatures.ini
+++ b/utils/emulator/advancedFeatures.ini
@@ -3,5 +3,7 @@
 LogcatPipe = on
 GLAsyncSwap = on
 GLESDynamicVersion = on
-EncryptUserData = off
+EncryptUserData = on
 IntelPerformanceMonitoringUnit = on
+SystemAsRoot = on
+Wifi = on
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 11c725c..be92bcb 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -10,15 +10,15 @@
 endif
 
 ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=android-google
 else
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
 endif
 
 # general properties
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
@@ -44,7 +44,7 @@
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
 # custom omni sounds
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
     ro.config.ringtone=omni_ringtone1.ogg \
     ro.config.notification_sound=omni_notification1.ogg \
     ro.config.alarm_alert=omni_alarm1.ogg
@@ -72,4 +72,4 @@
 # Add our overlays
 DEVICE_PACKAGE_OVERLAYS += vendor/omni/overlay/common
 
-WITH_DEXPREOPT := false
+WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := true
diff --git a/utils/emulator/create_emulator_image.sh b/utils/emulator/create_emulator_image.sh
index b92ec69..ba5524a 100755
--- a/utils/emulator/create_emulator_image.sh
+++ b/utils/emulator/create_emulator_image.sh
@@ -22,4 +22,5 @@
 cp -r vendor/omni/utils/emulator/advancedFeatures.ini $ANDROID_PRODUCT_OUT
 
 cd $ANDROID_PRODUCT_OUT/..
-zip -r /tmp/omni_emulator.zip generic_x86/skins generic_x86/system.img generic_x86/system/build.prop generic_x86/cache.img generic_x86/userdata.img generic_x86/start_emulator_image.sh generic_x86/advancedFeatures.ini
+rm /tmp/omni_emulator.zip
+zip -r /tmp/omni_emulator.zip generic_x86/skins generic_x86/system-qemu.img generic_x86/system/build.prop generic_x86/cache.img generic_x86/userdata.img generic_x86/start_emulator_image.sh generic_x86/advancedFeatures.ini generic_x86/vendor-qemu.img generic_x86/encryptionkey.img generic_x86/kernel-ranchu-64 generic_x86/ramdisk.img
diff --git a/utils/emulator/fstab.ranchu b/utils/emulator/fstab.ranchu
index 31958e9..0c83d59 100644
--- a/utils/emulator/fstab.ranchu
+++ b/utils/emulator/fstab.ranchu
@@ -2,7 +2,5 @@
 #<src>                                                  <mnt_point>         <type>    <mnt_flags and options>                              <fs_mgr_flags>
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
-/dev/block/vda                                          /system             ext4      ro                                                   wait
-/dev/block/vdb                                          /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait
-/dev/block/vdc                                          /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check,quota
-/devices/*/block/vdd                                    auto                auto      defaults                                             voldmanaged=sdcard:auto,encryptable=userdata
+/dev/block/vdc                                          /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic   wait,check,quota,forceencrypt=/dev/block/vdd
+/devices/*/block/vdf                                    auto                auto      defaults                                             voldmanaged=sdcard:auto,encryptable=userdata
diff --git a/utils/emulator/omni_emulator.mk b/utils/emulator/omni_emulator.mk
index c86e252..6f136f8 100644
--- a/utils/emulator/omni_emulator.mk
+++ b/utils/emulator/omni_emulator.mk
@@ -1,5 +1,6 @@
 PRODUCT_COPY_FILES += \
-    vendor/omni/utils/emulator/fstab.ranchu:root/fstab.ranchu
+    vendor/omni/utils/emulator/fstab.ranchu:vendor/etc/fstab.ranchu \
+    vendor/omni/prebuilt/etc/apns-conf.xml:system/etc/apns-conf.xml
 
 $(call inherit-product, build/target/product/sdk_x86.mk)
 
@@ -11,3 +12,5 @@
 PRODUCT_NAME := omni_emulator
 
 DEVICE_PACKAGE_OVERLAYS += vendor/omni/utils/emulator/overlay
+
+ALLOW_MISSING_DEPENDENCIES := true 
diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
index 3308e4b..7be2e5f 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -24,4 +24,8 @@
     <!-- Full qualified name of the class that implements
     com.android.internal.os.DeviceKeyHandler interface. -->
     <string name="config_deviceKeyHandlerClass" translatable="false">org.omnirom.device.KeyHandler</string>
+    <!-- make sure you enable this only if your device supports deep slepp
+    with active proximity sensor event listener -->
+    <bool name="config_proxiSensorWakupCheck">true</bool>
+    <bool name="config_showNavigationBar">true</bool>
 </resources>
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 653884f..40b699d 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -1,23 +1,20 @@
 # Additional apps
 PRODUCT_PACKAGES += \
     MonthCalendarWidget \
-    OpenDelta \
     OmniSwitch \
     Chromium \
     OmniJaws \
     OmniStyle \
-    QuickSearchBox \
     OmniClockOSS \
     MusicFX \
-    audio_effects.conf \
-    libcyanogen-dsp \
     Phonograph \
-    Turbo \
     MatLog \
-    GoldfishParts
+    OmniChange \
+    GoldfishParts \
+    OpenDelta
 
 # Themes
-PRODUCT_PACKAGES += \
+#PRODUCT_PACKAGES += \
     PixelTheme \
     Stock
 
diff --git a/utils/emulator/start_emulator_image.sh b/utils/emulator/start_emulator_image.sh
index c93ed81..96e1c48 100755
--- a/utils/emulator/start_emulator_image.sh
+++ b/utils/emulator/start_emulator_image.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# assumes the image zip has been extracted in /tmp
-export ANDROID_BUILD_TOP=/tmp/generic_x86
-export ANDROID_PRODUCT_OUT=/tmp/generic_x86
+export ANDROID_BUILD_TOP=`pwd`
+export ANDROID_PRODUCT_OUT=`pwd`
 
-~/Android/Sdk/tools/emulator  -verbose -skindir /tmp/generic_x86/skins/ -skin pixel_xl -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img -writable-system
+/home/maxl/Android/Sdk/emulator/emulator  -verbose -skindir $ANDROID_BUILD_TOP/skins/ -skin pixel_xl -gpu host -writable-system -qemu -cpu qemu64
diff --git a/utils/emulator/start_emulator_local.sh b/utils/emulator/start_emulator_local.sh
index 16ad274..34a838b 100755
--- a/utils/emulator/start_emulator_local.sh
+++ b/utils/emulator/start_emulator_local.sh
@@ -2,4 +2,4 @@
 
 # assumes the image zip has been extracted in /tmp
 
-emulator  -verbose -skindir $ANDROID_BUILD_TOP/vendor/omni/utils/emulator/skins/ -skin pixel_xl -ramdisk ~/Android/Sdk/system-images/android-26/google_apis/x86/ramdisk.img  -kernel ~/Android/Sdk/system-images/android-26/google_apis/x86/kernel-ranchu -gpu host -writable-system
+emulator  -verbose -skindir $ANDROID_BUILD_TOP/vendor/omni/utils/emulator/skins/ -skin pixel_xl -writable-system