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..bb299f5
--- /dev/null
+++ b/device-evolution.mk
@@ -0,0 +1,7 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+# Overlays
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
diff --git a/lineage.dependencies b/evolution.dependencies
similarity index 80%
rename from lineage.dependencies
rename to evolution.dependencies
index 173f051..fa764dd 100644
--- a/lineage.dependencies
+++ b/evolution.dependencies
@@ -1,6 +1,6 @@
 [
   {
-    "repository": "android_device_google_gs101",
+    "repository": "device_google_gs101",
     "target_path": "device/google/gs101"
   },
   {
diff --git a/lineage_oriole.mk b/lineage_oriole.mk
index 671aac9..91f692f 100644
--- a/lineage_oriole.mk
+++ b/lineage_oriole.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/raviole
 VENDOR_PATH := vendor/google/oriole
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs101/lineage_common.mk)
+$(call inherit-product, device/google/gs101/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_raven.mk b/lineage_raven.mk
index da9d7af..12eb3f0 100644
--- a/lineage_raven.mk
+++ b/lineage_raven.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/raviole
 VENDOR_PATH := vendor/google/raven
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs101/lineage_common.mk)
+$(call inherit-product, device/google/gs101/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/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 8f0eea4..0cb36a7 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -54,3 +54,4 @@ endif
 DEVICE_PATH := device/google/raviole
 VENDOR_PATH := vendor/google/oriole
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/oriole/BoardConfigEvolution.mk b/oriole/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/oriole/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/oriole/device-evolution.mk b/oriole/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/oriole/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/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..8d8d1db
--- /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">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index e67e313..ec56e58 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,7 +23,7 @@
     <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_default</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
     <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
diff --git a/oriole/proprietary-files.txt b/oriole/proprietary-files.txt
index 165c682..21113c1 100644
--- a/oriole/proprietary-files.txt
+++ b/oriole/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
@@ -40,7 +43,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
@@ -139,7 +142,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/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 5cb2277..be8a46e 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -54,3 +54,4 @@ endif
 DEVICE_PATH := device/google/raviole
 VENDOR_PATH := vendor/google/raven
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/raven/BoardConfigEvolution.mk b/raven/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/raven/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/raven/device-evolution.mk b/raven/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/raven/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/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..8d8d1db
--- /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">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index b58bb8c..ea9839c 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -23,7 +23,7 @@
     <dimen name="status_bar_padding_top">1px</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_default</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
     <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
diff --git a/raven/proprietary-files.txt b/raven/proprietary-files.txt
index 731c2d6..181d1ba 100644
--- a/raven/proprietary-files.txt
+++ b/raven/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
@@ -40,7 +43,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
@@ -139,7 +142,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