diff --git a/app/build.gradle b/app/build.gradle
index 509179f426f24b7cb13a5b9937244eea01ce0f93..92562772bef053f1157a182134a2dca8ef0ffeb1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+
     defaultConfig {
         applicationId "org.lineageos.recorder"
-        minSdkVersion 24
-        targetSdkVersion 27
+        minSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.1"
     }
@@ -15,18 +15,30 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug{
+            applicationIdSuffix ".debug"
+        }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
     productFlavors {
     }
+
+    aaptOptions {
+        additionalParameters '-I', 'e-ui-sdk.jar'
+    }
+
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
+    compileOnly files("../e-ui-sdk.jar")
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
+
 }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index d75cf3ea82018687b32ac0a9b103a605b00d0db4..0ba250e7674b625324731c5c43f2409ad74b0c8b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,4 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+-dontwarn lineageos.**
\ No newline at end of file
diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk
index 265b22cf374816255caf688c8efe1adf933973d7..4f00729c747af05f10b7994c737f4a29221dd669 100644
--- a/app/src/main/Android.mk
+++ b/app/src/main/Android.mk
@@ -34,10 +34,13 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
     androidx.recyclerview_recyclerview \
     com.google.android.material_material \
 
+LOCAL_STATIC_JAVA_LIBRARIES := \
+     org.lineageos.platform.sdk \
+
 LOCAL_PACKAGE_NAME := Recorder
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
-#LOCAL_PROGUARD_FLAG_FILES := $(LOCAL_PATH)/../../proguard-rules.pro
+LOCAL_PROGUARD_FLAG_FILES := ../../proguard-rules.pro
 
 LOCAL_PRIVATE_PLATFORM_APIS := true
 
diff --git a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
index 4ef7fa91585f132cf1e7adeeec14d916ca9351b8..621bcddd0c27a4f79cacd506ed474c4ac90566aa 100644
--- a/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
+++ b/app/src/main/java/org/lineageos/recorder/RecorderActivity.java
@@ -314,8 +314,8 @@ public class RecorderActivity extends AppCompatActivity implements
                 set.clone(this, R.layout.constraint_sound);
             }
         } else {
-            mScreenFab.setImageResource(R.drawable.ic_action_screen_record);
-            mSoundFab.setImageResource(R.drawable.ic_action_sound_record);
+            mScreenFab.setImageResource(lineageos.platform.R.drawable.ic_camera_video);
+            mSoundFab.setImageResource(lineageos.platform.R.drawable.ic_mic);
             mScreenFab.setSelected(false);
             mSoundFab.setSelected(false);
             mRecordingVisualizer.setVisibility(View.GONE);
diff --git a/app/src/main/res/layout/activty_constraint.xml b/app/src/main/res/layout/activty_constraint.xml
index 00d5e00180530937c573fd9459d172941a9f1f3e..d59e8da9bb7b6d3ab943a6d866164e2ad186c915 100644
--- a/app/src/main/res/layout/activty_constraint.xml
+++ b/app/src/main/res/layout/activty_constraint.xml
@@ -40,8 +40,10 @@
             android:paddingEnd="16dp"
             android:paddingStart="16dp"
             android:textAlignment="center"
-            android:textColor="@color/white"
-            android:textSize="28sp" />
+            android:textColor="@color/color_default_primary_text"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            android:text="@string/sound_recording_title_working" />
 
         <org.lineageos.recorder.ui.SoundVisualizer
             android:id="@+id/main_recording_visualizer"
@@ -65,7 +67,8 @@
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/sound_fab"
             style="@style/AppTheme.RecordFab"
-            android:src="@lineageos.platform:drawable/ic_mic" />
+            android:src="@lineageos.platform:drawable/ic_mic"
+            app:tint="@color/color_default_foreground"/>
 
         <TextView
             style="@style/AppTheme.RecordTitle"
@@ -96,7 +99,8 @@
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/screen_fab"
             style="@style/AppTheme.RecordFab"
-            android:src="@lineageos.platform:drawable/ic_camera_video" />
+            android:src="@lineageos.platform:drawable/ic_camera_video"
+            app:tint="@color/color_default_foreground"/>
 
         <TextView
             style="@style/AppTheme.RecordTitle"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c22b12f7eb54a29c404f59832b9dd96e6d7413d8..6f90463df77a46b698babea288d31ac859082585 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,6 +18,10 @@
     <color name="colorPrimaryDark">@lineageos.platform:color/color_default_primary_dark</color>
     <color name="colorAccent">@lineageos.platform:color/color_default_accent</color>
 
+    <color name="color_default_primary_text">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_secondary_text">@lineageos.platform:color/color_default_secondary_text</color>
+    <color name="color_default_foreground">@lineageos.platform:color/color_default_foreground</color>
+
     <color name="white">#fafafa</color>
     <color name="black">#333333</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a284e167c36ebc7c688427743c92b85b798b8c9f..462d73c1d00ae70f72fa523b45544382482cbb6e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,7 +46,7 @@
         <item name="android:layout_marginRight">16dp</item>
         <item name="android:layout_marginBottom">24dp</item>
         <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:textColor">@color/icon</item>
+        <item name="android:textColor">@color/color_default_primary_text</item>
         <item name="android:textSize">18sp</item>
         <item name="android:maxLines">1</item>
         <item name="android:layout_alignParentBottom">true</item>