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/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk
index 47281be..ea74e8e 100644
--- a/bluejay/BoardConfig.mk
+++ b/bluejay/BoardConfig.mk
@@ -39,3 +39,4 @@ BOARD_VENDOR_SEPOLICY_DIRS += \
 include device/google/gs101/wifi/BoardConfig-wifi.mk
 
 include $(VENDOR_PATH)/BoardConfigVendor.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/bluejay/BoardConfigEvolution.mk b/bluejay/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/bluejay/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/bluejay/device-evolution.mk b/bluejay/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/bluejay/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/bluejay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/bluejay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..8d8d1db
--- /dev/null
+++ b/bluejay/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">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
diff --git a/bluejay/proprietary-files.txt b/bluejay/proprietary-files.txt
index ec6d0b4..e22b673 100644
--- a/bluejay/proprietary-files.txt
+++ b/bluejay/proprietary-files.txt
@@ -13,6 +13,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
@@ -43,7 +46,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
@@ -133,7 +136,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/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/evolution.dependencies b/evolution.dependencies
new file mode 100644
index 0000000..19d3b0d
--- /dev/null
+++ b/evolution.dependencies
@@ -0,0 +1,18 @@
+[
+  {
+    "remote": "evo-tensor",
+    "repository": "device_google_gs101",
+    "target_path": "device/google/gs101"
+  },
+  { 
+    "remote": "github",
+    "repository": "LineageOS/android_device_google_bluejay-kernels",
+    "target_path": "device/google/bluejay-kernels",
+    "branch": "lineage-23.1"
+  },
+  { 
+    "remote": "evo-tensor",
+    "repository": "vendor_google_bluejay",
+    "target_path": "vendor/google/bluejay"
+  }
+]
diff --git a/lineage.dependencies b/lineage.dependencies
deleted file mode 100644
index 265bcea..0000000
--- a/lineage.dependencies
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "repository": "android_device_google_gs101",
-    "target_path": "device/google/gs101"
-  },
-  {
-    "repository": "android_device_google_bluejay-kernels",
-    "target_path": "device/google/bluejay-kernels"
-  }
-]
diff --git a/lineage_bluejay.mk b/lineage_bluejay.mk
index aeeaab0..449e457 100644
--- a/lineage_bluejay.mk
+++ b/lineage_bluejay.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 := bluejay
 DEVICE_PATH := device/google/bluejay
 VENDOR_PATH := vendor/google/bluejay
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 
+$(call inherit-product, device/google/gs101/evolution_common.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)
+
 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel 6a