diff --git a/device.mk b/device.mk
index 7392f45..fe95d72 100644
--- a/device.mk
+++ b/device.mk
@@ -368,7 +368,8 @@ PRODUCT_COPY_FILES += \
 # Overlays
 PRODUCT_ENFORCE_RRO_TARGETS := *
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay-lineage \
+    $(LOCAL_PATH)/overlay
 
 # Overlays RRO
 PRODUCT_PACKAGES += \
diff --git a/evolution.dependencies b/evolution.dependencies
new file mode 100644
index 0000000..dc2434b
--- /dev/null
+++ b/evolution.dependencies
@@ -0,0 +1,6 @@
+[
+  {
+    "repository": "vendor_xiaomi_stone",
+    "target_path": "vendor/xiaomi/stone"
+  }
+]
diff --git a/lineage_stone.mk b/lineage_stone.mk
index 8ee57ac..bf75a50 100644
--- a/lineage_stone.mk
+++ b/lineage_stone.mk
@@ -21,16 +21,9 @@ TARGET_FACE_UNLOCK_SUPPORTED := true
 TARGET_DISABLE_EPPE := true
 SYSTEM_OPTIMIZE_JAVA := true
 SYSTEMUI_OPTIMIZE_JAVA := true
-MATRIXX_BUILD_TYPE := Official
-MATRIXX_MAINTAINER := ARIJIT-SAHA
-MATRIXX_CHIPSET := SM6375
-MATRIXX_BATTERY := 5000mah
-MATRIXX_DISPLAY := 1080x2400
+EVO_BUILD_TYPE := Official
+ARGET_BUILD_APERTURE_CAMERA := false
 WITH_GMS := true
-EXTRA_GAPPS := false
-
-# Charging Animation
-TARGET_USE_PIXEL_CHARGER := true
 
 # Dolby
 Vendor_Dolby := true
diff --git a/overlay/packages/apps/Settings/Android.bp b/overlay/packages/apps/Settings/Android.bp
new file mode 100644
index 0000000..1ad2373
--- /dev/null
+++ b/overlay/packages/apps/Settings/Android.bp
@@ -0,0 +1,10 @@
+//
+// Copyright (C) 2022 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SettingsResStone",
+    device_specific: true,
+}
diff --git a/overlay/packages/apps/Settings/AndroidManifest.xml b/overlay/packages/apps/Settings/AndroidManifest.xml
new file mode 100644
index 0000000..3ddc7f8
--- /dev/null
+++ b/overlay/packages/apps/Settings/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.stone">
+    <overlay android:targetPackage="com.android.settings"
+                   android:isStatic="true"
+                   android:priority="700"/>
+</manifest>
diff --git a/overlay/packages/apps/Settings/res/values/evolution_strings.xml b/overlay/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..d5acd3d
--- /dev/null
+++ b/overlay/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2024 Evolution X
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- About device screen, build maintainer -->
+    <string name="build_maintainer_summary">Arijit Saha</string>
+    <string name="build_maintainer_donate_url">t.me/project_bd_support</string>
+</resources>
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 072e564..90c3d60 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,17 +1,14 @@
-# Clone Vendor
-git clone https://github.com/Arijit78/vendor_xiaomi_stone_new.git -b udc vendor/xiaomi/stone
-
-# Clone prebuilt kernel
-git clone https://github.com/Arijit78/device_xiaomi_stone-kernel.git -b 14 device/xiaomi/stone-kernel
-
 # Clone Dolby
 git clone https://github.com/Arijit78/vendor_dolby_oplus.git -b udc vendor/dolby
 
 # Clone hardware xiaomi
-git clone https://github.com/Evolution-X/hardware_xiaomi.git -b udc hardware/xiaomi
+git clone https://github.com/crdroidandroid/android_hardware_xiaomi.git -b 14.0 hardware/xiaomi
 
 # Clone Kernel Source
 git clone https://github.com/Stone-Trees/kernel_xiaomi_sm6375.git -b 14 kernel/xiaomi/sm6375
 
+# Clone prebuilt kernel
+git clone https://github.com/Arijit78/device_xiaomi_stone-kernel.git -b 14 device/xiaomi/stone-kernel
+
 # Clone v4a
 git clone --depth=1 https://github.com/TogoFire/packages_apps_ViPER4AndroidFX.git -b v4a packages/apps/ViPER4AndroidFX