diff --git a/build.gradle b/build.gradle
index 647351d..86fcc6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = "1.5.20"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:6.0.2"
 
diff --git a/settings.gradle b/settings.gradle
index fe86bdb..1fd0795 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
 rootProject.name = "Zom-Keanu3"
-include ':zomapp',':libkeanu'
-project(':libkeanu').projectDir = file('../keanuapp-android-uionly/app')
\ No newline at end of file
+include ':zomapp'
+//,':libkeanu'
+//project(':libkeanu').projectDir = file('../keanuapp-android-uionly/app')
diff --git a/zomapp/build.gradle b/zomapp/build.gradle
index 77738db..b116d4f 100644
--- a/zomapp/build.gradle
+++ b/zomapp/build.gradle
@@ -9,11 +9,10 @@ android {
 
     defaultConfig {
         applicationId "im.zom.messenger"
-        //applicationId "im.zom.keanu3"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 301002100
-        versionName "3.0.1-RC-1"
+        versionCode 302001200
+        versionName "3.0.2-BETA-2"
         archivesBaseName = "Zom-$versionName"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,6 +28,32 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    flavorDimensions "release"
+
+    productFlavors {
+
+        primary {// Assigns this product flavor to the "mode" flavor dimension.
+            dimension "release"
+            applicationId "im.zom.messenger"
+            archivesBaseName = "Zom-$versionName"
+            versionCode 302001200
+            versionName "3.0.2-BETA-2"
+            multiDexEnabled true
+        }
+
+        nightly {
+            dimension = "release"
+            applicationId "im.zom.keanu3"
+            versionCode 302001200
+            versionName "3.0.2-BETA-2"
+            archivesBaseName = "Zom-$versionName-nightly"
+        }
+
+
+    }
+
+
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
@@ -52,11 +77,10 @@ android {
         exclude 'META-INF/proguard'
         exclude 'META-INF/proguard/androidx-annotations.pro'
         exclude 'META-INF/androidx.exifinterface_exifinterface.version'
-    //    exclude 'lib/arm64-v8a/libjingle_peerconnection_so.so'
-     //   exclude 'lib/armeabi-v7a/libjingle_peerconnection_so.so'
-      //  exclude 'lib/x86/libjingle_peerconnection_so.so'
-       // exclude 'lib/x86_64/libjingle_peerconnection_so.so'
-
+        exclude 'lib/arm64-v8a/libjingle_peerconnection_so.so'
+        exclude 'lib/armeabi-v7a/libjingle_peerconnection_so.so'
+        exclude 'lib/x86/libjingle_peerconnection_so.so'
+        exclude 'lib/x86_64/libjingle_peerconnection_so.so'
 
     }
 
@@ -80,19 +104,18 @@ android {
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation project (":libkeanu")
-  //  implementation 'com.gitlab.keanuapp:keanu-android-trinity-app:0.0.5.29'
+    implementation 'com.gitlab.keanuapp:keanu-android-trinity-app:0.0.5.37'
 
 }
 
diff --git a/zomapp/src/main/res/values/zomstrings.xml b/zomapp/src/main/res/values/zomstrings.xml
index fea38cb..f4f7206 100644
--- a/zomapp/src/main/res/values/zomstrings.xml
+++ b/zomapp/src/main/res/values/zomstrings.xml
@@ -208,8 +208,7 @@
   <string name="view_profile">View profile</string>
   <string name="kickout">Kickout</string>
   <string name="find_your_friend">Find your friend on Zom</string>
-  <string name="hint_add_friend" translatable="false"><font size="12">@zomkyi12:home.zom.im</font></string>
-  <string name="enter_your_friends_account">Enter your friend\'s short username or full address. Your\'s is</string>
+  <string name="hint_add_friend" translatable="false"><font size="12">@zomkyi12:nang.zom.im</font></string>
   <string name="send_your_invite_link">Send your invite link</string>
   <string name="standing_next_to_them">Standing next to them?</string>