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..4928873
--- /dev/null
+++ b/device-evolution.mk
@@ -0,0 +1,9 @@
+#
+# Copyright (C) 2024 The Evolution X Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+
+TARGET_HAS_UDFPS += true
diff --git a/lineage.dependencies b/evolution.dependencies
similarity index 79%
rename from lineage.dependencies
rename to evolution.dependencies
index c301eb9..5f5da60 100644
--- a/lineage.dependencies
+++ b/evolution.dependencies
@@ -1,6 +1,6 @@
 [
   {
-    "repository": "android_device_google_gs201",
+    "repository": "device_google_gs201",
     "target_path": "device/google/gs201"
   },
   {
diff --git a/lineage_lynx.mk b/lineage_lynx.mk
index d26db25..6a195ef 100644
--- a/lineage_lynx.mk
+++ b/lineage_lynx.mk
@@ -14,7 +14,9 @@ DEVICE_PATH := device/google/lynx
 VENDOR_PATH := vendor/google/lynx
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
+$(call inherit-product, device/google/gs201/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/lynx/BoardConfig.mk b/lynx/BoardConfig.mk
index 6f58c41..2b836ca 100644
--- a/lynx/BoardConfig.mk
+++ b/lynx/BoardConfig.mk
@@ -54,3 +54,4 @@ endif
 DEVICE_PATH := device/google/lynx
 VENDOR_PATH := vendor/google/lynx
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
diff --git a/lynx/BoardConfigEvolution.mk b/lynx/BoardConfigEvolution.mk
new file mode 100644
index 0000000..87b71af
--- /dev/null
+++ b/lynx/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/lynx/device-evolution.mk b/lynx/device-evolution.mk
new file mode 100644
index 0000000..6065670
--- /dev/null
+++ b/lynx/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/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
new file mode 100644
index 0000000..8d8d1db
--- /dev/null
+++ b/lynx/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/lynx/overlay/frameworks/base/core/res/res/values/dimens.xml b/lynx/overlay/frameworks/base/core/res/res/values/dimens.xml
index 2069e4f..2ee9475 100644
--- a/lynx/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/lynx/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -29,8 +29,9 @@
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
+    <dimen name="status_bar_height">41.142857143dp</dimen>
     <dimen name="status_bar_height_default">28dp</dimen>
-    <dimen name="status_bar_height_portrait">118px</dimen>
+    <dimen name="status_bar_height_portrait">41.142857143dp</dimen>
     <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
diff --git a/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 1817484..da5fd12 100644
--- a/lynx/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/lynx/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">28dp</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/lynx/proprietary-files.txt b/lynx/proprietary-files.txt
index d5450c8..447b0dd 100644
--- a/lynx/proprietary-files.txt
+++ b/lynx/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
@@ -140,7 +143,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