diff --git a/BoardConfigEvolution.mk b/BoardConfigEvolution.mk
new file mode 100644
index 0000000..a833c7e
--- /dev/null
+++ b/BoardConfigEvolution.mk
@@ -0,0 +1,4 @@
+#
+# SPDX-FileCopyrightText: 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..5c0a356
--- /dev/null
+++ b/device-evolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
diff --git a/device-husky.mk b/device-husky.mk
index a2a0f32..e7e9206 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -26,9 +26,8 @@ $(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOAD
 
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
+TARGET_KERNEL_DIR := device/google/shusky-kernels/evolution
+TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
diff --git a/device-shiba.mk b/device-shiba.mk
index 0059ef0..d939565 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -26,9 +26,8 @@ $(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOAD
 
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
+TARGET_KERNEL_DIR := device/google/shusky-kernels/evolution
+TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers
 
 LOCAL_PATH := device/google/shusky
 
diff --git a/evolution.dependencies b/evolution.dependencies
new file mode 100644
index 0000000..8fe1de9
--- /dev/null
+++ b/evolution.dependencies
@@ -0,0 +1,18 @@
+[
+  {
+    "repository": "device_google_zuma",
+    "target_path": "device/google/zuma"
+  },
+  {
+    "repository": "device_google_shusky-kernels_evolution",
+    "target_path": "device/google/shusky-kernels/evolution"
+  },
+  {
+    "repository": "vendor_google_shiba",
+    "target_path": "vendor/google/shiba"
+  },
+  {
+    "repository": "vendor_google_husky",
+    "target_path": "vendor/google/husky"
+  }
+]
diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk
index 709134b..9b06225 100644
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -51,3 +51,4 @@ include device/google/shusky/wifi/BoardConfig-wifi.mk
 DEVICE_PATH := device/google/shusky
 VENDOR_PATH := vendor/google/husky
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/husky/BoardConfigEvolution.mk b/husky/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/husky/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
diff --git a/husky/device-evolution.mk b/husky/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/husky/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
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 13b0429..37b1891 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
@@ -41,7 +44,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
@@ -146,7 +149,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
 system_ext/priv-app/PixelIwlan/PixelIwlan.apk
 
 # 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.dependencies b/lineage.dependencies
deleted file mode 100644
index 3b7fb59..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    "repository": "android_device_google_zuma",
-    "target_path": "device/google/zuma"
-  },
-  {
-    "repository": "device/google/shusky-kernels/6.1",
-    "target_path": "device/google/shusky-kernels/6.1",
-    "remote": "aosp-shusky"
-  }
-]
diff --git a/lineage_husky.mk b/lineage_husky.mk
index 4a46255..30aaf8f 100644
--- a/lineage_husky.mk
+++ b/lineage_husky.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common stuff
+# Inherit some common Evolution X stuff
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
@@ -14,7 +14,9 @@ DEVICE_PATH := device/google/shusky
 VENDOR_PATH := vendor/google/husky
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/zuma/lineage_common.mk)
+$(call inherit-product, device/google/zuma/evolution_common.mk)
 $(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/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 1211691..be0eee7 100644
--- a/lineage_shiba.mk
+++ b/lineage_shiba.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-# Inherit some common stuff
+# Inherit some common Evolution X stuff
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
@@ -14,7 +14,9 @@ DEVICE_PATH := device/google/shusky
 VENDOR_PATH := vendor/google/shiba
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/zuma/lineage_common.mk)
+$(call inherit-product, device/google/zuma/evolution_common.mk)
 $(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/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 4643c26..d0ab11f 100644
--- a/shiba/BoardConfig.mk
+++ b/shiba/BoardConfig.mk
@@ -47,3 +47,4 @@ include device/google/shusky/wifi/BoardConfig-wifi.mk
 DEVICE_PATH := device/google/shusky
 VENDOR_PATH := vendor/google/shiba
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/shiba/BoardConfigEvolution.mk b/shiba/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/shiba/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
diff --git a/shiba/device-evolution.mk b/shiba/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/shiba/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
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 b54e7cf..df229d0 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
@@ -41,7 +44,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
@@ -142,7 +145,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
 system_ext/priv-app/PixelIwlan/PixelIwlan.apk
 
 # 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