diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f7d81810..5b8fefd1 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -12,10 +12,23 @@ jobs:
       uses: actions/setup-ruby@v1
       with:
         ruby-version: '2.7'
-    - name: set up JDK 1.8
+    - name: set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        distribution: 'zulu'
+        java-version: '11'
+    - name: set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - name: generate ksProp file
+      run: python scripts/generateKsPropFile.py
+    - name: create google-services.json file
+      run: cat app/google-services.json | base64
+    - name: update google-services.json file
+      env:
+        DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
+      run: echo $DATA > app/google-services.json
     - name: setup fastlane
       run: bundle install
     - name: run unit tests
@@ -30,23 +43,53 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: '11'
+      - name: set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: generate ksProp file
+        run: python scripts/generateKsPropFile.py
+      - name: create google-services.json file
+        run: cat app/google-services.json | base64
+      - name: update google-services.json file
+        env:
+          DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
+        run: echo $DATA > app/google-services.json
       - name: Lint
-        run: bash ./gradlew lint --stacktrace
+        run: bash ./gradlew lintDebug
       - name: Lint results
         uses: actions/upload-artifact@v1
         with:
           name: app
-          path: app/build/reports/lint-results.html
+          path: app/build/reports/lint-results-debug.html
 
   ui-test:
     runs-on: macOS-latest
     steps:
       - name: checkout
         uses: actions/checkout@v2
+      - name: set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - name: set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      - name: generate ksProp file
+        run: python scripts/generateKsPropFile.py
+      - name: create google-services.json file
+        run: cat app/google-services.json | base64
+      - name: update google-services.json file
+        env:
+          DATA: ${{ secrets.GOOGLE_SERVICES_JSON }}
+        run: echo $DATA > app/google-services.json
       - name: run tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
new file mode 100644
index 00000000..c1bfc262
--- /dev/null
+++ b/.idea/androidTestResultsUserPreferences.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidTestResultsUserPreferences">
+    <option name="androidTestResultsTableState">
+      <map>
+        <entry key="531090552">
+          <value>
+            <AndroidTestResultsTableState>
+              <option name="preferredColumnWidths">
+                <map>
+                  <entry key="Duration" value="90" />
+                  <entry key="Google&#10; Pixel 4 XL" value="120" />
+                  <entry key="Tests" value="360" />
+                  <entry key="_Rooted_Pixel_4_XL_API_31" value="120" />
+                  <entry key="adb-99061FFBA00BVD-B2Uy6y._adb-tls-connect._tcp." value="120" />
+                </map>
+              </option>
+            </AndroidTestResultsTableState>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 33782299..669e0711 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,10 +5,18 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.038288288288288286" />
+      </ProjectState>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460d..00000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 40f07aee..9f5be1e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,80 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.3)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    CFPropertyList (3.0.5)
+      rexml
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.416.0)
-    aws-sdk-core (3.111.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.642.0)
+    aws-sdk-core (3.158.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    claide (1.0.3)
+    claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
     declarative (0.0.20)
-    declarative-option (0.1.0)
-    digest-crc (0.6.3)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.1)
-    excon (0.78.1)
-    faraday (1.3.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.93.0)
+    faraday (1.10.2)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
-    faraday_middleware (1.0.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.1)
-    fastlane (2.172.0)
+    fastimage (2.2.6)
+    fastlane (2.210.1)
       CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
+      addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -65,18 +83,20 @@ GEM
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
+      optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
@@ -86,73 +106,85 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-api-client (0.38.0)
+    google-apis-androidpublisher_v3 (0.29.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-core (0.9.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-iamcredentials_v1 (0.15.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.11.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.4.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.2)
-      addressable (~> 2.5)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.43.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (0.14.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.2.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
-    json (2.5.1)
-    jwt (2.2.2)
+    jmespath (1.6.1)
+    json (2.6.2)
+    jwt (2.5.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
-    mini_mime (1.0.2)
+    mini_mime (1.1.2)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    naturally (2.2.0)
-    os (1.1.1)
+    naturally (2.2.1)
+    optparse (0.1.1)
+    os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
-    rake (13.0.3)
-    representable (3.0.4)
+    public_suffix (5.0.0)
+    rake (13.0.6)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
+    rexml (3.2.5)
     rouge (2.0.7)
-    ruby2_keywords (0.0.2)
-    rubyzip (2.3.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -160,25 +192,29 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7-x64-mingw32)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.8.2)
+    unf_ext (0.0.8.2-x64-mingw32)
+    unicode-display_width (1.8.0)
+    webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.19.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  universal-darwin-21
   x64-mingw32
 
 DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   2.1.4
+   2.3.7
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1..c8f0d7e9 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,3 @@
 /build
+keystore.properties
+google-services.json
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e876ce33..0b8c67e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,17 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'koin'
+plugins {
+    id 'com.android.application'
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
+    id 'dagger.hilt.android.plugin'
+}
 
 repositories {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -16,58 +21,90 @@ android {
     defaultConfig {
         applicationId "org.kabiri.android.usbterminal"
         minSdkVersion 23
-        targetSdkVersion 30
-        versionCode 9
-        versionName "0.7.9"
+        targetSdkVersion 33
+        versionCode 10
+        versionName "0.8.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        // read release credentials from keystore.properties file
+        def ksProp = new Properties()
+        // load keys inside the ksProp file
+        loadKeyStore(ksProp)
+        release {
+            keyAlias ksProp.getProperty("release.keyAlias")
+            keyPassword ksProp.getProperty("release.keyPassword")
+            storeFile file(ksProp.getProperty("release.file"))
+            storePassword ksProp.getProperty("release.storePassword")
+        }
+    }
+
     buildTypes {
         release {
+            signingConfig signingConfigs.release
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 
-    buildFeatures {
-        viewBinding true
-    }
+    namespace 'org.kabiri.android.usbterminal'
 
 }
 
+private void loadKeyStore(Properties ksProp) {
+    def ksPropFile = file("keystore.properties")
+    if (ksPropFile.exists()) {
+        ksProp.load(new FileInputStream(ksPropFile))
+    } else {
+        println 'ERROR: local keystore file not found'
+    }
+}
+
 dependencies {
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 
-    // Sentry Tracking
-    implementation 'io.sentry:sentry-android-core:2.0.2'
+    // Firebase
+    implementation platform("com.google.firebase:firebase-bom:$firebase_bom_version")
+    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
 
-    // Koin for Android - ViewModel features
-    implementation "org.koin:koin-android-viewmodel:$koin_version"
+    // Dependency Injection
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-compiler:$hilt_version"
 
     // Coroutines
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.activity:activity-compose:1.6.0'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2'
-//    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.0-RC2'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+
+    // hilt testing
+    // more info:
+    // https://developer.android.com/training/dependency-injection/hilt-testing
+    androidTestImplementation "com.google.dagger:hilt-android-testing:$hilt_version"
+    kaptAndroidTest "com.google.dagger:hilt-android-compiler:$hilt_version"
 
     // unit test libs
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation "com.google.truth:truth:1.1.2"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.google.truth:truth:1.1.3"
 
     // instrumented test libs
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test:core:1.5.0-alpha02'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
     // Espresso
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     // Hamcrest for view matching
-    androidTestImplementation 'org.hamcrest:hamcrest-library:1.3'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
 
     /**
      * This library helps to automate some parts of the USB serial connection.
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
index f49d7fbe..5a9c56a9 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
@@ -5,14 +5,18 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.rules.activityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 
 
+@RunWith(AndroidJUnit4::class)
 class MainActivityTest {
 
     @get:Rule
-    var rule = ActivityScenarioRule(MainActivity::class.java)
+    var rule = activityScenarioRule<MainActivity>()
 
     @Test
     fun checkUiViewsAreDisplayed() {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f89a8e95..c87c749d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.kabiri.android.usbterminal">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.usb.host" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -9,7 +8,6 @@
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
-        android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
@@ -19,7 +17,8 @@
         <!-- sentry: replace the empty value with @string/sentry_dsn -->
         <meta-data android:name="io.sentry.dsn" android:value="" />
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
index dd5d9661..cb0cd4d0 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainActivity.kt
@@ -7,49 +7,59 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import android.widget.Button
+import android.widget.EditText
+import android.widget.TextView
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import org.kabiri.android.usbterminal.databinding.ActivityMainBinding
+import dagger.hilt.android.AndroidEntryPoint
 import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
-import org.koin.android.viewmodel.ext.android.viewModel
-
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     companion object {
         private const val TAG = "MainActivity"
     }
 
-    private val viewModel: MainActivityViewModel by viewModel()
-    private lateinit var binding: ActivityMainBinding
+    private val viewModel by viewModels<MainActivityViewModel>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
         setContentView(R.layout.activity_main)
-        binding = ActivityMainBinding.inflate(layoutInflater)
+
+        val etInput = findViewById<EditText>(R.id.etInput)
+        val tvOutput = findViewById<TextView>(R.id.tvOutput)
+        val btEnter = findViewById<Button>(R.id.btEnter)
+
         // make the text view scrollable:
-        binding.tvOutput.movementMethod = ScrollingMovementMethod()
+        tvOutput.movementMethod = ScrollingMovementMethod()
 
         // open the device and port when the permission is granted by user.
-        viewModel.getGrantedDevice().observe(this, { device ->
+        viewModel.getGrantedDevice().observe(this) { device ->
             viewModel.openDeviceAndPort(device)
-        })
+        }
 
-        viewModel.getLiveOutput().observe(this, {
+        viewModel.getLiveOutput().observe(this) {
             val spannable = SpannableString(it.text)
             spannable.setSpan(
                 it.getAppearance(this),
                 0,
                 it.text.length,
-                SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE)
-            binding.tvOutput.append(it.text)
-        })
+                SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+        }
+
+        viewModel.output.observe(this) {
+            tvOutput.apply { text = it }
+        }
 
         // send the command to device when the button is clicked.
-        binding.btEnter.setOnClickListener {
-            val input = binding.etInput.text.toString()
+        btEnter.setOnClickListener {
+            val input = etInput.text.toString()
+            // append the input to console
             if (viewModel.serialWrite(input))
-                binding.etInput.setText("") // clear the terminal input.
+                etInput.setText("") // clear the terminal input.
             else Log.e(TAG, "The message was not sent to Arduino")
         }
     }
@@ -60,6 +70,10 @@ class MainActivity : AppCompatActivity() {
                 viewModel.askForConnectionPermission()
                 true
             }
+            R.id.actionDisconnect -> {
+                viewModel.disconnect()
+                true
+            }
             else -> false
         }
     }
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/MainApplication.kt b/app/src/main/java/org/kabiri/android/usbterminal/MainApplication.kt
index 7db4bd13..2244158a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/MainApplication.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/MainApplication.kt
@@ -1,25 +1,19 @@
 package org.kabiri.android.usbterminal
 
 import android.app.Application
-import org.kabiri.android.usbterminal.koin.appModule
-import org.koin.android.ext.koin.androidContext
-import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
-import org.koin.core.logger.Level
+import com.google.firebase.FirebaseApp
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import dagger.hilt.android.HiltAndroidApp
 
 /**
  * Created by Ali Kabiri on 13.04.20.
  */
+@HiltAndroidApp
 class MainApplication: Application() {
 
     override fun onCreate() {
+        FirebaseApp.initializeApp(this)
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(true)
         super.onCreate()
-
-        // start Koin context.
-        startKoin{
-            androidContext(this@MainApplication)
-            androidLogger(Level.DEBUG)
-            modules(appModule)
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
index 08e8dfeb..cc37258a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/arduino/ArduinoHelper.kt
@@ -15,6 +15,7 @@ import com.felhr.usbserial.UsbSerialDevice
 import com.felhr.usbserial.UsbSerialInterface
 import org.kabiri.android.usbterminal.Constants
 import org.kabiri.android.usbterminal.R
+import javax.inject.Inject
 
 
 /**
@@ -24,9 +25,13 @@ import org.kabiri.android.usbterminal.R
  * Info: The `askForConnectionPermission()` method
  *  registers the Arduino Permission Broadcast Receiver.
  */
-class ArduinoHelper(private val context: Context,
-                    private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
-                    private val arduinoSerialReceiver: ArduinoSerialReceiver) {
+
+class ArduinoHelper
+@Inject constructor(
+    private val context: Context,
+    private val arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
+    private val arduinoSerialReceiver: ArduinoSerialReceiver
+) {
 
     companion object {
         private const val TAG = "ArduinoHelper"
@@ -50,29 +55,11 @@ class ArduinoHelper(private val context: Context,
             for (device in usbDevices) {
                 val deviceVID = device.value.vendorId
                 if (deviceVID == 0x2341) { // Arduino vendor ID
-                    val permissionIntent = PendingIntent.getBroadcast(
-                        context,
-                        0,
-                        Intent(Constants.ACTION_USB_PERMISSION),
-                        0
-                    )
-                    val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
-                    context.registerReceiver(arduinoPermReceiver, filter) // register the broadcast receiver
-                    usbManager.requestPermission(device.value, permissionIntent)
-                    _liveInfoOutput.postValue(context.getString(R.string.helper_info_usb_permission_requested))
+                    connect(device)
                 } else {
                     _liveErrorOutput.postValue(context.getString(R.string.helper_error_device_not_found))
-                    try {
-                        connection.close()
-                    } catch (e: UninitializedPropertyAccessException) {
-                        _liveErrorOutput.postValue(context.getString(
-                            R.string.helper_error_connection_not_ready_to_close))
-                        _liveErrorOutput.postValue(e.message)
-                    } catch (e: Exception) {
-                        _liveErrorOutput.postValue(context.getString(
-                            R.string.helper_error_connection_failed_to_close))
-                        _liveErrorOutput.postValue(e.message)
-                    }
+                    _liveErrorOutput.postValue(context.getString(R.string.helper_error_connecting_anyway))
+                    connect(device)
                 }
             }
         } else {
@@ -80,6 +67,40 @@ class ArduinoHelper(private val context: Context,
         }
     }
 
+    fun disconnect() {
+        try {
+            connection.close()
+            _liveOutput.postValue(context.getString(R.string.helper_info_serial_connection_closed))
+        } catch (e: UninitializedPropertyAccessException) {
+            _liveErrorOutput.postValue(
+                context.getString(
+                    R.string.helper_error_connection_not_ready_to_close
+                )
+            )
+            _liveErrorOutput.postValue(e.message)
+        } catch (e: Exception) {
+            _liveErrorOutput.postValue(
+                context.getString(
+                    R.string.helper_error_connection_failed_to_close
+                )
+            )
+            _liveErrorOutput.postValue(e.message)
+        }
+    }
+
+    private fun connect(device: MutableMap.MutableEntry<String, UsbDevice>) {
+        val permissionIntent = PendingIntent.getBroadcast(
+            context,
+            0,
+            Intent(Constants.ACTION_USB_PERMISSION),
+            PendingIntent.FLAG_MUTABLE // it is necessary for connecting to the device.
+        )
+        val filter = IntentFilter(Constants.ACTION_USB_PERMISSION)
+        context.registerReceiver(arduinoPermReceiver, filter) // register the broadcast receiver
+        usbManager.requestPermission(device.value, permissionIntent)
+        _liveInfoOutput.postValue(context.getString(R.string.helper_info_usb_permission_requested))
+    }
+
     /**
      * use this live object in activity
      * to call `openDeviceAndPort()` method when the device is available.
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
new file mode 100644
index 00000000..1b17095d
--- /dev/null
+++ b/app/src/main/java/org/kabiri/android/usbterminal/di/AppModule.kt
@@ -0,0 +1,43 @@
+package org.kabiri.android.usbterminal.di
+
+import android.app.Application
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import org.kabiri.android.usbterminal.arduino.ArduinoHelper
+import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
+import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
+
+/**
+ * Created by Ali Kabiri on 13.04.20.
+ */
+@Module
+@InstallIn(SingletonComponent::class)
+class AppModule {
+
+    @Provides
+    fun provideContext(
+        app: Application
+    ): Context = app.applicationContext
+
+    @Provides
+    fun provideArduinoPermissionBroadcastReceiver() = ArduinoPermissionBroadcastReceiver()
+
+    @Provides
+    fun providesArduinoSerialReceiver() = ArduinoSerialReceiver()
+
+    @Provides
+    fun providesArduinoHelper(
+        context: Context,
+        arduinoPermReceiver: ArduinoPermissionBroadcastReceiver,
+        arduinoSerialReceiver: ArduinoSerialReceiver,
+    ): ArduinoHelper {
+        return ArduinoHelper(
+            context = context,
+            arduinoPermReceiver = arduinoPermReceiver,
+            arduinoSerialReceiver = arduinoSerialReceiver,
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/koin/AppModule.kt b/app/src/main/java/org/kabiri/android/usbterminal/koin/AppModule.kt
deleted file mode 100644
index efdd484c..00000000
--- a/app/src/main/java/org/kabiri/android/usbterminal/koin/AppModule.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.kabiri.android.usbterminal.koin
-
-import org.kabiri.android.usbterminal.arduino.ArduinoHelper
-import org.kabiri.android.usbterminal.arduino.ArduinoPermissionBroadcastReceiver
-import org.kabiri.android.usbterminal.arduino.ArduinoSerialReceiver
-import org.kabiri.android.usbterminal.viewmodel.MainActivityViewModel
-import org.koin.android.viewmodel.dsl.viewModel
-import org.koin.dsl.module
-
-/**
- * Created by Ali Kabiri on 13.04.20.
- */
-val appModule = module {
-
-    single { ArduinoPermissionBroadcastReceiver() }
-    single { ArduinoSerialReceiver() }
-    single { ArduinoHelper(get(), get(), get()) }
-
-    viewModel { MainActivityViewModel(get()) }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
index 0addf183..575ab12a 100644
--- a/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
+++ b/app/src/main/java/org/kabiri/android/usbterminal/viewmodel/MainActivityViewModel.kt
@@ -2,21 +2,35 @@ package org.kabiri.android.usbterminal.viewmodel
 
 import android.hardware.usb.UsbDevice
 import androidx.lifecycle.*
+import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import org.kabiri.android.usbterminal.arduino.ArduinoHelper
 import org.kabiri.android.usbterminal.model.OutputText
+import javax.inject.Inject
 
 /**
  * Created by Ali Kabiri on 12.04.20.
  */
-class MainActivityViewModel(private val arduinoHelper: ArduinoHelper): ViewModel() {
+@HiltViewModel
+class MainActivityViewModel
+@Inject constructor(
+    private val arduinoHelper: ArduinoHelper,
+): ViewModel() {
+
+    private val _outputLive = MutableLiveData("")
+    val output = _outputLive
 
     fun askForConnectionPermission() = arduinoHelper.askForConnectionPermission()
+
+    fun disconnect() = arduinoHelper.disconnect()
     fun getGrantedDevice() = arduinoHelper.getGrantedDevice()
     fun openDeviceAndPort(device: UsbDevice) = viewModelScope.launch {
         arduinoHelper.openDeviceAndPort(device)
     }
-    fun serialWrite(command: String) = arduinoHelper.serialWrite(command)
+    fun serialWrite(command: String): Boolean {
+        _outputLive.value = "${output.value}\n$command\n"
+        return arduinoHelper.serialWrite(command)
+    }
 
     /**
      * Transforms the outputs from ArduinoHelper into spannable text
@@ -29,14 +43,17 @@ class MainActivityViewModel(private val arduinoHelper: ArduinoHelper): ViewModel
         val liveErrorOutput = arduinoHelper.getLiveErrorOutput()
 
         val liveSpannedOutput: LiveData<OutputText> = Transformations.map(liveOutput) {
+            _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_NORMAL)
         }
 
         val liveSpannedInfoOutput: LiveData<OutputText> = Transformations.map(liveInfoOutput) {
+            _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_INFO)
         }
 
         val liveSpannedErrorOutput: LiveData<OutputText> = Transformations.map(liveErrorOutput) {
+            _outputLive.value = _outputLive.value + it
             return@map OutputText(it, OutputText.OutputType.TYPE_ERROR)
         }
 
diff --git a/app/src/main/res/drawable/ic_usb_off_white_24dp.xml b/app/src/main/res/drawable/ic_usb_off_white_24dp.xml
new file mode 100644
index 00000000..98152711
--- /dev/null
+++ b/app/src/main/res/drawable/ic_usb_off_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15,8h4v4h-1v2c0,0.34 -0.08,0.66 -0.23,0.94L16,13.17V12h-1V8zM11,8.17l2,2V6h2l-3,-4L9,6h2V8.17zM13,16v2.28c0.6,0.34 1,0.98 1,1.72c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-0.74 0.4,-1.37 1,-1.72V16H8c-1.11,0 -2,-0.89 -2,-2v-2.28C5.4,11.38 5,10.74 5,10c0,-0.59 0.26,-1.13 0.68,-1.49L1.39,4.22l1.41,-1.41l18.38,18.38l-1.41,1.41L13.17,16H13zM11,14v-0.17l-2.51,-2.51c-0.14,0.16 -0.31,0.29 -0.49,0.4V14H11z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 282ad2c2..b2eeabae 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,6 +14,7 @@
         android:layout_marginEnd="16dp"
         android:gravity="bottom"
         android:scrollbars="vertical"
+        android:text="@{viewModel.output}"
         app:layout_constraintBottom_toTopOf="@+id/etInput"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -27,7 +28,7 @@
         android:layout_height="64dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="8dp"
-        android:text="Enter"
+        android:text="@string/home_bt_enter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -37,8 +38,9 @@
         android:layout_height="64dp"
         android:layout_marginStart="16dp"
         android:layout_marginBottom="8dp"
+        android:autofillHints="null"
         android:ems="10"
-        android:hint="Type a command ..."
+        android:hint="@string/home_et_hint"
         android:inputType="textPersonName"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btEnter"
diff --git a/app/src/main/res/menu/activity_main_menu.xml b/app/src/main/res/menu/activity_main_menu.xml
index 39d4883f..025678fb 100644
--- a/app/src/main/res/menu/activity_main_menu.xml
+++ b/app/src/main/res/menu/activity_main_menu.xml
@@ -2,4 +2,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item android:id="@+id/actionConnect" android:title="@string/title_connect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_white_24dp"/>
+    <item android:id="@+id/actionDisconnect" android:title="@string/title_disconnect" app:showAsAction="ifRoom" android:icon="@drawable/ic_usb_off_white_24dp"/>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5fad82c6..eb35e199 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,14 +6,22 @@
     <!--TRANSLATABLE-->
     <string name="app_name">USBTerminal</string>
     <string name="title_connect">Connect</string>
+    <string name="title_disconnect">Disconnect</string>
 
+    <!-- Home Screen -->
+    <string name="home_bt_enter">Enter</string>
+    <string name="home_et_hint">Type a command …</string>
+
+    <!-- Joystick Screen (upcoming) -->
     <string name="bt_joystick_forward">Go Forward</string>
     <string name="bt_joystick_left">Turn Left</string>
     <string name="bt_joystick_right">Turn Right</string>
     <string name="bt_joystick_backward">Go Backward</string>
 
+    <!-- Messages -->
     <string name="helper_error_serial_port_is_null">Serial Port is null: The device might be disconnected.\n</string>
-    <string name="helper_error_device_not_found">\nArduino Device not found</string>
+    <string name="helper_error_device_not_found">\nArduino Device not found (or the device might be a clone).</string>
+    <string name="helper_error_connecting_anyway">\nConnecting anyway (may misbehave)…</string>
     <string name="helper_error_usb_devices_not_attached">\nNo USB devices are attached</string>
     <string name="helper_error_serial_connection_not_opened">\nPort not opened - There might be a problem with the serial connection to Arduino</string>
     <string name="helper_error_write_problem">Serial Write encountered an error:</string>
@@ -21,6 +29,7 @@
     <string name="helper_error_connection_not_ready_to_close">No device connection to close</string>
     <string name="helper_error_connection_failed_to_close">Device connection failed to close</string>
     <string name="helper_info_serial_connection_opened">\nSerial Connection Opened</string>
+    <string name="helper_info_serial_connection_closed">\nSerial Connection Closed</string>
     <string name="helper_info_usb_permission_requested">Requested permission to access the USB device…</string>
     <string name="helper_info_checking_attached_usb_devices">\nChecking attached USB devices…</string>
 
diff --git a/build.gradle b/build.gradle
index 0005aef7..44d2ea99 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
-    ext.koin_version = '2.2.0'
+    ext {
+        kotlin_version = '1.7.10'
+        hilt_version = '2.44'
+        firebase_bom_version = '30.5.0'
+    }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.koin:koin-gradle-plugin:$koin_version"
-
+        classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
+        classpath 'com.google.gms:google-services:4.3.14'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -20,7 +24,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 23339e0d..ebca75d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,6 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+#android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94d93d58..3d95cee8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/scripts/generateKsPropFile.py b/scripts/generateKsPropFile.py
new file mode 100644
index 00000000..7731df9a
--- /dev/null
+++ b/scripts/generateKsPropFile.py
@@ -0,0 +1,22 @@
+# This script reads the keystore properties from environment variable
+# and generates a keystore.properties file in app module.
+#
+# More info about gradle properties:
+# https://ubuntudroid.medium.com/handling-environment-variables-in-gradle-fb1b8bb6c758
+
+import os
+
+outputPath = "app/keystore.properties"
+
+keystoreFile = os.getenv('KS_PATH')
+keystorePassword = os.getenv('KS_PASSWORD')
+keyAlias = os.getenv('KS_KEY_ALIAS')
+keyPassword = os.getenv('KS_KEY_PASSWORD')
+
+fhand = open(outputPath, 'w')
+fhand.write("# Gradle properties for module app\n\n")
+fhand.write("release.file=" + str(keystoreFile) + "\n")
+fhand.write("release.storePassword=" + str(keystorePassword) + '\n')
+fhand.write("release.keyAlias=" + str(keyAlias) + '\n')
+fhand.write("release.keyPassword=" + str(keyPassword))
+fhand.close()
\ No newline at end of file