diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
index bdca7a8f..ddba7f06 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseLayout.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.browse.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class BrowseLayout {
     LIST, GRID
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
index c70f711e..c8bea349 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/model/BrowseSortOrder.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.browse.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class BrowseSortOrder {
     NAME,
     FILE_FORMAT,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
index 2a537798..41057832 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryLayout.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.library.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class LibraryLayout {
     GRID, LIST
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
index 3899deab..bd0e46ba 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibrarySortOrder.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.library.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class LibrarySortOrder {
     NAME,
     LAST_READ,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
index 7bfc2e72..0f3803f4 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/library/model/LibraryTitlePosition.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.library.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class LibraryTitlePosition {
     OFF, BELOW, INSIDE
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
index 9ac31ef9..69b73bc8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
@@ -119,12 +119,12 @@ class MainActivity : AppCompatActivity() {
                             else LibraryScreen,
                             transitionSpec = { lastEvent ->
                                 when (lastEvent) {
-                                    StackEvent.Default -> {
+                                    StackEvent.DEFAULT -> {
                                         Transitions.SlidingTransitionIn
                                             .togetherWith(Transitions.SlidingTransitionOut)
                                     }
 
-                                    StackEvent.Pop -> {
+                                    StackEvent.POP -> {
                                         Transitions.BackSlidingTransitionIn
                                             .togetherWith(Transitions.BackSlidingTransitionOut)
                                     }
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
index 0ad7d3ff..5a33b704 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/Navigator.kt
@@ -41,7 +41,7 @@ class Navigator @AssistedInject constructor(
         initialValue = initialScreen
     )
 
-    val lastEvent = savedStateHandle.getStateFlow("stack_event", StackEvent.Default)
+    val lastEvent = savedStateHandle.getStateFlow("stack_event", StackEvent.DEFAULT)
     private fun changeStackEvent(stackEvent: StackEvent) {
         savedStateHandle["stack_event"] = stackEvent
     }
@@ -56,8 +56,8 @@ class Navigator @AssistedInject constructor(
         if (!saveInBackStack) items.removeLast()
 
         changeStackEvent(
-            if (popping) StackEvent.Pop
-            else StackEvent.Default
+            if (popping) StackEvent.POP
+            else StackEvent.DEFAULT
         )
 
         if (lastItem.value::class == targetScreen::class) items.removeLast()
@@ -67,8 +67,8 @@ class Navigator @AssistedInject constructor(
     fun pop(popping: Boolean = true) {
         if (items.value.count() > 1) {
             changeStackEvent(
-                if (popping) StackEvent.Pop
-                else StackEvent.Default
+                if (popping) StackEvent.POP
+                else StackEvent.DEFAULT
             )
             items.removeLast()
         }
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
index 7f4bead0..e6d8a5ce 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/navigator/StackEvent.kt
@@ -7,11 +7,9 @@
 package ua.acclorite.book_story.presentation.navigator
 
 import android.os.Parcelable
-import androidx.compose.runtime.Immutable
 import kotlinx.parcelize.Parcelize
 
-@Immutable
 @Parcelize
 enum class StackEvent : Parcelable {
-    Default, Pop
+    DEFAULT, POP
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
index 49914677..4c3f85d8 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderColorEffects.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.reader.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class ReaderColorEffects {
     OFF,
     GRAYSCALE,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
index c7e0667c..f677452a 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderFontThickness.kt
@@ -6,10 +6,8 @@
 
 package ua.acclorite.book_story.presentation.reader.model
 
-import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.font.FontWeight
 
-@Immutable
 enum class ReaderFontThickness(val thickness: FontWeight) {
     THIN(FontWeight.Thin),
     EXTRA_LIGHT(FontWeight.ExtraLight),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
index 6364781d..868ff6fa 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderHorizontalGesture.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.reader.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class ReaderHorizontalGesture {
     OFF,
     ON,
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
index 30256b2e..e63184b9 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderProgressCount.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.presentation.reader.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class ReaderProgressCount {
     PERCENTAGE,
     QUANTITY
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
index 4ed6f5c9..d311b898 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderScreenOrientation.kt
@@ -7,9 +7,7 @@
 package ua.acclorite.book_story.presentation.reader.model
 
 import android.content.pm.ActivityInfo
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class ReaderScreenOrientation(val code: Int) {
     DEFAULT(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED),
     FREE(ActivityInfo.SCREEN_ORIENTATION_USER),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
index e201ee95..f617318b 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/reader/model/ReaderTextAlignment.kt
@@ -6,10 +6,8 @@
 
 package ua.acclorite.book_story.presentation.reader.model
 
-import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.style.TextAlign
 
-@Immutable
 enum class ReaderTextAlignment(val textAlignment: TextAlign) {
     START(TextAlign.Start),
     JUSTIFY(TextAlign.Justify),
diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
index 5e171b25..0b06fc96 100644
--- a/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
+++ b/app/src/main/java/ua/acclorite/book_story/presentation/start/StartScreen.kt
@@ -56,7 +56,7 @@ object StartScreen : Screen, Parcelable {
         val activity = LocalActivity.current
 
         val currentPage = remember { mutableIntStateOf(0) }
-        val stackEvent = remember { mutableStateOf(StackEvent.Default) }
+        val stackEvent = remember { mutableStateOf(StackEvent.DEFAULT) }
 
         val languages = remember(settings.language.value) {
             CoreData.languages.sortedBy { it.second }.map {
@@ -79,14 +79,14 @@ object StartScreen : Screen, Parcelable {
                     return@StartContent
                 }
 
-                stackEvent.value = StackEvent.Default
+                stackEvent.value = StackEvent.DEFAULT
                 currentPage.intValue += 1
             },
             navigateBack = {
                 if ((currentPage.intValue - 1) < 0) {
                     activity.finish()
                 } else {
-                    stackEvent.value = StackEvent.Pop
+                    stackEvent.value = StackEvent.POP
                     currentPage.intValue -= 1
                 }
             },
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
index fb43203d..2a2d967d 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Direction.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.ui.common.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class Direction {
     START, NEUTRAL, END
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
index b5968a23..86edc647 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/common/model/Position.kt
@@ -6,9 +6,7 @@
 
 package ua.acclorite.book_story.ui.common.model
 
-import androidx.compose.runtime.Immutable
 
-@Immutable
 enum class Position {
     TOP, CENTER, BOTTOM, SOLO
 }
\ No newline at end of file
diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
index d7647555..2de3e6a6 100644
--- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
+++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
@@ -28,12 +28,12 @@ fun StartContentTransition(
         targetState = targetValue,
         transitionSpec = {
             when (stackEvent) {
-                StackEvent.Default -> {
+                StackEvent.DEFAULT -> {
                     Transitions.SlidingTransitionIn
                         .togetherWith(Transitions.SlidingTransitionOut)
                 }
 
-                StackEvent.Pop -> {
+                StackEvent.POP -> {
                     Transitions.BackSlidingTransitionIn
                         .togetherWith(Transitions.BackSlidingTransitionOut)
                 }