diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index df21dba..3bee15d 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -5,4 +5,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/derp_topaz.mk
+    $(LOCAL_DIR)/lineage_topaz.mk
+
+COMMON_LUNCH_CHOICES := \
+    lineage_topaz-user \
+    lineage_topaz-userdebug \
+    lineage_topaz-eng
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c107258..fa844de 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -246,7 +246,7 @@ BOARD_AVB_ODM_ADD_HASHTREE_FOOTER_ARGS += --hash_algorithm sha256
 # VINTF
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
     $(DEVICE_PATH)/configs/vintf/framework_compatibility_matrix.xml \
-    vendor/derp/config/device_framework_matrix.xml \
+    vendor/lineage/config/device_framework_matrix.xml \
     hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml
 DEVICE_FRAMEWORK_MANIFEST_FILE += $(DEVICE_PATH)/configs/vintf/framework_manifest.xml
 DEVICE_MANIFEST_FILE += \
diff --git a/derp_topaz.mk b/lineage_topaz.mk
similarity index 83%
rename from derp_topaz.mk
rename to lineage_topaz.mk
index e0bdcd1..589e857 100644
--- a/derp_topaz.mk
+++ b/lineage_topaz.mk
@@ -12,9 +12,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 $(call inherit-product, device/xiaomi/topaz/device.mk)
 
 # Inherit some common derp stuff.
-$(call inherit-product, vendor/derp/config/common_full_phone.mk)
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
-PRODUCT_NAME := derp_topaz
+# To include Gapps 
+WITH_GMS := true
+
+PRODUCT_NAME := lineage_topaz
 PRODUCT_DEVICE := topaz
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_BRAND := Redmi
@@ -24,5 +27,4 @@ PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
 BUILD_FINGERPRINT := Redmi/tapas_global/tapas:13/TKQ1.221114.001/OS2.0.5.0.VMTMIXM:user/release-keys
 
-# DerpFest
-TARGET_NOT_USES_BLUR := true
+
diff --git a/overlay-lineage/packages/apps/Settings/res/values/derp_strings.xml b/overlay-lineage/packages/apps/Settings/res/values/derp_strings.xml
deleted file mode 100644
index 333be84..0000000
--- a/overlay-lineage/packages/apps/Settings/res/values/derp_strings.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2024 DerpFest
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-
-    <string name="maintainer_name">artemscine</string>
-    <string name="maintainer_telegram">https://t.me/openscine</string>
-
-</resources>
diff --git a/overlay-lineage/packages/apps/Settings/res/values/strings.xml b/overlay-lineage/packages/apps/Settings/res/values/strings.xml
new file mode 100644
index 0000000..26a64d4
--- /dev/null
+++ b/overlay-lineage/packages/apps/Settings/res/values/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2025 Project Matrixx
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Android version screen, build maintainer -->
+    <string name="matrixx_maintainer">REIGN</string>
+</resources>