diff --git a/.idea/.name b/.idea/.name
index 16bd2628..1d185db5 100644
--- a/.idea/.name
+++ b/.idea/.name
@@ -1 +1 @@
-Book's History Resurrection
\ No newline at end of file
+Book's Story
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 5679c4ab..bfc6f1c8 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -4,19 +4,18 @@
     <value>
       <entry key="app">
         <State>
-          <runningDeviceTargetSelectedWithDropDown>
+          <targetSelectedWithDropDown>
             <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
+              <type value="QUICK_BOOT_TARGET" />
               <deviceKey>
                 <Key>
                   <type value="VIRTUAL_DEVICE_PATH" />
-                  <value value="$USER_HOME$/.android/avd/Phone_13_.avd" />
+                  <value value="C:\Users\Administrator\.android\avd\Phone_33_.avd" />
                 </Key>
               </deviceKey>
             </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-02-22T17:49:53.931710327Z" />
-          <multipleDevicesSelectedInDropDown value="true" />
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-02-29T15:05:04.852701900Z" />
           <targetsSelectedWithDialog>
             <Target>
               <type value="QUICK_BOOT_TARGET" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb865f69..5653bfc3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="jbr-17 (2)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3d7ddf56..a9dc1af8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -10,15 +10,15 @@ plugins {
 }
 
 android {
-    namespace = "com.acclorite.books_history"
+    namespace = "ua.acclorite.book_story"
     compileSdk = 34
 
     defaultConfig {
-        applicationId = "com.acclorite.books_history"
+        applicationId = "ua.acclorite.book_story"
         minSdk = 26
         targetSdk = 34
         versionCode = 1
-        versionName = "0.6.0"
+        versionName = "0.8.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -140,4 +140,7 @@ dependencies {
     }
     implementation("org.slf4j:slf4j-android:latest.release")
     implementation("org.jsoup:jsoup:latest.release")
+
+    implementation("androidx.appcompat:appcompat:latest.release")
+    implementation("androidx.appcompat:appcompat-resources:latest.release")
 }
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt
deleted file mode 100644
index e001c9c8..00000000
--- a/app/src/androidTest/java/com/acclorite/books_history/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.acclorite.books_history
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.acclorite.books_history", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d48af3ed..b438d2f9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,9 +17,10 @@
         android:theme="@style/Theme.Start.Splash"
         android:enableOnBackInvokedCallback="true"
         tools:targetApi="tiramisu">
+
         <activity
             android:name=".MainActivity"
-            android:configChanges="screenSize|screenLayout|smallestScreenSize|locale|density"
+            android:configChanges="screenSize|screenLayout|smallestScreenSize|locale|density|uiMode"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Theme.Start.Splash">
@@ -28,6 +29,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/app_icon-playstore.png b/app/src/main/app_icon-playstore.png
deleted file mode 100644
index d8766d0a..00000000
Binary files a/app/src/main/app_icon-playstore.png and /dev/null differ
diff --git a/app/src/main/app_icon_mc-playstore.png b/app/src/main/app_icon_mc-playstore.png
deleted file mode 100644
index 31e72bd8..00000000
Binary files a/app/src/main/app_icon_mc-playstore.png and /dev/null differ
diff --git a/app/src/main/app_icon_monochromed-playstore.png b/app/src/main/app_icon_monochromed-playstore.png
deleted file mode 100644
index 0448c62f..00000000
Binary files a/app/src/main/app_icon_monochromed-playstore.png and /dev/null differ
diff --git a/app/src/main/deleteme-playstore.png b/app/src/main/deleteme-playstore.png
deleted file mode 100644
index ee0066a6..00000000
Binary files a/app/src/main/deleteme-playstore.png and /dev/null differ
diff --git a/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt b/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt
deleted file mode 100644
index 397e5bfe..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/di/RepositoryModule.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.acclorite.books_history.data.di
-
-import com.acclorite.books_history.data.local.data_store.DataStore
-import com.acclorite.books_history.data.local.data_store.DataStoreImpl
-import com.acclorite.books_history.data.mapper.BookMapper
-import com.acclorite.books_history.data.mapper.BookMapperImpl
-import com.acclorite.books_history.data.repository.BookRepositoryImpl
-import com.acclorite.books_history.domain.repository.BookRepository
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-abstract class RepositoryModule {
-
-    @Binds
-    abstract fun bindDataStore(
-        dataStoreImpl: DataStoreImpl
-    ): DataStore
-
-    @Binds
-    @Singleton
-    abstract fun bindBookRepository(
-        bookRepositoryImpl: BookRepositoryImpl
-    ): BookRepository
-
-    @Binds
-    @Singleton
-    abstract fun bindBookMapper(
-        bookMapperImpl: BookMapperImpl
-    ): BookMapper
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt b/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt
deleted file mode 100644
index 91c12767..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDatabase.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.acclorite.books_history.data.local.room
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import com.acclorite.books_history.data.local.dto.BookEntity
-
-@Database(
-    entities = [BookEntity::class],
-    version = 1,
-    exportSchema = false
-)
-abstract class BookDatabase : RoomDatabase() {
-    abstract val dao: BookDao
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt b/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt
deleted file mode 100644
index a904014c..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapper.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.acclorite.books_history.data.mapper
-
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.domain.model.Book
-
-interface BookMapper {
-    suspend fun toBookEntity(book: Book): BookEntity
-
-    suspend fun toBook(bookEntity: BookEntity): Book
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt b/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt
deleted file mode 100644
index ad884b10..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/parser/FileParser.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.acclorite.books_history.data.parser
-
-import com.acclorite.books_history.domain.model.Book
-import java.io.File
-
-interface FileParser {
-
-    suspend fun parse(file: File): Book?
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt b/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt
deleted file mode 100644
index f3e14a23..00000000
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TextParser.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.acclorite.books_history.data.parser
-
-import com.acclorite.books_history.domain.model.StringWithId
-import java.io.File
-
-interface TextParser {
-    suspend fun parse(file: File): List<StringWithId>
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt b/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt
deleted file mode 100644
index 7ffe9c27..00000000
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/DeleteBooks.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.acclorite.books_history.domain.use_case
-
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
-import javax.inject.Inject
-
-class DeleteBooks @Inject constructor(private val repository: BookRepository) {
-
-    suspend fun execute(books: List<Book>) {
-        repository.deleteBooks(books)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt b/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt
deleted file mode 100644
index 37e6eb14..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/AnimatedTopAppBar.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.acclorite.books_history.presentation.components
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.spring
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.statusBars
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.TopAppBarScrollBehavior
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.DefaultTransition
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AnimatedTopAppBar(
-    containerColor: Color = MaterialTheme.colorScheme.surface,
-    scrolledContainerColor: Color?,
-
-    scrollBehavior: TopAppBarScrollBehavior?,
-    isTopBarScrolled: Boolean?,
-
-    content1Visibility: Boolean,
-    content1NavigationIcon: @Composable () -> Unit,
-    content1Title: @Composable () -> Unit,
-    content1Actions: @Composable RowScope.() -> Unit,
-
-    content2Visibility: Boolean,
-    content2NavigationIcon: @Composable () -> Unit,
-    content2Title: @Composable () -> Unit,
-    content2Actions: @Composable RowScope.() -> Unit,
-
-    content3Visibility: Boolean,
-    content3NavigationIcon: @Composable () -> Unit,
-    content3Title: @Composable () -> Unit,
-    content3Actions: @Composable RowScope.() -> Unit
-) {
-    val color =
-        if (isTopBarScrolled == true && scrolledContainerColor != null) scrolledContainerColor
-        else containerColor
-
-    val animatedColor by animateColorAsState(
-        targetValue = color,
-        animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
-        label = "TopAppBar color animation"
-    )
-
-    if (scrollBehavior != null && scrolledContainerColor != null) {
-        val isScrolled = scrollBehavior.state.overlappedFraction > 0.01f
-        val statusBarPadding = with(LocalDensity.current) {
-            WindowInsets.statusBars.getTop(LocalDensity.current).toDp()
-        }
-
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(64.dp + statusBarPadding)
-                .background(
-                    if (isScrolled) scrolledContainerColor
-                    else containerColor
-                )
-        )
-    }
-
-    Box(modifier = Modifier.fillMaxWidth()) {
-        DefaultTransition(visible = content1Visibility) {
-            TopAppBar(
-                navigationIcon = content1NavigationIcon,
-                title = content1Title,
-                actions = content1Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-
-        DefaultTransition(visible = content2Visibility) {
-            TopAppBar(
-                navigationIcon = content2NavigationIcon,
-                title = content2Title,
-                actions = content2Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-
-        DefaultTransition(visible = content3Visibility) {
-            TopAppBar(
-                navigationIcon = content3NavigationIcon,
-                title = content3Title,
-                actions = content3Actions,
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = animatedColor,
-                    scrolledContainerColor = scrolledContainerColor ?: Color.Transparent
-                )
-            )
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt
deleted file mode 100644
index aeecb9c8..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/HistoryScreen.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.screens.history.data.HistoryViewModel
-
-@Composable
-fun HistoryScreen(
-    viewModel: HistoryViewModel = hiltViewModel(),
-    navigator: Navigator
-) {
-    val state by viewModel.state.collectAsState()
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt
deleted file mode 100644
index 6b699239..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-sealed class HistoryEvent
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt
deleted file mode 100644
index d35f6901..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryState.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-data class HistoryState(
-    val foo: Int = 0
-)
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt
deleted file mode 100644
index 5bce8000..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/history/data/HistoryViewModel.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.acclorite.books_history.presentation.screens.history.data
-
-import androidx.lifecycle.ViewModel
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import javax.inject.Inject
-
-@HiltViewModel
-class HistoryViewModel @Inject constructor(
-
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(HistoryState())
-    val state = _state.asStateFlow()
-
-    fun onEvent(event: HistoryEvent) {
-        //
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt
deleted file mode 100644
index b507e8f0..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetItem.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.acclorite.books_history.presentation.screens.reader.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun ReaderSettingsBottomSheetItem(
-    modifier: Modifier = Modifier,
-    title: String,
-    description: String,
-    verticalPadding: Dp = 8.dp,
-    onClick: () -> Unit
-) {
-    Column(
-        modifier
-            .fillMaxWidth()
-            .clickable {
-                onClick()
-            }
-            .padding(horizontal = 18.dp, vertical = verticalPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.Start
-    ) {
-        Text(
-            title,
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.onSurface,
-            fontSize = 18.sp
-        )
-        Spacer(modifier = Modifier.height(2.dp))
-        Text(
-            description,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt b/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt
deleted file mode 100644
index d14f85dc..00000000
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsOptionItem.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.acclorite.books_history.presentation.screens.settings.components
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun SettingsOptionItem(
-    modifier: Modifier = Modifier,
-    title: String,
-    description: String,
-    verticalPadding: Dp = 8.dp,
-    onClick: () -> Unit
-) {
-    Column(
-        modifier
-            .fillMaxWidth()
-            .clickable {
-                onClick()
-            }
-            .padding(horizontal = 16.dp, vertical = verticalPadding),
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.Start
-    ) {
-        Text(
-            title,
-            style = MaterialTheme.typography.bodyLarge,
-            color = MaterialTheme.colorScheme.onSurface,
-            fontSize = 18.sp
-        )
-        Spacer(modifier = Modifier.height(2.dp))
-        Text(
-            description,
-            style = MaterialTheme.typography.bodyMedium,
-            color = MaterialTheme.colorScheme.onSurfaceVariant,
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/MainActivity.kt
similarity index 76%
rename from app/src/main/java/com/acclorite/books_history/MainActivity.kt
rename to app/src/main/java/ua/acclorite/book_story/MainActivity.kt
index 72e285a7..e33f3564 100644
--- a/app/src/main/java/com/acclorite/books_history/MainActivity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/MainActivity.kt
@@ -1,11 +1,15 @@
-package com.acclorite.books_history
+package ua.acclorite.book_story
 
 import android.content.res.Configuration
 import android.os.Bundle
-import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.slideInHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
@@ -15,33 +19,29 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.NavigationHost
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.BottomNavigationBar
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.book_info.BookInfoScreen
-import com.acclorite.books_history.presentation.screens.browse.BrowseScreen
-import com.acclorite.books_history.presentation.screens.history.HistoryScreen
-import com.acclorite.books_history.presentation.screens.library.LibraryScreen
-import com.acclorite.books_history.presentation.screens.reader.ReaderScreen
-import com.acclorite.books_history.presentation.screens.settings.SettingsScreen
-import com.acclorite.books_history.presentation.screens.settings.nested.appearance.AppearanceSettings
-import com.acclorite.books_history.presentation.screens.settings.nested.general.GeneralSettings
-import com.acclorite.books_history.ui.BooksHistoryResurrectionTheme
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.isDark
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import dagger.hilt.android.AndroidEntryPoint
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.NavigationHost
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.BottomNavigationBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.book_info.BookInfoScreen
+import ua.acclorite.book_story.presentation.screens.browse.BrowseScreen
+import ua.acclorite.book_story.presentation.screens.history.HistoryScreen
+import ua.acclorite.book_story.presentation.screens.library.LibraryScreen
+import ua.acclorite.book_story.presentation.screens.reader.ReaderScreen
+import ua.acclorite.book_story.presentation.screens.settings.SettingsScreen
+import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.AppearanceSettings
+import ua.acclorite.book_story.presentation.screens.settings.nested.general.GeneralSettings
+import ua.acclorite.book_story.ui.BooksHistoryResurrectionTheme
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.isDark
 
-@OptIn(ExperimentalPermissionsApi::class)
 @AndroidEntryPoint
-class MainActivity : ComponentActivity() {
+class MainActivity : AppCompatActivity() {
     private val mainViewModel: MainViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -70,14 +70,17 @@ class MainActivity : ComponentActivity() {
                 if (!updating) {
                     NavigationHost(startScreen = Screen.LIBRARY) {
                         val currentScreen by this.getCurrentScreen().collectAsState()
-                        DefaultTransition(
+                        AnimatedVisibility(
                             visible = currentScreen == Screen.LIBRARY ||
                                     currentScreen == Screen.HISTORY ||
-                                    currentScreen == Screen.BROWSE
+                                    currentScreen == Screen.BROWSE,
+                            enter = fadeIn(tween(200)) +
+                                    slideInHorizontally(tween(200)) { it / 15 },
+                            exit = Transitions.SlidingTransitionOut
                         ) {
                             Scaffold(
                                 bottomBar = {
-                                    BottomNavigationBar(navigator = this)
+                                    BottomNavigationBar(navigator = this@NavigationHost)
                                 },
                                 containerColor = MaterialTheme.colorScheme.surface
                             ) {
@@ -122,8 +125,7 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             ReaderScreen(
-                                navigator = this@NavigationHost,
-                                mainViewModel = mainViewModel
+                                navigator = this@NavigationHost
                             )
                         }
 
@@ -145,7 +147,6 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             GeneralSettings(
-                                mainViewModel = mainViewModel,
                                 navigator = this@NavigationHost
                             )
                         }
@@ -155,7 +156,6 @@ class MainActivity : ComponentActivity() {
                             exitAnim = Transitions.SlidingTransitionOut
                         ) {
                             AppearanceSettings(
-                                mainViewModel = mainViewModel,
                                 navigator = this@NavigationHost
                             )
                         }
@@ -165,8 +165,7 @@ class MainActivity : ComponentActivity() {
                         modifier = Modifier
                             .fillMaxSize()
                             .background(
-                                if (darkTheme.isDark()) Color.Black
-                                else Color.White
+                                MaterialTheme.colorScheme.surface
                             )
                     )
                 }
diff --git a/app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt b/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt
rename to app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
index 79b1e892..2202be40 100644
--- a/app/src/main/java/com/acclorite/books_history/data/di/AppModule.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/di/AppModule.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.data.di
+package ua.acclorite.book_story.data.di
 
 import android.app.Application
 import androidx.room.Room
-import com.acclorite.books_history.data.local.room.BookDao
-import com.acclorite.books_history.data.local.room.BookDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import ua.acclorite.book_story.data.local.room.BookDao
+import ua.acclorite.book_story.data.local.room.BookDatabase
 import javax.inject.Singleton
 
 @Module
diff --git a/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
new file mode 100644
index 00000000..a129eccf
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/di/RepositoryModule.kt
@@ -0,0 +1,43 @@
+package ua.acclorite.book_story.data.di
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import ua.acclorite.book_story.data.local.data_store.DataStore
+import ua.acclorite.book_story.data.local.data_store.DataStoreImpl
+import ua.acclorite.book_story.data.mapper.BookMapper
+import ua.acclorite.book_story.data.mapper.BookMapperImpl
+import ua.acclorite.book_story.data.mapper.HistoryMapper
+import ua.acclorite.book_story.data.mapper.HistoryMapperImpl
+import ua.acclorite.book_story.data.repository.BookRepositoryImpl
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class RepositoryModule {
+
+    @Binds
+    abstract fun bindDataStore(
+        dataStoreImpl: DataStoreImpl
+    ): DataStore
+
+    @Binds
+    @Singleton
+    abstract fun bindBookRepository(
+        bookRepositoryImpl: BookRepositoryImpl
+    ): BookRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindBookMapper(
+        bookMapperImpl: BookMapperImpl
+    ): BookMapper
+
+    @Binds
+    @Singleton
+    abstract fun bindHistoryMapper(
+        historyMapperImpl: HistoryMapperImpl
+    ): HistoryMapper
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
index ad23569a..62342537 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStore.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.data_store
+package ua.acclorite.book_story.data.local.data_store
 
 import androidx.datastore.preferences.core.Preferences
 import kotlinx.coroutines.flow.Flow
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
index bcab84b2..ca8f3df2 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/data_store/DataStoreImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/data_store/DataStoreImpl.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.data_store
+package ua.acclorite.book_story.data.local.data_store
 
 import android.app.Application
 import android.content.Context
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
index 68cc6b11..08addf36 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/dto/BookEntity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/BookEntity.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.data.local.dto
+package ua.acclorite.book_story.data.local.dto
 
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Category
 
 @Entity
 data class BookEntity(
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt b/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
new file mode 100644
index 00000000..dbdebc73
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/dto/HistoryEntity.kt
@@ -0,0 +1,12 @@
+package ua.acclorite.book_story.data.local.dto
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class HistoryEntity(
+    @PrimaryKey(true)
+    val id: Int? = null,
+    val bookId: Int,
+    val time: Long
+)
diff --git a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
similarity index 54%
rename from app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt
rename to app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
index 7d93677e..eb3f9fec 100644
--- a/app/src/main/java/com/acclorite/books_history/data/local/room/BookDao.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDao.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.data.local.room
+package ua.acclorite.book_story.data.local.room
 
 import androidx.room.Dao
 import androidx.room.Delete
@@ -6,7 +6,8 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
-import com.acclorite.books_history.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
 
 @Dao
 interface BookDao {
@@ -35,4 +36,22 @@ interface BookDao {
 
     @Update
     suspend fun updateBooks(books: List<BookEntity>)
+
+
+    @Query("SELECT * FROM historyentity")
+    suspend fun getHistory(): List<HistoryEntity>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertHistory(
+        history: List<HistoryEntity>
+    )
+
+    @Query("DELETE FROM historyentity")
+    suspend fun deleteWholeHistory()
+
+    @Query("DELETE FROM historyentity WHERE bookId = :bookId")
+    suspend fun deleteBookHistory(bookId: Int)
+
+    @Delete
+    suspend fun deleteHistory(history: List<HistoryEntity>)
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
new file mode 100644
index 00000000..232103de
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/local/room/BookDatabase.kt
@@ -0,0 +1,18 @@
+package ua.acclorite.book_story.data.local.room
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+
+@Database(
+    entities = [
+        BookEntity::class,
+        HistoryEntity::class
+    ],
+    version = 1,
+    exportSchema = false
+)
+abstract class BookDatabase : RoomDatabase() {
+    abstract val dao: BookDao
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt
new file mode 100644
index 00000000..e3fe7bce
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapper.kt
@@ -0,0 +1,10 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.domain.model.Book
+
+interface BookMapper {
+    suspend fun toBookEntity(book: Book): BookEntity
+
+    suspend fun toBook(bookEntity: BookEntity): Book
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
index 7cee664d..f72eb061 100644
--- a/app/src/main/java/com/acclorite/books_history/data/mapper/BookMapperImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/BookMapperImpl.kt
@@ -1,14 +1,14 @@
-package com.acclorite.books_history.data.mapper
+package ua.acclorite.book_story.data.mapper
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import com.acclorite.books_history.R
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.data.parser.EpubFileParser
-import com.acclorite.books_history.data.parser.PdfFileParser
-import com.acclorite.books_history.data.parser.TxtFileParser
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.parser.EpubFileParser
+import ua.acclorite.book_story.data.parser.PdfFileParser
+import ua.acclorite.book_story.data.parser.TxtFileParser
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.util.UIText
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt
new file mode 100644
index 00000000..0648b0d0
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapper.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+
+interface HistoryMapper {
+    suspend fun toHistoryEntity(history: History): HistoryEntity
+
+    suspend fun toHistory(historyEntity: HistoryEntity, book: Book): History
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt
new file mode 100644
index 00000000..81c8ef76
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/mapper/HistoryMapperImpl.kt
@@ -0,0 +1,24 @@
+package ua.acclorite.book_story.data.mapper
+
+import ua.acclorite.book_story.data.local.dto.HistoryEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import javax.inject.Inject
+
+class HistoryMapperImpl @Inject constructor() : HistoryMapper {
+    override suspend fun toHistoryEntity(history: History): HistoryEntity {
+        return HistoryEntity(
+            id = history.id,
+            bookId = history.book.id ?: 0,
+            time = history.time
+        )
+    }
+
+    override suspend fun toHistory(historyEntity: HistoryEntity, book: Book): History {
+        return History(
+            historyEntity.id,
+            book = book,
+            time = historyEntity.time
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
similarity index 79%
rename from app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
index 006dd7e9..3547b05a 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/EpubFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubFileParser.kt
@@ -1,10 +1,12 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.graphics.BitmapFactory
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.util.UIText
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import nl.siegmann.epublib.epub.EpubReader
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import java.io.FileInputStream
 import javax.inject.Inject
@@ -18,7 +20,9 @@ class EpubFileParser @Inject constructor() : FileParser {
 
         try {
             val epubReader = EpubReader()
-            val book = epubReader.readEpub(FileInputStream(file))
+            val book = withContext(Dispatchers.IO) {
+                epubReader.readEpub(FileInputStream(file))
+            }
 
             val metadata = book.metadata
             val author = UIText.StringValue(metadata.authors.joinToString(", "))
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
index 0fc99892..c8ee1158 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/EpubTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/EpubTextParser.kt
@@ -1,8 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.domain.model.StringWithId
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import nl.siegmann.epublib.epub.EpubReader
 import org.jsoup.Jsoup
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileInputStream
@@ -18,7 +20,9 @@ class EpubTextParser @Inject constructor() : TextParser {
         }
 
         try {
-            val book = EpubReader().readEpub(FileInputStream(file))
+            val book = withContext(Dispatchers.IO) {
+                EpubReader().readEpub(FileInputStream(file))
+            }
             val unformattedText = StringBuilder()
 
             for (spineReference in book.spine.spineReferences) {
@@ -28,7 +32,9 @@ class EpubTextParser @Inject constructor() : TextParser {
                     BufferedReader(InputStreamReader(inputStream, Charset.forName("UTF-8")))
                 var line: String?
 
-                while (reader.readLine().also { line = it } != null) {
+                while (withContext(Dispatchers.IO) {
+                        reader.readLine()
+                    }.also { line = it } != null) {
                     unformattedText.append(line).append("\n")
                 }
             }
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt
new file mode 100644
index 00000000..270f9846
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/FileParser.kt
@@ -0,0 +1,9 @@
+package ua.acclorite.book_story.data.parser
+
+import ua.acclorite.book_story.domain.model.Book
+import java.io.File
+
+interface FileParser {
+
+    suspend fun parse(file: File): Book?
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
index 2072a98c..36badf5c 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/PdfFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfFileParser.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.app.Application
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.UIText
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
index 92d9dd86..42391f12 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/PdfTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/PdfTextParser.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
 import android.app.Application
-import com.acclorite.books_history.domain.model.StringWithId
 import com.tom_roush.pdfbox.android.PDFBoxResourceLoader
 import com.tom_roush.pdfbox.pdmodel.PDDocument
 import com.tom_roush.pdfbox.text.PDFTextStripper
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt
new file mode 100644
index 00000000..50be3cec
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TextParser.kt
@@ -0,0 +1,8 @@
+package ua.acclorite.book_story.data.parser
+
+import ua.acclorite.book_story.domain.model.StringWithId
+import java.io.File
+
+interface TextParser {
+    suspend fun parse(file: File): List<StringWithId>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
index 76cd8224..bb7f0fe1 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TxtFileParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtFileParser.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.UIText
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
similarity index 55%
rename from app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt
rename to app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
index 0181aa61..1964463a 100644
--- a/app/src/main/java/com/acclorite/books_history/data/parser/TxtTextParser.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/parser/TxtTextParser.kt
@@ -1,6 +1,8 @@
-package com.acclorite.books_history.data.parser
+package ua.acclorite.book_story.data.parser
 
-import com.acclorite.books_history.domain.model.StringWithId
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import ua.acclorite.book_story.domain.model.StringWithId
 import java.io.BufferedReader
 import java.io.File
 import java.io.FileReader
@@ -16,10 +18,12 @@ class TxtTextParser @Inject constructor() : TextParser {
         return try {
             val formattedLines = mutableListOf<StringWithId>()
 
-            BufferedReader(FileReader(file)).forEachLine { line ->
-                formattedLines.add(
-                    StringWithId(line)
-                )
+            withContext(Dispatchers.IO) {
+                BufferedReader(FileReader(file)).forEachLine { line ->
+                    formattedLines.add(
+                        StringWithId(line)
+                    )
+                }
             }
 
             formattedLines
diff --git a/app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
similarity index 76%
rename from app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt
rename to app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
index 14a393a7..30a15dd3 100644
--- a/app/src/main/java/com/acclorite/books_history/data/repository/BookRepositoryImpl.kt
+++ b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt
@@ -1,25 +1,27 @@
-package com.acclorite.books_history.data.repository
+package ua.acclorite.book_story.data.repository
 
 import android.os.Environment
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.data.local.data_store.DataStore
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.data.local.room.BookDao
-import com.acclorite.books_history.data.mapper.BookMapper
-import com.acclorite.books_history.data.parser.EpubFileParser
-import com.acclorite.books_history.data.parser.EpubTextParser
-import com.acclorite.books_history.data.parser.PdfFileParser
-import com.acclorite.books_history.data.parser.PdfTextParser
-import com.acclorite.books_history.data.parser.TxtFileParser
-import com.acclorite.books_history.data.parser.TxtTextParser
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Constants
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
+import ua.acclorite.book_story.data.local.data_store.DataStore
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.data.local.room.BookDao
+import ua.acclorite.book_story.data.mapper.BookMapper
+import ua.acclorite.book_story.data.mapper.HistoryMapper
+import ua.acclorite.book_story.data.parser.EpubFileParser
+import ua.acclorite.book_story.data.parser.EpubTextParser
+import ua.acclorite.book_story.data.parser.PdfFileParser
+import ua.acclorite.book_story.data.parser.PdfTextParser
+import ua.acclorite.book_story.data.parser.TxtFileParser
+import ua.acclorite.book_story.data.parser.TxtTextParser
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Constants
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -30,6 +32,7 @@ class BookRepositoryImpl @Inject constructor(
     private val dataStore: DataStore,
 
     private val bookMapper: BookMapper,
+    private val historyMapper: HistoryMapper,
 
     private val txtFileParser: TxtFileParser,
     private val pdfFileParser: PdfFileParser,
@@ -233,6 +236,38 @@ class BookRepositoryImpl @Inject constructor(
             emit(Resource.Success(books))
         }
     }
+
+    override suspend fun insertHistory(history: List<History>) {
+        database.insertHistory(history.map { historyMapper.toHistoryEntity(it) })
+    }
+
+    override suspend fun getHistory(): Flow<Resource<List<History>>> {
+        return flow {
+            emit(Resource.Loading(true))
+
+            val history = database.getHistory()
+            emit(
+                Resource.Success(
+                    data = history.map {
+                        val book = database.findBookById(it.bookId)
+                        historyMapper.toHistory(it, bookMapper.toBook(book))
+                    }
+                )
+            )
+        }
+    }
+
+    override suspend fun deleteWholeHistory() {
+        database.deleteWholeHistory()
+    }
+
+    override suspend fun deleteBookHistory(bookId: Int) {
+        database.deleteBookHistory(bookId)
+    }
+
+    override suspend fun deleteHistory(history: List<History>) {
+        database.deleteHistory(history.map { historyMapper.toHistoryEntity(it) })
+    }
 }
 
 
@@ -248,3 +283,4 @@ class BookRepositoryImpl @Inject constructor(
 
 
 
+
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/Book.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/domain/model/Book.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
index 4ee2c4ae..985463a3 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/Book.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/Book.kt
@@ -1,21 +1,21 @@
-package com.acclorite.books_history.domain.model
-
-import android.graphics.Bitmap
-import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.util.UIText
-import java.io.File
-
-@Immutable
-data class Book(
-    val id: Int?,
-    val title: String,
-    val author: UIText,
-    val description: String?,
-    val text: List<StringWithId> = emptyList(),
-    val progress: Float,
-    val file: File?,
-    val filePath: String,
-    val lastOpened: Long?,
-    val category: Category,
-    val coverImage: Bitmap?
-)
+package ua.acclorite.book_story.domain.model
+
+import android.graphics.Bitmap
+import androidx.compose.runtime.Immutable
+import ua.acclorite.book_story.util.UIText
+import java.io.File
+
+@Immutable
+data class Book(
+    val id: Int?,
+    val title: String,
+    val author: UIText,
+    val description: String?,
+    val text: List<StringWithId> = emptyList(),
+    val progress: Float,
+    val file: File?,
+    val filePath: String,
+    val lastOpened: Long?,
+    val category: Category,
+    val coverImage: Bitmap?
+)
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/Category.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
similarity index 58%
rename from app/src/main/java/com/acclorite/books_history/domain/model/Category.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
index 55c56261..dfbb5321 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/Category.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/Category.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 enum class Category {
     READING, ALREADY_READ, PLANNING, DROPPED
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
index 759ecec0..185f16b1 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/ChipItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/ChipItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
similarity index 67%
rename from app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
index a423a6ea..a6242f1b 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/FontWithName.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/FontWithName.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontFamily
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.util.UIText
 
 @Immutable
 data class FontWithName(
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt
new file mode 100644
index 00000000..2c51a68c
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/GroupedHistory.kt
@@ -0,0 +1,9 @@
+package ua.acclorite.book_story.domain.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class GroupedHistory(
+    val title: String,
+    val history: List<History>
+)
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt
new file mode 100644
index 00000000..1e9d8ada
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/History.kt
@@ -0,0 +1,10 @@
+package ua.acclorite.book_story.domain.model
+
+import androidx.compose.runtime.Immutable
+
+@Immutable
+data class History(
+    val id: Int?,
+    val book: Book,
+    val time: Long
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
index cc1476c4..ff897133 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/NavigationBarItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationBarItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.painter.Painter
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
index 51e05e11..014b0940 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/NullableBook.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/NullableBook.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.domain.model
+package ua.acclorite.book_story.domain.model
 
 sealed class NullableBook(val book: Pair<Book, Boolean>?, val fileName: String?) {
     class NotNull(book: Pair<Book, Boolean>) : NullableBook(book, null)
diff --git a/app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
similarity index 80%
rename from app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
index 85b15c6c..f8e99868 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/model/StringWithId.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/model/StringWithId.kt
@@ -1,13 +1,13 @@
-package com.acclorite.books_history.domain.model
-
-import android.os.Parcelable
-import androidx.compose.runtime.Immutable
-import kotlinx.parcelize.Parcelize
-import java.util.UUID
-
-@Parcelize
-@Immutable
-data class StringWithId(
-    val line: String,
-    val id: String = UUID.randomUUID().toString()
-) : Parcelable
+package ua.acclorite.book_story.domain.model
+
+import android.os.Parcelable
+import androidx.compose.runtime.Immutable
+import kotlinx.parcelize.Parcelize
+import java.util.UUID
+
+@Parcelize
+@Immutable
+data class StringWithId(
+    val line: String,
+    val id: String = UUID.randomUUID().toString()
+) : Parcelable
diff --git a/app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
similarity index 61%
rename from app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
index 4d5fc4e4..b2bf1844 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/repository/BookRepository.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/BookRepository.kt
@@ -1,12 +1,13 @@
-package com.acclorite.books_history.domain.repository
+package ua.acclorite.book_story.domain.repository
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.data.local.dto.BookEntity
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.data.local.dto.BookEntity
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 
 interface BookRepository {
@@ -50,4 +51,17 @@ interface BookRepository {
     suspend fun getBookTextFromFile(file: File): Flow<Resource<List<StringWithId>>>
 
     suspend fun getBooksFromFiles(files: List<File>): Flow<Resource<List<NullableBook>>>
+
+
+    suspend fun insertHistory(history: List<History>)
+
+    suspend fun getHistory(): Flow<Resource<List<History>>>
+
+    suspend fun deleteWholeHistory()
+
+    suspend fun deleteBookHistory(bookId: Int)
+
+    suspend fun deleteHistory(
+        history: List<History>
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
index dc4ffe75..99341fcc 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/ChangeLanguage.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt
@@ -1,12 +1,14 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
+import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.DataStoreConstants
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.DataStoreConstants
 import java.util.Locale
 import javax.inject.Inject
 
 class ChangeLanguage @Inject constructor(private val repository: BookRepository) {
+    @SuppressLint("AppBundleLocaleChanges")
     suspend fun execute(language: String, activity: ComponentActivity) {
         val config = activity.resources.configuration
         val resources = activity.resources
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt
new file mode 100644
index 00000000..b1f1236f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteBooks.kt
@@ -0,0 +1,17 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteBooks @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(books: List<Book>) {
+        repository.deleteBooks(books)
+        books.forEach {
+            if (it.id != null) {
+                repository.deleteBookHistory(it.id)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt
new file mode 100644
index 00000000..90ad74ed
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteHistory.kt
@@ -0,0 +1,12 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(history: List<History>) {
+        repository.deleteHistory(history)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt
new file mode 100644
index 00000000..2bc8b897
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/DeleteWholeHistory.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class DeleteWholeHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute() {
+        repository.deleteWholeHistory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
similarity index 55%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
index cb33357b..8f1628a8 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/FastGetBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/FastGetBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class FastGetBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
similarity index 54%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
index 0dc9a0a3..c6eeb698 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooks.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import javax.inject.Inject
 
 class GetBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
similarity index 57%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
index 14cbc690..b8d0374d 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetBooksFromFiles.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetBooksFromFiles.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
index 56f9654a..f6581105 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetDatastore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetDatastore.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.domain.repository.BookRepository
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class GetDatastore @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
similarity index 64%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
index 53689ff9..b2d15ef7 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetFilesFromDownloads.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetFilesFromDownloads.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt
new file mode 100644
index 00000000..2745db62
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetHistory.kt
@@ -0,0 +1,14 @@
+package ua.acclorite.book_story.domain.use_case
+
+import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
+import javax.inject.Inject
+
+class GetHistory @Inject constructor(private val repository: BookRepository) {
+
+    suspend fun execute(): Flow<Resource<List<History>>> {
+        return repository.getHistory()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
similarity index 56%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
index ef7bdcb1..7bfab049 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/GetText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/GetText.kt
@@ -1,9 +1,9 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.StringWithId
-import com.acclorite.books_history.domain.repository.BookRepository
-import com.acclorite.books_history.util.Resource
 import kotlinx.coroutines.flow.Flow
+import ua.acclorite.book_story.domain.model.StringWithId
+import ua.acclorite.book_story.domain.repository.BookRepository
+import ua.acclorite.book_story.util.Resource
 import java.io.File
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
similarity index 53%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
index 8fde956b..9edadf50 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/InsertBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class InsertBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt
new file mode 100644
index 00000000..45a168ca
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/InsertHistory.kt
@@ -0,0 +1,11 @@
+package ua.acclorite.book_story.domain.use_case
+
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.repository.BookRepository
+import javax.inject.Inject
+
+class InsertHistory @Inject constructor(private val repository: BookRepository) {
+    suspend fun execute(history: List<History>) {
+        repository.insertHistory(history)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
similarity index 70%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
index f536c350..5e1beaa9 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/SetDatastore.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/SetDatastore.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
 import androidx.datastore.preferences.core.Preferences
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class SetDatastore @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
similarity index 53%
rename from app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt
rename to app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
index 36222a8b..77815cb3 100644
--- a/app/src/main/java/com/acclorite/books_history/domain/use_case/UpdateBooks.kt
+++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/UpdateBooks.kt
@@ -1,7 +1,7 @@
-package com.acclorite.books_history.domain.use_case
+package ua.acclorite.book_story.domain.use_case
 
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.repository.BookRepository
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.repository.BookRepository
 import javax.inject.Inject
 
 class UpdateBooks @Inject constructor(private val repository: BookRepository) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt b/app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
index b8d2581d..ac384499 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/Navigation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/Navigation.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation
+package ua.acclorite.book_story.presentation
 
 import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
@@ -20,7 +20,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.ui.Transitions
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -29,6 +28,7 @@ import dagger.hilt.android.lifecycle.withCreationCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.ui.Transitions
 
 
 private const val CURRENT_SCREEN = "current_screen"
@@ -155,8 +155,8 @@ class Navigator @AssistedInject constructor(
     @Composable
     fun composable(
         screen: Screen,
-        enterAnim: EnterTransition = Transitions.DefaultTransitionIn,
-        exitAnim: ExitTransition = Transitions.DefaultTransitionOut,
+        enterAnim: EnterTransition = Transitions.FadeTransitionIn,
+        exitAnim: ExitTransition = Transitions.FadeTransitionOut,
         content: @Composable () -> Unit
     ) {
         AnimatedVisibility(
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt
new file mode 100644
index 00000000..275ee0a6
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt
@@ -0,0 +1,141 @@
+package ua.acclorite.book_story.presentation.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.statusBars
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.unit.dp
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.elevation
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun AnimatedTopAppBar(
+    containerColor: Color = MaterialTheme.colorScheme.surface,
+    scrolledContainerColor: Color? = MaterialTheme.elevation(),
+
+    scrollBehavior: TopAppBarScrollBehavior?,
+    isTopBarScrolled: Boolean?,
+
+    content1Visibility: Boolean? = null,
+    content1NavigationIcon: @Composable () -> Unit,
+    content1Title: @Composable () -> Unit,
+    content1Actions: @Composable RowScope.() -> Unit,
+
+    content2Visibility: Boolean? = null,
+    content2NavigationIcon: @Composable () -> Unit = {},
+    content2Title: @Composable () -> Unit = {},
+    content2Actions: @Composable RowScope.() -> Unit = {},
+
+    content3Visibility: Boolean? = null,
+    content3NavigationIcon: @Composable () -> Unit = {},
+    content3Title: @Composable () -> Unit = {},
+    content3Actions: @Composable RowScope.() -> Unit = {}
+) {
+    Box(modifier = Modifier.fillMaxWidth()) {
+        if ((scrollBehavior != null || isTopBarScrolled != null) && scrolledContainerColor != null) {
+
+            val fraction by remember {
+                derivedStateOf {
+                    scrollBehavior?.state?.overlappedFraction ?: 0f
+                }
+            }
+
+            val isScrolled = if (scrollBehavior != null) {
+                fraction > 0.01f
+            } else isTopBarScrolled ?: false
+
+            val color = if (isScrolled) scrolledContainerColor else containerColor
+            val animatedColor by animateColorAsState(
+                targetValue = color,
+                animationSpec = spring(stiffness = Spring.StiffnessMediumLow),
+                label = "TopAppBar color animation"
+            )
+
+            val statusBarPadding = with(LocalDensity.current) {
+                WindowInsets.statusBars.getTop(LocalDensity.current).toDp()
+            }
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(64.dp + statusBarPadding)
+                    .background(
+                        animatedColor
+                    )
+            )
+        }
+
+        DefaultTransition(visible = content1Visibility ?: true) {
+            TopAppBar(
+                navigationIcon = content1NavigationIcon,
+                title = content1Title,
+                actions = content1Actions,
+                scrollBehavior = scrollBehavior,
+                colors = TopAppBarDefaults.topAppBarColors(
+                    containerColor = Color.Transparent,
+                    scrolledContainerColor = Color.Transparent
+                )
+            )
+        }
+
+        if (content2Visibility != null) {
+            DefaultTransition(visible = content2Visibility) {
+                TopAppBar(
+                    navigationIcon = content2NavigationIcon,
+                    title = content2Title,
+                    actions = content2Actions,
+                    scrollBehavior = scrollBehavior,
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = Color.Transparent,
+                        scrolledContainerColor = Color.Transparent
+                    )
+                )
+            }
+        }
+
+        if (content3Visibility != null) {
+            DefaultTransition(visible = content3Visibility) {
+                TopAppBar(
+                    navigationIcon = content3NavigationIcon,
+                    title = content3Title,
+                    actions = content3Actions,
+                    scrollBehavior = scrollBehavior,
+                    colors = TopAppBarDefaults.topAppBarColors(
+                        containerColor = Color.Transparent,
+                        scrolledContainerColor = Color.Transparent
+                    )
+                )
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
similarity index 70%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
index bae5ecf2..b50bc246 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationBar.kt
@@ -1,17 +1,20 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.NavigationBarItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.NavigationBarItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.ui.elevation
 
 /**
  * Bottom navigation bar, uses default [NavigationBar].
@@ -20,7 +23,15 @@ import com.acclorite.books_history.ui.elevation
 fun BottomNavigationBar(
     navigator: Navigator
 ) {
-    val currentScreen by navigator.getCurrentScreen().collectAsState()
+    var currentScreen: Screen? by remember { mutableStateOf(null) }
+
+    LaunchedEffect(Unit) {
+        navigator.getCurrentScreen().collect {
+            if (it == Screen.LIBRARY || it == Screen.HISTORY || it == Screen.BROWSE) {
+                currentScreen = it
+            }
+        }
+    }
 
     NavigationBar(
         containerColor = MaterialTheme.elevation()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
index b4b80c79..94c8edac 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/BottomNavigationItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/BottomNavigationItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.size
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.NavigationBarItem
+import ua.acclorite.book_story.domain.model.NavigationBarItem
 
 /**
  * Bottom Navigation Bar Item, uses default [NavigationBarItem].
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
index 7e09177f..c553bf4c 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CategoryTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
similarity index 92%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
index dbcf4181..addfddca 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomCheckbox.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.ui.elevation
 
 @Composable
 fun CustomCheckbox(selected: Boolean) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
index 483f573e..a7751c64 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithContent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithContent.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -31,9 +31,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -100,6 +100,8 @@ fun CustomDialogWithContent(
                         else Alignment.Start
                     )
                     .padding(horizontal = 24.dp),
+                textAlign = if (drawableIcon != null || imageVectorIcon != null) TextAlign.Center
+                else TextAlign.Start,
                 style = MaterialTheme.typography.headlineSmall,
                 color = MaterialTheme.colorScheme.onSurface
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
index 1be5db0b..51cf8bb1 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDialogWithLazyColumn.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDialogWithLazyColumn.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
@@ -32,9 +32,9 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -101,6 +101,8 @@ fun CustomDialogWithLazyColumn(
                         else Alignment.Start
                     )
                     .padding(horizontal = 24.dp),
+                textAlign = if (drawableIcon != null || imageVectorIcon != null) TextAlign.Center
+                else TextAlign.Start,
                 style = MaterialTheme.typography.headlineSmall,
                 color = MaterialTheme.colorScheme.onSurface
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
index 91820fec..f4353a5b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/CustomDropDownMenuItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.size
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt
new file mode 100644
index 00000000..b23809c6
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackBar.kt
@@ -0,0 +1,49 @@
+package ua.acclorite.book_story.presentation.components
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.DismissValue
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.SwipeToDismiss
+import androidx.compose.material.rememberDismissState
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@OptIn(ExperimentalMaterialApi::class)
+@Composable
+fun CustomSnackbar(snackbarState: SnackbarHostState) {
+    val dismissState = rememberDismissState { value ->
+        if (value != DismissValue.Default) {
+            snackbarState.currentSnackbarData?.dismiss()
+            true
+        } else false
+    }
+
+    LaunchedEffect(dismissState.currentValue) {
+        if (dismissState.currentValue != DismissValue.Default) {
+            dismissState.reset()
+        }
+    }
+
+    SwipeToDismiss(
+        modifier = Modifier
+            .padding(vertical = 4.dp)
+            .fillMaxWidth(),
+        state = dismissState,
+        background = {}
+    ) {
+        SnackbarHost(
+            hostState = snackbarState,
+            snackbar = { data ->
+                Snackbar(
+                    data
+                )
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
index 7db1ad53..0a4d67a5 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/IsEmpty.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsEmpty.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
index 84f07820..61bf90b1 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/IsError.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/IsError.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
index f1ffae65..c5cd1e4b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/MoreDropDown.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
@@ -20,9 +20,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
 
 @Composable
 fun MoreDropDown(navigator: Navigator) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
index 5daf96a3..7c638013 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/components/SelectableDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/SelectableDialogItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.components
+package ua.acclorite.book_story.presentation.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
similarity index 83%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
index 132bd69f..71b426bd 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/ArithmeticOperations.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/ArithmeticOperations.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 fun String.removeTrailingZero(): String {
     if (!this.contains('.'))
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
index b58b5bc2..aa25f590 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/MainEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 import androidx.activity.ComponentActivity
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
index de2d5e58..73b2fffe 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/data/MainViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.data
+package ua.acclorite.book_story.presentation.data
 
 import android.os.Build
 import androidx.activity.ComponentActivity
@@ -6,15 +6,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.use_case.ChangeLanguage
-import com.acclorite.books_history.domain.use_case.GetDatastore
-import com.acclorite.books_history.domain.use_case.SetDatastore
-import com.acclorite.books_history.ui.DarkTheme
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.toDarkTheme
-import com.acclorite.books_history.ui.toTheme
-import com.acclorite.books_history.util.Constants
-import com.acclorite.books_history.util.DataStoreConstants
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -25,6 +16,15 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.use_case.ChangeLanguage
+import ua.acclorite.book_story.domain.use_case.GetDatastore
+import ua.acclorite.book_story.domain.use_case.SetDatastore
+import ua.acclorite.book_story.ui.DarkTheme
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.toDarkTheme
+import ua.acclorite.book_story.ui.toTheme
+import ua.acclorite.book_story.util.Constants
+import ua.acclorite.book_story.util.DataStoreConstants
 import java.util.Locale
 import javax.inject.Inject
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
index c4219230..140a1ce6 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/BookInfoScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info
+package ua.acclorite.book_story.presentation.screens.book_info
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -33,7 +33,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -51,34 +50,39 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoBackground
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoChangeCoverBottomSheet
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDeleteDialog
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDescriptionSection
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoDetailsBottomSheet
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoInfoSection
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoMoreDropDown
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoMoveDialog
-import com.acclorite.books_history.presentation.screens.book_info.components.BookInfoStatisticSection
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
 import dagger.hilt.android.lifecycle.withCreationCallback
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoBackground
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoChangeCoverBottomSheet
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDeleteDialog
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDescriptionSection
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDetailsBottomSheet
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoInfoSection
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoMoreDropDown
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoMoveDialog
+import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoStatisticSection
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BookInfoScreen(
     libraryViewModel: LibraryViewModel = hiltViewModel(),
+    browseViewModel: BrowseViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val context = LocalContext.current
@@ -120,7 +124,11 @@ fun BookInfoScreen(
     }
 
     if (state.showChangeCoverBottomSheet) {
-        BookInfoChangeCoverBottomSheet(libraryViewModel = libraryViewModel, viewModel = viewModel)
+        BookInfoChangeCoverBottomSheet(
+            libraryViewModel = libraryViewModel,
+            historyViewModel = historyViewModel,
+            viewModel = viewModel
+        )
     }
     if (state.showDetailsBottomSheet) {
         BookInfoDetailsBottomSheet(viewModel = viewModel)
@@ -128,6 +136,8 @@ fun BookInfoScreen(
     if (state.showDeleteDialog) {
         BookInfoDeleteDialog(
             libraryViewModel = libraryViewModel,
+            browseViewModel = browseViewModel,
+            historyViewModel = historyViewModel,
             viewModel = viewModel,
             navigator = navigator
         )
@@ -147,9 +157,13 @@ fun BookInfoScreen(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
+            AnimatedTopAppBar(
+                containerColor = Color.Transparent,
+                scrolledContainerColor = MaterialTheme.elevation(),
                 scrollBehavior = scrollBehavior,
-                navigationIcon = {
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = {
                         navigator.navigateBack()
                     }) {
@@ -160,7 +174,7 @@ fun BookInfoScreen(
                         )
                     }
                 },
-                title = {
+                content1Title = {
                     DefaultTransition(visible = firstVisibleItemIndex > 0) {
                         Text(
                             state.book.title,
@@ -171,7 +185,7 @@ fun BookInfoScreen(
                         )
                     }
                 },
-                actions = {
+                content1Actions = {
                     Box {
                         DefaultTransition(
                             visible = !state.editTitle
@@ -214,11 +228,7 @@ fun BookInfoScreen(
                             }
                         }
                     }
-                },
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = Color.Transparent,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                }
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
index 0b0367fb..31d3dc3f 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoBackground.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
similarity index 80%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
index 9bd6e2ff..5e6e4eca 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -22,18 +22,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun BookInfoChangeCoverBottomSheet(
     libraryViewModel: LibraryViewModel,
+    historyViewModel: HistoryViewModel,
     viewModel: BookInfoViewModel
 ) {
     val state by viewModel.state.collectAsState()
@@ -50,6 +53,7 @@ fun BookInfoChangeCoverBottomSheet(
                         context,
                         refreshList = {
                             libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                            historyViewModel.onEvent(HistoryEvent.OnLoadList)
                         }
                     )
                 )
@@ -91,6 +95,7 @@ fun BookInfoChangeCoverBottomSheet(
                 viewModel.onEvent(BookInfoEvent.OnDeleteCover(
                     refreshList = {
                         libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                        historyViewModel.onEvent(HistoryEvent.OnLoadList)
                     }
                 ))
                 Toast.makeText(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
index 05955650..7778d6a9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoChangeCoverBottomSheetItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
similarity index 52%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
index 184c4027..84921428 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDeleteDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.material.icons.Icons
@@ -6,17 +6,23 @@ import androidx.compose.material.icons.outlined.DeleteOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
 fun BookInfoDeleteDialog(
     libraryViewModel: LibraryViewModel,
+    browseViewModel: BrowseViewModel,
+    historyViewModel: HistoryViewModel,
     viewModel: BookInfoViewModel,
     navigator: Navigator
 ) {
@@ -37,9 +43,9 @@ fun BookInfoDeleteDialog(
                 BookInfoEvent.OnDeleteBook(
                     navigator = navigator,
                     refreshList = {
-                        libraryViewModel.onEvent(
-                            LibraryEvent.OnLoadList
-                        )
+                        libraryViewModel.onEvent(LibraryEvent.OnLoadList)
+                        browseViewModel.onEvent(BrowseEvent.OnLoadList)
+                        historyViewModel.onEvent(HistoryEvent.OnLoadList)
                     }
                 )
             )
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
similarity index 85%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
index d61f2601..f4f4ab4b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
@@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
 
 @Composable
 fun BookInfoDescriptionSection(book: Book) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
similarity index 92%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
index 6595badc..6a460b8a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheet.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.foundation.layout.Spacer
@@ -16,11 +16,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
index 422702e3..662ff4d3 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDetailsBottomSheetItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
index 9b3d61b1..61c385a9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoInfoSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
@@ -41,10 +41,10 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
@@ -117,8 +117,8 @@ fun BookInfoInfoSection(viewModel: BookInfoViewModel, book: Book) {
                 )
             } else {
                 BasicTextField(
+                    maxLines = 4,
                     value = state.titleValue,
-                    singleLine = true,
                     textStyle = TextStyle(
                         color = MaterialTheme.colorScheme.onSurface,
                         fontSize = MaterialTheme.typography.headlineSmall.fontSize,
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
index 23e0be2c..756cac9e 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
@@ -18,10 +18,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDropDownMenuItem
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDropDownMenuItem
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
 
 @Composable
 fun BookInfoMoreDropDown(viewModel: BookInfoViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
index 2192b83e..92411f5d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoveDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import android.widget.Toast
 import androidx.compose.foundation.lazy.items
@@ -11,15 +11,15 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.components.SelectableDialogItem
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoEvent
-import com.acclorite.books_history.presentation.screens.book_info.data.BookInfoViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.components.SelectableDialogItem
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent
+import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
 fun BookInfoMoveDialog(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
index 44dd912e..a08305bb 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/components/BookInfoStatisticSection.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.components
+package ua.acclorite.book_story.presentation.screens.book_info.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -14,10 +14,10 @@ import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
 
 @Composable
 fun BookInfoStatisticSection(book: Book) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
index 30d17975..dce99736 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoEvent.kt
@@ -1,10 +1,10 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import android.content.Context
 import android.net.Uri
 import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
 
 sealed class BookInfoEvent {
     data object OnShowHideChangeCoverBottomSheet : BookInfoEvent()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
similarity index 73%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
index e0469897..7c580f2b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 @Immutable
 data class BookInfoState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
index 0cfdf7d7..559cd40b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/book_info/data/BookInfoViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.book_info.data
+package ua.acclorite.book_story.presentation.screens.book_info.data
 
 import android.content.ClipData
 import android.content.ClipboardManager
@@ -7,12 +7,6 @@ import android.graphics.BitmapFactory
 import android.os.Build
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.DeleteBooks
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -22,6 +16,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.use_case.DeleteBooks
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
 
 
 @HiltViewModel(assistedFactory = BookInfoViewModel.Factory::class)
@@ -134,9 +134,11 @@ class BookInfoViewModel @AssistedInject constructor(
 
             is BookInfoEvent.OnUpdateTitle -> {
                 viewModelScope.launch {
+                    val title = _state.value.titleValue.trim().replace("\n", "")
+
                     updateBooks.execute(
                         listOf(
-                            _state.value.book.copy(title = _state.value.titleValue.trim())
+                            _state.value.book.copy(title = title)
                         )
                     )
                     event.refreshList()
@@ -144,7 +146,7 @@ class BookInfoViewModel @AssistedInject constructor(
                     _state.update {
                         it.copy(
                             book = it.book.copy(
-                                title = it.titleValue
+                                title = title
                             )
                         )
                     }
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
index d57f276f..ca5d96ab 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/BrowseScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.browse
+package ua.acclorite.book_story.presentation.screens.browse
 
 import android.Manifest
 import androidx.activity.compose.BackHandler
@@ -54,26 +54,26 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.AnimatedTopAppBar
-import com.acclorite.books_history.presentation.components.IsEmpty
-import com.acclorite.books_history.presentation.components.IsError
-import com.acclorite.books_history.presentation.components.MoreDropDown
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseAddingDialog
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseFileItem
-import com.acclorite.books_history.presentation.screens.browse.components.BrowseStoragePermissionDialog
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.acclorite.books_history.ui.DefaultTransition
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberPermissionState
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.IsError
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseAddingDialog
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseFileItem
+import ua.acclorite.book_story.presentation.screens.browse.components.BrowseStoragePermissionDialog
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.ui.DefaultTransition
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(
     ExperimentalMaterial3Api::class,
@@ -114,7 +114,9 @@ fun BrowseScreen(
         }
             .debounce(10L)
             .collectLatest {
-                viewModel.onEvent(BrowseEvent.OnUpdateScrollOffset(it))
+                viewModel.onEvent(
+                    BrowseEvent.OnUpdateScrollOffset(it)
+                )
             }
     }
     LaunchedEffect(Unit) {
@@ -266,7 +268,7 @@ fun BrowseScreen(
                 modifier = Modifier
                     .fillMaxSize(),
                 columns = GridCells.Adaptive(170.dp),
-                contentPadding = PaddingValues(10.dp)
+                contentPadding = PaddingValues(12.dp)
             ) {
                 items(state.selectableFiles, key = { it.first.path }) { selectableFile ->
                     BrowseFileItem(
@@ -305,7 +307,8 @@ fun BrowseScreen(
 
             AnimatedVisibility(
                 visible = !state.isLoading && state.selectableFiles.isEmpty()
-                        && !state.showErrorMessage && !state.requestPermissionDialog,
+                        && !state.showErrorMessage && !state.requestPermissionDialog
+                        && !state.isRefreshing,
                 modifier = Modifier.align(Alignment.Center),
                 enter = Transitions.DefaultTransitionIn,
                 exit = fadeOut(tween(0))
@@ -332,11 +335,15 @@ fun BrowseScreen(
     BackHandler {
         if (state.hasSelectedItems) {
             viewModel.onEvent(BrowseEvent.OnClearSelectedFiles)
-        } else if (state.showSearch) {
-            viewModel.onEvent(BrowseEvent.OnSearchShowHide)
-        } else {
-            navigator.navigate(Screen.LIBRARY)
+            return@BackHandler
         }
+
+        if (state.showSearch) {
+            viewModel.onEvent(BrowseEvent.OnSearchShowHide)
+            return@BackHandler
+        }
+
+        navigator.navigate(Screen.LIBRARY)
     }
 }
 
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
index 219dfd1f..92cef92b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialog.kt
@@ -1,89 +1,89 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import android.widget.Toast
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.CircularProgressIndicator
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AddChart
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.StrokeCap
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-
-@Composable
-fun BrowseAddingDialog(
-    libraryViewModel: LibraryViewModel = hiltViewModel(),
-    viewModel: BrowseViewModel,
-    navigator: Navigator
-) {
-    val state by viewModel.state.collectAsState()
-    val context = LocalContext.current
-
-    CustomDialogWithLazyColumn(
-        title = stringResource(id = R.string.add_books),
-        imageVectorIcon = Icons.Default.AddChart,
-        description = stringResource(id = R.string.add_books_description),
-        actionText = stringResource(id = R.string.add),
-        isActionEnabled = !state.isBooksLoading,
-        onDismiss = { viewModel.onEvent(BrowseEvent.OnAddingDialogDismiss) },
-        onAction = {
-            viewModel.onEvent(
-                BrowseEvent.OnAddBooks(
-                    navigator,
-                    resetScroll = {
-                        libraryViewModel.onEvent(LibraryEvent.OnUpdateCurrentPage(0))
-                    }
-                )
-            )
-            Toast.makeText(
-                context,
-                context.getString(R.string.books_added),
-                Toast.LENGTH_LONG
-            ).show()
-        },
-        withDivider = true,
-        items = {
-            if (state.isBooksLoading) {
-                item {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(top = 16.dp)
-                    ) {
-                        CircularProgressIndicator(
-                            color = MaterialTheme.colorScheme.primary,
-                            strokeCap = StrokeCap.Round,
-                            modifier = Modifier
-                                .align(Alignment.Center)
-                                .size(36.dp)
-                        )
-                    }
-                }
-            } else {
-                items(state.selectedBooks) { book ->
-                    BrowseAddingDialogItem(result = book) {
-                        viewModel.onEvent(BrowseEvent.OnSelectBook(book))
-                    }
-                }
-            }
-        }
-    )
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import android.widget.Toast
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.AddChart
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+
+@Composable
+fun BrowseAddingDialog(
+    libraryViewModel: LibraryViewModel = hiltViewModel(),
+    viewModel: BrowseViewModel,
+    navigator: Navigator
+) {
+    val state by viewModel.state.collectAsState()
+    val context = LocalContext.current
+
+    CustomDialogWithLazyColumn(
+        title = stringResource(id = R.string.add_books),
+        imageVectorIcon = Icons.Default.AddChart,
+        description = stringResource(id = R.string.add_books_description),
+        actionText = stringResource(id = R.string.add),
+        isActionEnabled = !state.isBooksLoading,
+        onDismiss = { viewModel.onEvent(BrowseEvent.OnAddingDialogDismiss) },
+        onAction = {
+            viewModel.onEvent(
+                BrowseEvent.OnAddBooks(
+                    navigator,
+                    resetScroll = {
+                        libraryViewModel.onEvent(LibraryEvent.OnUpdateCurrentPage(0))
+                    }
+                )
+            )
+            Toast.makeText(
+                context,
+                context.getString(R.string.books_added),
+                Toast.LENGTH_LONG
+            ).show()
+        },
+        withDivider = true,
+        items = {
+            if (state.isBooksLoading) {
+                item {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 16.dp)
+                    ) {
+                        CircularProgressIndicator(
+                            color = MaterialTheme.colorScheme.primary,
+                            strokeCap = StrokeCap.Round,
+                            modifier = Modifier
+                                .align(Alignment.Center)
+                                .size(36.dp)
+                        )
+                    }
+                }
+            } else {
+                items(state.selectedBooks) { book ->
+                    BrowseAddingDialogItem(result = book) {
+                        viewModel.onEvent(BrowseEvent.OnSelectBook(book))
+                    }
+                }
+            }
+        }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
index 6edd40dc..55776d10 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseAddingDialogItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseAddingDialogItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.browse.components
+package ua.acclorite.book_story.presentation.screens.browse.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -19,8 +19,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.presentation.components.CustomCheckbox
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.presentation.components.CustomCheckbox
 
 @Composable
 fun BrowseAddingDialogItem(result: NullableBook, onClick: () -> Unit) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
index 5565fa17..fd538230 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseFIleItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseFIleItem.kt
@@ -1,147 +1,147 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.ui.DefaultTransition
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
-
-@Composable
-fun BrowseFileItem(file: Pair<File, Boolean>, modifier: Modifier, onClick: () -> Unit) {
-    val fileExtension: String = file.first.name.substringAfterLast(".", "")
-
-    val pattern = SimpleDateFormat("HH:mm dd MMM", Locale.getDefault())
-
-    val lastModified = pattern.format(Date(file.first.lastModified()))
-    val icon = when (fileExtension) {
-        "txt" -> painterResource(id = R.drawable.txt)
-        "epub" -> painterResource(id = R.drawable.epub)
-        "pdf" -> painterResource(id = R.drawable.pdf)
-        else -> painterResource(id = R.drawable.file)
-    }
-    val outlineColor = if (file.second) MaterialTheme.colorScheme.primary
-    else MaterialTheme.colorScheme.outlineVariant
-    val backgroundColor = if (file.second) MaterialTheme.colorScheme.secondaryContainer
-    else Color.Transparent
-
-    val animatedOutlineColor by animateColorAsState(
-        targetValue = outlineColor,
-        tween(300),
-        label = "Outline animation"
-    )
-    val animatedBackgroundColor by animateColorAsState(
-        targetValue = backgroundColor,
-        tween(300),
-        label = "Background animation"
-    )
-
-    Column(
-        verticalArrangement = Arrangement.Center,
-        horizontalAlignment = Alignment.CenterHorizontally,
-        modifier = modifier
-            .padding(6.dp)
-            .clip(MaterialTheme.shapes.medium)
-            .border(
-                width = 1.dp,
-                color = animatedOutlineColor,
-                shape = MaterialTheme.shapes.medium
-            )
-            .padding(1.dp)
-            .background(animatedBackgroundColor)
-            .clickable {
-                onClick()
-            }
-    ) {
-        Icon(
-            painter = icon,
-            contentDescription = "File icon",
-            modifier = Modifier
-                .padding(vertical = 60.dp)
-                .size(70.dp),
-            tint = MaterialTheme.colorScheme.onSurfaceVariant
-        )
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.Start,
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.surface)
-                .padding(horizontal = 10.dp, vertical = 12.dp)
-        ) {
-            Box {
-                DefaultTransition(visible = !file.second) {
-                    Icon(
-                        painter = painterResource(R.drawable.file),
-                        contentDescription = "File",
-                        modifier = Modifier
-                            .size(28.dp),
-                        tint = MaterialTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-                DefaultTransition(visible = file.second) {
-                    Icon(
-                        imageVector = Icons.Filled.CheckCircle,
-                        contentDescription = "Checked",
-                        modifier = Modifier
-                            .size(28.dp),
-                        tint = MaterialTheme.colorScheme.primary
-                    )
-                }
-            }
-            Spacer(modifier = Modifier.width(8.dp))
-            Column(
-                verticalArrangement = Arrangement.Center
-            ) {
-                Text(
-                    file.first.name,
-                    color = MaterialTheme.colorScheme.onSurface,
-                    style = MaterialTheme.typography.labelMedium,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.fillMaxWidth()
-                )
-                Spacer(modifier = Modifier.height(2.dp))
-                Text(
-                    lastModified,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                    style = MaterialTheme.typography.bodySmall,
-                    fontSize = 11.sp,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.fillMaxWidth()
-                )
-            }
-
-        }
-    }
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import androidx.compose.animation.animateColorAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.ui.DefaultTransition
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun BrowseFileItem(file: Pair<File, Boolean>, modifier: Modifier, onClick: () -> Unit) {
+    val fileExtension: String = file.first.name.substringAfterLast(".", "")
+
+    val pattern = SimpleDateFormat("HH:mm dd MMM", Locale.getDefault())
+
+    val lastModified = pattern.format(Date(file.first.lastModified()))
+    val icon = when (fileExtension) {
+        "txt" -> painterResource(id = R.drawable.txt)
+        "epub" -> painterResource(id = R.drawable.epub)
+        "pdf" -> painterResource(id = R.drawable.pdf)
+        else -> painterResource(id = R.drawable.file)
+    }
+    val outlineColor = if (file.second) MaterialTheme.colorScheme.primary
+    else MaterialTheme.colorScheme.outlineVariant
+    val backgroundColor = if (file.second) MaterialTheme.colorScheme.secondaryContainer
+    else Color.Transparent
+
+    val animatedOutlineColor by animateColorAsState(
+        targetValue = outlineColor,
+        tween(300),
+        label = "Outline animation"
+    )
+    val animatedBackgroundColor by animateColorAsState(
+        targetValue = backgroundColor,
+        tween(300),
+        label = "Background animation"
+    )
+
+    Column(
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally,
+        modifier = modifier
+            .padding(6.dp)
+            .clip(MaterialTheme.shapes.medium)
+            .border(
+                width = 1.dp,
+                color = animatedOutlineColor,
+                shape = MaterialTheme.shapes.medium
+            )
+            .padding(1.dp)
+            .background(animatedBackgroundColor)
+            .clickable {
+                onClick()
+            }
+    ) {
+        Icon(
+            painter = icon,
+            contentDescription = "File icon",
+            modifier = Modifier
+                .padding(vertical = 60.dp)
+                .size(70.dp),
+            tint = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Start,
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.surface)
+                .padding(horizontal = 10.dp, vertical = 12.dp)
+        ) {
+            Box {
+                DefaultTransition(visible = !file.second) {
+                    Icon(
+                        painter = painterResource(R.drawable.file),
+                        contentDescription = "File",
+                        modifier = Modifier
+                            .size(28.dp),
+                        tint = MaterialTheme.colorScheme.onSurfaceVariant
+                    )
+                }
+                DefaultTransition(visible = file.second) {
+                    Icon(
+                        imageVector = Icons.Filled.CheckCircle,
+                        contentDescription = "Checked",
+                        modifier = Modifier
+                            .size(28.dp),
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                }
+            }
+            Spacer(modifier = Modifier.width(8.dp))
+            Column(
+                verticalArrangement = Arrangement.Center
+            ) {
+                Text(
+                    file.first.name,
+                    color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.labelMedium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.fillMaxWidth()
+                )
+                Spacer(modifier = Modifier.height(2.dp))
+                Text(
+                    lastModified,
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    style = MaterialTheme.typography.bodySmall,
+                    fontSize = 11.sp,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                    modifier = Modifier.fillMaxWidth()
+                )
+            }
+
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
similarity index 78%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
index a88a8902..2dddfea9 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt
@@ -1,40 +1,40 @@
-package com.acclorite.books_history.presentation.screens.browse.components
-
-import android.os.Build
-import androidx.activity.ComponentActivity
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SdStorage
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseEvent
-import com.acclorite.books_history.presentation.screens.browse.data.BrowseViewModel
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.PermissionState
-
-@OptIn(ExperimentalPermissionsApi::class)
-@Composable
-fun BrowseStoragePermissionDialog(viewModel: BrowseViewModel, permissionState: PermissionState) {
-    val activity = LocalContext.current as ComponentActivity
-
-    CustomDialogWithContent(
-        title = stringResource(id = R.string.storage_permission),
-        description = stringResource(id = R.string.storage_permission_description),
-        actionText = stringResource(id = R.string.grant),
-        imageVectorIcon = Icons.Default.SdStorage,
-        onDismiss = { viewModel.onEvent(BrowseEvent.OnStoragePermissionDismiss(permissionState)) },
-        isActionEnabled = true,
-        withDivider = false,
-        onAction = {
-            viewModel.onEvent(
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                    BrowseEvent.OnStoragePermissionRequest(activity)
-                } else {
-                    BrowseEvent.OnLegacyStoragePermissionRequest(permissionState)
-                }
-            )
-        }
-    )
+package ua.acclorite.book_story.presentation.screens.browse.components
+
+import android.os.Build
+import androidx.activity.ComponentActivity
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SdStorage
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionState
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun BrowseStoragePermissionDialog(viewModel: BrowseViewModel, permissionState: PermissionState) {
+    val activity = LocalContext.current as ComponentActivity
+
+    CustomDialogWithContent(
+        title = stringResource(id = R.string.storage_permission),
+        description = stringResource(id = R.string.storage_permission_description),
+        actionText = stringResource(id = R.string.grant),
+        imageVectorIcon = Icons.Default.SdStorage,
+        onDismiss = { viewModel.onEvent(BrowseEvent.OnStoragePermissionDismiss(permissionState)) },
+        isActionEnabled = true,
+        withDivider = false,
+        onAction = {
+            viewModel.onEvent(
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    BrowseEvent.OnStoragePermissionRequest(activity)
+                } else {
+                    BrowseEvent.OnLegacyStoragePermissionRequest(permissionState)
+                }
+            )
+        }
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
index e5939ae7..c5ca39a8 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseEvent.kt
@@ -1,37 +1,36 @@
-@file:OptIn(ExperimentalPermissionsApi::class)
-
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.presentation.Navigator
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.PermissionState
-import java.io.File
-
-sealed class BrowseEvent {
-    data class OnStoragePermissionRequest(val activity: ComponentActivity) : BrowseEvent()
-    data class OnLegacyStoragePermissionRequest(val permissionState: PermissionState) :
-        BrowseEvent()
-
-    data class OnStoragePermissionDismiss(val permissionState: PermissionState) : BrowseEvent()
-    data object OnRefreshList : BrowseEvent()
-    data class OnPermissionCheck(val permissionState: PermissionState) : BrowseEvent()
-    data class OnSelectFile(val file: Pair<File, Boolean>) : BrowseEvent()
-    data class OnSelectBook(val book: NullableBook) : BrowseEvent()
-    data object OnSearchShowHide : BrowseEvent()
-    data class OnRequestFocus(val focusRequester: FocusRequester) : BrowseEvent()
-
-    data object OnClearSelectedFiles : BrowseEvent()
-    data class OnSearchQueryChange(val query: String) : BrowseEvent()
-    data object OnAddingDialogRequest : BrowseEvent()
-    data object OnAddingDialogDismiss : BrowseEvent()
-    data object OnGetBooksFromFiles : BrowseEvent()
-    data class OnAddBooks(val navigator: Navigator, val resetScroll: () -> Unit) : BrowseEvent()
-    data object OnLoadList : BrowseEvent()
-    data class OnUpdateScrollIndex(val index: Int) : BrowseEvent()
-    data class OnUpdateScrollOffset(val offset: Int) : BrowseEvent()
-
-
+@file:OptIn(ExperimentalPermissionsApi::class)
+
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.focus.FocusRequester
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.PermissionState
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.presentation.Navigator
+import java.io.File
+
+sealed class BrowseEvent {
+    data class OnStoragePermissionRequest(val activity: ComponentActivity) : BrowseEvent()
+    data class OnLegacyStoragePermissionRequest(val permissionState: PermissionState) :
+        BrowseEvent()
+
+    data class OnStoragePermissionDismiss(val permissionState: PermissionState) : BrowseEvent()
+    data object OnRefreshList : BrowseEvent()
+    data class OnPermissionCheck(val permissionState: PermissionState) : BrowseEvent()
+    data class OnSelectFile(val file: Pair<File, Boolean>) : BrowseEvent()
+    data class OnSelectBook(val book: NullableBook) : BrowseEvent()
+    data object OnSearchShowHide : BrowseEvent()
+    data class OnRequestFocus(val focusRequester: FocusRequester) : BrowseEvent()
+    data object OnClearSelectedFiles : BrowseEvent()
+    data class OnSearchQueryChange(val query: String) : BrowseEvent()
+    data object OnAddingDialogRequest : BrowseEvent()
+    data object OnAddingDialogDismiss : BrowseEvent()
+    data object OnGetBooksFromFiles : BrowseEvent()
+    data class OnAddBooks(val navigator: Navigator, val resetScroll: () -> Unit) : BrowseEvent()
+    data object OnLoadList : BrowseEvent()
+    data class OnUpdateScrollIndex(val index: Int) : BrowseEvent()
+    data class OnUpdateScrollOffset(val offset: Int) : BrowseEvent()
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
index a4a59347..12ad5af7 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseState.kt
@@ -1,28 +1,28 @@
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.NullableBook
-import java.io.File
-
-@Immutable
-data class BrowseState(
-    val selectableFiles: List<Pair<File, Boolean>> = emptyList(),
-    val isLoading: Boolean = true,
-    val isRefreshing: Boolean = false,
-    val requestPermissionDialog: Boolean = false,
-    val showErrorMessage: Boolean = false,
-
-    val selectedItemsCount: Int = 0,
-    val hasSelectedItems: Boolean = false,
-
-    val scrollIndex: Int = 0,
-    val scrollOffset: Int = 0,
-
-    val showSearch: Boolean = false,
-    val searchQuery: String = "",
-    val hasFocused: Boolean = false,
-
-    val showAddingDialog: Boolean = false,
-    val selectedBooks: List<NullableBook> = emptyList(),
-    val isBooksLoading: Boolean = false
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import androidx.compose.runtime.Immutable
+import ua.acclorite.book_story.domain.model.NullableBook
+import java.io.File
+
+@Immutable
+data class BrowseState(
+    val selectableFiles: List<Pair<File, Boolean>> = emptyList(),
+    val isLoading: Boolean = true,
+    val isRefreshing: Boolean = false,
+    val requestPermissionDialog: Boolean = false,
+    val showErrorMessage: Boolean = false,
+
+    val selectedItemsCount: Int = 0,
+    val hasSelectedItems: Boolean = false,
+
+    val scrollIndex: Int = 0,
+    val scrollOffset: Int = 0,
+
+    val showSearch: Boolean = false,
+    val searchQuery: String = "",
+    val hasFocused: Boolean = false,
+
+    val showAddingDialog: Boolean = false,
+    val selectedBooks: List<NullableBook> = emptyList(),
+    val isBooksLoading: Boolean = false
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
similarity index 91%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
index 5bc95fae..62db5c49 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/browse/data/BrowseViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt
@@ -1,385 +1,386 @@
-package com.acclorite.books_history.presentation.screens.browse.data
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.provider.Settings
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.NullableBook
-import com.acclorite.books_history.domain.use_case.FastGetBooks
-import com.acclorite.books_history.domain.use_case.GetBooksFromFiles
-import com.acclorite.books_history.domain.use_case.GetFilesFromDownloads
-import com.acclorite.books_history.domain.use_case.InsertBooks
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.util.Resource
-import com.google.accompanist.permissions.ExperimentalPermissionsApi
-import com.google.accompanist.permissions.isGranted
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@OptIn(ExperimentalPermissionsApi::class)
-@HiltViewModel
-class BrowseViewModel @Inject constructor(
-    private val getBooksFromFiles: GetBooksFromFiles,
-    private val getFilesFromDownloads: GetFilesFromDownloads,
-    private val insertBooks: InsertBooks,
-    private val fastGetBooks: FastGetBooks
-) : ViewModel() {
-
-    private val _state = MutableStateFlow(BrowseState())
-    val state = _state.asStateFlow()
-
-    private var job: Job? = null
-
-    init {
-        onEvent(BrowseEvent.OnLoadList)
-    }
-
-    fun onEvent(event: BrowseEvent) {
-        when (event) {
-            is BrowseEvent.OnLegacyStoragePermissionRequest -> {
-                event.permissionState.launchPermissionRequest()
-
-                viewModelScope.launch {
-                    for (i in 0 until 100) {
-                        if (!event.permissionState.status.isGranted) {
-                            delay(100)
-                            continue
-                        }
-                        _state.update {
-                            it.copy(
-                                requestPermissionDialog = false,
-                                showErrorMessage = false
-                            )
-                        }
-                        onEvent(BrowseEvent.OnRefreshList)
-                        break
-                    }
-                }
-            }
-
-            is BrowseEvent.OnStoragePermissionRequest -> {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-
-                    val uri = Uri.parse("package:${event.activity.packageName}")
-                    val intent = Intent(
-                        Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
-                        uri
-                    )
-                    event.activity.startActivity(intent)
-
-                    viewModelScope.launch {
-                        for (i in 0 until 20) {
-                            if (!Environment.isExternalStorageManager()) {
-                                delay(1000)
-                                continue
-                            }
-                            _state.update {
-                                it.copy(
-                                    requestPermissionDialog = false,
-                                    showErrorMessage = false
-                                )
-                            }
-                            onEvent(BrowseEvent.OnRefreshList)
-                            break
-                        }
-                    }
-                }
-            }
-
-            is BrowseEvent.OnStoragePermissionDismiss -> {
-                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-                val isPermissionGranted =
-                    if (!legacyPermission) Environment.isExternalStorageManager()
-                    else event.permissionState.status.isGranted
-
-                _state.update {
-                    it.copy(
-                        requestPermissionDialog = false,
-                        showErrorMessage = !isPermissionGranted
-                    )
-                }
-
-                if (isPermissionGranted) {
-                    viewModelScope.launch(Dispatchers.IO) {
-                        getFilesFromDownloads()
-                    }
-                }
-
-            }
-
-            is BrowseEvent.OnRefreshList -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            isRefreshing = true,
-                            selectedItemsCount = 0,
-                            hasSelectedItems = false,
-                            showSearch = false,
-                            selectableFiles = emptyList()
-                        )
-                    }
-
-                    getFilesFromDownloads("")
-                    delay(1000)
-                    _state.update {
-                        it.copy(
-                            isRefreshing = false
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnPermissionCheck -> {
-                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
-                val isPermissionGranted =
-                    if (!legacyPermission) Environment.isExternalStorageManager()
-                    else event.permissionState.status.isGranted
-
-                if (isPermissionGranted) {
-                    return
-                }
-                _state.update {
-                    it.copy(
-                        requestPermissionDialog = true,
-                        showErrorMessage = false
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSelectFile -> {
-                val indexOfFile = _state.value.selectableFiles.indexOf(event.file)
-                val editedList = _state.value.selectableFiles.toMutableList()
-                editedList[indexOfFile] = editedList[indexOfFile].copy(
-                    second = !editedList[indexOfFile].second
-                )
-
-                _state.update {
-                    it.copy(
-                        selectableFiles = editedList.toList(),
-                        selectedItemsCount = editedList.filter { file -> file.second }.size,
-                        hasSelectedItems = editedList.any { file -> file.second }
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSelectBook -> {
-                val indexOfFile = _state.value.selectedBooks.indexOf(event.book)
-                val editedList = _state.value.selectedBooks.toMutableList()
-                editedList[indexOfFile] = NullableBook.NotNull(
-                    editedList[indexOfFile].book!!.copy(
-                        second = !editedList[indexOfFile].book!!.second
-                    )
-                )
-
-                if (!editedList.any { it.book?.second == true }) {
-                    return
-                }
-
-                _state.update {
-                    it.copy(
-                        selectedBooks = editedList
-                    )
-                }
-            }
-
-            is BrowseEvent.OnSearchShowHide -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    val shouldHide = _state.value.showSearch
-
-                    if (shouldHide) {
-                        getFilesFromDownloads("")
-                    } else {
-                        _state.update {
-                            it.copy(
-                                searchQuery = "",
-                                hasFocused = false
-                            )
-                        }
-                    }
-                    _state.update {
-                        it.copy(
-                            showSearch = !shouldHide
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnRequestFocus -> {
-                if (!_state.value.hasFocused) {
-                    event.focusRequester.requestFocus()
-                    _state.update {
-                        it.copy(
-                            hasFocused = true
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnClearSelectedFiles -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            selectableFiles = it.selectableFiles.map { file -> file.copy(second = false) },
-                            hasSelectedItems = false
-                        )
-                    }
-                }
-            }
-
-            is BrowseEvent.OnSearchQueryChange -> {
-                _state.update {
-                    it.copy(
-                        searchQuery = event.query
-                    )
-                }
-                job?.cancel()
-                job = viewModelScope.launch {
-                    delay(500)
-                    getFilesFromDownloads()
-                }
-            }
-
-            is BrowseEvent.OnAddingDialogDismiss -> {
-                _state.update {
-                    it.copy(
-                        showAddingDialog = false
-                    )
-                }
-            }
-
-            is BrowseEvent.OnAddingDialogRequest -> {
-                _state.update {
-                    it.copy(
-                        showAddingDialog = true,
-                        selectedBooks = emptyList()
-                    )
-                }
-                onEvent(BrowseEvent.OnGetBooksFromFiles)
-            }
-
-            is BrowseEvent.OnGetBooksFromFiles -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    getBooksFromFiles.execute(
-                        _state.value.selectableFiles
-                            .filter { it.second }
-                            .map { it.first }
-                    ).collect { result ->
-                        when (result) {
-                            is Resource.Success -> {
-                                if (result.data?.isEmpty() ?: return@collect) {
-                                    return@collect
-                                }
-                                _state.update {
-                                    it.copy(
-                                        selectedBooks = result.data,
-                                        isBooksLoading = false
-                                    )
-                                }
-                            }
-
-                            is Resource.Loading -> {
-                                _state.update {
-                                    it.copy(
-                                        isBooksLoading = result.isLoading
-                                    )
-                                }
-                            }
-
-                            is Resource.Error -> Unit
-                        }
-                    }
-                }
-            }
-
-            is BrowseEvent.OnAddBooks -> {
-                viewModelScope.launch {
-                    val booksToInsert = _state.value.selectedBooks
-                        .filterIsInstance<NullableBook.NotNull>()
-                        .filter { it.book!!.second }
-                        .map { it.book!!.first }
-
-                    if (booksToInsert.isEmpty()) {
-                        return@launch
-                    }
-
-                    insertBooks.execute(booksToInsert)
-                    val books = fastGetBooks.execute("")
-
-                    event.resetScroll()
-                    _state.update {
-                        it.copy(
-                            showAddingDialog = false
-                        )
-                    }
-                    onEvent(BrowseEvent.OnClearSelectedFiles)
-
-                    event.navigator.navigate(Screen.LIBRARY, Argument("added_books", books))
-                }
-            }
-
-            is BrowseEvent.OnLoadList -> {
-                viewModelScope.launch(Dispatchers.IO) {
-                    _state.update {
-                        it.copy(
-                            isLoading = true
-                        )
-                    }
-                    getFilesFromDownloads("")
-                }
-            }
-
-            is BrowseEvent.OnUpdateScrollIndex -> {
-                _state.update {
-                    it.copy(
-                        scrollIndex = event.index
-                    )
-                }
-            }
-
-            is BrowseEvent.OnUpdateScrollOffset -> {
-                _state.update {
-                    it.copy(
-                        scrollOffset = event.offset
-                    )
-                }
-            }
-        }
-    }
-
-    private suspend fun getFilesFromDownloads(query: String = _state.value.searchQuery) {
-        getFilesFromDownloads.execute(query).collect { result ->
-            when (result) {
-                is Resource.Success -> {
-                    _state.update {
-                        it.copy(
-                            selectableFiles = result.data?.map { book -> Pair(book, false) }
-                                ?: emptyList(),
-                            isLoading = false
-                        )
-                    }
-                }
-
-                is Resource.Loading -> {
-                    _state.update {
-                        it.copy(
-                            isLoading = result.isLoading
-                        )
-                    }
-                }
-
-                is Resource.Error -> Unit
-            }
-        }
-    }
+package ua.acclorite.book_story.presentation.screens.browse.data
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.NullableBook
+import ua.acclorite.book_story.domain.use_case.FastGetBooks
+import ua.acclorite.book_story.domain.use_case.GetBooksFromFiles
+import ua.acclorite.book_story.domain.use_case.GetFilesFromDownloads
+import ua.acclorite.book_story.domain.use_case.InsertBooks
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.util.Resource
+import javax.inject.Inject
+
+@OptIn(ExperimentalPermissionsApi::class)
+@HiltViewModel
+class BrowseViewModel @Inject constructor(
+    private val getBooksFromFiles: GetBooksFromFiles,
+    private val getFilesFromDownloads: GetFilesFromDownloads,
+    private val insertBooks: InsertBooks,
+    private val fastGetBooks: FastGetBooks
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(BrowseState())
+    val state = _state.asStateFlow()
+
+    private var job: Job? = null
+
+    init {
+        onEvent(BrowseEvent.OnLoadList)
+    }
+
+    fun onEvent(event: BrowseEvent) {
+        when (event) {
+            is BrowseEvent.OnLegacyStoragePermissionRequest -> {
+                event.permissionState.launchPermissionRequest()
+
+                viewModelScope.launch {
+                    for (i in 0 until 100) {
+                        if (!event.permissionState.status.isGranted) {
+                            delay(100)
+                            continue
+                        }
+                        _state.update {
+                            it.copy(
+                                requestPermissionDialog = false,
+                                showErrorMessage = false
+                            )
+                        }
+                        onEvent(BrowseEvent.OnRefreshList)
+                        break
+                    }
+                }
+            }
+
+            is BrowseEvent.OnStoragePermissionRequest -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+
+                    val uri = Uri.parse("package:${event.activity.packageName}")
+                    val intent = Intent(
+                        Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+                        uri
+                    )
+                    event.activity.startActivity(intent)
+
+                    viewModelScope.launch {
+                        for (i in 0 until 20) {
+                            if (!Environment.isExternalStorageManager()) {
+                                delay(1000)
+                                continue
+                            }
+                            _state.update {
+                                it.copy(
+                                    requestPermissionDialog = false,
+                                    showErrorMessage = false
+                                )
+                            }
+                            onEvent(BrowseEvent.OnRefreshList)
+                            break
+                        }
+                    }
+                }
+            }
+
+            is BrowseEvent.OnStoragePermissionDismiss -> {
+                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+                val isPermissionGranted =
+                    if (!legacyPermission) Environment.isExternalStorageManager()
+                    else event.permissionState.status.isGranted
+
+                _state.update {
+                    it.copy(
+                        requestPermissionDialog = false,
+                        showErrorMessage = !isPermissionGranted
+                    )
+                }
+
+                if (isPermissionGranted) {
+                    viewModelScope.launch(Dispatchers.IO) {
+                        getFilesFromDownloads()
+                    }
+                }
+
+            }
+
+            is BrowseEvent.OnRefreshList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isRefreshing = true,
+                            hasSelectedItems = false,
+                            showSearch = false
+                        )
+                    }
+
+                    getFilesFromDownloads("")
+                    delay(500)
+                    _state.update {
+                        it.copy(
+                            isRefreshing = false
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnPermissionCheck -> {
+                val legacyPermission = Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+                val isPermissionGranted =
+                    if (!legacyPermission) Environment.isExternalStorageManager()
+                    else event.permissionState.status.isGranted
+
+                if (isPermissionGranted) {
+                    return
+                }
+                _state.update {
+                    it.copy(
+                        requestPermissionDialog = true,
+                        showErrorMessage = false
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSelectFile -> {
+                val indexOfFile = _state.value.selectableFiles.indexOf(event.file)
+                val editedList = _state.value.selectableFiles.toMutableList()
+                editedList[indexOfFile] = editedList[indexOfFile].copy(
+                    second = !editedList[indexOfFile].second
+                )
+
+                _state.update {
+                    it.copy(
+                        selectableFiles = editedList.toList(),
+                        selectedItemsCount = editedList.filter { file -> file.second }.size,
+                        hasSelectedItems = editedList.any { file -> file.second }
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSelectBook -> {
+                val indexOfFile = _state.value.selectedBooks.indexOf(event.book)
+                val editedList = _state.value.selectedBooks.toMutableList()
+                editedList[indexOfFile] = NullableBook.NotNull(
+                    editedList[indexOfFile].book!!.copy(
+                        second = !editedList[indexOfFile].book!!.second
+                    )
+                )
+
+                if (!editedList.any { it.book?.second == true }) {
+                    return
+                }
+
+                _state.update {
+                    it.copy(
+                        selectedBooks = editedList
+                    )
+                }
+            }
+
+            is BrowseEvent.OnSearchShowHide -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    val shouldHide = _state.value.showSearch
+
+                    if (shouldHide) {
+                        getFilesFromDownloads("")
+                    } else {
+                        _state.update {
+                            it.copy(
+                                searchQuery = "",
+                                hasFocused = false
+                            )
+                        }
+                    }
+                    _state.update {
+                        it.copy(
+                            showSearch = !shouldHide
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnRequestFocus -> {
+                if (!_state.value.hasFocused) {
+                    event.focusRequester.requestFocus()
+                    _state.update {
+                        it.copy(
+                            hasFocused = true
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnClearSelectedFiles -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            selectableFiles = it.selectableFiles.map { file -> file.copy(second = false) },
+                            hasSelectedItems = false
+                        )
+                    }
+                }
+            }
+
+            is BrowseEvent.OnSearchQueryChange -> {
+                _state.update {
+                    it.copy(
+                        searchQuery = event.query
+                    )
+                }
+                job?.cancel()
+                job = viewModelScope.launch {
+                    delay(500)
+                    getFilesFromDownloads()
+                }
+            }
+
+            is BrowseEvent.OnAddingDialogDismiss -> {
+                _state.update {
+                    it.copy(
+                        showAddingDialog = false
+                    )
+                }
+            }
+
+            is BrowseEvent.OnAddingDialogRequest -> {
+                _state.update {
+                    it.copy(
+                        showAddingDialog = true,
+                        selectedBooks = emptyList()
+                    )
+                }
+                onEvent(BrowseEvent.OnGetBooksFromFiles)
+            }
+
+            is BrowseEvent.OnGetBooksFromFiles -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    getBooksFromFiles.execute(
+                        _state.value.selectableFiles
+                            .filter { it.second }
+                            .map { it.first }
+                    ).collect { result ->
+                        when (result) {
+                            is Resource.Success -> {
+                                if (result.data?.isEmpty() ?: return@collect) {
+                                    return@collect
+                                }
+                                _state.update {
+                                    it.copy(
+                                        selectedBooks = result.data,
+                                        isBooksLoading = false
+                                    )
+                                }
+                            }
+
+                            is Resource.Loading -> {
+                                _state.update {
+                                    it.copy(
+                                        isBooksLoading = result.isLoading
+                                    )
+                                }
+                            }
+
+                            is Resource.Error -> Unit
+                        }
+                    }
+                }
+            }
+
+            is BrowseEvent.OnAddBooks -> {
+                viewModelScope.launch {
+                    val booksToInsert = _state.value.selectedBooks
+                        .filterIsInstance<NullableBook.NotNull>()
+                        .filter { it.book!!.second }
+                        .map { it.book!!.first }
+
+                    if (booksToInsert.isEmpty()) {
+                        return@launch
+                    }
+
+                    insertBooks.execute(booksToInsert)
+                    val books = fastGetBooks.execute("")
+
+                    event.resetScroll()
+                    _state.update {
+                        it.copy(
+                            showAddingDialog = false
+                        )
+                    }
+                    onEvent(BrowseEvent.OnClearSelectedFiles)
+                    onEvent(BrowseEvent.OnLoadList)
+
+                    event.navigator.navigate(Screen.LIBRARY, Argument("added_books", books))
+                }
+            }
+
+            is BrowseEvent.OnLoadList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isLoading = true
+                        )
+                    }
+                    getFilesFromDownloads()
+                }
+            }
+
+            is BrowseEvent.OnUpdateScrollIndex -> {
+                _state.update {
+                    it.copy(
+                        scrollIndex = event.index
+                    )
+                }
+            }
+
+            is BrowseEvent.OnUpdateScrollOffset -> {
+                _state.update {
+                    it.copy(
+                        scrollOffset = event.offset
+                    )
+                }
+            }
+        }
+    }
+
+    private suspend fun getFilesFromDownloads(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
+        getFilesFromDownloads.execute(query).collect { result ->
+            when (result) {
+                is Resource.Success -> {
+                    _state.update {
+                        it.copy(
+                            selectableFiles = result.data?.map { book -> Pair(book, false) }
+                                ?: emptyList(),
+                            isLoading = false
+                        )
+                    }
+                }
+
+                is Resource.Loading -> {
+                    _state.update {
+                        it.copy(
+                            isLoading = result.isLoading
+                        )
+                    }
+                }
+
+                is Resource.Error -> Unit
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt
new file mode 100644
index 00000000..7d6740bb
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt
@@ -0,0 +1,348 @@
+package ua.acclorite.book_story.presentation.screens.history
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.text.BasicTextField
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.CircularProgressIndicator
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.outlined.DeleteSweep
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.snapshotFlow
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.graphics.StrokeCap
+import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CustomSnackbar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.history.components.HistoryDeleteWholeHistoryDialog
+import ua.acclorite.book_story.presentation.screens.history.components.HistoryItem
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import java.util.UUID
+
+@OptIn(
+    ExperimentalMaterial3Api::class,
+    ExperimentalMaterialApi::class, FlowPreview::class, ExperimentalFoundationApi::class
+)
+@Composable
+fun HistoryScreen(
+    viewModel: HistoryViewModel = hiltViewModel(),
+    navigator: Navigator
+) {
+    val context = LocalContext.current
+    val state by viewModel.state.collectAsState()
+    val refreshState = rememberPullRefreshState(
+        refreshing = state.isRefreshing,
+        onRefresh = {
+            viewModel.onEvent(HistoryEvent.OnRefreshList)
+        }
+    )
+    val focusRequester = remember { FocusRequester() }
+    val snackbarState = remember { SnackbarHostState() }
+    val listState = rememberLazyListState(state.scrollIndex, state.scrollOffset)
+
+    LaunchedEffect(listState) {
+        snapshotFlow {
+            listState.firstVisibleItemIndex
+        }
+            .debounce(10L)
+            .collectLatest {
+                viewModel.onEvent(HistoryEvent.OnUpdateScrollIndex(it))
+            }
+    }
+    LaunchedEffect(listState) {
+        snapshotFlow {
+            listState.firstVisibleItemScrollOffset
+        }
+            .debounce(10L)
+            .collectLatest {
+                viewModel.onEvent(
+                    HistoryEvent.OnUpdateScrollOffset(it)
+                )
+            }
+    }
+
+    if (state.showDeleteWholeHistoryDialog) {
+        HistoryDeleteWholeHistoryDialog(viewModel = viewModel)
+    }
+
+    Scaffold(
+        Modifier
+            .fillMaxSize()
+            .pullRefresh(refreshState),
+        containerColor = MaterialTheme.colorScheme.surface,
+        topBar = {
+            AnimatedTopAppBar(
+                scrolledContainerColor = MaterialTheme.elevation(),
+                scrollBehavior = null,
+                isTopBarScrolled = (state.scrollIndex > 0 || state.scrollOffset > 0) && !state.isLoading,
+
+                content1Visibility = !state.showSearch,
+                content1NavigationIcon = {},
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.history_screen),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {
+                    IconButton(onClick = { viewModel.onEvent(HistoryEvent.OnSearchShowHide) }) {
+                        Icon(
+                            imageVector = Icons.Default.Search,
+                            contentDescription = "Search history",
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    IconButton(
+                        enabled = !state.isLoading && !state.isRefreshing && state.history.isNotEmpty(),
+                        onClick = {
+                            viewModel.onEvent(HistoryEvent.OnShowHideDeleteWholeHistoryDialog)
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Outlined.DeleteSweep,
+                            contentDescription = "Delete whole history",
+                            tint = MaterialTheme.colorScheme.onSurfaceVariant
+                        )
+                    }
+                    MoreDropDown(navigator = navigator)
+                },
+
+                content2Visibility = state.showSearch,
+                content2NavigationIcon = {
+                    IconButton(onClick = { viewModel.onEvent(HistoryEvent.OnSearchShowHide) }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            contentDescription = "Exit search mode",
+                            modifier = Modifier.size(24.dp),
+                            tint = MaterialTheme.colorScheme.onSurface
+                        )
+                    }
+                },
+                content2Title = {
+                    BasicTextField(
+                        value = state.searchQuery,
+                        singleLine = true,
+                        textStyle = TextStyle(
+                            color = MaterialTheme.colorScheme.onSurface,
+                            fontSize = MaterialTheme.typography.titleLarge.fontSize,
+                            lineHeight = MaterialTheme.typography.titleLarge.lineHeight,
+                            fontFamily = MaterialTheme.typography.titleLarge.fontFamily
+                        ),
+                        modifier = Modifier
+                            .focusRequester(focusRequester)
+                            .onGloballyPositioned {
+                                viewModel.onEvent(HistoryEvent.OnRequestFocus(focusRequester))
+                            },
+                        onValueChange = {
+                            viewModel.onEvent(HistoryEvent.OnSearchQueryChange(it))
+                        },
+                        keyboardOptions = KeyboardOptions(KeyboardCapitalization.Words),
+                        cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurfaceVariant)
+                    ) { innerText ->
+                        Box(
+                            modifier = Modifier.fillMaxHeight(),
+                            contentAlignment = Alignment.CenterStart
+                        ) {
+                            if (state.searchQuery.isEmpty()) {
+                                Text(
+                                    stringResource(
+                                        id = R.string.search_query,
+                                        stringResource(id = R.string.history)
+                                    ),
+                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                                    style = MaterialTheme.typography.titleLarge,
+                                    maxLines = 1,
+                                    overflow = TextOverflow.Ellipsis,
+                                )
+                            }
+                            innerText()
+                        }
+                    }
+                },
+                content2Actions = {
+                    MoreDropDown(navigator = navigator)
+                },
+                content3Visibility = false
+            )
+        },
+        bottomBar = {
+            CustomSnackbar(snackbarState = snackbarState)
+        }
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(top = paddingValues.calculateTopPadding())
+        ) {
+            LazyColumn(
+                Modifier
+                    .fillMaxSize(),
+                state = listState,
+                contentPadding = PaddingValues(vertical = 12.dp)
+            ) {
+                if (!state.isLoading) {
+                    state.history.forEachIndexed { index, groupedHistory ->
+                        item(key = groupedHistory.title) {
+                            if (index > 0) {
+                                Spacer(modifier = Modifier.height(8.dp))
+                            }
+
+                            CategoryTitle(
+                                modifier = Modifier.animateItemPlacement(tween(300)),
+                                title = when (groupedHistory.title) {
+                                    "today" -> stringResource(id = R.string.today)
+                                    "yesterday" -> stringResource(id = R.string.yesterday)
+                                    else -> groupedHistory.title
+                                },
+                                padding = 16.dp
+                            )
+                            Spacer(modifier = Modifier.height(8.dp))
+                        }
+
+                        items(
+                            groupedHistory.history, key = { it.id ?: UUID.randomUUID() }
+                        ) {
+                            HistoryItem(
+                                modifier = Modifier.animateItemPlacement(tween(300)),
+                                history = it,
+                                onBodyClick = {
+                                    navigator.navigate(
+                                        Screen.BOOK_INFO,
+                                        Argument("book", it.book)
+                                    )
+                                },
+                                onTitleClick = {
+                                    navigator.navigate(
+                                        Screen.READER,
+                                        Argument("book", it.book)
+                                    )
+                                },
+                                onDeleteClick = {
+                                    viewModel.onEvent(
+                                        HistoryEvent.OnDeleteHistoryElement(
+                                            it,
+                                            snackbarState,
+                                            context
+                                        )
+                                    )
+                                }
+                            )
+                        }
+                    }
+                }
+            }
+
+            AnimatedVisibility(
+                visible = !state.isLoading && state.history.isEmpty() && !state.isRefreshing,
+                modifier = Modifier.align(Alignment.Center),
+                enter = Transitions.DefaultTransitionIn,
+                exit = fadeOut(tween(0))
+            ) {
+                IsEmpty(
+                    modifier = Modifier.align(Alignment.Center),
+                    message = stringResource(id = R.string.history_empty),
+                    icon = painterResource(id = R.drawable.empty_history)
+                )
+            }
+            if (state.isLoading && !state.isRefreshing) {
+                CircularProgressIndicator(
+                    color = MaterialTheme.colorScheme.primary,
+                    strokeCap = StrokeCap.Round,
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .size(36.dp)
+                )
+            }
+
+            PullRefreshIndicator(
+                state.isRefreshing,
+                refreshState,
+                Modifier.align(Alignment.TopCenter),
+                backgroundColor = MaterialTheme.elevation(),
+                contentColor = MaterialTheme.colorScheme.primary,
+                scale = true
+            )
+        }
+    }
+
+    BackHandler {
+        if (state.showSearch) {
+            viewModel.onEvent(HistoryEvent.OnSearchShowHide)
+            return@BackHandler
+        }
+
+        navigator.navigate(Screen.LIBRARY)
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt
new file mode 100644
index 00000000..0474860f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt
@@ -0,0 +1,41 @@
+package ua.acclorite.book_story.presentation.screens.history.components
+
+import android.widget.Toast
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.DeleteOutline
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+
+@Composable
+fun HistoryDeleteWholeHistoryDialog(
+    viewModel: HistoryViewModel
+) {
+    val context = LocalContext.current
+
+    CustomDialogWithContent(
+        title = stringResource(id = R.string.delete_history),
+        imageVectorIcon = Icons.Outlined.DeleteOutline,
+        description = stringResource(
+            id = R.string.delete_history_description
+        ),
+        actionText = stringResource(id = R.string.delete),
+        onDismiss = { viewModel.onEvent(HistoryEvent.OnShowHideDeleteWholeHistoryDialog) },
+        withDivider = false,
+        isActionEnabled = true,
+        onAction = {
+            viewModel.onEvent(
+                HistoryEvent.OnDeleteWholeHistory
+            )
+            Toast.makeText(
+                context,
+                context.getString(R.string.history_deleted),
+                Toast.LENGTH_LONG
+            ).show()
+        }
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt
new file mode 100644
index 00000000..f1cb83f0
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt
@@ -0,0 +1,138 @@
+package ua.acclorite.book_story.presentation.screens.history.components
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Image
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.ui.elevation
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+@Composable
+fun HistoryItem(
+    modifier: Modifier = Modifier,
+    history: History,
+    onBodyClick: () -> Unit,
+    onTitleClick: () -> Unit,
+    onDeleteClick: () -> Unit
+) {
+    val date = Date(history.time)
+    val pattern = SimpleDateFormat("HH:mm", Locale.getDefault())
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = modifier
+            .fillMaxWidth()
+            .clickable {
+                onBodyClick()
+            }
+            .padding(top = 6.dp, bottom = 6.dp, start = 16.dp, end = 10.dp)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.weight(0.9f)
+        ) {
+            Box(
+                modifier = Modifier
+                    .height(90.dp)
+                    .width(60.dp)
+                    .clip(MaterialTheme.shapes.medium)
+                    .background(MaterialTheme.elevation())
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Image,
+                    contentDescription = "Cover Image not found",
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                        .fillMaxWidth(0.7f)
+                        .aspectRatio(1f),
+                    tint = MaterialTheme.elevation(12.dp)
+                )
+
+                if (history.book.coverImage != null) {
+                    Image(
+                        bitmap = history.book.coverImage.asImageBitmap(),
+                        contentDescription = "Cover",
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .clip(MaterialTheme.shapes.medium),
+                        contentScale = ContentScale.Crop
+                    )
+                }
+            }
+
+            Spacer(modifier = Modifier.width(16.dp))
+
+            Column(
+                verticalArrangement = Arrangement.Center,
+                modifier = Modifier.fillMaxHeight()
+            ) {
+                Text(
+                    history.book.title,
+                    color = MaterialTheme.colorScheme.onSurface,
+                    style = MaterialTheme.typography.bodyLarge,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .clickable(
+                            interactionSource = null,
+                            indication = null,
+                            onClick = onTitleClick
+                        ),
+                    maxLines = 2,
+                    overflow = TextOverflow.Ellipsis
+                )
+                Spacer(modifier = Modifier.height(4.dp))
+                Text(
+                    pattern.format(date),
+                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    style = MaterialTheme.typography.bodyMedium,
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis
+                )
+            }
+        }
+        Box(modifier = Modifier.weight(0.1f), contentAlignment = Alignment.CenterEnd) {
+            IconButton(
+                onClick = {
+                    onDeleteClick()
+                }
+            ) {
+                Icon(
+                    imageVector = Icons.Outlined.Delete,
+                    contentDescription = "Delete this history element",
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt
new file mode 100644
index 00000000..ff091295
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryEvent.kt
@@ -0,0 +1,24 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import android.content.Context
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.ui.focus.FocusRequester
+import ua.acclorite.book_story.domain.model.History
+
+sealed class HistoryEvent {
+    data object OnRefreshList : HistoryEvent()
+    data object OnLoadList : HistoryEvent()
+    data object OnShowHideDeleteWholeHistoryDialog : HistoryEvent()
+    data object OnDeleteWholeHistory : HistoryEvent()
+    data class OnDeleteHistoryElement(
+        val historyToDelete: History,
+        val snackbarState: SnackbarHostState,
+        val context: Context
+    ) : HistoryEvent()
+
+    data class OnSearchQueryChange(val query: String) : HistoryEvent()
+    data object OnSearchShowHide : HistoryEvent()
+    data class OnRequestFocus(val focusRequester: FocusRequester) : HistoryEvent()
+    data class OnUpdateScrollIndex(val index: Int) : HistoryEvent()
+    data class OnUpdateScrollOffset(val offset: Int) : HistoryEvent()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt
new file mode 100644
index 00000000..0f0c6158
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryState.kt
@@ -0,0 +1,19 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import ua.acclorite.book_story.domain.model.GroupedHistory
+
+data class HistoryState(
+    val history: List<GroupedHistory> = emptyList(),
+    val isRefreshing: Boolean = false,
+    val isLoading: Boolean = true,
+
+    val showDeleteWholeHistoryDialog: Boolean = false,
+
+    val showSearch: Boolean = false,
+    val searchQuery: String = "",
+    val hasFocused: Boolean = false,
+
+    val scrollIndex: Int = 0,
+    val scrollOffset: Int = 0,
+
+    )
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt
new file mode 100644
index 00000000..8217099f
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt
@@ -0,0 +1,294 @@
+package ua.acclorite.book_story.presentation.screens.history.data
+
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarResult
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.GroupedHistory
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.use_case.DeleteHistory
+import ua.acclorite.book_story.domain.use_case.DeleteWholeHistory
+import ua.acclorite.book_story.domain.use_case.GetHistory
+import ua.acclorite.book_story.domain.use_case.InsertHistory
+import ua.acclorite.book_story.util.Resource
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import javax.inject.Inject
+
+@HiltViewModel
+class HistoryViewModel @Inject constructor(
+    private val insertHistory: InsertHistory,
+    private val getHistory: GetHistory,
+    private val deleteWholeHistory: DeleteWholeHistory,
+    private val deleteHistory: DeleteHistory
+) : ViewModel() {
+
+    private val _state = MutableStateFlow(HistoryState())
+    val state = _state.asStateFlow()
+
+    private var job: Job? = null
+
+    init {
+        onEvent(HistoryEvent.OnLoadList)
+    }
+
+    fun onEvent(event: HistoryEvent) {
+        when (event) {
+            is HistoryEvent.OnRefreshList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isRefreshing = true,
+                            showSearch = false
+                        )
+                    }
+
+                    getHistoryFromDatabase("")
+                    delay(500)
+                    _state.update {
+                        it.copy(
+                            isRefreshing = false
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnLoadList -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    _state.update {
+                        it.copy(
+                            isLoading = true
+                        )
+                    }
+                    getHistoryFromDatabase()
+                    onEvent(HistoryEvent.OnUpdateScrollIndex(0))
+                    onEvent(HistoryEvent.OnUpdateScrollOffset(0))
+                }
+            }
+
+            is HistoryEvent.OnDeleteWholeHistory -> {
+                viewModelScope.launch {
+                    _state.update {
+                        it.copy(
+                            showDeleteWholeHistoryDialog = false
+                        )
+                    }
+
+                    deleteWholeHistory.execute()
+                    getHistoryFromDatabase("")
+                }
+
+            }
+
+            is HistoryEvent.OnShowHideDeleteWholeHistoryDialog -> {
+                _state.update {
+                    it.copy(
+                        showDeleteWholeHistoryDialog = !it.showDeleteWholeHistoryDialog
+                    )
+                }
+            }
+
+            is HistoryEvent.OnDeleteHistoryElement -> {
+                viewModelScope.launch {
+                    deleteHistory.execute(
+                        listOf(event.historyToDelete)
+                    )
+                    onEvent(HistoryEvent.OnRefreshList)
+
+                    event.snackbarState.currentSnackbarData?.dismiss()
+                    val snackbar = event.snackbarState.showSnackbar(
+                        event.context.getString(R.string.history_element_deleted),
+                        event.context.getString(R.string.undo),
+                        duration = SnackbarDuration.Long
+                    )
+
+                    when (snackbar) {
+                        SnackbarResult.Dismissed -> return@launch
+                        SnackbarResult.ActionPerformed -> {
+                            insertHistory.execute(
+                                listOf(event.historyToDelete)
+                            )
+                            onEvent(HistoryEvent.OnRefreshList)
+                        }
+                    }
+                }
+            }
+
+            is HistoryEvent.OnSearchShowHide -> {
+                viewModelScope.launch(Dispatchers.IO) {
+                    val shouldHide = _state.value.showSearch
+
+                    if (shouldHide) {
+                        getHistoryFromDatabase("")
+                    } else {
+                        _state.update {
+                            it.copy(
+                                searchQuery = "",
+                                hasFocused = false
+                            )
+                        }
+                    }
+                    _state.update {
+                        it.copy(
+                            showSearch = !shouldHide
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnSearchQueryChange -> {
+                _state.update {
+                    it.copy(
+                        searchQuery = event.query
+                    )
+                }
+                job?.cancel()
+                job = viewModelScope.launch {
+                    delay(500)
+                    getHistoryFromDatabase()
+                }
+            }
+
+            is HistoryEvent.OnRequestFocus -> {
+                if (!_state.value.hasFocused) {
+                    event.focusRequester.requestFocus()
+                    _state.update {
+                        it.copy(
+                            hasFocused = true
+                        )
+                    }
+                }
+            }
+
+            is HistoryEvent.OnUpdateScrollIndex -> {
+                _state.update {
+                    it.copy(
+                        scrollIndex = event.index
+                    )
+                }
+            }
+
+            is HistoryEvent.OnUpdateScrollOffset -> {
+                _state.update {
+                    it.copy(
+                        scrollOffset = event.offset
+                    )
+                }
+            }
+        }
+    }
+
+    private suspend fun getHistoryFromDatabase(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
+        fun isSameDay(cal1: Calendar, cal2: Calendar): Boolean {
+            return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+                    cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR)
+        }
+
+        fun filterMaxElementsById(elements: List<History>): List<History> {
+            val groupedById = elements.groupBy { it.book.id }
+            val maxElementsById = groupedById.map { (_, values) ->
+                values.maxByOrNull { it.time }
+            }
+            return maxElementsById.filterNotNull()
+        }
+
+        getHistory.execute().collect { result ->
+            when (result) {
+                is Resource.Success -> {
+                    _state.update {
+                        it.copy(
+                            history = emptyList()
+                        )
+                    }
+                    val history = result.data?.sortedByDescending { it.time } ?: emptyList()
+
+                    if (history.isEmpty()) {
+                        _state.update {
+                            it.copy(
+                                isLoading = false
+                            )
+                        }
+                        return@collect
+                    }
+
+                    val groupedHistory = mutableListOf<GroupedHistory>()
+
+                    history
+                        .filter {
+                            it.book.title.lowercase().trim().contains(query.lowercase().trim())
+                        }.groupBy { item ->
+                            val calendar = Calendar.getInstance().apply {
+                                timeInMillis = item.time
+                            }
+                            val now = Calendar.getInstance()
+
+                            when {
+                                isSameDay(calendar, now) -> "today"
+                                isSameDay(
+                                    calendar,
+                                    now.apply {
+                                        add(
+                                            Calendar.DAY_OF_YEAR,
+                                            -1
+                                        )
+                                    }) -> "yesterday"
+
+                                else -> SimpleDateFormat(
+                                    "dd.MM.yy",
+                                    Locale.getDefault()
+                                ).format(item.time)
+                            }
+                        }.forEach { (key, value) ->
+                            groupedHistory.add(
+                                GroupedHistory(
+                                    key,
+                                    filterMaxElementsById(value)
+                                )
+                            )
+                        }
+
+                    _state.update {
+                        it.copy(
+                            history = groupedHistory,
+                            isLoading = false
+                        )
+                    }
+                }
+
+                is Resource.Loading -> Unit
+
+                is Resource.Error -> Unit
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
similarity index 91%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
index 00b0a4b8..3f786611 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/LibraryScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library
+package ua.acclorite.book_story.presentation.screens.library
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -70,34 +70,38 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.components.AnimatedTopAppBar
-import com.acclorite.books_history.presentation.components.IsEmpty
-import com.acclorite.books_history.presentation.components.MoreDropDown
-import com.acclorite.books_history.presentation.screens.library.components.LibraryBookItem
-import com.acclorite.books_history.presentation.screens.library.components.LibraryDeleteDialog
-import com.acclorite.books_history.presentation.screens.library.components.LibraryMoveDialog
-import com.acclorite.books_history.presentation.screens.library.components.LibraryTabRow
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.Transitions
-import com.acclorite.books_history.ui.elevation
-import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.components.IsEmpty
+import ua.acclorite.book_story.presentation.components.MoreDropDown
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryBookItem
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryDeleteDialog
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryMoveDialog
+import ua.acclorite.book_story.presentation.screens.library.components.LibraryTabRow
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.Transitions
+import ua.acclorite.book_story.ui.elevation
+import java.util.UUID
 
 @OptIn(
     ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class,
-    ExperimentalMaterialApi::class, FlowPreview::class
+    ExperimentalMaterialApi::class
 )
 @Composable
 fun LibraryScreen(
     viewModel: LibraryViewModel = hiltViewModel(),
+    browseViewModel: BrowseViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator,
     addedBooks: List<Book>
 ) {
@@ -129,7 +133,11 @@ fun LibraryScreen(
         LibraryMoveDialog(viewModel = viewModel, pagerState = pagerState)
     }
     if (state.showDeleteDialog) {
-        LibraryDeleteDialog(viewModel = viewModel)
+        LibraryDeleteDialog(
+            viewModel = viewModel,
+            browseViewModel = browseViewModel,
+            historyViewModel = historyViewModel
+        )
     }
 
     Scaffold(
@@ -174,7 +182,7 @@ fun LibraryScreen(
                         IconButton(onClick = { viewModel.onEvent(LibraryEvent.OnSearchShowHide) }) {
                             Icon(
                                 imageVector = Icons.Default.Search,
-                                contentDescription = "Search files",
+                                contentDescription = "Search books",
                                 modifier = Modifier.size(24.dp),
                                 tint = MaterialTheme.colorScheme.onSurfaceVariant
                             )
@@ -321,7 +329,7 @@ fun LibraryScreen(
                         if (!state.isLoading) {
                             items(
                                 categorizedBooks,
-                                key = { it.first.id ?: 0 }
+                                key = { it.first.id ?: UUID.randomUUID() }
                             ) {
                                 LibraryBookItem(
                                     book = it,
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
index ef76b3dc..f0d168c5 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryBookItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.tween
@@ -35,10 +35,10 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
similarity index 52%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
index 9cfd1216..1ea9df85 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryDeleteDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryDeleteDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import android.widget.Toast
 import androidx.compose.material.icons.Icons
@@ -8,13 +8,21 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CustomDialogWithContent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CustomDialogWithContent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent
+import ua.acclorite.book_story.presentation.screens.browse.data.BrowseViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @Composable
-fun LibraryDeleteDialog(viewModel: LibraryViewModel) {
+fun LibraryDeleteDialog(
+    viewModel: LibraryViewModel,
+    browseViewModel: BrowseViewModel,
+    historyViewModel: HistoryViewModel
+) {
     val state by viewModel.state.collectAsState()
     val context = LocalContext.current
 
@@ -30,7 +38,12 @@ fun LibraryDeleteDialog(viewModel: LibraryViewModel) {
         withDivider = false,
         isActionEnabled = true,
         onAction = {
-            viewModel.onEvent(LibraryEvent.OnDeleteBooks)
+            viewModel.onEvent(
+                LibraryEvent.OnDeleteBooks {
+                    browseViewModel.onEvent(BrowseEvent.OnLoadList)
+                    historyViewModel.onEvent(HistoryEvent.OnLoadList)
+                }
+            )
             Toast.makeText(
                 context,
                 context.getString(R.string.books_deleted),
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
index 4a15cc23..86e17724 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryMoveDialog.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryMoveDialog.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import android.widget.Toast
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -11,12 +11,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.components.CustomDialogWithLazyColumn
-import com.acclorite.books_history.presentation.components.SelectableDialogItem
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.components.CustomDialogWithLazyColumn
+import ua.acclorite.book_story.presentation.components.SelectableDialogItem
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
index 076afacd..664ce0ee 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/components/LibraryTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTabRow.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.library.components
+package ua.acclorite.book_story.presentation.screens.library.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
@@ -24,12 +24,12 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
similarity index 83%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
index ccea5cd0..a5967bdc 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryEvent.kt
@@ -1,12 +1,12 @@
 @file:OptIn(ExperimentalFoundationApi::class)
 
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.ui.focus.FocusRequester
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 sealed class LibraryEvent {
     data class OnPreloadBooks(val books: List<Book>) : LibraryEvent()
@@ -25,6 +25,6 @@ sealed class LibraryEvent {
     data class OnSelectCategory(val category: Category) : LibraryEvent()
     data class OnMoveBooks(val pagerState: PagerState) : LibraryEvent()
     data object OnShowHideDeleteDialog : LibraryEvent()
-    data object OnDeleteBooks : LibraryEvent()
+    data class OnDeleteBooks(val refreshList: () -> Unit) : LibraryEvent()
     data class OnUpdateBook(val book: Book) : LibraryEvent()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
index 9b7be6ba..22794824 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
 
 @Immutable
 data class LibraryState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
index 595a543a..b25724b2 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/library/data/LibraryViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt
@@ -1,13 +1,8 @@
-package com.acclorite.books_history.presentation.screens.library.data
+package ua.acclorite.book_story.presentation.screens.library.data
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.DeleteBooks
-import com.acclorite.books_history.domain.use_case.GetBooks
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.util.Resource
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -16,6 +11,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.use_case.DeleteBooks
+import ua.acclorite.book_story.domain.use_case.GetBooks
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.util.Resource
 import javax.inject.Inject
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -32,9 +32,7 @@ class LibraryViewModel @Inject constructor(
     private var job: Job? = null
 
     init {
-        viewModelScope.launch(Dispatchers.IO) {
-            getBooksFromDatabase()
-        }
+        onEvent(LibraryEvent.OnLoadList)
     }
 
     fun onEvent(event: LibraryEvent) {
@@ -71,10 +69,8 @@ class LibraryViewModel @Inject constructor(
                     _state.update {
                         it.copy(
                             isRefreshing = true,
-                            selectedItemsCount = 0,
                             hasSelectedItems = false,
-                            showSearch = false,
-                            books = emptyList()
+                            showSearch = false
                         )
                     }
 
@@ -253,6 +249,7 @@ class LibraryViewModel @Inject constructor(
                     deleteBooks.execute(books)
 
                     getBooksFromDatabase()
+                    event.refreshList()
 
                     onEvent(LibraryEvent.OnClearSelectedBooks)
                 }
@@ -275,7 +272,9 @@ class LibraryViewModel @Inject constructor(
         }
     }
 
-    private suspend fun getBooksFromDatabase(query: String = _state.value.searchQuery) {
+    private suspend fun getBooksFromDatabase(
+        query: String = if (_state.value.showSearch) _state.value.searchQuery else ""
+    ) {
         getBooks.execute(query).collect { result ->
             when (result) {
                 is Resource.Success -> {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
index 82eac8a0..2c8d9d18 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/ReaderScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader
+package ua.acclorite.book_story.presentation.screens.reader
 
 import android.annotation.SuppressLint
 import androidx.activity.ComponentActivity
@@ -51,32 +51,36 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.components.IsError
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderBottomBar
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderEndItem
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderSettingsBottomSheet
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderStartItem
-import com.acclorite.books_history.presentation.screens.reader.components.ReaderTopBar
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
 import dagger.hilt.android.lifecycle.withCreationCallback
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.debounce
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.IsError
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent
+import ua.acclorite.book_story.presentation.screens.history.data.HistoryViewModel
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderBottomBar
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderEndItem
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderSettingsBottomSheet
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderStartItem
+import ua.acclorite.book_story.presentation.screens.reader.components.ReaderTopBar
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(FlowPreview::class)
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
 fun ReaderScreen(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
+    libraryViewModel: LibraryViewModel = hiltViewModel(),
+    historyViewModel: HistoryViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val context = LocalContext.current as ComponentActivity
@@ -95,7 +99,6 @@ fun ReaderScreen(
                 }
         }
     )
-    val libraryViewModel: LibraryViewModel = hiltViewModel()
 
     var loading by remember { mutableStateOf(true) }
     val state by viewModel.state.collectAsState()
@@ -139,6 +142,7 @@ fun ReaderScreen(
             listState,
             refreshList = {
                 libraryViewModel.onEvent(LibraryEvent.OnUpdateBook(it))
+                historyViewModel.onEvent(HistoryEvent.OnLoadList)
             },
             onLoaded = {
                 loading = false
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
similarity index 84%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
index d8b6b422..6ae3075a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderBottomBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderBottomBar.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -19,13 +19,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @Composable
 fun ReaderBottomBar(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
similarity index 86%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
index 107b4718..47d27f7d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderEndItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import android.widget.Toast
 import androidx.activity.ComponentActivity
@@ -24,14 +24,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.library.data.LibraryEvent
-import com.acclorite.books_history.presentation.screens.library.data.LibraryViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent
+import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @Composable
 fun ReaderEndItem(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
index bfd4d210..0e1c507b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheet.kt
@@ -1,11 +1,10 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.activity.ComponentActivity
 import androidx.compose.animation.animateColorAsState
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
@@ -34,24 +33,23 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.components.CategoryTitle
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.CheckboxWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.ColorPickerWithTitle
-import com.acclorite.books_history.presentation.screens.settings.components.SliderWithTitle
-import com.acclorite.books_history.ui.ElevationDefaults
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.CheckboxWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.ColorPickerWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle
+import ua.acclorite.book_story.ui.ElevationDefaults
+import ua.acclorite.book_story.ui.elevation
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class,
-    ExperimentalLayoutApi::class
+    ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class
 )
 @Composable
 fun ReaderSettingsBottomSheet(mainViewModel: MainViewModel, viewModel: ReaderViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
similarity index 90%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
index 53529321..28d787c4 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderSettingsBottomSheetTabRow.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -17,9 +17,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
index 732857a0..b397dafa 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderStartItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderStartItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -29,9 +29,9 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.ui.elevation
 
 @Composable
 fun ReaderStartItem(viewModel: ReaderViewModel) {
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
index ffd53524..37a88904 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/components/ReaderTopBar.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTopBar.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.components
+package ua.acclorite.book_story.presentation.screens.reader.components
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.basicMarquee
@@ -30,14 +30,14 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.data.removeDigits
-import com.acclorite.books_history.presentation.data.removeTrailingZero
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderEvent
-import com.acclorite.books_history.presentation.screens.reader.data.ReaderViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.data.removeDigits
+import ua.acclorite.book_story.presentation.data.removeTrailingZero
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent
+import ua.acclorite.book_story.presentation.screens.reader.data.ReaderViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
index f858a7c5..f9294234 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderEvent.kt
@@ -1,13 +1,13 @@
 @file:OptIn(ExperimentalFoundationApi::class)
 
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.pager.PagerState
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.presentation.Navigator
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.presentation.Navigator
 
 sealed class ReaderEvent {
     data class OnFileNotFound(val onLoaded: () -> Unit) : ReaderEvent()
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
similarity index 60%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
index 5da45419..056f6758 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderState.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt
@@ -1,8 +1,8 @@
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.compose.runtime.Immutable
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.util.UIText
 
 @Immutable
 data class ReaderState(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
similarity index 89%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
index ed2cfbea..1184f683 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/reader/data/ReaderViewModel.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.reader.data
+package ua.acclorite.book_story.presentation.screens.reader.data
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.ExperimentalFoundationApi
@@ -9,16 +9,6 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.use_case.GetText
-import com.acclorite.books_history.domain.use_case.UpdateBooks
-import com.acclorite.books_history.presentation.Argument
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.util.Resource
-import com.acclorite.books_history.util.UIText
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -30,6 +20,18 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.History
+import ua.acclorite.book_story.domain.use_case.GetText
+import ua.acclorite.book_story.domain.use_case.InsertHistory
+import ua.acclorite.book_story.domain.use_case.UpdateBooks
+import ua.acclorite.book_story.presentation.Argument
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.util.Resource
+import ua.acclorite.book_story.util.UIText
 import java.util.Date
 import kotlin.math.roundToInt
 
@@ -38,7 +40,8 @@ import kotlin.math.roundToInt
 class ReaderViewModel @AssistedInject constructor(
     @Assisted book: Book,
     private val getText: GetText,
-    private val updateBooks: UpdateBooks
+    private val updateBooks: UpdateBooks,
+    private val insertHistory: InsertHistory
 ) : ViewModel() {
 
     private val _state = MutableStateFlow(ReaderState(book))
@@ -94,10 +97,12 @@ class ReaderViewModel @AssistedInject constructor(
                         }
                     }
 
+                    val time = Date().time
+
                     _state.update {
                         it.copy(
                             book = it.book.copy(
-                                lastOpened = Date().time
+                                lastOpened = time
                             )
                         )
                     }
@@ -105,11 +110,19 @@ class ReaderViewModel @AssistedInject constructor(
                     updateBooks.execute(
                         listOf(_state.value.book)
                     )
+                    insertHistory.execute(
+                        listOf(
+                            History(
+                                null,
+                                _state.value.book,
+                                time
+                            )
+                        )
+                    )
                     event.refreshList(_state.value.book)
                     event.navigator.putArgument(
                         Argument("book", _state.value.book)
                     )
-                    //todo add history
 
                     viewModelScope.launch {
                         snapshotFlow {
@@ -127,7 +140,7 @@ class ReaderViewModel @AssistedInject constructor(
                                         }
                                     }
                                 }
-                                //todo fix blinking
+
                                 delay(500)
                                 event.onLoaded()
                                 return@collectLatest
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
similarity index 82%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
index 06509c70..77985539 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings
+package ua.acclorite.book_story.presentation.screens.settings
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -16,18 +16,17 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.Screen
-import com.acclorite.books_history.presentation.screens.settings.components.SettingsCategoryItem
-import com.acclorite.books_history.ui.elevation
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.Screen
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.screens.settings.components.SettingsCategoryItem
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -43,17 +42,11 @@ fun SettingsScreen(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.settings_screen),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -62,11 +55,16 @@ fun SettingsScreen(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.settings_screen),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
similarity index 88%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
index 16e33546..e7fbcf54 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/CheckboxWIthTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/CheckboxWIthTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -12,7 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @Composable
 fun CheckboxWithTitle(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
similarity index 93%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
index 96b1492c..8d8fa4d0 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ChipsWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
@@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @OptIn(ExperimentalMaterialApi::class, ExperimentalLayoutApi::class)
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
index 927253b8..3396ee86 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/ColorPickerWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -25,8 +25,8 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 
 @Composable
 fun ColorPickerWithTitle(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
similarity index 96%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
index 55565312..3babc5c4 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SettingsCategoryItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SettingsCategoryItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
index 8939be44..c3c048ec 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/components/SliderWithTitle.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.components
+package ua.acclorite.book_story.presentation.screens.settings.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -15,7 +15,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.components.CategoryTitle
 import kotlin.math.roundToInt
 
 @Composable
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
index 1dc549a1..5405f01a 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
@@ -14,7 +14,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -22,20 +21,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.presentation.screens.settings.nested.appearance.components.AppearanceSettingsThemeSwitcher
-import com.acclorite.books_history.ui.DarkTheme
-import com.acclorite.books_history.ui.elevation
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.AppearanceSettingsThemeSwitcher
+import ua.acclorite.book_story.ui.DarkTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun AppearanceSettings(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -49,17 +49,11 @@ fun AppearanceSettings(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.appearance_settings),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -68,11 +62,16 @@ fun AppearanceSettings(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.appearance_settings),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
similarity index 81%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
index 4a3eaaa1..d543800d 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcher.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance.components
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components
 
 import android.os.Build
 import androidx.compose.foundation.layout.Column
@@ -13,13 +13,13 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.R
-import com.acclorite.books_history.presentation.components.CategoryTitle
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.isDark
-import com.acclorite.books_history.util.Constants
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.presentation.components.CategoryTitle
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.isDark
+import ua.acclorite.book_story.util.Constants
 
 @Composable
 fun AppearanceSettingsThemeSwitcher(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
index 151d7240..df5e3b9b 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/AppearanceSettingsThemeSwitcherItem.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.appearance.components
+package ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -29,9 +29,9 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.acclorite.books_history.ui.Theme
-import com.acclorite.books_history.ui.colorScheme
-import com.acclorite.books_history.util.UIText
+import ua.acclorite.book_story.ui.Theme
+import ua.acclorite.book_story.ui.colorScheme
+import ua.acclorite.book_story.util.UIText
 
 @Composable
 fun AppearanceSettingsThemeSwitcherItem(
diff --git a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt
rename to app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
index 46c68e2d..01cc5d76 100644
--- a/app/src/main/java/com/acclorite/books_history/presentation/screens/settings/nested/general/GeneralSettings.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.presentation.screens.settings.nested.general
+package ua.acclorite.book_story.presentation.screens.settings.nested.general
 
 import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.WindowInsets
@@ -15,7 +15,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -24,19 +23,20 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.ChipItem
-import com.acclorite.books_history.presentation.Navigator
-import com.acclorite.books_history.presentation.data.MainEvent
-import com.acclorite.books_history.presentation.data.MainViewModel
-import com.acclorite.books_history.presentation.screens.settings.components.ChipsWithTitle
-import com.acclorite.books_history.ui.elevation
-import com.acclorite.books_history.util.Constants
+import androidx.hilt.navigation.compose.hiltViewModel
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.ChipItem
+import ua.acclorite.book_story.presentation.Navigator
+import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar
+import ua.acclorite.book_story.presentation.data.MainEvent
+import ua.acclorite.book_story.presentation.data.MainViewModel
+import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle
+import ua.acclorite.book_story.util.Constants
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun GeneralSettings(
-    mainViewModel: MainViewModel,
+    mainViewModel: MainViewModel = hiltViewModel(),
     navigator: Navigator
 ) {
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
@@ -51,17 +51,11 @@ fun GeneralSettings(
             .windowInsetsPadding(WindowInsets.navigationBars),
         containerColor = MaterialTheme.colorScheme.surface,
         topBar = {
-            TopAppBar(
-                title = {
-                    Text(
-                        stringResource(id = R.string.general_settings),
-                        style = MaterialTheme.typography.titleLarge,
-                        color = MaterialTheme.colorScheme.onSurface,
-                        overflow = TextOverflow.Ellipsis,
-                        maxLines = 1
-                    )
-                },
-                navigationIcon = {
+            AnimatedTopAppBar(
+                scrollBehavior = scrollBehavior,
+                isTopBarScrolled = null,
+
+                content1NavigationIcon = {
                     IconButton(onClick = { navigator.navigateBack() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
@@ -70,11 +64,16 @@ fun GeneralSettings(
                         )
                     }
                 },
-                scrollBehavior = scrollBehavior,
-                colors = TopAppBarDefaults.topAppBarColors(
-                    containerColor = MaterialTheme.colorScheme.surface,
-                    scrolledContainerColor = MaterialTheme.elevation()
-                )
+                content1Title = {
+                    Text(
+                        stringResource(id = R.string.general_settings),
+                        style = MaterialTheme.typography.titleLarge,
+                        color = MaterialTheme.colorScheme.onSurface,
+                        overflow = TextOverflow.Ellipsis,
+                        maxLines = 1
+                    )
+                },
+                content1Actions = {}
             )
         }
     ) { paddingValues ->
@@ -86,7 +85,7 @@ fun GeneralSettings(
             item {
                 ChipsWithTitle(
                     title = stringResource(id = R.string.language_option),
-                    chips = Constants.LANGUAGES.map {
+                    chips = Constants.LANGUAGES.sortedBy { it.second }.map {
                         ChipItem(
                             it.first,
                             it.second,
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Color.kt b/app/src/main/java/ua/acclorite/book_story/ui/Color.kt
similarity index 77%
rename from app/src/main/java/com/acclorite/books_history/ui/Color.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Color.kt
index 24e7ede3..c676f833 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Color.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Color.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import android.annotation.SuppressLint
 import androidx.compose.material3.ColorScheme
@@ -6,21 +6,23 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
-import com.acclorite.books_history.ui.theme.blueTheme
-import com.acclorite.books_history.ui.theme.greenTheme
-import com.acclorite.books_history.ui.theme.pinkTheme
-import com.acclorite.books_history.ui.theme.purpleTheme
-import com.acclorite.books_history.ui.theme.redTheme
-import com.acclorite.books_history.ui.theme.yellowTheme
+import ua.acclorite.book_story.ui.theme.aquaTheme
+import ua.acclorite.book_story.ui.theme.blueTheme
+import ua.acclorite.book_story.ui.theme.greenTheme
+import ua.acclorite.book_story.ui.theme.pinkTheme
+import ua.acclorite.book_story.ui.theme.purpleTheme
+import ua.acclorite.book_story.ui.theme.redTheme
+import ua.acclorite.book_story.ui.theme.yellowTheme
 
 enum class Theme {
     DYNAMIC,
     BLUE,
-    PURPLE,
     GREEN,
+    RED,
+    PURPLE,
     PINK,
     YELLOW,
-    RED
+    AQUA
 }
 
 /**
@@ -34,6 +36,7 @@ fun String.toTheme(): Theme {
         "PINK" -> Theme.PINK
         "YELLOW" -> Theme.YELLOW
         "RED" -> Theme.RED
+        "AQUA" -> Theme.AQUA
         else -> Theme.BLUE
     }
 }
@@ -86,5 +89,10 @@ fun colorScheme(theme: Theme, darkTheme: Boolean): ColorScheme {
             /* Red Theme */
             return redTheme(isDark = darkTheme)
         }
+
+        Theme.AQUA -> {
+            /* Aqua Theme */
+            return aquaTheme(isDark = darkTheme)
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Elevation.kt b/app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
similarity index 74%
rename from app/src/main/java/com/acclorite/books_history/ui/Elevation.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
index cc0f519a..c12a5505 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Elevation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Elevation.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.ui.unit.dp
 
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
similarity index 98%
rename from app/src/main/java/com/acclorite/books_history/ui/Theme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
index 7a0ba602..e3c2bc07 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Theme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Theme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import android.app.Activity
 import android.os.Build
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/ui/Transitions.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
index 34fe0e01..71e701e7 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Transitions.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Transitions.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
@@ -13,18 +13,20 @@ object Transitions {
     val DefaultTransitionIn = fadeIn(tween(300))
     val DefaultTransitionOut = fadeOut(tween(300))
 
-    val SlidingTransitionIn = fadeIn(tween(300)) +
-            slideInHorizontally(tween(300)) { it / 6 }
+    val FadeTransitionIn = fadeIn(tween(300))
+    val FadeTransitionOut = fadeOut(tween(50))
 
-    val SlidingTransitionOut = fadeOut(tween(300)) +
-            slideOutHorizontally(tween(300)) { it / 6 }
+    val SlidingTransitionIn = fadeIn(tween(300)) +
+            slideInHorizontally(tween(300)) { it / 15 }
+
+    val SlidingTransitionOut = fadeOut(tween(200)) +
+            slideOutHorizontally(tween(200)) { it / 25 }
 }
 
 @Composable
 fun DefaultTransition(
     visible: Boolean,
     modifier: Modifier = Modifier,
-
     content: @Composable (() -> Unit)
 ) {
     AnimatedVisibility(
diff --git a/app/src/main/java/com/acclorite/books_history/ui/Typography.kt b/app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
similarity index 97%
rename from app/src/main/java/com/acclorite/books_history/ui/Typography.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
index 5e16a3e4..82258847 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/Typography.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/Typography.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui
+package ua.acclorite.book_story.ui
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt
new file mode 100644
index 00000000..782d3c9c
--- /dev/null
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/AquaTheme.kt
@@ -0,0 +1,136 @@
+package ua.acclorite.book_story.ui.theme
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+private val md_theme_light_primary = Color(0xFF006876)
+private val md_theme_light_onPrimary = Color(0xFFFFFFFF)
+private val md_theme_light_primaryContainer = Color(0xFFA1EFFF)
+private val md_theme_light_onPrimaryContainer = Color(0xFF001F25)
+private val md_theme_light_secondary = Color(0xFF4A6268)
+private val md_theme_light_onSecondary = Color(0xFFFFFFFF)
+private val md_theme_light_secondaryContainer = Color(0xFFCDE7ED)
+private val md_theme_light_onSecondaryContainer = Color(0xFF051F23)
+private val md_theme_light_tertiary = Color(0xFF545D7E)
+private val md_theme_light_onTertiary = Color(0xFFFFFFFF)
+private val md_theme_light_tertiaryContainer = Color(0xFFDBE1FF)
+private val md_theme_light_onTertiaryContainer = Color(0xFF101A37)
+private val md_theme_light_error = Color(0xFFBA1A1A)
+private val md_theme_light_errorContainer = Color(0xFFFFDAD6)
+private val md_theme_light_onError = Color(0xFFFFFFFF)
+private val md_theme_light_onErrorContainer = Color(0xFF410002)
+private val md_theme_light_background = Color(0xFFFBFCFD)
+private val md_theme_light_onBackground = Color(0xFF191C1D)
+private val md_theme_light_surface = Color(0xFFFBFCFD)
+private val md_theme_light_onSurface = Color(0xFF191C1D)
+private val md_theme_light_surfaceVariant = Color(0xFFDBE4E6)
+private val md_theme_light_onSurfaceVariant = Color(0xFF3F484A)
+private val md_theme_light_outline = Color(0xFF6F797B)
+private val md_theme_light_inverseOnSurface = Color(0xFFEFF1F2)
+private val md_theme_light_inverseSurface = Color(0xFF2E3132)
+private val md_theme_light_inversePrimary = Color(0xFF51D7EF)
+private val md_theme_light_surfaceTint = Color(0xFF006876)
+private val md_theme_light_outlineVariant = Color(0xFFBFC8CA)
+private val md_theme_light_scrim = Color(0xFF000000)
+
+private val md_theme_dark_primary = Color(0xFF51D7EF)
+private val md_theme_dark_onPrimary = Color(0xFF00363E)
+private val md_theme_dark_primaryContainer = Color(0xFF004E59)
+private val md_theme_dark_onPrimaryContainer = Color(0xFFA1EFFF)
+private val md_theme_dark_secondary = Color(0xFFB1CBD1)
+private val md_theme_dark_onSecondary = Color(0xFF1C3439)
+private val md_theme_dark_secondaryContainer = Color(0xFF334A50)
+private val md_theme_dark_onSecondaryContainer = Color(0xFFCDE7ED)
+private val md_theme_dark_tertiary = Color(0xFFBCC5EB)
+private val md_theme_dark_onTertiary = Color(0xFF262F4D)
+private val md_theme_dark_tertiaryContainer = Color(0xFF3C4665)
+private val md_theme_dark_onTertiaryContainer = Color(0xFFDBE1FF)
+private val md_theme_dark_error = Color(0xFFFFB4AB)
+private val md_theme_dark_errorContainer = Color(0xFF93000A)
+private val md_theme_dark_onError = Color(0xFF690005)
+private val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
+private val md_theme_dark_background = Color(0xFF191C1D)
+private val md_theme_dark_onBackground = Color(0xFFE1E3E3)
+private val md_theme_dark_surface = Color(0xFF191C1D)
+private val md_theme_dark_onSurface = Color(0xFFE1E3E3)
+private val md_theme_dark_surfaceVariant = Color(0xFF3F484A)
+private val md_theme_dark_onSurfaceVariant = Color(0xFFBFC8CA)
+private val md_theme_dark_outline = Color(0xFF899295)
+private val md_theme_dark_inverseOnSurface = Color(0xFF191C1D)
+private val md_theme_dark_inverseSurface = Color(0xFFE1E3E3)
+private val md_theme_dark_inversePrimary = Color(0xFF006876)
+private val md_theme_dark_surfaceTint = Color(0xFF51D7EF)
+private val md_theme_dark_outlineVariant = Color(0xFF3F484A)
+private val md_theme_dark_scrim = Color(0xFF000000)
+
+@Composable
+fun aquaTheme(isDark: Boolean): ColorScheme {
+    return if (isDark) {
+        darkColorScheme(
+            primary = md_theme_dark_primary,
+            onPrimary = md_theme_dark_onPrimary,
+            primaryContainer = md_theme_dark_primaryContainer,
+            onPrimaryContainer = md_theme_dark_onPrimaryContainer,
+            secondary = md_theme_dark_secondary,
+            onSecondary = md_theme_dark_onSecondary,
+            secondaryContainer = md_theme_dark_secondaryContainer,
+            onSecondaryContainer = md_theme_dark_onSecondaryContainer,
+            tertiary = md_theme_dark_tertiary,
+            onTertiary = md_theme_dark_onTertiary,
+            tertiaryContainer = md_theme_dark_tertiaryContainer,
+            onTertiaryContainer = md_theme_dark_onTertiaryContainer,
+            error = md_theme_dark_error,
+            errorContainer = md_theme_dark_errorContainer,
+            onError = md_theme_dark_onError,
+            onErrorContainer = md_theme_dark_onErrorContainer,
+            background = md_theme_dark_background,
+            onBackground = md_theme_dark_onBackground,
+            surface = md_theme_dark_surface,
+            onSurface = md_theme_dark_onSurface,
+            surfaceVariant = md_theme_dark_surfaceVariant,
+            onSurfaceVariant = md_theme_dark_onSurfaceVariant,
+            outline = md_theme_dark_outline,
+            inverseOnSurface = md_theme_dark_inverseOnSurface,
+            inverseSurface = md_theme_dark_inverseSurface,
+            inversePrimary = md_theme_dark_inversePrimary,
+            surfaceTint = md_theme_dark_surfaceTint,
+            outlineVariant = md_theme_dark_outlineVariant,
+            scrim = md_theme_dark_scrim
+        )
+    } else {
+        lightColorScheme(
+            primary = md_theme_light_primary,
+            onPrimary = md_theme_light_onPrimary,
+            primaryContainer = md_theme_light_primaryContainer,
+            onPrimaryContainer = md_theme_light_onPrimaryContainer,
+            secondary = md_theme_light_secondary,
+            onSecondary = md_theme_light_onSecondary,
+            secondaryContainer = md_theme_light_secondaryContainer,
+            onSecondaryContainer = md_theme_light_onSecondaryContainer,
+            tertiary = md_theme_light_tertiary,
+            onTertiary = md_theme_light_onTertiary,
+            tertiaryContainer = md_theme_light_tertiaryContainer,
+            onTertiaryContainer = md_theme_light_onTertiaryContainer,
+            error = md_theme_light_error,
+            errorContainer = md_theme_light_errorContainer,
+            onError = md_theme_light_onError,
+            onErrorContainer = md_theme_light_onErrorContainer,
+            background = md_theme_light_background,
+            onBackground = md_theme_light_onBackground,
+            surface = md_theme_light_surface,
+            onSurface = md_theme_light_onSurface,
+            surfaceVariant = md_theme_light_surfaceVariant,
+            onSurfaceVariant = md_theme_light_onSurfaceVariant,
+            outline = md_theme_light_outline,
+            inverseOnSurface = md_theme_light_inverseOnSurface,
+            inverseSurface = md_theme_light_inverseSurface,
+            inversePrimary = md_theme_light_inversePrimary,
+            surfaceTint = md_theme_light_surfaceTint,
+            outlineVariant = md_theme_light_outlineVariant,
+            scrim = md_theme_light_scrim
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
index 7d45c48f..e3e09f53 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/BlueTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/BlueTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
index 024c1042..19cebb58 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/GreenTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/GreenTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
index d7637112..36a0f03a 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/PinkTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/PinkTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
index 8db93d43..1c31f974 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/PurpleTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/PurpleTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
index 43d2261f..bc98c65c 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/RedTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/RedTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
similarity index 99%
rename from app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt
rename to app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
index 5d1e46ee..a601635d 100644
--- a/app/src/main/java/com/acclorite/books_history/ui/theme/YellowTheme.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/YellowTheme.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.ui.theme
+package ua.acclorite.book_story.ui.theme
 
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.darkColorScheme
diff --git a/app/src/main/java/com/acclorite/books_history/util/BookApplication.kt b/app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
similarity index 75%
rename from app/src/main/java/com/acclorite/books_history/util/BookApplication.kt
rename to app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
index efc2af1c..d203292c 100644
--- a/app/src/main/java/com/acclorite/books_history/util/BookApplication.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/BookApplication.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
diff --git a/app/src/main/java/com/acclorite/books_history/util/Constants.kt b/app/src/main/java/ua/acclorite/book_story/util/Constants.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/util/Constants.kt
rename to app/src/main/java/ua/acclorite/book_story/util/Constants.kt
index 755b6f59..7103c7dc 100644
--- a/app/src/main/java/com/acclorite/books_history/util/Constants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/Constants.kt
@@ -1,14 +1,14 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
-import com.acclorite.books_history.R
-import com.acclorite.books_history.domain.model.Book
-import com.acclorite.books_history.domain.model.Category
-import com.acclorite.books_history.domain.model.FontWithName
-import com.acclorite.books_history.ui.Theme
+import ua.acclorite.book_story.R
+import ua.acclorite.book_story.domain.model.Book
+import ua.acclorite.book_story.domain.model.Category
+import ua.acclorite.book_story.domain.model.FontWithName
+import ua.acclorite.book_story.ui.Theme
 
 object Constants {
 
@@ -39,11 +39,12 @@ object Constants {
     val THEMES = listOf(
         Pair(Theme.DYNAMIC, UIText.StringResource(R.string.dynamic_theme)),
         Pair(Theme.BLUE, UIText.StringResource(R.string.blue_theme)),
-        Pair(Theme.PURPLE, UIText.StringResource(R.string.purple_theme)),
         Pair(Theme.GREEN, UIText.StringResource(R.string.green_theme)),
+        Pair(Theme.RED, UIText.StringResource(R.string.red_theme)),
+        Pair(Theme.PURPLE, UIText.StringResource(R.string.purple_theme)),
         Pair(Theme.PINK, UIText.StringResource(R.string.pink_theme)),
         Pair(Theme.YELLOW, UIText.StringResource(R.string.yellow_theme)),
-        Pair(Theme.RED, UIText.StringResource(R.string.red_theme)),
+        Pair(Theme.AQUA, UIText.StringResource(R.string.aqua_theme)),
     )
 
     // Fonts for Reader
@@ -176,7 +177,7 @@ object Constants {
     )
 
     val EMPTY_BOOK = Book(
-        null,
+        0,
         "",
         UIText.StringValue(""),
         null,
diff --git a/app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
similarity index 95%
rename from app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt
rename to app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
index f5dd2f5c..d350dfac 100644
--- a/app/src/main/java/com/acclorite/books_history/util/DataStoreConstants.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/DataStoreConstants.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.intPreferencesKey
diff --git a/app/src/main/java/com/acclorite/books_history/util/Resource.kt b/app/src/main/java/ua/acclorite/book_story/util/Resource.kt
similarity index 87%
rename from app/src/main/java/com/acclorite/books_history/util/Resource.kt
rename to app/src/main/java/ua/acclorite/book_story/util/Resource.kt
index df48dacd..1edb7509 100644
--- a/app/src/main/java/com/acclorite/books_history/util/Resource.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/Resource.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 sealed class Resource<T>(val data: T? = null, val message: UIText? = null) {
     class Success<T>(data: T?) : Resource<T>(data)
diff --git a/app/src/main/java/com/acclorite/books_history/util/UIText.kt b/app/src/main/java/ua/acclorite/book_story/util/UIText.kt
similarity index 94%
rename from app/src/main/java/com/acclorite/books_history/util/UIText.kt
rename to app/src/main/java/ua/acclorite/book_story/util/UIText.kt
index c1717790..c859b54d 100644
--- a/app/src/main/java/com/acclorite/books_history/util/UIText.kt
+++ b/app/src/main/java/ua/acclorite/book_story/util/UIText.kt
@@ -1,4 +1,4 @@
-package com.acclorite.books_history.util
+package ua.acclorite.book_story.util
 
 import android.content.Context
 import androidx.annotation.StringRes
diff --git a/app/src/main/res/mipmap-anydpi-v26/app_icon.xml b/app/src/main/res/mipmap-anydpi/app_icon.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/app_icon.xml
rename to app/src/main/res/mipmap-anydpi/app_icon.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml b/app/src/main/res/mipmap-anydpi/app_icon_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/app_icon_round.xml
rename to app/src/main/res/mipmap-anydpi/app_icon_round.xml
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c7ca581f..6e172b27 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -17,6 +17,7 @@
     <string name="delete_books">Видалити книги?</string>
     <string name="delete_book">Видалити книгу?</string>
     <string name="move_book">Перемістити книгу?</string>
+    <string name="delete_history">Видалити історію читання?</string>
 
     <!-- Dialog Descriptions -->
     <string name="storage_permission_description">
@@ -43,6 +44,9 @@
         Виберіть категорію, в яку ви хочете перемістити цю книгу.
         Ця книга буде переміщена в обрану категорію.
     </string>
+    <string name="delete_history_description">
+        Це видалить всю історію з бази даних.
+    </string>
 
     <!-- Errors -->
     <string name="error_permission">
@@ -65,6 +69,10 @@
     <string name="library_empty">
         Читайте ваші улюблені книги та сортуйте їх між категоріями
     </string>
+    <string name="history_empty">
+        Нехай ваша остання прочитана книга відкриє перед
+        вами сторінки нової великої історії вашого читацького шляху
+    </string>
 
     <!-- Query strings -->
     <string name="selected_items_count_query">%1$s обрано</string>
@@ -87,10 +95,12 @@
     <string name="go_back">Назад</string>
     <string name="move_to_read">Перемістити цю книгу в \"Прочитано\"</string>
     <string name="back_to_library">Назад в Бібліотеку</string>
+    <string name="undo">Скасувати</string>
 
     <!-- Items -->
     <string name="files">файли</string>
     <string name="books">книги</string>
+    <string name="history">історію</string>
 
     <!-- Book -->
     <string name="unknown_author">Невідомий</string>
@@ -145,13 +155,14 @@
     <string name="font_style_normal">Нормальний</string>
 
     <!-- Themes -->
-    <string name="dynamic_theme">Хаос</string>
+    <string name="dynamic_theme">Меркурій</string>
     <string name="blue_theme">Нептун</string>
-    <string name="purple_theme">Супернова</string>
     <string name="green_theme">Земля</string>
-    <string name="pink_theme">Пульсар</string>
-    <string name="yellow_theme">Венера</string>
     <string name="red_theme">Марс</string>
+    <string name="purple_theme">Юпітер</string>
+    <string name="pink_theme">Сатурн</string>
+    <string name="yellow_theme">Венера</string>
+    <string name="aqua_theme">Уран</string>
 
     <!-- Toast messages -->
     <string name="press_again_toast">Натисніть ще раз, щоб вийти</string>
@@ -165,6 +176,10 @@
     <string name="book_deleted">Ця книга була успішно видалена.</string>
     <string name="book_moved">Ця книга була успішно переміщена.</string>
     <string name="copied">Скопійовано</string>
+    <string name="history_deleted">Історія була успішно видалена.</string>
+
+    <!-- Snackbar messages -->
+    <string name="history_element_deleted">Елемент історії був успішно видалений.</string>
 
     <!-- DropDown properties -->
     <string name="move_this_book">Перемістити</string>
@@ -189,4 +204,8 @@
     <!-- Font families -->
     <string name="default_font">За замовчуванням</string>
 
+    <!-- History -->
+    <string name="today">Сьогодні</string>
+    <string name="yesterday">Вчора</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 707607fb..d4206141 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!-- Basic Strings -->
-    <string name="app_version" translatable="false">0.6.0</string>
-    <string name="app_name">Book\'s History</string>
+    <string name="app_version" translatable="false">0.8.0</string>
+    <string name="app_name">Book\'s Story</string>
 
     <!-- Screens -->
     <string name="library_screen">Library</string>
@@ -18,6 +18,7 @@
     <string name="delete_books">Delete books?</string>
     <string name="delete_book">Delete book?</string>
     <string name="move_book">Move book?</string>
+    <string name="delete_history">Delete reading history?</string>
 
     <!-- Dialog Descriptions -->
     <string name="storage_permission_description">
@@ -44,6 +45,9 @@
         Choose the category to which you want to move this book.
         This book will be moved to the selected category.
     </string>
+    <string name="delete_history_description">
+        It will delete the whole history from the database.
+    </string>
 
     <!-- Errors -->
     <string name="error_permission">
@@ -66,6 +70,9 @@
     <string name="library_empty">
         Read your favorite books and sort them between categories
     </string>
+    <string name="history_empty">
+        Let your last book you read open the pages of a new great story of your reading journey
+    </string>
 
     <!-- Query strings -->
     <string name="selected_items_count_query">%1$s selected</string>
@@ -88,10 +95,12 @@
     <string name="go_back">Go back</string>
     <string name="move_to_read">Move this book to \"Already Read\"</string>
     <string name="back_to_library">Back to Library</string>
+    <string name="undo">Undo</string>
 
     <!-- Items -->
     <string name="files">files</string>
     <string name="books">books</string>
+    <string name="history">history</string>
 
     <!-- Book -->
     <string name="unknown_author">Unknown</string>
@@ -146,13 +155,14 @@
     <string name="font_style_normal">Normal</string>
 
     <!-- Themes -->
-    <string name="dynamic_theme">Chaos</string>
+    <string name="dynamic_theme">Mercury</string>
     <string name="blue_theme">Neptune</string>
-    <string name="purple_theme">Supernova</string>
     <string name="green_theme">Earth</string>
-    <string name="pink_theme">Pulsar</string>
-    <string name="yellow_theme">Venus</string>
     <string name="red_theme">Mars</string>
+    <string name="purple_theme">Jupiter</string>
+    <string name="pink_theme">Saturn</string>
+    <string name="yellow_theme">Venus</string>
+    <string name="aqua_theme">Uranus</string>
 
     <!-- Toast messages -->
     <string name="press_again_toast">Press back again to exit</string>
@@ -166,6 +176,10 @@
     <string name="book_deleted">This book was successfully deleted.</string>
     <string name="book_moved">This book was successfully moved.</string>
     <string name="copied">Copied</string>
+    <string name="history_deleted">History was successfully deleted.</string>
+
+    <!-- Snackbar messages -->
+    <string name="history_element_deleted">History element was successfully deleted.</string>
 
     <!-- DropDown properties -->
     <string name="move_this_book">Move</string>
@@ -190,4 +204,8 @@
     <!-- Font families -->
     <string name="default_font">Default</string>
 
+    <!-- History -->
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5882a10a..972f848f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.BooksHistoryResurrection" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="Theme.BooksHistoryResurrection" parent="Theme.AppCompat.NoActionBar">
         <item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>
 
         <item name="android:statusBarColor">@android:color/transparent</item>
diff --git a/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt b/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt
deleted file mode 100644
index 949d8f7a..00000000
--- a/app/src/test/java/com/acclorite/books_history/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.acclorite.books_history
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/app/strings.xml b/app/strings.xml
deleted file mode 100644
index 58cbc499..00000000
--- a/app/strings.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<resources>
-    <!-- Basic Strings -->
-    <string name="app_name">Історія Книги</string>
-
-    <!-- Screens -->
-    <string name="library_screen">Бібліотека</string>
-    <string name="history_screen">Історія</string>
-    <string name="browse_screen">Оглянути</string>
-    <string name="settings_screen">Налаштування</string>
-    <string name="about_screen">Про застосунок</string>
-    <string name="help_screen">Допомога</string>
-
-    <!-- Dialog Labels -->
-    <string name="storage_permission">Надати Дозвіл?</string>
-    <string name="add_books">Додати ці книги?</string>
-
-    <!-- Dialog Descriptions -->
-    <string name="storage_permission_description">
-        Нам потрібен дозвіл на сховище, щоб просканувати вашу теку Завантажень.
-        Без цього дозволу ви не зможете додати книгу.
-    </string>
-    <string name="add_books_description">
-        Ви можете вибрати книги, які хочете додати.
-        Ви зможете відредагувати Назву та Обкладинку книги пізніше.
-    </string>
-
-    <!-- Errors -->
-    <string name="error_permission">
-        Нам потрібен дозвіл на сховище, щоб просканувати вашу теку Завантажень та отримати книги
-    </string>
-
-    <!-- Is Empty messages -->
-    <string name="browse_empty">
-        Розширюйте книжковий арсенал бібліотеки своїми завантаженнями
-    </string>
-
-    <!-- Query strings -->
-    <string name="selected_items_count_query">%1$s обрано</string>
-    <string name="search_query">Знайти %1$s...</string>
-
-    <!-- Action Texts -->
-    <string name="cancel">Відмінити</string>
-    <string name="grant">Надати</string>
-    <string name="grant_permission">Надати дозвіл</string>
-    <string name="get_help">Мені потрібна допомога</string>
-    <string name="add">Додати</string>
-
-    <!-- Items -->
-    <string name="files">файли</string>
-
-    <!-- Book -->
-    <string name="unknown_author">Невідомий</string>
-
-    <!-- Tabs -->
-    <string name="reading_tab">Читаю</string>
-    <string name="already_read_tab">Прочитано</string>
-    <string name="planning_tab">Планую</string>
-    <string name="dropped_tab">Кинуто</string>
-
-    <!-- Settings categories -->
-    <string name="general_settings">Головні</string>
-    <string name="general_settings_desc">Мова застосунку</string>
-
-    <!-- Settings options -->
-    <string name="language_option">Мова застосунку</string>
-
-</resources>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3c5031eb..2e7e7ed8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+org.gradle.configuration-cache=true
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b921c451..5e9a413d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,6 +19,6 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "Book's History Resurrection"
+rootProject.name = "Book's Story"
 include(":app")
  
\ No newline at end of file