diff --git a/device-oriole.mk b/device-oriole.mk
index 8d2d196..cbf40c7 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -13,6 +13,7 @@ TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/oriole/overlay-lineage
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage
+DEVICE_PACKAGE_OVERLAYS += device/google/raviole/$(DEVICE_CODENAME)/overlay-evolution
 
 include device/google/gs101/device-shipping-common.mk
 
diff --git a/device-raven.mk b/device-raven.mk
index 3d34727..e0abac6 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -13,6 +13,7 @@ TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/raven/overlay-lineage
 DEVICE_PACKAGE_OVERLAYS += device/google/raviole/overlay-lineage
+DEVICE_PACKAGE_OVERLAYS += device/google/raviole/$(DEVICE_CODENAME)/overlay-evolution
 
 include device/google/gs101/device-shipping-common.mk
 
diff --git a/evolution.dependencies b/evolution.dependencies
new file mode 100644
index 0000000..d57dac4
--- /dev/null
+++ b/evolution.dependencies
@@ -0,0 +1,23 @@
+[
+  {
+    "remote": "evo-tensor",
+    "repository": "device_google_gs101",
+    "target_path": "device/google/gs101"
+  },
+  {
+    "remote": "github",
+    "repository": "LineageOS/android_device_google_raviole-kernels",
+    "target_path": "device/google/raviole-kernels",
+    "branch": "lineage-23.1"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_oriole",
+    "target_path": "vendor/google/oriole"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_raven",
+    "target_path": "vendor/google/raven"
+  }
+]
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 6508e39..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "repository": "android_device_google_gs101",
-    "target_path": "device/google/gs101"
-  },
-  {
-    "repository": "android_device_google_raviole-kernels",
-    "target_path": "device/google/raviole-kernels"
-  }
-]
diff --git a/lineage_oriole.mk b/lineage_oriole.mk
index 839dbd1..36a7a22 100644
--- a/lineage_oriole.mk
+++ b/lineage_oriole.mk
@@ -7,12 +7,18 @@
 # Inherit some common stuff
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
+# Inherit some common Evolution X stuff
+TARGET_DISABLE_EPPE := true
+
 # Inherit device configuration
 DEVICE_CODENAME := oriole
 DEVICE_PATH := device/google/raviole
 VENDOR_PATH := vendor/google/oriole
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 
+# Inherit some common Evolution X stuff
+$(call inherit-product, device/google/gs101/evolution_common.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 6
diff --git a/lineage_raven.mk b/lineage_raven.mk
index 96d05f4..f67143c 100644
--- a/lineage_raven.mk
+++ b/lineage_raven.mk
@@ -7,12 +7,18 @@
 # Inherit some common stuff
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
+# Inherit some common Evolution X stuff
+TARGET_DISABLE_EPPE := true
+
 # Inherit device configuration
 DEVICE_CODENAME := raven
 DEVICE_PATH := device/google/raviole
 VENDOR_PATH := vendor/google/raven
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 
+# Inherit some common Evolution X stuff
+$(call inherit-product, device/google/gs101/evolution_common.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 6 Pro
diff --git a/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/oriole/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..7663bd4
--- /dev/null
+++ b/oriole/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">TechPanelGM (Giovanni)</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://buymeacoffee.com/TechPanelGM</string>
+</resources>
diff --git a/oriole/proprietary-files.txt b/oriole/proprietary-files.txt
index 266ce2c..eab16e7 100644
--- a/oriole/proprietary-files.txt
+++ b/oriole/proprietary-files.txt
@@ -43,7 +43,7 @@ product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
 product/etc/libnfc-nci.conf
 
 # 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
@@ -132,7 +132,7 @@ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksServ
 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/raven/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/raven/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..7663bd4
--- /dev/null
+++ b/raven/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">TechPanelGM (Giovanni)</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://buymeacoffee.com/TechPanelGM</string>
+</resources>
diff --git a/raven/proprietary-files.txt b/raven/proprietary-files.txt
index a2a4f4b..39cf5af 100644
--- a/raven/proprietary-files.txt
+++ b/raven/proprietary-files.txt
@@ -43,7 +43,7 @@ product/etc/sysconfig/allowlist_com.shannon.imsservice.xml
 product/etc/libnfc-nci.conf
 
 # 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
@@ -132,7 +132,7 @@ system_ext/priv-app/ShannonQualifiedNetworksService/ShannonQualifiedNetworksServ
 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