diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 51503631100de567d1a13be1440fa64550304a6f..62d9246d4a783cc6a67db57771ed48be924d03eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,33 @@
+image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"
+
 stages:
-  - auto-merge-main
+  - build
   - update-from-upstream
 
 include:
-  - project: 'e/templates'
-    ref: master
-    file: '/gitlab-ci/.gitlab-ci-auto-merge-main.yml'
-  - project: 'e/templates'
-    ref: master
-    file: '/gitlab-ci/.gitlab-ci-import-updates-from-upstream.yml'
+  - project: "e/templates"
+    ref: main
+    file: "/.gitlab/gitlab-ci/gitlab-ci-import-updates-from-upstream.yml"
+
+main:
+  extends: .update-from-upstream
+  variables:
+    UPSTREAM_BRANCH: lineage-23.0
+    LOCAL_BRANCH: main
+
+before_script:
+  - export GRADLE_USER_HOME=$(pwd)/.gradle
+  - chmod +x ./gradlew
+
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+    - .gradle/
+
+build:
+  stage: build
+  script:
+    - ./gradlew assemble
+  artifacts:
+    paths:
+      - app/build/outputs/apk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index c78d7bf7052a9f3915d73f8bfcc353e9000d9ca3..6afb1f2b6d025df4f0a86b53c92baa61651f9cab 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -25,11 +25,22 @@ android {
         versionName = "1.1"
     }
 
+    signingConfigs {
+        create("testkey") {
+            storeFile = File("${rootDir}/keystore/testkey.jks")
+            storePassword = "testkey"
+            keyAlias = "testkey"
+            keyPassword = "testkey"
+        }
+    }
+
     buildTypes {
         getByName("release") {
             // Enables code shrinking, obfuscation, and optimization.
             isMinifyEnabled = true
 
+            signingConfig = signingConfigs.getByName("testkey")
+
             // Includes the default ProGuard rules files.
             setProguardFiles(
                 listOf(
@@ -39,8 +50,7 @@ android {
             )
         }
         getByName("debug") {
-            // Append .dev to package name so we won't conflict with AOSP build.
-            applicationIdSuffix = ".dev"
+            signingConfig = signingConfigs.getByName("testkey")
         }
     }
 
@@ -74,6 +84,8 @@ dependencies {
     // Recyclerview
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
+
+    implementation("foundation.e:elib:0.0.1-alpha11")
 }
 
 configure<GenerateBpPluginExtension> {
diff --git a/app/src/main/java/org/lineageos/recorder/ui/WaveFormView.kt b/app/src/main/java/org/lineageos/recorder/ui/WaveFormView.kt
index a5570c967c4243bf463fa743a306bed8657147fd..bd61797c84ff55cd3e772f4d82a3505cd382555f 100644
--- a/app/src/main/java/org/lineageos/recorder/ui/WaveFormView.kt
+++ b/app/src/main/java/org/lineageos/recorder/ui/WaveFormView.kt
@@ -17,6 +17,7 @@ import com.google.android.material.color.MaterialColors
 import org.lineageos.recorder.R
 import kotlin.math.pow
 import kotlin.math.sin
+import foundation.e.elib.R as eR
 
 class WaveFormView @JvmOverloads constructor(
     context: Context,
@@ -76,9 +77,7 @@ class WaveFormView @JvmOverloads constructor(
             DEFAULT_PHASE_SHIFT
         )
 
-        wavesColor = MaterialColors.getColor(
-            this, com.google.android.material.R.attr.colorSecondary
-        )
+        wavesColor = context.getColor(eR.color.e_secondary_text_color)
 
         paint = Paint()
         paint.color = wavesColor
diff --git a/app/src/main/res/layout/dialog_content_rename.xml b/app/src/main/res/layout/dialog_content_rename.xml
index 29d58bbb36368b93faf51a4f72bfb7681e3180a7..70d61acf319304d884e9c6744717f3e2791dd120 100644
--- a/app/src/main/res/layout/dialog_content_rename.xml
+++ b/app/src/main/res/layout/dialog_content_rename.xml
@@ -14,6 +14,7 @@
         android:layout_height="wrap_content"
         android:importantForAutofill="no"
         android:maxLines="1"
-        android:singleLine="true" />
+        android:singleLine="true"
+        android:textColorHighlight="@color/e_alpha_accent"/>
 
 </FrameLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 077081c32e3c8c50e33b362ff7915069c18fb8a5..3d7b9f5689a09491c8fe94c59fefde6888ded47d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,6 +18,7 @@
         <item name="android:windowBackground">@color/e_background</item>
         <item name="actionModeStyle">@style/action_mode_style</item>
         <item name="statusBarForeground">@color/e_action_bar</item>
+        <item name="colorControlActivated">@color/e_accent</item>
     </style>
 
     <style name="action_mode_style" parent="@style/Widget.Material3.ActionMode">
diff --git a/keystore/testkey.jks b/keystore/testkey.jks
new file mode 100644
index 0000000000000000000000000000000000000000..f8e2054d1569c252e29ec38ddf557234164c2534
Binary files /dev/null and b/keystore/testkey.jks differ
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d3931514a00388dae892c3f9a4956bfa5fe66eac..7f2d9caa8c9cf0e2517e00ae0ca84c1ed1855bed 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -17,6 +17,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        maven("https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven")
     }
 }