diff --git a/app/build.gradle b/app/build.gradle
index fdb2b6fdc..3978f6789 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,16 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.bitcoinkit.demo'
+    compileSdk 34
+
     defaultConfig {
         applicationId "io.horizontalsystems.bitcoinkit.demo"
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 34
         versionCode 1
         versionName "0.3.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -19,11 +22,14 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
     packagingOptions {
-        pickFirst("META-INF/atomicfu.kotlin_module")
+        resources {
+            pickFirsts += ['META-INF/atomicfu.kotlin_module']
+        }
     }
 }
 
@@ -31,9 +37,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'com.google.android.material:material:1.10.0'
 
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
@@ -41,15 +47,12 @@ dependencies {
     // ViewModel and LiveData
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
-    // For debug
-    implementation 'com.facebook.stetho:stetho:1.5.1'
-
     //LeakCanary
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
-    testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     implementation project(':bitcoinkit')
     implementation project(':dashkit')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ddd7232f1..68e75920d 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="io.horizontalsystems.bitcoinkit.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
@@ -12,7 +11,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="io.horizontalsystems.bitcoinkit.demo.MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/App.kt b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/App.kt
index ed70614ad..38ad9349e 100644
--- a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/App.kt
+++ b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/App.kt
@@ -1,16 +1,12 @@
 package io.horizontalsystems.bitcoinkit.demo
 
 import android.app.Application
-import com.facebook.stetho.Stetho
 
 class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
 
-        // Enable debug bridge
-        Stetho.initializeWithDefaults(this)
-
         instance = this
     }
 
diff --git a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt
index bfe85c52b..3fac4efde 100644
--- a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/BalanceFragment.kt
@@ -11,7 +11,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.ViewModelProvider
 import io.horizontalsystems.bitcoincore.BitcoinCore
-import kotlinx.android.synthetic.main.fragment_balance.*
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -27,6 +26,7 @@ class BalanceFragment : Fragment() {
     lateinit var startButton: Button
     lateinit var clearButton: Button
     lateinit var buttonDebug: Button
+    lateinit var buttonStatus: Button
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -113,6 +113,7 @@ class BalanceFragment : Fragment() {
         startButton = view.findViewById(R.id.buttonStart)
         clearButton = view.findViewById(R.id.buttonClear)
         buttonDebug = view.findViewById(R.id.buttonDebug)
+        buttonStatus = view.findViewById(R.id.buttonStatus)
 
         startButton.setOnClickListener {
             viewModel.start()
diff --git a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/SendReceiveFragment.kt b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/SendReceiveFragment.kt
index 387648eab..c9acd08e2 100644
--- a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/SendReceiveFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/SendReceiveFragment.kt
@@ -1,10 +1,7 @@
 package io.horizontalsystems.bitcoinkit.demo
 
-import androidx.lifecycle.Observer
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.text.Editable
-import android.text.SpannableStringBuilder
 import android.text.TextWatcher
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -12,16 +9,30 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.EditText
+import android.widget.RadioGroup
+import android.widget.Spinner
+import android.widget.TextView
 import android.widget.Toast
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import io.horizontalsystems.bitcoincore.exceptions.AddressFormatException
-import io.horizontalsystems.bitcoincore.managers.SendValueErrors
 import io.horizontalsystems.hodler.LockTimeInterval
-import kotlinx.android.synthetic.main.fragment_send_receive.*
 
 class SendReceiveFragment : Fragment() {
     private lateinit var viewModel: MainViewModel
 
+    lateinit var receiveAddressText: TextView
+    lateinit var receiveAddressButton: Button
+    lateinit var sendAmount: EditText
+    lateinit var sendAddress: EditText
+    lateinit var txFeeValue: TextView
+    lateinit var sendButton: Button
+    lateinit var maxButton: Button
+    lateinit var radioGroup: RadioGroup
+    lateinit var lockTimePeriodValue: Spinner
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_send_receive, container, false)
     }
@@ -60,6 +71,16 @@ class SendReceiveFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        receiveAddressText = view.findViewById(R.id.receiveAddressText)
+        receiveAddressButton = view.findViewById(R.id.receiveAddressButton)
+        sendAmount = view.findViewById(R.id.sendAmount)
+        sendAddress = view.findViewById(R.id.sendAddress)
+        txFeeValue = view.findViewById(R.id.txFeeValue)
+        sendButton = view.findViewById(R.id.sendButton)
+        maxButton = view.findViewById(R.id.maxButton)
+        radioGroup = view.findViewById(R.id.radioGroup)
+        lockTimePeriodValue = view.findViewById(R.id.lockTimePeriodValue)
+
         receiveAddressButton.setOnClickListener {
             viewModel.onReceiveClick()
         }
@@ -71,7 +92,7 @@ class SendReceiveFragment : Fragment() {
         maxButton.setOnClickListener {
 
 
-                viewModel.onMaxClick()
+            viewModel.onMaxClick()
 
         }
 
diff --git a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/TransactionsFragment.kt b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/TransactionsFragment.kt
index 615b3c1c6..87a0eaa26 100644
--- a/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/TransactionsFragment.kt
+++ b/app/src/main/java/io/horizontalsystems/bitcoinkit/demo/TransactionsFragment.kt
@@ -21,7 +21,6 @@ import io.horizontalsystems.bitcoincore.models.TransactionOutputInfo
 import io.horizontalsystems.dashkit.models.DashTransactionInfo
 import io.horizontalsystems.hodler.HodlerOutputData
 import io.horizontalsystems.hodler.HodlerPlugin
-import kotlinx.android.synthetic.main.fragment_transactions.*
 import java.text.DateFormat
 import java.util.*
 
@@ -31,6 +30,8 @@ class TransactionsFragment : Fragment(), ViewHolderTransaction.Listener {
     private lateinit var transactionsRecyclerView: RecyclerView
     private val transactionsAdapter = TransactionsAdapter(this)
 
+    lateinit var tabs: TabLayout
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -62,6 +63,8 @@ class TransactionsFragment : Fragment(), ViewHolderTransaction.Listener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        tabs = view.findViewById(R.id.tabs)
+
         transactionsRecyclerView = view.findViewById(R.id.transactions)
         transactionsRecyclerView.adapter = transactionsAdapter
         transactionsRecyclerView.layoutManager = LinearLayoutManager(context)
diff --git a/app/src/main/res/layout/fragment_balance.xml b/app/src/main/res/layout/fragment_balance.xml
index 435741ab4..cc717cbb9 100644
--- a/app/src/main/res/layout/fragment_balance.xml
+++ b/app/src/main/res/layout/fragment_balance.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/white"
     android:padding="8dp">
 
     <TextView
@@ -53,8 +54,7 @@
         android:text="Balance Unspendable:"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/balanceTitle"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/balanceTitle" />
 
     <TextView
         android:id="@+id/balanceUnspendableValue"
@@ -64,8 +64,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintStart_toEndOf="@+id/balanceUnspendableTitle"
         app:layout_constraintTop_toTopOf="@+id/balanceUnspendableTitle"
-        tools:text="100.0"
-        />
+        tools:text="100.0" />
 
     <TextView
         android:id="@+id/stateTitle"
diff --git a/app/src/main/res/layout/fragment_send_receive.xml b/app/src/main/res/layout/fragment_send_receive.xml
index 89baf5c37..b6a19855f 100644
--- a/app/src/main/res/layout/fragment_send_receive.xml
+++ b/app/src/main/res/layout/fragment_send_receive.xml
@@ -4,14 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:scrollbars="vertical"
-    >
+    android:background="@android:color/white"
+    android:scrollbars="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="8dp"
-        >
+        android:padding="8dp">
 
         <TextView
             android:id="@+id/receiveAddressText"
@@ -25,8 +24,7 @@
             android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/receiveAddressButton"
@@ -36,8 +34,7 @@
             android:layout_marginEnd="20dp"
             android:text="Receive"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <View
             android:id="@+id/divider"
@@ -49,8 +46,7 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/receiveAddressButton"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/receiveAddressButton" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/sendAddressLayout"
@@ -61,16 +57,14 @@
             android:layout_marginEnd="8dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/divider"
-            >
+            app:layout_constraintTop_toBottomOf="@+id/divider">
 
             <EditText
                 android:id="@+id/sendAddress"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="Address"
-                android:inputType="text"
-                />
+                android:inputType="text" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -82,16 +76,14 @@
             android:layout_marginTop="8dp"
             app:layout_constraintEnd_toStartOf="@+id/maxButton"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/sendAddressLayout"
-            >
+            app:layout_constraintTop_toBottomOf="@+id/sendAddressLayout">
 
             <EditText
                 android:id="@+id/sendAmount"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:hint="Amount (Satoshi)"
-                android:inputType="numberDecimal"
-                />
+                android:inputType="numberDecimal" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -105,8 +97,7 @@
             app:layout_constraintBottom_toBottomOf="@+id/sendAmountLayout"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/sendAmountLayout"
-            app:layout_constraintTop_toTopOf="@+id/sendAmountLayout"
-            />
+            app:layout_constraintTop_toTopOf="@+id/sendAmountLayout" />
 
         <TextView
             android:id="@+id/txFeeTitle"
@@ -116,8 +107,7 @@
             android:layout_marginTop="10dp"
             android:text="Fee (Satoshi):"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/maxButton"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/maxButton" />
 
         <TextView
             android:id="@+id/txFeeValue"
@@ -126,8 +116,7 @@
             android:layout_marginStart="8dp"
             app:layout_constraintStart_toEndOf="@+id/txFeeTitle"
             app:layout_constraintTop_toTopOf="@+id/txFeeTitle"
-            tools:text="328"
-            />
+            tools:text="328" />
 
         <TextView
             android:id="@+id/feePriorityTitle"
@@ -139,8 +128,7 @@
             app:layout_constraintEnd_toStartOf="@+id/radioGroup"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/txFeeTitle"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/txFeeTitle" />
 
         <RadioGroup
             android:id="@+id/radioGroup"
@@ -152,8 +140,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/feePriorityTitle"
-            app:layout_constraintTop_toTopOf="@+id/feePriorityTitle"
-            >
+            app:layout_constraintTop_toTopOf="@+id/feePriorityTitle">
 
             <RadioButton
                 android:id="@+id/radioLow"
@@ -161,8 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
 
-                android:text="Low"
-                />
+                android:text="Low" />
 
             <RadioButton
                 android:id="@+id/radioMedium"
@@ -170,16 +156,14 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:checked="true"
-                android:text="Meduim"
-                />
+                android:text="Meduim" />
 
             <RadioButton
                 android:id="@+id/radioHigh"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="High"
-                />
+                android:text="High" />
 
         </RadioGroup>
 
@@ -191,8 +175,7 @@
             android:layout_marginTop="24dp"
             android:text="Lock for period"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/feePriorityTitle"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/feePriorityTitle" />
 
         <Spinner
             android:id="@+id/lockTimePeriodValue"
@@ -201,8 +184,7 @@
             android:layout_marginEnd="8dp"
             app:layout_constraintBottom_toBottomOf="@+id/lockTimeIntervalTitle"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/lockTimeIntervalTitle"
-            />
+            app:layout_constraintTop_toTopOf="@+id/lockTimeIntervalTitle" />
 
         <Button
             android:id="@+id/sendButton"
@@ -214,8 +196,7 @@
             android:text="Send"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/lockTimePeriodValue"
-            />
+            app:layout_constraintTop_toBottomOf="@+id/lockTimePeriodValue" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml
index 3aea98ea6..da0ff57d4 100644
--- a/app/src/main/res/layout/fragment_transactions.xml
+++ b/app/src/main/res/layout/fragment_transactions.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@android:color/white"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/bitcoincashkit/build.gradle b/bitcoincashkit/build.gradle
index 45766df64..a0845bec6 100644
--- a/bitcoincashkit/build.gradle
+++ b/bitcoincashkit/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.bitcoincashkit'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "0.4.1"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -26,11 +38,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 }
 
 dependencies {
@@ -63,7 +75,3 @@ dependencies {
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito-inline:2.19.1'
     androidTestImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.6.0'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/bitcoincashkit/src/main/AndroidManifest.xml b/bitcoincashkit/src/main/AndroidManifest.xml
index 1549bffd7..94cbbcfc3 100644
--- a/bitcoincashkit/src/main/AndroidManifest.xml
+++ b/bitcoincashkit/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.horizontalsystems.bitcoincashkit" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/bitcoincore/build.gradle b/bitcoincore/build.gradle
index 9fd75782e..0af3d0efb 100644
--- a/bitcoincore/build.gradle
+++ b/bitcoincore/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.bitcoincore'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "0.4.1"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -33,11 +45,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 }
 
 dependencies {
@@ -82,7 +94,3 @@ dependencies {
     testImplementation "com.linkedin.dexmaker:dexmaker-mockito-inline:2.19.1"
     testImplementation 'androidx.test.ext:junit:1.1.1'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/bitcoincore/src/main/AndroidManifest.xml b/bitcoincore/src/main/AndroidManifest.xml
index e6a4ca8ae..361052066 100644
--- a/bitcoincore/src/main/AndroidManifest.xml
+++ b/bitcoincore/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.horizontalsystems.bitcoincore">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/AccountPublicKeyManager.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/AccountPublicKeyManager.kt
index 0749ce3a3..f0269af23 100644
--- a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/AccountPublicKeyManager.kt
+++ b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/AccountPublicKeyManager.kt
@@ -75,7 +75,7 @@ class AccountPublicKeyManager(
         val keys = mutableListOf<PublicKey>()
 
         if (keysCount < wallet.gapLimit) {
-            val lastIndex = publicKeys.maxBy { it.publicKey.index }?.publicKey?.index ?: -1
+            val lastIndex = publicKeys.maxByOrNull { it.publicKey.index }?.publicKey?.index ?: -1
 
             val newKeysStartIndex = lastIndex + 1
             val indices = newKeysStartIndex until (newKeysStartIndex + wallet.gapLimit - keysCount)
@@ -88,7 +88,7 @@ class AccountPublicKeyManager(
     }
 
     private fun gapKeysCount(publicKeys: List<PublicKeyWithUsedState>): Int {
-        return when (val lastUsedKey = publicKeys.filter { it.used }.maxBy { it.publicKey.index }) {
+        return when (val lastUsedKey = publicKeys.filter { it.used }.maxByOrNull { it.publicKey.index }) {
             null -> publicKeys.size
             else -> publicKeys.filter { it.publicKey.index > lastUsedKey.publicKey.index }.size
         }
diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/PublicKeyManager.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/PublicKeyManager.kt
index 367d43286..dbd2acf74 100644
--- a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/PublicKeyManager.kt
+++ b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/PublicKeyManager.kt
@@ -45,7 +45,7 @@ class PublicKeyManager(
     }
 
     override fun fillGap() {
-        val lastUsedAccount = storage.getPublicKeysUsed().map { it.account }.max()
+        val lastUsedAccount = storage.getPublicKeysUsed().map { it.account }.maxOrNull()
 
         val requiredAccountsCount = if (lastUsedAccount != null) {
             lastUsedAccount + 1 + 1 //  One because account starts from 0, One because we must have n+1 accounts
@@ -90,7 +90,7 @@ class PublicKeyManager(
         val keys = mutableListOf<PublicKey>()
 
         if (keysCount < wallet.gapLimit) {
-            val lastIndex = publicKeys.maxBy { it.publicKey.index }?.publicKey?.index ?: -1
+            val lastIndex = publicKeys.maxByOrNull { it.publicKey.index }?.publicKey?.index ?: -1
 
             val newKeysStartIndex = lastIndex + 1
             val indices = newKeysStartIndex until (newKeysStartIndex + wallet.gapLimit - keysCount)
@@ -103,7 +103,7 @@ class PublicKeyManager(
     }
 
     private fun gapKeysCount(publicKeys: List<PublicKeyWithUsedState>): Int {
-        val lastUsedKey = publicKeys.filter { it.used }.maxBy { it.publicKey.index }
+        val lastUsedKey = publicKeys.filter { it.used }.maxByOrNull { it.publicKey.index }
 
         return when (lastUsedKey) {
             null -> publicKeys.size
diff --git a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt
index bfd2666b8..2697bebed 100644
--- a/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt
+++ b/bitcoincore/src/main/kotlin/io/horizontalsystems/bitcoincore/managers/SyncManager.kt
@@ -70,6 +70,7 @@ class SyncManager(
             is KitState.Syncing, is KitState.Synced -> {
                 peerGroup.stop()
             }
+            else -> Unit
         }
         syncState = KitState.NotSynced(BitcoinCore.StateError.NotStarted())
     }
diff --git a/bitcoincore/src/test/kotlin/io/horizontalsystems/bitcoincore/managers/ApiManagerTest.kt b/bitcoincore/src/test/kotlin/io/horizontalsystems/bitcoincore/managers/ApiManagerTest.kt
index c30adbd97..29e2177bd 100644
--- a/bitcoincore/src/test/kotlin/io/horizontalsystems/bitcoincore/managers/ApiManagerTest.kt
+++ b/bitcoincore/src/test/kotlin/io/horizontalsystems/bitcoincore/managers/ApiManagerTest.kt
@@ -36,7 +36,7 @@ class ApiManagerTest {
 
         whenever(url.openConnection()).thenReturn(urlConnection)
 
-        apiManager = ApiManager("https://ipfs.horizontalsystems.xyz")
+        apiManager = ApiManager("https://ipfs.blocksdecoded.com")
     }
 
     @Test
diff --git a/bitcoinkit/build.gradle b/bitcoinkit/build.gradle
index 730d6bb90..e554e5551 100644
--- a/bitcoinkit/build.gradle
+++ b/bitcoinkit/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.bitcoinkit'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "0.4.1"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -26,11 +38,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 }
 
 dependencies {
@@ -64,7 +76,3 @@ dependencies {
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito-inline:2.19.1'
     androidTestImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.6.0'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/bitcoinkit/src/main/AndroidManifest.xml b/bitcoinkit/src/main/AndroidManifest.xml
index e549d5325..cf3a4b0bd 100644
--- a/bitcoinkit/src/main/AndroidManifest.xml
+++ b/bitcoinkit/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="io.horizontalsystems.bitcoinkit">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt
index ce5bb1432..46bdb4ab1 100644
--- a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt
+++ b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/BitcoinKit.kt
@@ -128,7 +128,7 @@ class BitcoinKit : AbstractKit {
                 MainNet()
             }
             NetworkType.TestNet -> {
-                initialSyncApi = BCoinApi("https://btc-testnet.horizontalsystems.xyz/api")
+                initialSyncApi = BCoinApi("https://btc-testnet.blocksdecoded.com/api")
                 TestNet()
             }
             NetworkType.RegTest -> {
diff --git a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/RegTest.kt b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/RegTest.kt
index af012ef46..ad064e61c 100644
--- a/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/RegTest.kt
+++ b/bitcoinkit/src/main/kotlin/io/horizontalsystems/bitcoinkit/RegTest.kt
@@ -22,10 +22,10 @@ class RegTest : Network() {
     override val syncableFromApi = false
 
     override var dnsSeeds = listOf(
-            "btc-regtest.horizontalsystems.xyz",
-            "btc01-regtest.horizontalsystems.xyz",
-            "btc02-regtest.horizontalsystems.xyz",
-            "btc03-regtest.horizontalsystems.xyz"
+            "btc-regtest.blocksdecoded.com",
+            "btc01-regtest.blocksdecoded.com",
+            "btc02-regtest.blocksdecoded.com",
+            "btc03-regtest.blocksdecoded.com"
     )
 
 }
diff --git a/build.gradle b/build.gradle
index b618a906f..ba065ac62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url "https://jitpack.io" }
     }
 }
diff --git a/dashkit/build.gradle b/dashkit/build.gradle
index f4109d123..0f6232c6d 100644
--- a/dashkit/build.gradle
+++ b/dashkit/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.dashkit'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "0.4.1"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -33,11 +45,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 
     externalNativeBuild {
         cmake {
@@ -81,7 +93,3 @@ dependencies {
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito-inline:2.19.1'
     androidTestImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.6.0'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/dashkit/src/main/AndroidManifest.xml b/dashkit/src/main/AndroidManifest.xml
index 86fb394b6..c4e6c98d7 100644
--- a/dashkit/src/main/AndroidManifest.xml
+++ b/dashkit/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest package="io.horizontalsystems.dashkit"
-          xmlns:android="http://schemas.android.com/apk/res/android"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/ecashkit/build.gradle b/ecashkit/build.gradle
index 9ed4ba0cf..e3b946a2b 100644
--- a/ecashkit/build.gradle
+++ b/ecashkit/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.ecashkit'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "0.4.1"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -26,11 +38,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 }
 
 dependencies {
@@ -66,7 +78,3 @@ dependencies {
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito-inline:2.19.1'
     androidTestImplementation 'com.nhaarman:mockito-kotlin-kt1.1:1.6.0'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/ecashkit/src/main/AndroidManifest.xml b/ecashkit/src/main/AndroidManifest.xml
index a4f8edf1c..44008a433 100644
--- a/ecashkit/src/main/AndroidManifest.xml
+++ b/ecashkit/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="io.horizontalsystems.ecashkit">
+<manifest>
 
 </manifest>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8de505811..a8c570082 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,10 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b4ca508b..199d187d3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat May 01 16:29:47 EDT 2021
+#Fri Oct 27 15:32:24 KGT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/hodler/build.gradle b/hodler/build.gradle
index 3601b03dd..c37022345 100644
--- a/hodler/build.gradle
+++ b/hodler/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.hodler'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -27,11 +39,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 }
 
 dependencies {
diff --git a/hodler/src/main/AndroidManifest.xml b/hodler/src/main/AndroidManifest.xml
index e212ac57a..94cbbcfc3 100644
--- a/hodler/src/main/AndroidManifest.xml
+++ b/hodler/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest package="io.horizontalsystems.hodler"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/litecoinkit/build.gradle b/litecoinkit/build.gradle
index 073a3a8f1..4c39890ce 100644
--- a/litecoinkit/build.gradle
+++ b/litecoinkit/build.gradle
@@ -1,15 +1,27 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'maven-publish'
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+            }
+        }
+    }
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'io.horizontalsystems.litecoinkit'
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -27,11 +39,11 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
     }
 
-    kotlinOptions { jvmTarget = '1.8' }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
+    kotlinOptions { jvmTarget = '17' }
 
 }
 
@@ -52,7 +64,3 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
-
-repositories {
-    mavenCentral()
-}
diff --git a/litecoinkit/src/main/AndroidManifest.xml b/litecoinkit/src/main/AndroidManifest.xml
index b227848d8..94cbbcfc3 100644
--- a/litecoinkit/src/main/AndroidManifest.xml
+++ b/litecoinkit/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.horizontalsystems.litecoinkit" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/litecoinkit/src/main/kotlin/io/horizontalsystems/litecoinkit/LitecoinKit.kt b/litecoinkit/src/main/kotlin/io/horizontalsystems/litecoinkit/LitecoinKit.kt
index 25a680a6d..fae1dfef7 100644
--- a/litecoinkit/src/main/kotlin/io/horizontalsystems/litecoinkit/LitecoinKit.kt
+++ b/litecoinkit/src/main/kotlin/io/horizontalsystems/litecoinkit/LitecoinKit.kt
@@ -90,7 +90,7 @@ class LitecoinKit : AbstractKit {
 
         network = when (networkType) {
             NetworkType.MainNet -> {
-                initialSyncUrl = "https://ltc.horizontalsystems.xyz/api"
+                initialSyncUrl = "https://ltc.blocksdecoded.com/api"
                 MainNetLitecoin()
             }
             NetworkType.TestNet -> {
diff --git a/tools/build.gradle b/tools/build.gradle
index a83229a36..aff3d7276 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -3,13 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 34
 
         consumerProguardFiles 'consumer-rules.pro'
     }
@@ -20,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    namespace 'io.horizontalsystems.tools'
 }
 
 dependencies {
diff --git a/tools/src/main/AndroidManifest.xml b/tools/src/main/AndroidManifest.xml
index 90813ed82..94cbbcfc3 100644
--- a/tools/src/main/AndroidManifest.xml
+++ b/tools/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.horizontalsystems.tools" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />