diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts
index b509820..c9e9be5 100644
--- a/mobile/build.gradle.kts
+++ b/mobile/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "ru.omni_devel.cards"
         minSdk = 30
         targetSdk = 36
-        versionCode = 60 // 0 at end for mobile
-        versionName = "2.1.1"
+        versionCode = 70 // 0 at end for mobile
+        versionName = "2.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
index be2918c..17aec13 100644
--- a/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
+++ b/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt
@@ -33,6 +33,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -82,9 +83,9 @@ fun CardEditable(
     color: String?,
     onColorChange: (String?) -> Unit
 ) {
-    var isCodeTypeDropdownExpanded by remember { mutableStateOf(false) }
-    var isColorPickerExpanded by remember { mutableStateOf(false) }
-    var isColorEnabled by remember { mutableStateOf(color != null) }
+    var isCodeTypeDropdownExpanded by rememberSaveable { mutableStateOf(false) }
+    var isColorPickerExpanded by rememberSaveable { mutableStateOf(false) }
+    var isColorEnabled by rememberSaveable { mutableStateOf(color != null) }
 
     val colorPickerController = rememberColorPickerController()
 
@@ -210,10 +211,10 @@ fun CardEditable(
 
 @Composable
 fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
-    var cardName by remember { mutableStateOf("") }
-    var codeValue by remember { mutableStateOf("") }
-    var codeType by remember { mutableStateOf(BarcodeFormat.QR_CODE) }
-    var color by remember { mutableStateOf<String?>(null) }
+    var cardName by rememberSaveable { mutableStateOf("") }
+    var codeValue by rememberSaveable { mutableStateOf("") }
+    var codeType by rememberSaveable { mutableStateOf(BarcodeFormat.QR_CODE) }
+    var color by rememberSaveable { mutableStateOf<String?>(null) }
 
     val context = LocalActivity.current
 
@@ -257,10 +258,10 @@ fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
 
 @Composable
 fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> DbHelper) {
-    var cardName by remember { mutableStateOf(cardInfo.name) }
-    var codeValue by remember { mutableStateOf(cardInfo.codeValue) }
-    var codeType by remember { mutableStateOf(cardInfo.codeType) }
-    var color by remember { mutableStateOf(cardInfo.color) }
+    var cardName by rememberSaveable { mutableStateOf(cardInfo.name) }
+    var codeValue by rememberSaveable { mutableStateOf(cardInfo.codeValue) }
+    var codeType by rememberSaveable { mutableStateOf(cardInfo.codeType) }
+    var color by rememberSaveable { mutableStateOf(cardInfo.color) }
 
     val context = LocalActivity.current