diff --git a/BoardConfig.mk b/BoardConfig.mk
index 6e2d899..7815b1e 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,5 @@
-# Copyright (C) 2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2014-2016 The CyanogenMod Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,21 +22,32 @@ TARGET_SPECIFIC_HEADER_PATH := $(LOCAL_PATH)/include
 
 TARGET_OTA_ASSERT_DEVICE := viennalte,viennaltexx
 
-# BLOCK_BASED_OTA:= false
 # WITH_TWRP := true
 
-# Use Snapdragon LLVM if available on build server
-TARGET_USE_SDCLANG := true
+# Audio
+BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
+USE_CUSTOM_AUDIO_POLICY := 1
 
-# ADB Legacy Interface
-TARGET_USES_LEGACY_ADB_INTERFACE := true
+# Bluetooth
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
+BOARD_CUSTOM_BT_CONFIG := $(LOCAL_PATH)/bluetooth/vnd_viennalte.txt
+BOARD_HAVE_BLUETOOTH_BCM := true
+BOARD_HAVE_SAMSUNG_BLUETOOTH := true
 
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := MSM8974
 
+# Camera
+USE_DEVICE_SPECIFIC_CAMERA := true
+
+# Extended Filesystem Support
+TARGET_EXFAT_DRIVER := sdfat
+
+# HIDL
+DEVICE_MANIFEST_FILE += $(LOCAL_PATH)/manifest.xml
+
 # Kernel
 BOARD_KERNEL_BASE := 0x00000000
-#BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3
 BOARD_KERNEL_CMDLINE := androidboot.hardware=qcom user_debug=31 msm_rtb.filter=0x37 ehci-hcd.park=3 androidboot.selinux=permissive
 BOARD_KERNEL_IMAGE_NAME := zImage
 BOARD_KERNEL_PAGESIZE := 2048
@@ -52,31 +63,10 @@ TARGET_KERNEL_SOURCE := kernel/samsung/msm8974
 TARGET_INIT_VENDOR_LIB := libinit_msm8974
 TARGET_LIBINIT_MSM8974_DEFINES_FILE := device/samsung/viennalte/init/init_viennalte.cpp
 
-# Audio
-BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
-USE_CUSTOM_AUDIO_POLICY := 1
-
-# Binder API version
-TARGET_USES_64_BIT_BINDER := true
-
-# Bluetooth
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(LOCAL_PATH)/bluetooth
-BOARD_CUSTOM_BT_CONFIG := $(LOCAL_PATH)/bluetooth/vnd_viennalte.txt
-BOARD_BLUETOOTH_USES_HCIATTACH_PROPERTY := false
-BOARD_HAVE_BLUETOOTH_BCM := true
-
-# Camera
-TARGET_HAS_LEGACY_CAMERA_HAL1 := true
-USE_DEVICE_SPECIFIC_CAMERA := true
-
-# Filesystem
-TARGET_FS_CONFIG_GEN := $(LOCAL_PATH)/config.fs
-
-# HIDL
-DEVICE_MANIFEST_FILE += $(LOCAL_PATH)/manifest.xml
-
 # Legacy BLOB Support
 TARGET_NEEDS_PLATFORM_TEXT_RELOCATIONS := true
+TARGET_LD_SHIM_LIBS += \
+    /system/vendor/lib/hw/camera.vendor.msm8974.so|libshim_camera.so
 
 # Partitions
 BOARD_FLASH_BLOCK_SIZE := 131072
@@ -90,7 +80,6 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 27847015936
 BOARD_CACHEIMAGE_PARTITION_SIZE := 524288000
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
-BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := f2fs
 
 # Power HAL
 TARGET_POWERHAL_SET_INTERACTIVE_EXT := $(LOCAL_PATH)/power/power_ext.c
@@ -111,15 +100,16 @@ BOARD_RECOVERY_SWIPE := true
 TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.full
 
 # SELinux
--include device/qcom/sepolicy/sepolicy.mk
-
-BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy
+include $(LOCAL_PATH)/sepolicy/sepolicy.mk
 
 # TWRP Support - Optional
 ifeq ($(WITH_TWRP),true)
 -include $(LOCAL_PATH)/twrp.mk
 endif
 
+# Use Snapdragon LLVM if available on build server
+TARGET_USE_SDCLANG := true
+
 # Wifi
 BOARD_HAVE_SAMSUNG_WIFI := true
 BOARD_WLAN_DEVICE := bcmdhd
diff --git a/config.fs b/config.fs
deleted file mode 100755
index 14d23f5..0000000
--- a/config.fs
+++ /dev/null
@@ -1,8 +0,0 @@
-[AID_QCOM_DIAG]
-value:2950
-
-[AID_RFS]
-value:2951
-
-[AID_RFS_SHARED]
-value:2952
diff --git a/device.mk b/device.mk
index 6aeb39b..8db951e 100755
--- a/device.mk
+++ b/device.mk
@@ -1,6 +1,6 @@
 #
 # Copyright (C) 2014-2016 The CyanogenMod Project
-# Copyright (C) 2017 The LineageOS Project
+# Copyright (C) 2017-2018 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -73,24 +73,18 @@ PRODUCT_PACKAGES += \
     camera.device@1.0-impl \
     camera.msm8974 \
     libshim_camera \
-    libxml2
-
-#PRODUCT_PACKAGES += \
-#    Snap
+    libxml2 \
+    Snap
 
 # Doze
-#PRODUCT_PACKAGES += \
-#    SamsungDoze
+PRODUCT_PACKAGES += \
+    SamsungDoze
 
 # IPv6 tethering
 PRODUCT_PACKAGES += \
     ebtables \
     ethertypes
 
-# IR Blaster
-#PRODUCT_PACKAGES += \
-#    consumerir.msm8974
-
 # Input device
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/idc/sec_e-pen.idc:system/usr/idc/sec_e-pen.idc \
@@ -112,12 +106,12 @@ PRODUCT_PACKAGES += \
 
 # Media
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
     $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml
 
 # Radio
 PRODUCT_PACKAGES += \
-    libsecnativefeature \
-    libshim_cutils_atomic
+    libsecnativefeature
 
 # Ramdisk
 PRODUCT_PACKAGES += \
@@ -148,5 +142,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     su
 
+# ADB
+PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
+    persist.sys.usb.config=adb \
+    ro.adb.secure=0
+
 # common msm8974
 $(call inherit-product, device/samsung/msm8974-common/msm8974.mk)
diff --git a/extract-files.sh b/extract-files.sh
index fe26204..494ffe7 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -28,7 +28,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 CM_ROOT="$MY_DIR"/../../..
 
-HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
diff --git a/init/init_viennalte.cpp b/init/init_viennalte.cpp
index c162b71..6065d68 100755
--- a/init/init_viennalte.cpp
+++ b/init/init_viennalte.cpp
@@ -1,6 +1,6 @@
 /*
    Copyright (c) 2016, The Linux Foundation. All rights reserved.
-   Copyright (c) 2017, The LineageOS Project. All rights reserved.
+   Copyright (c) 2017-2018, The LineageOS Project. All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions are
diff --git a/libshims/libshim_camera/camera_shim.c b/libshims/libshim_camera/camera_shim.c
index 1dde914..efdd307 100755
--- a/libshims/libshim_camera/camera_shim.c
+++ b/libshims/libshim_camera/camera_shim.c
@@ -15,28 +15,19 @@
  */
 
 // rt hdr
-const char *_ZN7android16CameraParameters10KEY_RT_HDRE = "rt-hdr";
-const char *_ZN7android16CameraParameters20KEY_SUPPORTED_RT_HDRE = "rt-hdr-values";
-const char *_ZN7android16CameraParameters9RTHDR_OFFE = "off";
-const char *_ZN7android16CameraParameters8RTHDR_ONE = "on";
+const char _ZN7android16CameraParameters10KEY_RT_HDRE[] = "rt-hdr";
+const char _ZN7android16CameraParameters20KEY_SUPPORTED_RT_HDRE[] = "rt-hdr-values";
+const char _ZN7android16CameraParameters9RTHDR_OFFE[] = "off";
+const char _ZN7android16CameraParameters8RTHDR_ONE[] = "on";
 
 // phase af
-const char *_ZN7android16CameraParameters12KEY_PHASE_AFE = "phase-af";
-const char *_ZN7android16CameraParameters22KEY_SUPPORTED_PHASE_AFE = "phase-af-values";
-const char *_ZN7android16CameraParameters7PAF_OFFE = "off";
-const char *_ZN7android16CameraParameters6PAF_ONE = "on";
+const char _ZN7android16CameraParameters12KEY_PHASE_AFE[] = "phase-af";
+const char _ZN7android16CameraParameters22KEY_SUPPORTED_PHASE_AFE[] = "phase-af-values";
+const char _ZN7android16CameraParameters7PAF_OFFE[] = "off";
+const char _ZN7android16CameraParameters6PAF_ONE[] = "on";
 
 // dynamic range control
-const char *_ZN7android16CameraParameters25KEY_DYNAMIC_RANGE_CONTROLE = "dynamic-range-control";
-const char *_ZN7android16CameraParameters35KEY_SUPPORTED_DYNAMIC_RANGE_CONTROLE = "dynamic-range-control-values";
-const char *_ZN7android16CameraParameters7DRC_OFFE = "off";
-const char *_ZN7android16CameraParameters6DRC_ONE = "on";
-
-int _ZNK7android16CameraParameters8getInt64EPKc(const char *key);
-
-int _ZNK7android16CameraParameters8getInt64EPKc(const char *key)
-{
-    return -1;
-}
-
-//int CameraParameters::getInt64(const char *key) const { return -1; };
+const char _ZN7android16CameraParameters25KEY_DYNAMIC_RANGE_CONTROLE[] = "dynamic-range-control";
+const char _ZN7android16CameraParameters35KEY_SUPPORTED_DYNAMIC_RANGE_CONTROLE[] = "dynamic-range-control-values";
+const char _ZN7android16CameraParameters7DRC_OFFE[] = "off";
+const char _ZN7android16CameraParameters6DRC_ONE[] = "on";
diff --git a/lineage.dependencies b/lineage.dependencies
index 2768e08..cceaefc 100755
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,14 +1,6 @@
 [
-  {
-    "repository": "android_external_sony_boringssl-compat",
-    "target_path": "external/sony/boringssl-compat"
-  },
   {
     "repository": "android_device_samsung_msm8974-common",
     "target_path": "device/samsung/msm8974-common"
-  },
-  {
-    "repository": "android_external_stlport",
-    "target_path": "external/stlport"
   }
 ]
diff --git a/manifest.xml b/manifest.xml
index 354ba97..1c68ad1 100755
--- a/manifest.xml
+++ b/manifest.xml
@@ -17,19 +17,10 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.nfc</name>
-        <transport arch="32">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>INfc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl">
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
-        <version>1.0</version>
+        <version>1.1</version>
         <interface>
             <name>IRadio</name>
             <instance>slot1</instance>
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index e63eba0..df9534c 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -30,7 +30,7 @@ if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
 CM_ROOT="$MY_DIR"/../../..
 
-HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
diff --git a/system.prop b/system.prop
index b255618..7ecc490 100755
--- a/system.prop
+++ b/system.prop
@@ -34,8 +34,6 @@ ro.qc.sdk.izat.premium_enabled=0
 ro.qc.sdk.izat.service_mask=0x0
 
 # Media
-media.stagefright.legacyencoder=true
-media.stagefright.less-secure=true
 persist.media.treble_omx=false
 
 # Perf
@@ -47,8 +45,6 @@ persist.data.qmi.adb_logmask=0
 persist.radio.add_power_save=1
 rild.libpath=/system/vendor/lib/libsec-ril.so
 ro.telephony.mms_data_profile=5
-ro.ril.telephony.data_reg_resp_strings=7
-ro.ril.telephony.oper_resp_strings=4
 ro.ril.telephony.qan_resp_strings=6
 
 # Ril sends only one RIL_UNSOL_CALL_RING, so set call_ring.multiple to false
@@ -57,16 +53,8 @@ ro.telephony.call_ring.multiple=0
 # Sensors
 debug.sensors=1
 
-# Storage
-ro.sys.sdcardfs=false
-
 # Tethering
 net.tethering.noprovisioning=true
 
 # WiFi
 wifi.interface=wlan0
-
-# Enable adb
-#persist.service.adb.enable=1
-#persist.service.debuggable=1
-#ro.adb.secure=0