diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2634534..a1bf042 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -22,6 +22,7 @@ if (flutterVersionName == null) {
 }
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 
@@ -36,13 +37,19 @@ android {
     compileSdkVersion 31
 
     compileOptions {
-
-        // Required to use WebRTC
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
-
     }
 
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/java'
+    }
+
+
     lintOptions {
         disable 'InvalidPackage'
 
@@ -79,9 +86,7 @@ android {
 
     buildTypes {
         release {
-            useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
         }
     }
 
@@ -112,6 +117,7 @@ flutter {
 }
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.neovisionaries:nv-websocket-client:2.14'
     testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/android/app/src/main/kotlin/org/communiquons/comunic/MainActivity.kt b/android/app/src/main/kotlin/org/communiquons/comunic/MainActivity.kt
deleted file mode 100644
index f220697..0000000
--- a/android/app/src/main/kotlin/org/communiquons/comunic/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.communiquons.comunic
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/build.gradle b/android/build.gradle
index a672cda..aa17323 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,5 @@
 buildscript {
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         mavenCentral()
@@ -6,6 +7,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // Firebase
         classpath 'com.google.gms:google-services:4.3.10'
diff --git a/lib/ui/widgets/login_routes_theme.dart b/lib/ui/widgets/login_routes_theme.dart
index 99d72bc..6593075 100644
--- a/lib/ui/widgets/login_routes_theme.dart
+++ b/lib/ui/widgets/login_routes_theme.dart
@@ -50,9 +50,7 @@ class LoginRoutesTheme extends StatelessWidget {
             ),
             colorScheme: ColorScheme(
               primary: Colors.white,
-              primaryVariant: Colors.white,
               secondary: Colors.white,
-              secondaryVariant: Colors.white,
               surface: Config.get().splashBackgroundColor,
               background: Config.get().splashBackgroundColor,
               error: Colors.redAccent,
diff --git a/pubspec.lock b/pubspec.lock
index a74d054..3c2072c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -422,6 +422,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.3"
   meta:
     dependency: transitive
     description:
@@ -727,7 +734,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.3"
+    version: "0.4.8"
   typed_data:
     dependency: transitive
     description: