diff --git a/BoardConfigEvolution.mk b/BoardConfigEvolution.mk
new file mode 100644
index 0000000..cd489ab
--- /dev/null
+++ b/BoardConfigEvolution.mk
@@ -0,0 +1,5 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/device-evolution.mk b/device-evolution.mk
new file mode 100644
index 0000000..1e0d2e7
--- /dev/null
+++ b/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Udfps
+TARGET_HAS_UDFPS += true
diff --git a/lineage.dependencies b/evolution.dependencies
similarity index 79%
rename from lineage.dependencies
rename to evolution.dependencies
index 3f85043..be6a4aa 100644
--- a/lineage.dependencies
+++ b/evolution.dependencies
@@ -1,6 +1,6 @@
 [
   {
-    "repository": "android_device_google_zuma",
+    "repository": "device_google_zuma",
     "target_path": "device/google/zuma"
   },
   {
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 1adcd18..5b4100f 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -69,3 +69,4 @@ BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe
 endif
 
 include device/google/shusky/husky/BoardConfigLineage.mk
+include device/google/shusky/husky/BoardConfigEvolution.mk
diff --git a/husky/BoardConfigEvolution.mk b/husky/BoardConfigEvolution.mk
new file mode 100644
index 0000000..4309d2f
--- /dev/null
+++ b/husky/BoardConfigEvolution.mk
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include device/google/shusky/BoardConfigEvolution.mk
diff --git a/husky/device-evolution.mk b/husky/device-evolution.mk
new file mode 100644
index 0000000..2900f8b
--- /dev/null
+++ b/husky/device-evolution.mk
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/husky/overlay-evolution
+
+$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)
diff --git a/husky/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/husky/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..687d231
--- /dev/null
+++ b/husky/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Oscar Mariscal</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/osmjr1019</string>
+</resources>
diff --git a/husky/proprietary-files.txt b/husky/proprietary-files.txt
index ffa8d8e..429cbfa 100644
--- a/husky/proprietary-files.txt
+++ b/husky/proprietary-files.txt
@@ -14,6 +14,9 @@ product/etc/firmware/music_detector.sound_model
 product/etc/firmware/music_detector.sound_model_2
 product/etc/firmware/music_detector.sound_model_tflite
 
+# Camera
+product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED
+
 # Camera extensions
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
@@ -36,7 +39,7 @@ product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIO
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
 
 # Permissions
-product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml
+product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml
 product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
 product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
 product/etc/sysconfig/nexus.xml
@@ -119,7 +122,7 @@ system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
 # Permissions
-system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
 
 # Radio
 system_ext/etc/default-permissions/default-permissions-euiccpixel.xml
diff --git a/lineage_husky.mk b/lineage_husky.mk
index baa31ef..443665d 100644
--- a/lineage_husky.mk
+++ b/lineage_husky.mk
@@ -4,15 +4,17 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Lineage stuff.
+# Inherit some common Evolution X stuff.
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/shusky/aosp_husky.mk)
 $(call inherit-product, device/google/zuma/lineage_common.mk)
+$(call inherit-product, device/google/zuma/evolution_common.mk)
 
 include device/google/shusky/husky/device-lineage.mk
+include device/google/shusky/husky/device-evolution.mk
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
diff --git a/lineage_shiba.mk b/lineage_shiba.mk
index a431394..37cf18c 100644
--- a/lineage_shiba.mk
+++ b/lineage_shiba.mk
@@ -4,15 +4,17 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common Lineage stuff.
+# Inherit some common Evolution X stuff.
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 # Inherit device configuration
 $(call inherit-product, device/google/shusky/aosp_shiba.mk)
 $(call inherit-product, device/google/zuma/lineage_common.mk)
+$(call inherit-product, device/google/zuma/evolution_common.mk)
 
 include device/google/shusky/shiba/device-lineage.mk
+include device/google/shusky/shiba/device-evolution.mk
 
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk
index a094c3d..a6c30a9 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -55,3 +55,4 @@ include device/google/shusky/sepolicy/shiba-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk
 
 include device/google/shusky/shiba/BoardConfigLineage.mk
+include device/google/shusky/shiba/BoardConfigEvolution.mk
diff --git a/shiba/BoardConfigEvolution.mk b/shiba/BoardConfigEvolution.mk
new file mode 100644
index 0000000..4309d2f
--- /dev/null
+++ b/shiba/BoardConfigEvolution.mk
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include device/google/shusky/BoardConfigEvolution.mk
diff --git a/shiba/device-evolution.mk b/shiba/device-evolution.mk
new file mode 100644
index 0000000..1687c44
--- /dev/null
+++ b/shiba/device-evolution.mk
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/shiba/overlay-evolution
+
+$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)
diff --git a/shiba/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/shiba/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..687d231
--- /dev/null
+++ b/shiba/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Oscar Mariscal</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/osmjr1019</string>
+</resources>
diff --git a/shiba/proprietary-files.txt b/shiba/proprietary-files.txt
index c8fdf97..3f08943 100644
--- a/shiba/proprietary-files.txt
+++ b/shiba/proprietary-files.txt
@@ -14,6 +14,9 @@ product/etc/firmware/music_detector.sound_model
 product/etc/firmware/music_detector.sound_model_2
 product/etc/firmware/music_detector.sound_model_tflite
 
+# Camera
+product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED
+
 # Camera extensions
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
@@ -36,7 +39,7 @@ product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIO
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
 
 # Permissions
-product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml
+product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml
 product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
 product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
 product/etc/sysconfig/nexus.xml
@@ -115,7 +118,7 @@ system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED
 
 # Permissions
-system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml
 
 # Radio
 system_ext/etc/default-permissions/default-permissions-euiccpixel.xml