diff --git a/BoardConfig.mk b/BoardConfig.mk
index 3e96770..1ed9c33 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -5,6 +5,17 @@
 #
 
 DEVICE_PATH := device/xiaomi/lisa
+BUILD_BROKEN_DUP_RULES := true
+BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true
+BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+
+# Camera
+TARGET_CAMERA_OVERRIDE_FORMAT_FROM_RESERVED := true
+TARGET_INCLUDES_MIUI_CAMERA := true
+MALLOC_SVELTE_FOR_LIBC32 := true
+
+# Miui-Cam
+TARGET_INCLUDES_MIUI_CAMERA := true
 
 # Inherit from sm8350-common
 include device/xiaomi/sm8350-common/BoardConfigCommon.mk
diff --git a/device.mk b/device.mk
index 62d95e9..2505f31 100644
--- a/device.mk
+++ b/device.mk
@@ -7,10 +7,13 @@
 # Inherit from sm8350-common
 $(call inherit-product, device/xiaomi/sm8350-common/common.mk)
 
+# Camera
+$(call inherit-product-if-exists, vendor/xiaomi/miuicamera-lisa/BoardConfig.mk)
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay-evolution
 
 # Overlays-RRO
 PRODUCT_PACKAGES += \
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 5ebda54..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_xiaomi_sm8350-common",
-    "target_path": "device/xiaomi/sm8350-common"
-  }
-]
diff --git a/lineage_lisa.mk b/lineage_lisa.mk
index 6d6ab97..d226e10 100644
--- a/lineage_lisa.mk
+++ b/lineage_lisa.mk
@@ -11,9 +11,17 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from lisa device
 $(call inherit-product, device/xiaomi/lisa/device.mk)
 
-# Inherit some common Lineage stuff.
+# Inherit some common Evolution-X stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
+# Bootanimation
+TARGET_BOOT_ANIMATION_RES := 1080
+
+# Evolution-X Stuff
+EVO_BUILD_TYPE := Official
+TARGET_FACE_UNLOCK_SUPPORTED := true
+TARGET_SUPPORTS_QUICK_TAP := true
+
 PRODUCT_BRAND := Xiaomi
 PRODUCT_DEVICE := lisa
 PRODUCT_MANUFACTURER := Xiaomi
diff --git a/overlay-evolution/frameworks/base/core/res/res/values/config.xml b/overlay-evolution/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..2321c98
--- /dev/null
+++ b/overlay-evolution/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2021 The Evolution X Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <!-- Whether the device supports Smart Pixels -->
+    <bool name="config_supportSmartPixels">true</bool>
+</resources>
\ No newline at end of file
diff --git a/overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml b/overlay-evolution/packages/apps/Aperture/app/src/main/res/values/config.xml
similarity index 100%
rename from overlay-lineage/packages/apps/Aperture/app/src/main/res/values/config.xml
rename to overlay-evolution/packages/apps/Aperture/app/src/main/res/values/config.xml
diff --git a/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..e4bb53f
--- /dev/null
+++ b/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2021 The Evolution X Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="build_maintainer_summary">zαι∂ κнαи</string>
+    <string name="build_maintainer_telegram">https://t.me/zaidkhan0997</string>
+</resources>
\ No newline at end of file