diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3825ceaa..39bb676c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -8,13 +8,13 @@ plugins {
 }
 
 android {
-    compileSdk = 30
-    buildToolsVersion = "30.0.3"
+    compileSdk = 31
+    buildToolsVersion = "31.0.0"
 
     defaultConfig {
         applicationId = "com.meloda.fast"
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 31
         versionCode = 1
         versionName = "1.0"
 
@@ -65,7 +65,7 @@ kapt {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30")
 
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
 
@@ -98,16 +98,16 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
 
-    implementation("com.google.dagger:hilt-android:2.37")
-    kapt("com.google.dagger:hilt-android-compiler:2.37")
+    implementation("com.google.dagger:hilt-android:2.38.1")
+    kapt("com.google.dagger:hilt-android-compiler:2.38.1")
     implementation("androidx.hilt:hilt-navigation-fragment:1.0.0")
 
     implementation("com.github.yogacp:android-viewbinding:1.0.2")
 
-    implementation("io.coil-kt:coil:1.3.0")
+    implementation("io.coil-kt:coil:1.3.2")
 
-    implementation("com.google.code.gson:gson:2.8.7")
-    implementation("org.jsoup:jsoup:1.14.1")
+    implementation("com.google.code.gson:gson:2.8.8")
+    implementation("org.jsoup:jsoup:1.14.2")
     implementation("ch.acra:acra:4.11.1")
 
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3529a735..e157a4f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.meloda.fast">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -7,15 +8,17 @@
 
     <application
         android:name=".common.AppGlobal"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:testOnly="false"
         android:theme="@style/AppTheme">
+
         <activity
             android:name=".activity.MainActivity"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -30,7 +33,8 @@
 
         <receiver
             android:name=".receiver.MinuteReceiver"
-            android:enabled="true">
+            android:enabled="true"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.ACTION_TIME_CHANGED" />
             </intent-filter>
diff --git a/app/src/main/java/com/meloda/fast/UserConfig.kt b/app/src/main/kotlin/com/meloda/fast/UserConfig.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/UserConfig.kt
rename to app/src/main/kotlin/com/meloda/fast/UserConfig.kt
diff --git a/app/src/main/java/com/meloda/fast/VKLongPollParser.kt b/app/src/main/kotlin/com/meloda/fast/VKLongPollParser.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/VKLongPollParser.kt
rename to app/src/main/kotlin/com/meloda/fast/VKLongPollParser.kt
diff --git a/app/src/main/java/com/meloda/fast/activity/MainActivity.kt b/app/src/main/kotlin/com/meloda/fast/activity/MainActivity.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/activity/MainActivity.kt
rename to app/src/main/kotlin/com/meloda/fast/activity/MainActivity.kt
diff --git a/app/src/main/java/com/meloda/fast/api/Answer.kt b/app/src/main/kotlin/com/meloda/fast/api/Answer.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/Answer.kt
rename to app/src/main/kotlin/com/meloda/fast/api/Answer.kt
diff --git a/app/src/main/java/com/meloda/fast/api/ErrorCodes.kt b/app/src/main/kotlin/com/meloda/fast/api/ErrorCodes.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/ErrorCodes.kt
rename to app/src/main/kotlin/com/meloda/fast/api/ErrorCodes.kt
diff --git a/app/src/main/java/com/meloda/fast/api/OnResponseListener.kt b/app/src/main/kotlin/com/meloda/fast/api/OnResponseListener.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/OnResponseListener.kt
rename to app/src/main/kotlin/com/meloda/fast/api/OnResponseListener.kt
diff --git a/app/src/main/java/com/meloda/fast/api/Requests.kt b/app/src/main/kotlin/com/meloda/fast/api/Requests.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/Requests.kt
rename to app/src/main/kotlin/com/meloda/fast/api/Requests.kt
diff --git a/app/src/main/java/com/meloda/fast/api/Resource.kt b/app/src/main/kotlin/com/meloda/fast/api/Resource.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/Resource.kt
rename to app/src/main/kotlin/com/meloda/fast/api/Resource.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKApi.kt b/app/src/main/kotlin/com/meloda/fast/api/VKApi.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKApi.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKApi.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKApiKeys.kt b/app/src/main/kotlin/com/meloda/fast/api/VKApiKeys.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKApiKeys.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKApiKeys.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKAuth.kt b/app/src/main/kotlin/com/meloda/fast/api/VKAuth.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKAuth.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKAuth.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKConstants.kt b/app/src/main/kotlin/com/meloda/fast/api/VKConstants.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKConstants.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKConstants.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKException.kt b/app/src/main/kotlin/com/meloda/fast/api/VKException.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKException.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKException.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKRepo.kt b/app/src/main/kotlin/com/meloda/fast/api/VKRepo.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKRepo.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKRepo.kt
diff --git a/app/src/main/java/com/meloda/fast/api/VKUrls.kt b/app/src/main/kotlin/com/meloda/fast/api/VKUrls.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/VKUrls.kt
rename to app/src/main/kotlin/com/meloda/fast/api/VKUrls.kt
diff --git a/app/src/main/java/com/meloda/fast/api/datasource/MessagesDataSource.kt b/app/src/main/kotlin/com/meloda/fast/api/datasource/MessagesDataSource.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/datasource/MessagesDataSource.kt
rename to app/src/main/kotlin/com/meloda/fast/api/datasource/MessagesDataSource.kt
diff --git a/app/src/main/java/com/meloda/fast/api/datasource/base/BaseDataSource.kt b/app/src/main/kotlin/com/meloda/fast/api/datasource/base/BaseDataSource.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/datasource/base/BaseDataSource.kt
rename to app/src/main/kotlin/com/meloda/fast/api/datasource/base/BaseDataSource.kt
diff --git a/app/src/main/java/com/meloda/fast/api/method/MessageMethodSetter.kt b/app/src/main/kotlin/com/meloda/fast/api/method/MessageMethodSetter.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/method/MessageMethodSetter.kt
rename to app/src/main/kotlin/com/meloda/fast/api/method/MessageMethodSetter.kt
diff --git a/app/src/main/java/com/meloda/fast/api/method/MethodSetter.kt b/app/src/main/kotlin/com/meloda/fast/api/method/MethodSetter.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/method/MethodSetter.kt
rename to app/src/main/kotlin/com/meloda/fast/api/method/MethodSetter.kt
diff --git a/app/src/main/java/com/meloda/fast/api/method/UserMethodSetter.kt b/app/src/main/kotlin/com/meloda/fast/api/method/UserMethodSetter.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/method/UserMethodSetter.kt
rename to app/src/main/kotlin/com/meloda/fast/api/method/UserMethodSetter.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/ApiResponse.kt b/app/src/main/kotlin/com/meloda/fast/api/model/ApiResponse.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/ApiResponse.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/ApiResponse.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKAttachments.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKAttachments.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKAttachments.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKAttachments.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKAudio.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKAudio.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKAudio.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKAudio.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKAudioMessage.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKAudioMessage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKAudioMessage.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKAudioMessage.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKCall.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKCall.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKCall.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKCall.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKComment.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKComment.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKComment.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKComment.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKConversation.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKConversation.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKConversation.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKConversation.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKDocument.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKDocument.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKDocument.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKDocument.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKGeolocation.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKGeolocation.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKGeolocation.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKGeolocation.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKGift.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKGift.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKGift.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKGift.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKGraffiti.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKGraffiti.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKGraffiti.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKGraffiti.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKGroup.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKGroup.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKGroup.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKGroup.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKLink.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKLink.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKLink.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKLink.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKLongPollHistory.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKLongPollHistory.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKLongPollHistory.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKLongPollHistory.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKLongPollServer.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKLongPollServer.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKLongPollServer.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKLongPollServer.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKMessage.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKMessage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKMessage.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKMessage.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKMessageAction.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKMessageAction.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKMessageAction.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKMessageAction.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKModel.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKModel.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKModel.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKModel.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKPhoto.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKPhoto.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKPhoto.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKPhoto.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKPhotoSize.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKPhotoSize.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKPhotoSize.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKPhotoSize.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKPoll.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKPoll.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKPoll.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKPoll.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKSticker.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKSticker.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKSticker.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKSticker.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKUser.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKUser.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKUser.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKUser.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKVideo.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKVideo.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKVideo.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKVideo.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/VKWall.kt b/app/src/main/kotlin/com/meloda/fast/api/model/VKWall.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/VKWall.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/VKWall.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/request/RequestMessagesGetConversations.kt b/app/src/main/kotlin/com/meloda/fast/api/model/request/RequestMessagesGetConversations.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/request/RequestMessagesGetConversations.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/request/RequestMessagesGetConversations.kt
diff --git a/app/src/main/java/com/meloda/fast/api/model/response/MessagesResponse.kt b/app/src/main/kotlin/com/meloda/fast/api/model/response/MessagesResponse.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/model/response/MessagesResponse.kt
rename to app/src/main/kotlin/com/meloda/fast/api/model/response/MessagesResponse.kt
diff --git a/app/src/main/java/com/meloda/fast/api/service/MessagesService.kt b/app/src/main/kotlin/com/meloda/fast/api/service/MessagesService.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/service/MessagesService.kt
rename to app/src/main/kotlin/com/meloda/fast/api/service/MessagesService.kt
diff --git a/app/src/main/java/com/meloda/fast/api/util/VKUtil.kt b/app/src/main/kotlin/com/meloda/fast/api/util/VKUtil.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/api/util/VKUtil.kt
rename to app/src/main/kotlin/com/meloda/fast/api/util/VKUtil.kt
diff --git a/app/src/main/java/com/meloda/fast/base/BaseActivity.kt b/app/src/main/kotlin/com/meloda/fast/base/BaseActivity.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/BaseActivity.kt
rename to app/src/main/kotlin/com/meloda/fast/base/BaseActivity.kt
diff --git a/app/src/main/java/com/meloda/fast/base/BaseFragment.kt b/app/src/main/kotlin/com/meloda/fast/base/BaseFragment.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/BaseFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/base/BaseFragment.kt
diff --git a/app/src/main/java/com/meloda/fast/base/BaseFullscreenDialog.kt b/app/src/main/kotlin/com/meloda/fast/base/BaseFullscreenDialog.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/BaseFullscreenDialog.kt
rename to app/src/main/kotlin/com/meloda/fast/base/BaseFullscreenDialog.kt
diff --git a/app/src/main/java/com/meloda/fast/base/BaseVMFragment.kt b/app/src/main/kotlin/com/meloda/fast/base/BaseVMFragment.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/BaseVMFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/base/BaseVMFragment.kt
diff --git a/app/src/main/java/com/meloda/fast/base/adapter/BaseAdapter.kt b/app/src/main/kotlin/com/meloda/fast/base/adapter/BaseAdapter.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/adapter/BaseAdapter.kt
rename to app/src/main/kotlin/com/meloda/fast/base/adapter/BaseAdapter.kt
diff --git a/app/src/main/java/com/meloda/fast/base/adapter/BaseItem.kt b/app/src/main/kotlin/com/meloda/fast/base/adapter/BaseItem.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/adapter/BaseItem.kt
rename to app/src/main/kotlin/com/meloda/fast/base/adapter/BaseItem.kt
diff --git a/app/src/main/java/com/meloda/fast/base/adapter/EmptyHeaderAdapter.kt b/app/src/main/kotlin/com/meloda/fast/base/adapter/EmptyHeaderAdapter.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/adapter/EmptyHeaderAdapter.kt
rename to app/src/main/kotlin/com/meloda/fast/base/adapter/EmptyHeaderAdapter.kt
diff --git a/app/src/main/java/com/meloda/fast/base/adapter/Holders.kt b/app/src/main/kotlin/com/meloda/fast/base/adapter/Holders.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/adapter/Holders.kt
rename to app/src/main/kotlin/com/meloda/fast/base/adapter/Holders.kt
diff --git a/app/src/main/java/com/meloda/fast/base/adapter/Listeners.kt b/app/src/main/kotlin/com/meloda/fast/base/adapter/Listeners.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/adapter/Listeners.kt
rename to app/src/main/kotlin/com/meloda/fast/base/adapter/Listeners.kt
diff --git a/app/src/main/java/com/meloda/fast/base/viewmodel/BaseVM.kt b/app/src/main/kotlin/com/meloda/fast/base/viewmodel/BaseVM.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/viewmodel/BaseVM.kt
rename to app/src/main/kotlin/com/meloda/fast/base/viewmodel/BaseVM.kt
diff --git a/app/src/main/java/com/meloda/fast/base/viewmodel/Events.kt b/app/src/main/kotlin/com/meloda/fast/base/viewmodel/Events.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/viewmodel/Events.kt
rename to app/src/main/kotlin/com/meloda/fast/base/viewmodel/Events.kt
diff --git a/app/src/main/java/com/meloda/fast/base/viewmodel/VKEvent.kt b/app/src/main/kotlin/com/meloda/fast/base/viewmodel/VKEvent.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/base/viewmodel/VKEvent.kt
rename to app/src/main/kotlin/com/meloda/fast/base/viewmodel/VKEvent.kt
diff --git a/app/src/main/java/com/meloda/fast/common/AppGlobal.kt b/app/src/main/kotlin/com/meloda/fast/common/AppGlobal.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/common/AppGlobal.kt
rename to app/src/main/kotlin/com/meloda/fast/common/AppGlobal.kt
diff --git a/app/src/main/java/com/meloda/fast/common/FragmentSwitcher.kt b/app/src/main/kotlin/com/meloda/fast/common/FragmentSwitcher.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/common/FragmentSwitcher.kt
rename to app/src/main/kotlin/com/meloda/fast/common/FragmentSwitcher.kt
diff --git a/app/src/main/java/com/meloda/fast/common/TimeManager.kt b/app/src/main/kotlin/com/meloda/fast/common/TimeManager.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/common/TimeManager.kt
rename to app/src/main/kotlin/com/meloda/fast/common/TimeManager.kt
diff --git a/app/src/main/java/com/meloda/fast/common/UpdateManager.kt b/app/src/main/kotlin/com/meloda/fast/common/UpdateManager.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/common/UpdateManager.kt
rename to app/src/main/kotlin/com/meloda/fast/common/UpdateManager.kt
diff --git a/app/src/main/java/com/meloda/fast/concurrent/EventInfo.kt b/app/src/main/kotlin/com/meloda/fast/concurrent/EventInfo.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/concurrent/EventInfo.kt
rename to app/src/main/kotlin/com/meloda/fast/concurrent/EventInfo.kt
diff --git a/app/src/main/java/com/meloda/fast/concurrent/LowThread.kt b/app/src/main/kotlin/com/meloda/fast/concurrent/LowThread.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/concurrent/LowThread.kt
rename to app/src/main/kotlin/com/meloda/fast/concurrent/LowThread.kt
diff --git a/app/src/main/java/com/meloda/fast/concurrent/TaskManager.kt b/app/src/main/kotlin/com/meloda/fast/concurrent/TaskManager.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/concurrent/TaskManager.kt
rename to app/src/main/kotlin/com/meloda/fast/concurrent/TaskManager.kt
diff --git a/app/src/main/java/com/meloda/fast/database/CacheStorage.kt b/app/src/main/kotlin/com/meloda/fast/database/CacheStorage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/CacheStorage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/CacheStorage.kt
diff --git a/app/src/main/java/com/meloda/fast/database/DatabaseHelper.kt b/app/src/main/kotlin/com/meloda/fast/database/DatabaseHelper.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/DatabaseHelper.kt
rename to app/src/main/kotlin/com/meloda/fast/database/DatabaseHelper.kt
diff --git a/app/src/main/java/com/meloda/fast/database/DatabaseKeys.kt b/app/src/main/kotlin/com/meloda/fast/database/DatabaseKeys.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/DatabaseKeys.kt
rename to app/src/main/kotlin/com/meloda/fast/database/DatabaseKeys.kt
diff --git a/app/src/main/java/com/meloda/fast/database/DatabaseUtils.kt b/app/src/main/kotlin/com/meloda/fast/database/DatabaseUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/DatabaseUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/database/DatabaseUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/database/QueryBuilder.kt b/app/src/main/kotlin/com/meloda/fast/database/QueryBuilder.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/QueryBuilder.kt
rename to app/src/main/kotlin/com/meloda/fast/database/QueryBuilder.kt
diff --git a/app/src/main/java/com/meloda/fast/database/base/Storage.kt b/app/src/main/kotlin/com/meloda/fast/database/base/Storage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/base/Storage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/base/Storage.kt
diff --git a/app/src/main/java/com/meloda/fast/database/storage/ChatsStorage.kt b/app/src/main/kotlin/com/meloda/fast/database/storage/ChatsStorage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/storage/ChatsStorage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/storage/ChatsStorage.kt
diff --git a/app/src/main/java/com/meloda/fast/database/storage/GroupsStorage.kt b/app/src/main/kotlin/com/meloda/fast/database/storage/GroupsStorage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/storage/GroupsStorage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/storage/GroupsStorage.kt
diff --git a/app/src/main/java/com/meloda/fast/database/storage/MessagesStorage.kt b/app/src/main/kotlin/com/meloda/fast/database/storage/MessagesStorage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/storage/MessagesStorage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/storage/MessagesStorage.kt
diff --git a/app/src/main/java/com/meloda/fast/database/storage/UsersStorage.kt b/app/src/main/kotlin/com/meloda/fast/database/storage/UsersStorage.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/database/storage/UsersStorage.kt
rename to app/src/main/kotlin/com/meloda/fast/database/storage/UsersStorage.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/ContextExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/ContextExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/ContextExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/ContextExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/DrawableExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/DrawableExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/DrawableExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/DrawableExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/FloatExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/FloatExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/FloatExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/FloatExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/LiveDataExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/LiveDataExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/LiveDataExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/LiveDataExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/NavigationExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/NavigationExtensions.kt
similarity index 99%
rename from app/src/main/java/com/meloda/fast/extensions/NavigationExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/NavigationExtensions.kt
index 48a783b8..ad2b3c72 100644
--- a/app/src/main/java/com/meloda/fast/extensions/NavigationExtensions.kt
+++ b/app/src/main/kotlin/com/meloda/fast/extensions/NavigationExtensions.kt
@@ -3,7 +3,6 @@ package com.meloda.fast.extensions
 import android.content.Intent
 import android.util.SparseArray
 import androidx.core.util.forEach
-import androidx.core.util.set
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LiveData
diff --git a/app/src/main/java/com/meloda/fast/extensions/StringExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/StringExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/StringExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/StringExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/extensions/TextViewExtensions.kt b/app/src/main/kotlin/com/meloda/fast/extensions/TextViewExtensions.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/extensions/TextViewExtensions.kt
rename to app/src/main/kotlin/com/meloda/fast/extensions/TextViewExtensions.kt
diff --git a/app/src/main/java/com/meloda/fast/io/BytesOutputStream.kt b/app/src/main/kotlin/com/meloda/fast/io/BytesOutputStream.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/io/BytesOutputStream.kt
rename to app/src/main/kotlin/com/meloda/fast/io/BytesOutputStream.kt
diff --git a/app/src/main/java/com/meloda/fast/io/Charsets.kt b/app/src/main/kotlin/com/meloda/fast/io/Charsets.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/io/Charsets.kt
rename to app/src/main/kotlin/com/meloda/fast/io/Charsets.kt
diff --git a/app/src/main/java/com/meloda/fast/io/EasyStreams.kt b/app/src/main/kotlin/com/meloda/fast/io/EasyStreams.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/io/EasyStreams.kt
rename to app/src/main/kotlin/com/meloda/fast/io/EasyStreams.kt
diff --git a/app/src/main/java/com/meloda/fast/io/FileStreams.kt b/app/src/main/kotlin/com/meloda/fast/io/FileStreams.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/io/FileStreams.kt
rename to app/src/main/kotlin/com/meloda/fast/io/FileStreams.kt
diff --git a/app/src/main/java/com/meloda/fast/model/NewUpdateInfo.kt b/app/src/main/kotlin/com/meloda/fast/model/NewUpdateInfo.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/model/NewUpdateInfo.kt
rename to app/src/main/kotlin/com/meloda/fast/model/NewUpdateInfo.kt
diff --git a/app/src/main/java/com/meloda/fast/model/UpdateInfo.kt b/app/src/main/kotlin/com/meloda/fast/model/UpdateInfo.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/model/UpdateInfo.kt
rename to app/src/main/kotlin/com/meloda/fast/model/UpdateInfo.kt
diff --git a/app/src/main/java/com/meloda/fast/net/HttpRequest.kt b/app/src/main/kotlin/com/meloda/fast/net/HttpRequest.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/net/HttpRequest.kt
rename to app/src/main/kotlin/com/meloda/fast/net/HttpRequest.kt
diff --git a/app/src/main/java/com/meloda/fast/receiver/DownloadUpdateReceiver.kt b/app/src/main/kotlin/com/meloda/fast/receiver/DownloadUpdateReceiver.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/receiver/DownloadUpdateReceiver.kt
rename to app/src/main/kotlin/com/meloda/fast/receiver/DownloadUpdateReceiver.kt
diff --git a/app/src/main/java/com/meloda/fast/receiver/MinuteReceiver.kt b/app/src/main/kotlin/com/meloda/fast/receiver/MinuteReceiver.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/receiver/MinuteReceiver.kt
rename to app/src/main/kotlin/com/meloda/fast/receiver/MinuteReceiver.kt
diff --git a/app/src/main/java/com/meloda/fast/fragment/friends/FriendsFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/friends/FriendsFragment.kt
similarity index 93%
rename from app/src/main/java/com/meloda/fast/fragment/friends/FriendsFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/friends/FriendsFragment.kt
index 4fa16732..77333572 100644
--- a/app/src/main/java/com/meloda/fast/fragment/friends/FriendsFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/friends/FriendsFragment.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.friends
+package com.meloda.fast.screens.friends
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/meloda/fast/fragment/important/ImportantFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/important/ImportantFragment.kt
similarity index 93%
rename from app/src/main/java/com/meloda/fast/fragment/important/ImportantFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/important/ImportantFragment.kt
index ff009428..e52e4e70 100644
--- a/app/src/main/java/com/meloda/fast/fragment/important/ImportantFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/important/ImportantFragment.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.important
+package com.meloda.fast.screens.important
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/meloda/fast/fragment/login/LoginFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/login/LoginFragment.kt
similarity index 98%
rename from app/src/main/java/com/meloda/fast/fragment/login/LoginFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/login/LoginFragment.kt
index 23d1b950..f9577eba 100644
--- a/app/src/main/java/com/meloda/fast/fragment/login/LoginFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/login/LoginFragment.kt
@@ -1,6 +1,7 @@
-package com.meloda.fast.fragment.login
+package com.meloda.fast.screens.login
 
 import android.annotation.SuppressLint
+import android.graphics.Typeface
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
@@ -26,7 +27,7 @@ import com.meloda.fast.base.viewmodel.StopProgressEvent
 import com.meloda.fast.base.viewmodel.VKEvent
 import com.meloda.fast.databinding.DialogCaptchaBinding
 import com.meloda.fast.databinding.FragmentLoginBinding
-import com.meloda.fast.fragment.main.MainFragment
+import com.meloda.fast.screens.main.MainFragment
 import com.meloda.fast.util.KeyboardUtils
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
@@ -123,6 +124,7 @@ class LoginFragment : BaseVMFragment<LoginVM>(R.layout.fragment_login) {
     }
 
     private fun preparePasswordEditText() {
+        binding.passwordInput.typeface = Typeface.DEFAULT
         binding.passwordLayout.endIconMode = TextInputLayout.END_ICON_NONE
 
         binding.passwordInput.addTextChangedListener {
diff --git a/app/src/main/java/com/meloda/fast/fragment/login/LoginVM.kt b/app/src/main/kotlin/com/meloda/fast/screens/login/LoginVM.kt
similarity index 99%
rename from app/src/main/java/com/meloda/fast/fragment/login/LoginVM.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/login/LoginVM.kt
index 7f449236..f25ed0d9 100644
--- a/app/src/main/java/com/meloda/fast/fragment/login/LoginVM.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/login/LoginVM.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.login
+package com.meloda.fast.screens.login
 
 import android.os.Bundle
 import android.util.Log
diff --git a/app/src/main/java/com/meloda/fast/fragment/login/ValidationFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/login/ValidationFragment.kt
similarity index 98%
rename from app/src/main/java/com/meloda/fast/fragment/login/ValidationFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/login/ValidationFragment.kt
index 4dedd559..62db202e 100644
--- a/app/src/main/java/com/meloda/fast/fragment/login/ValidationFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/login/ValidationFragment.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.login
+package com.meloda.fast.screens.login
 
 import android.graphics.Bitmap
 import android.os.Bundle
diff --git a/app/src/main/java/com/meloda/fast/fragment/main/MainFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/main/MainFragment.kt
similarity index 97%
rename from app/src/main/java/com/meloda/fast/fragment/main/MainFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/main/MainFragment.kt
index b71f0063..7a697e2c 100644
--- a/app/src/main/java/com/meloda/fast/fragment/main/MainFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/main/MainFragment.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.main
+package com.meloda.fast.screens.main
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/meloda/fast/fragment/main/MainVM.kt b/app/src/main/kotlin/com/meloda/fast/screens/main/MainVM.kt
similarity index 64%
rename from app/src/main/java/com/meloda/fast/fragment/main/MainVM.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/main/MainVM.kt
index a5bb4b26..39b40f31 100644
--- a/app/src/main/java/com/meloda/fast/fragment/main/MainVM.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/main/MainVM.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.main
+package com.meloda.fast.screens.main
 
 import com.meloda.fast.base.viewmodel.BaseVM
 
diff --git a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsAdapter.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
similarity index 96%
rename from app/src/main/java/com/meloda/fast/fragment/messages/ConversationsAdapter.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
index de34a4f1..4c2a978a 100644
--- a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsAdapter.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.messages
+package com.meloda.fast.screens.messages
 
 import android.content.Context
 import android.view.ViewGroup
diff --git a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsFragment.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsFragment.kt
similarity index 98%
rename from app/src/main/java/com/meloda/fast/fragment/messages/ConversationsFragment.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsFragment.kt
index d723b47b..523359c3 100644
--- a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsFragment.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsFragment.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.messages
+package com.meloda.fast.screens.messages
 
 import android.os.Bundle
 import android.view.View
diff --git a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsVM.kt b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsVM.kt
similarity index 86%
rename from app/src/main/java/com/meloda/fast/fragment/messages/ConversationsVM.kt
rename to app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsVM.kt
index 5dc00b15..e9479a86 100644
--- a/app/src/main/java/com/meloda/fast/fragment/messages/ConversationsVM.kt
+++ b/app/src/main/kotlin/com/meloda/fast/screens/messages/ConversationsVM.kt
@@ -1,4 +1,4 @@
-package com.meloda.fast.fragment.messages
+package com.meloda.fast.screens.messages
 
 import androidx.lifecycle.viewModelScope
 import com.meloda.fast.base.viewmodel.BaseVM
diff --git a/app/src/main/java/com/meloda/fast/service/LongPollService.kt b/app/src/main/kotlin/com/meloda/fast/service/LongPollService.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/service/LongPollService.kt
rename to app/src/main/kotlin/com/meloda/fast/service/LongPollService.kt
diff --git a/app/src/main/java/com/meloda/fast/util/AndroidUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/AndroidUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/AndroidUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/AndroidUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/ArrayUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/ArrayUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/ArrayUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/ArrayUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/ColorUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/ColorUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/ColorUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/ColorUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/ImageUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/ImageUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/ImageUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/ImageUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/KeyboardUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/KeyboardUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/KeyboardUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/KeyboardUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/TextUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/TextUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/TextUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/TextUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/TimeUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/TimeUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/TimeUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/TimeUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/Utils.kt b/app/src/main/kotlin/com/meloda/fast/util/Utils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/Utils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/Utils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/VKUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/VKUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/VKUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/VKUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/util/ViewUtils.kt b/app/src/main/kotlin/com/meloda/fast/util/ViewUtils.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/util/ViewUtils.kt
rename to app/src/main/kotlin/com/meloda/fast/util/ViewUtils.kt
diff --git a/app/src/main/java/com/meloda/fast/viewmodel/ChatsViewModel.kt b/app/src/main/kotlin/com/meloda/fast/viewmodel/ChatsViewModel.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/viewmodel/ChatsViewModel.kt
rename to app/src/main/kotlin/com/meloda/fast/viewmodel/ChatsViewModel.kt
diff --git a/app/src/main/java/com/meloda/fast/widget/BoundedLinearLayout.kt b/app/src/main/kotlin/com/meloda/fast/widget/BoundedLinearLayout.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/widget/BoundedLinearLayout.kt
rename to app/src/main/kotlin/com/meloda/fast/widget/BoundedLinearLayout.kt
diff --git a/app/src/main/java/com/meloda/fast/widget/CircleImageView.kt b/app/src/main/kotlin/com/meloda/fast/widget/CircleImageView.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/widget/CircleImageView.kt
rename to app/src/main/kotlin/com/meloda/fast/widget/CircleImageView.kt
diff --git a/app/src/main/java/com/meloda/fast/widget/NoItemsView.kt b/app/src/main/kotlin/com/meloda/fast/widget/NoItemsView.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/widget/NoItemsView.kt
rename to app/src/main/kotlin/com/meloda/fast/widget/NoItemsView.kt
diff --git a/app/src/main/java/com/meloda/fast/widget/Toolbar.kt b/app/src/main/kotlin/com/meloda/fast/widget/Toolbar.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/widget/Toolbar.kt
rename to app/src/main/kotlin/com/meloda/fast/widget/Toolbar.kt
diff --git a/app/src/main/java/com/meloda/fast/widget/WrapTextView.kt b/app/src/main/kotlin/com/meloda/fast/widget/WrapTextView.kt
similarity index 100%
rename from app/src/main/java/com/meloda/fast/widget/WrapTextView.kt
rename to app/src/main/kotlin/com/meloda/fast/widget/WrapTextView.kt
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 73cdca85..ecec7bc7 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -117,9 +117,10 @@
                             android:id="@+id/passwordInput"
                             android:layout_width="match_parent"
                             android:layout_height="48dp"
-                            android:imeOptions="actionGo"
+                            android:fontFamily="@font/roboto_regular"
                             android:hint="@string/password_login_hint"
-                            android:inputType="textPassword" />
+                            android:imeOptions="actionGo"
+                            android:typeface="normal" />
 
                     </com.google.android.material.textfield.TextInputLayout>
 
@@ -137,15 +138,15 @@
                     android:paddingStart="24dp"
                     android:paddingEnd="16dp"
                     android:text="@string/log_in"
-                    android:textColor="?colorAccent"
+                    android:textColor="?colorActionContentPrimary"
                     android:textSize="14sp"
-                    app:backgroundTint="?colorSurface"
+                    app:backgroundTint="?colorAction"
                     app:cornerRadius="50dp"
                     app:elevation="16dp"
                     app:icon="@drawable/ic_arrow_end"
                     app:iconGravity="end"
-                    app:iconTint="?colorAccent"
-                    app:rippleColor="?colorAccent" />
+                    app:iconTint="?colorActionContentPrimary"
+                    app:rippleColor="?colorActionRipple" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/navigation/friends.xml b/app/src/main/res/navigation/friends.xml
index c18265b4..1f8d3a90 100644
--- a/app/src/main/res/navigation/friends.xml
+++ b/app/src/main/res/navigation/friends.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/friendsFragment"
-        android:name="com.meloda.fast.fragment.friends.FriendsFragment"
+        android:name="com.meloda.fast.screens.friends.FriendsFragment"
         android:label="FriendsFragment"
         tools:layout="@layout/fragment_friends" />
 
diff --git a/app/src/main/res/navigation/important.xml b/app/src/main/res/navigation/important.xml
index 14fb1eb5..4301a41a 100644
--- a/app/src/main/res/navigation/important.xml
+++ b/app/src/main/res/navigation/important.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/importantFragment"
-        android:name="com.meloda.fast.fragment.important.ImportantFragment"
+        android:name="com.meloda.fast.screens.important.ImportantFragment"
         android:label="ImportantFragment"
         tools:layout="@layout/fragment_important" />
 
diff --git a/app/src/main/res/navigation/login.xml b/app/src/main/res/navigation/login.xml
index d23dfd39..60528bb8 100644
--- a/app/src/main/res/navigation/login.xml
+++ b/app/src/main/res/navigation/login.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/loginFragment"
-        android:name="com.meloda.fast.fragment.login.LoginFragment"
+        android:name="com.meloda.fast.screens.login.LoginFragment"
         android:label="LoginFragment"
         tools:layout="@layout/fragment_login">
 
@@ -25,7 +25,7 @@
 
     <fragment
         android:id="@+id/validationFragment"
-        android:name="com.meloda.fast.fragment.login.ValidationFragment"
+        android:name="com.meloda.fast.screens.login.ValidationFragment"
         android:label="ValidationFragment"
         tools:layout="@layout/fragment_validation">
 
diff --git a/app/src/main/res/navigation/main.xml b/app/src/main/res/navigation/main.xml
index c1de44cf..2aecd907 100644
--- a/app/src/main/res/navigation/main.xml
+++ b/app/src/main/res/navigation/main.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/mainFragment"
-        android:name="com.meloda.fast.fragment.main.MainFragment"
+        android:name="com.meloda.fast.screens.main.MainFragment"
         android:label="MainFragment"
         tools:layout="@layout/fragment_main">
 
@@ -19,7 +19,7 @@
 
     <fragment
         android:id="@+id/loginFragment"
-        android:name="com.meloda.fast.fragment.login.LoginFragment"
+        android:name="com.meloda.fast.screens.login.LoginFragment"
         android:label="LoginFragment"
         tools:layout="@layout/fragment_login">
 
@@ -37,7 +37,7 @@
 
     <fragment
         android:id="@+id/validationFragment"
-        android:name="com.meloda.fast.fragment.login.ValidationFragment"
+        android:name="com.meloda.fast.screens.login.ValidationFragment"
         android:label="ValidationFragment"
         tools:layout="@layout/fragment_validation">
 
diff --git a/app/src/main/res/navigation/messages.xml b/app/src/main/res/navigation/messages.xml
index 2d0cbaf3..e8b26d74 100644
--- a/app/src/main/res/navigation/messages.xml
+++ b/app/src/main/res/navigation/messages.xml
@@ -7,7 +7,7 @@
 
     <fragment
         android:id="@+id/conversationsFragment"
-        android:name="com.meloda.fast.fragment.messages.ConversationsFragment"
+        android:name="com.meloda.fast.screens.messages.ConversationsFragment"
         android:label="ConversationsFragment"
         tools:layout="@layout/fragment_conversations" />
 
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b2dd03af..097c40e0 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-        <item name="colorPrimary">@color/dark_primary</item>
-        <item name="colorPrimaryDark">@color/dark_primaryDark</item>
+        <item name="android:statusBarColor">@color/dark_statusBar</item>
+        <item name="android:navigationBarColor">@color/dark_navigationBar</item>
+        <item name="android:windowBackground">@color/dark_background</item>
         <item name="colorAccent">@color/dark_accent</item>
+        <item name="colorAction">@color/dark_action</item>
+        <item name="colorActionRipple">@color/dark_actionRipple</item>
+        <item name="colorActionContentPrimary">@color/dark_actionContentPrimary</item>
+
+
+        <item name="colorPrimary">@color/dark_primary</item>
 
         <item name="toolbarStyle">@style/AppTheme.Toolbar</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="dialogCornerRadius">12dp</item>
-        <item name="android:windowBackground">@color/dark_background</item>
         <item name="itemTitleColor">?colorAccent</item>
         <item name="dividerHorizontal">@color/dark_divider</item>
         <item name="textColorSecondary">@color/dark_textSecondary</item>
@@ -21,7 +27,6 @@
 
         <item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
 
-        <item name="android:navigationBarColor">@color/dark_navigationBar</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">
             @android:color/transparent
         </item>
@@ -50,7 +55,6 @@
 
     <style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Bridge">
         <item name="colorPrimary">@color/dark_primary</item>
-        <item name="colorPrimaryDark">@color/dark_primaryDark</item>
         <item name="colorAccent">@color/dark_accent</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowBackground">@color/dark_background</item>
@@ -68,7 +72,6 @@
     <style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
         <item name="colorAccent">@color/dark_accent</item>
         <item name="colorPrimary">@color/dark_primary</item>
-        <item name="colorPrimaryDark">@color/dark_primaryDark</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
new file mode 100644
index 00000000..bdde9573
--- /dev/null
+++ b/app/src/main/res/values-v31/colors.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="statusBar">@android:color/system_accent1_10</color>
+    <color name="navigationBar">@android:color/system_accent1_10</color>
+    <color name="background">@android:color/system_accent1_10</color>
+    <color name="accent">@android:color/system_accent1_500</color>
+    <color name="action">@android:color/system_accent3_500</color>
+    <color name="actionRipple">@android:color/system_accent3_200</color>
+    <color name="actionContentPrimary">@android:color/system_accent1_10</color>
+
+
+    <color name="primary">@android:color/system_accent1_10</color>
+
+    <color name="divider">#E0E0E0</color>
+
+    <color name="textSecondary">#99000000</color>
+
+    <color name="text_secondary_100_alpha">#ff000000</color>
+    <color name="text_secondary_87_alpha">#DE000000</color>
+    <color name="text_secondary_60_alpha">#99000000</color>
+
+    <color name="text_secondary_light_100_alpha">#ffffff</color>
+    <color name="text_secondary_light_87_alpha">#DEFFFFFF</color>
+    <color name="text_secondary_light_60_alpha">#99FFFFFF</color>
+
+    <color name="text_secondary_60">#666666</color>
+
+    <color name="fast_logo_border_color">#F5F5F5</color>
+
+    <color name="login_secondary_color">#5c5c5c</color>
+    <color name="edittext_filled_background">#e8e8e8</color>
+    <color name="login_button_text_color">#ffffff</color>
+
+    <color name="conversationTitle">@color/accent</color>
+
+    <color name="message_in">#ffffff</color>
+    <color name="message_out">#000000</color>
+
+
+    <color name="dark_statusBar">@android:color/system_accent1_1000</color>
+    <color name="dark_navigationBar">@android:color/system_accent1_1000</color>
+    <color name="dark_background">@android:color/system_accent1_1000</color>
+    <color name="dark_accent">@android:color/system_accent1_400</color>
+    <color name="dark_action">@android:color/system_accent3_300</color>
+    <color name="dark_actionRipple">@android:color/system_accent3_50</color>
+    <color name="dark_actionContentPrimary">@android:color/system_accent3_1000</color>
+
+    <color name="dark_primary">@android:color/system_accent1_900</color>
+
+    <color name="dark_divider">#292929</color>
+
+    <color name="dark_textSecondary">#99FFFFFF</color>
+
+    <color name="dark_edittext_filled_background">#272727</color>
+
+    <color name="dark_message_in">#000000</color>
+    <color name="dark_message_out">#ffffff</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d002566d..3bae8bfa 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <attr name="colorAction" format="color" />
+    <attr name="colorActionRipple" format="color" />
+    <attr name="colorActionContentPrimary" format="color" />
+
     <attr name="itemTitleColor" format="color" />
 
     <attr name="textColorSecondary" format="color" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 864d4b70..1152bcb5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="primary">@color/accent</color>
-    <color name="primaryDark">#ffffff</color>
-    <color name="accent">#4284F4</color>
+
+    <color name="statusBar">#ffffff</color>
     <color name="navigationBar">#ffffff</color>
     <color name="background">#ffffff</color>
+    <color name="accent">#4284F4</color>
+    <color name="action">#4E8CF6</color>
+    <color name="actionRipple">#95BBFB</color>
+    <color name="actionContentPrimary">#ffffff</color>
+
+    <color name="primary">@color/accent</color>
 
     <color name="divider">#E0E0E0</color>
 
@@ -35,11 +40,15 @@
 
     <!-- Dark Theme Colors -->
 
-    <color name="dark_primary">#000000</color>
-    <color name="dark_primaryDark">#000000</color>
-    <color name="dark_accent">#63ACFF</color>
+    <color name="dark_statusBar">#000000</color>
     <color name="dark_navigationBar">#000000</color>
     <color name="dark_background">#000000</color>
+    <color name="dark_accent">#63ACFF</color>
+    <color name="dark_action">#56A5FF</color>
+    <color name="dark_actionRipple">#2E90FF</color>
+    <color name="dark_actionContentPrimary">#000000</color>
+
+    <color name="dark_primary">#000000</color>
 
     <color name="dark_divider">#292929</color>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b2f9b95f..ccaa1221 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,16 +2,21 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:statusBarColor">@color/statusBar</item>
+        <item name="android:navigationBarColor">@color/navigationBar</item>
+        <item name="android:windowBackground">@color/background</item>
         <item name="colorAccent">@color/accent</item>
+        <item name="colorAction">@color/action</item>
+        <item name="colorActionRipple">@color/actionRipple</item>
+        <item name="colorActionContentPrimary">@color/actionContentPrimary</item>
+
+        <item name="colorPrimary">@color/primary</item>
 
         <item name="toolbarStyle">@style/AppTheme.Toolbar</item>
 
         <item name="android:windowLightStatusBar">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="dialogCornerRadius">12dp</item>
-        <item name="android:windowBackground">@color/background</item>
         <item name="itemTitleColor">@color/accent</item>
         <item name="dividerHorizontal">@color/divider</item>
         <item name="textColorSecondary">@color/textSecondary</item>
@@ -22,7 +27,6 @@
 
         <item name="android:windowAnimationStyle">@style/AppTheme.ActivityAnimation</item>
 
-        <item name="android:navigationBarColor">@color/navigationBar</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
         <item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">
             @android:color/transparent
@@ -54,7 +58,6 @@
 
     <style name="AppTheme.FullScreenDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Bridge">
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:windowIsFloating">false</item>
         <item name="android:windowBackground">@color/background</item>
@@ -79,7 +82,6 @@
     <style name="AppTheme.ProfileDialog" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
         <item name="colorAccent">@color/accent</item>
         <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 305f8f92..1e4a8ca4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
-        classpath("com.android.tools.build:gradle:7.0.0")
+        classpath("com.android.tools.build:gradle:7.0.1")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5")
 
         classpath("com.google.dagger:hilt-android-gradle-plugin:2.37")
@@ -18,7 +18,6 @@ allprojects {
         google()
         mavenCentral()
         maven(url = "https://jitpack.io")
-        //maven { url 'https://jitpack.io' }
     }
 }