From 7abb2d9c08b41e4419ba8a1c5d1cf1762a95c251 Mon Sep 17 00:00:00 2001
From: AmadeyKuspakov <SteveDrumble1@gmail.com>
Date: Mon, 31 Jul 2023 02:46:20 +0400
Subject: [PATCH 1/3] Addition of night mode

---
 app/src/main/AndroidManifest.xml              |   2 -
 .../main/java/jp/co/soramitsu/sora/SoraApp.kt |   6 +
 .../splash/presentation/SplashActivity.kt     |  33 +++-
 app/src/main/res/layout/activity_splash.xml   |   4 +-
 .../soramitsu/common/base/SoraBaseFragment.kt |  13 +-
 .../common/domain/DarkThemeManager.kt         | 164 ++++++++++++++++++
 .../compose/components/CheckboxButton.kt      |   1 +
 .../compose/components/DetailsItem.kt         |   2 +
 .../presentation/compose/components/Option.kt |   2 +-
 .../compose/components/OptionSwitch.kt        |   1 +
 .../presentation/compose/theme/SoraTheme.kt   |   5 +-
 .../uikit/organisms/PagerTextIndicator.kt     |  11 +-
 .../presentation/compose/webview/WebView.kt   |  11 +-
 .../presentation/view/SoraBaseActivity.kt     |  25 ++-
 common/src/main/res/values-night/styles.xml   |  18 +-
 common/src/main/res/values/styles.xml         |   1 +
 .../assetdetails/AssetDetailsBalanceCard.kt   |   3 +
 .../AssetDetailsTokenPriceCard.kt             |   1 +
 .../compose/assetdetails/AssetIdCard.kt       |   1 +
 .../compose/assetdetails/XorBalancesDialog.kt |   3 +
 .../presentation/screen/TxHistoryListItem.kt  |  11 +-
 .../screen/TxHistoryListScreen.kt             |   6 +-
 .../presentation/MainActivity.kt              |   4 +
 .../inappupdate/FlexibleUpdateDialog.kt       |  13 +-
 .../presentation/pincode/PincodeScreen.kt     |   1 +
 .../profile/appsettings/AppSettingsScreen.kt  |   4 +-
 .../appsettings/AppSettingsViewModel.kt       |  28 ++-
 .../profile/debugmenu/DebugMenuFragment.kt    |  37 +++-
 .../profile/debugmenu/DebugMenuScreen.kt      |   3 +
 .../src/main/res/layout/activity_main.xml     |   2 +-
 .../presentation/OnboardingActivity.kt        |   8 +-
 .../presentation/OnboardingViewModel.kt       |   4 +-
 .../backup_password/BackupPasswordScreen.kt   |   1 +
 .../create_account/CreateAccountScreen.kt     |   1 +
 .../enter_passphrase/EnterPassphraseScreen.kt |   1 +
 .../account_details/AccountDetailsFragment.kt |   2 +
 .../account_list/AccountWithIcon.kt           |   1 +
 .../export_account/backup/BackupScreen.kt     |   3 +
 .../backup/MnemonicWordsColumn.kt             |   3 +
 .../backup/json/BackupJsonScreen.kt           |   1 +
 .../ImportAccountPasswordScreen.kt            |   2 +
 .../ImportAccountSuccessScreen.kt             |   1 +
 .../MnemonicConfirmationScreen.kt             |   3 +
 .../presentation/tutorial/TutorialScreen.kt   |  15 ++
 .../compose/LiquidityAddConfirmScreen.kt      |   2 +
 .../compose/LiquidityRemoveConfirmScreen.kt   |   2 +
 .../components/compose/SwapAmountSquare.kt    |   1 +
 .../components/compose/SwapConfirmScreen.kt   |   2 +
 .../components/compose/SwapMarketsScreen.kt   |   2 +
 .../liquidityadd/LiquidityAddFragment.kt      |  11 +-
 .../LiquidityRemoveFragment.kt                |  11 +-
 .../pooldetails/PoolDetailsFragment.kt        |   9 +-
 .../presentation/screens/swap/SwapFragment.kt |   9 +-
 .../presentation/ReferralBondUnbondXor.kt     |   4 +
 .../presentation/ReferrerFilled.kt            |   2 +
 .../presentation/ReferrerInput.kt             |   1 +
 .../presentation/YourReferralsCard.kt         |   6 +
 .../screens/ReferralWelcomePage.kt            |   3 +
 .../get/card/GetSoraCardScreen.kt             |   7 +-
 .../presentation/buycrypto/BuyCryptoScreen.kt |  12 +-
 .../presentation/claim/ClaimScreen.kt         |   3 +
 61 files changed, 498 insertions(+), 51 deletions(-)
 create mode 100644 common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ce02f1617..1402d7d34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,6 @@
         <activity
             android:name=".splash.presentation.SplashActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/SplashTheme"
             android:exported="true">
 
             <intent-filter>
@@ -55,7 +54,6 @@
 
         <activity
             android:name="jp.co.soramitsu.feature_assets_impl.presentation.screens.scan.QRCodeScannerActivity"
-            android:theme="@style/SplashTheme"
             android:exported="false"/>
 
         <meta-data
diff --git a/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt b/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt
index d195da90c..e47d18462 100644
--- a/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt
+++ b/app/src/main/java/jp/co/soramitsu/sora/SoraApp.kt
@@ -41,6 +41,7 @@ import coil.decode.SvgDecoder
 import com.google.firebase.FirebaseApp
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.domain.OptionsProvider
 import jp.co.soramitsu.common.io.FileManager
 import jp.co.soramitsu.common.resourses.ResourceManager
@@ -68,6 +69,9 @@ open class SoraApp : Application(), Configuration.Provider, ImageLoaderFactory {
     @Inject
     lateinit var workerFactory: HiltWorkerFactory
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     override fun newImageLoader(): ImageLoader {
         val loader = ImageLoader.Builder(this).components {
             add(svg)
@@ -91,6 +95,8 @@ open class SoraApp : Application(), Configuration.Provider, ImageLoaderFactory {
         OptionsProvider.CURRENT_VERSION_CODE = BuildConfig.VERSION_CODE
         OptionsProvider.CURRENT_VERSION_NAME = BuildConfig.VERSION_NAME
         OptionsProvider.APPLICATION_ID = BuildConfig.APPLICATION_ID
+
+        darkThemeManager.updateUiModeFromCache()
     }
 
     private fun initLogger() {
diff --git a/app/src/main/java/jp/co/soramitsu/sora/splash/presentation/SplashActivity.kt b/app/src/main/java/jp/co/soramitsu/sora/splash/presentation/SplashActivity.kt
index 4212639fb..68688702a 100644
--- a/app/src/main/java/jp/co/soramitsu/sora/splash/presentation/SplashActivity.kt
+++ b/app/src/main/java/jp/co/soramitsu/sora/splash/presentation/SplashActivity.kt
@@ -33,12 +33,18 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.sora.splash.presentation
 
 import android.animation.ValueAnimator
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
 import android.os.Bundle
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import com.airbnb.lottie.LottieProperty
+import com.airbnb.lottie.model.KeyPath
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
+import jp.co.soramitsu.common.R
+import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.feature_main_api.launcher.MainStarter
 import jp.co.soramitsu.feature_multiaccount_api.MultiaccountStarter
 import jp.co.soramitsu.sora.databinding.ActivitySplashBinding
@@ -78,7 +84,27 @@ class SplashActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(ActivitySplashBinding.inflate(layoutInflater).also { viewBinding = it }.root)
 
-        viewBinding.animationView.addAnimatorUpdateListener(animatorUpdateListener)
+        val currentPageColorTypedValue = getColorFromAttrs(R.attr.baseBackground)
+
+        viewBinding.animationView.apply {
+            addValueCallback(
+                KeyPath(
+                    LOTTIE_WILDCARD_GLOBSTAR,
+                    WAVE_ANIMATION_RINGS_PATH,
+                    LOTTIE_WILDCARD_GLOBSTAR,
+                ),
+                LottieProperty.COLOR_FILTER
+            ) {
+                PorterDuffColorFilter(
+                    currentPageColorTypedValue.data,
+                    PorterDuff.Mode.MULTIPLY
+                )
+            }
+
+            addAnimatorUpdateListener(
+                animatorUpdateListener
+            )
+        }
 
         splashViewModel.runtimeInitiated.observe(
             this
@@ -116,4 +142,9 @@ class SplashActivity : AppCompatActivity() {
         viewBinding.animationView.removeUpdateListener(animatorUpdateListener)
         splashViewModel.nextScreen()
     }
+
+    private companion object {
+        const val LOTTIE_WILDCARD_GLOBSTAR = "*"
+        const val WAVE_ANIMATION_RINGS_PATH = "Ellipse 1"
+    }
 }
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index d58327678..1fb6fe874 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -5,7 +5,7 @@
     android:id="@+id/splashContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/neu_color_100">
+    android:background="?attr/baseBackground">
 
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/animation_view"
@@ -27,7 +27,7 @@
         android:visibility="gone"
         android:textStyle="bold"
         android:fontFamily="@font/sora_bold"
-        android:textColor="@color/neu_black_default"
+        android:textColor="?attr/secondaryBackground"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt b/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt
index 0f250e601..850150ec3 100644
--- a/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/base/SoraBaseFragment.kt
@@ -49,6 +49,8 @@ import androidx.compose.material.SnackbarResult
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -66,6 +68,7 @@ import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import javax.inject.Inject
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.domain.BarsColorhandler
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.presentation.compose.components.AlertDialogContent
 import jp.co.soramitsu.common.presentation.compose.components.Toolbar
 import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
@@ -85,6 +88,9 @@ abstract class SoraBaseFragment<T : BaseViewModel> : Fragment() {
     @Inject
     lateinit var debounceClickHandler: DebounceClickHandler
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     override fun onResume() {
         super.onResume()
         activity?.safeCast<BarsColorhandler>()?.setColor(backgroundColor())
@@ -98,7 +104,12 @@ abstract class SoraBaseFragment<T : BaseViewModel> : Fragment() {
     ): View? {
         return ComposeView(requireContext()).apply {
             setContent {
-                SoraAppTheme {
+                val isDarkModeOn: State<Boolean> =
+                    darkThemeManager.darkModeStatusFlow.collectAsState()
+
+                SoraAppTheme(
+                    darkTheme = isDarkModeOn.value
+                ) {
                     val scaffoldState = rememberScaffoldState()
                     val scrollState = rememberScrollState()
                     val coroutineScope = rememberCoroutineScope()
diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt b/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt
new file mode 100644
index 000000000..c7c9ba92a
--- /dev/null
+++ b/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt
@@ -0,0 +1,164 @@
+package jp.co.soramitsu.common.domain
+
+import android.content.Context
+import android.content.res.Configuration
+import androidx.appcompat.app.AppCompatDelegate
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+import jp.co.soramitsu.common.data.SoraPreferences
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.mapLatest
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+
+@Singleton
+@OptIn(ExperimentalCoroutinesApi::class)
+class DarkThemeManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val coroutineManager: CoroutineManager,
+    private val soraPreferences: SoraPreferences,
+) {
+
+    private data class DarkModeSettings(
+        val isSystemDrivenUiEnabled: Boolean,
+        val isDarkModeEnabled: Boolean
+    )
+
+    private val mutableDarkThemeSharedFlow = MutableSharedFlow<DarkModeSettings>(
+        replay = 1,
+        extraBufferCapacity = 0,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+
+    /**
+     * [darkModeStatusFlow] is used to read saved state of dark mode preferences off of SoraPreferences
+     * and align these results with Application Configuration
+     *
+     * Hot StateFlow is used to share the same state of UI mode between screens, and avoid unnecessary
+     * theme switches
+     */
+    val darkModeStatusFlow: StateFlow<Boolean> = mutableDarkThemeSharedFlow
+        .mapLatest { darkModeSettings ->
+            with(darkModeSettings) {
+                return@mapLatest if (isSystemDrivenUiEnabled) {
+                    /*
+                        Resources.Configuration.uiMode as opposed to AppCompatDelegate.getDefaultNightMode()
+                        is set to Configuration.UI_MODE_NIGHT_YES when system dark mode is enabled
+                        (e.g. extreme battery settings on, or system dark mode is enabled)
+                     */
+                    val currentAppUiMode = context.resources.configuration.uiMode
+                        .and(Configuration.UI_MODE_NIGHT_MASK)
+
+                    if (currentAppUiMode == Configuration.UI_MODE_NIGHT_YES)
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                    else
+                        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+
+                    AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
+                } else {
+                    /*
+                        On the other hand, AppCompatDelegate controls dark theme in scope of
+                        our application
+                     */
+                    val currentAppUiMode = AppCompatDelegate.getDefaultNightMode()
+
+                    when {
+                        currentAppUiMode == AppCompatDelegate.MODE_NIGHT_YES && isDarkModeEnabled -> {
+                            /*
+                                Saved state matches system configuration;
+                                no need to change anything
+                             */
+                            true
+                        }
+                        currentAppUiMode == AppCompatDelegate.MODE_NIGHT_NO && !isDarkModeEnabled -> {
+                            /*
+                                Saved state matches system configuration;
+                                no need to change anything
+                             */
+                            false
+                        }
+                        else -> {
+                            /*
+                                Something went wrong, saved state is different from system config;
+                                might happen due to start of the whole application (vs. moving between screens),
+                                while user system is set to light mode
+                             */
+
+                            val newUiMode = if (isDarkModeEnabled)
+                                AppCompatDelegate.MODE_NIGHT_YES else
+                                AppCompatDelegate.MODE_NIGHT_NO
+
+                            AppCompatDelegate.setDefaultNightMode(newUiMode)
+
+                            AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
+                        }
+                    }
+                }
+            }
+        }.flowOn(coroutineManager.main.immediate).stateIn(
+            scope = coroutineManager.applicationScope,
+            started = SharingStarted.Eagerly, // Eager mode is used to apply changes as soon as possible
+            initialValue = AppCompatDelegate.getDefaultNightMode()
+                .equals(AppCompatDelegate.MODE_NIGHT_YES)
+        )
+
+    fun updateUiModeFromCache() {
+        coroutineManager.applicationScope.launch {
+            mutableDarkThemeSharedFlow.emit(
+                value = DarkModeSettings(
+                    isSystemDrivenUiEnabled = soraPreferences.getBoolean(
+                        field = KEY_SYSTEM_DRIVEN_UI_ENABLED,
+                        defaultValue = false
+                    ),
+                    isDarkModeEnabled = soraPreferences.getBoolean(
+                        field = KEY_DARK_THEME_ENABLED,
+                        defaultValue = false
+                    )
+                )
+            )
+        }
+    }
+
+    suspend fun setDarkThemeEnabled(isEnabled: Boolean) {
+        val newDarkModeValue = soraPreferences.run {
+            putBoolean(KEY_SYSTEM_DRIVEN_UI_ENABLED, false) // deactivate this, if the other is chosen
+            putBoolean(KEY_DARK_THEME_ENABLED, isEnabled)
+            getBoolean(KEY_DARK_THEME_ENABLED, false) // double check, in case it didn't get saved
+        }
+
+        // update listeners with new value
+        mutableDarkThemeSharedFlow.emit(
+            value = DarkModeSettings(
+                isSystemDrivenUiEnabled = false,
+                isDarkModeEnabled = newDarkModeValue
+            )
+        )
+    }
+
+    suspend fun setSystemDrivenUiEnabled(isEnabled: Boolean) {
+        val newDarkModeValue = soraPreferences.run {
+            putBoolean(KEY_DARK_THEME_ENABLED, false) // deactivate this, if the other is chosen
+            putBoolean(KEY_SYSTEM_DRIVEN_UI_ENABLED, isEnabled)
+            getBoolean(KEY_SYSTEM_DRIVEN_UI_ENABLED, false) // double check, in case it didn't get saved
+        }
+
+        // update listeners with new value
+        mutableDarkThemeSharedFlow.emit(
+            value = DarkModeSettings(
+                isSystemDrivenUiEnabled = newDarkModeValue,
+                isDarkModeEnabled = false
+            )
+        )
+    }
+
+    private companion object {
+        const val KEY_DARK_THEME_ENABLED = "KEY_DARK_THEME_ENABLED"
+        const val KEY_SYSTEM_DRIVEN_UI_ENABLED = "KEY_SYSTEM_DRIVEN_UI_ENABLED"
+    }
+}
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/CheckboxButton.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/CheckboxButton.kt
index a7277dfa8..4c53f6238 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/CheckboxButton.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/CheckboxButton.kt
@@ -88,6 +88,7 @@ fun CheckboxButton(
                 .weight(1f)
                 .padding(start = Dimens.x2),
             style = MaterialTheme.customTypography.paragraphS,
+            color = MaterialTheme.customColors.fgPrimary,
             text = text
         )
     }
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/DetailsItem.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/DetailsItem.kt
index 9dd1a242e..ce8e322aa 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/DetailsItem.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/DetailsItem.kt
@@ -96,12 +96,14 @@ fun DetailsItem(
                 title = {
                     Text(
                         text = text,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.textSBold
                     )
                 },
                 text = {
                     Text(
                         text = hint,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.paragraphSBold
                     )
                 },
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Option.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Option.kt
index 24e9a54ab..7a307c04a 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Option.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/Option.kt
@@ -69,7 +69,7 @@ fun Option(
     bottomDivider: Boolean,
     @DrawableRes iconEnd: Int = R.drawable.ic_chevron_right_24,
     tint: Boolean = true,
-    textColor: Color = Color.Unspecified,
+    textColor: Color = MaterialTheme.customColors.fgPrimary,
     enabled: Boolean = true,
     onClick: () -> Unit
 ) {
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/OptionSwitch.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/OptionSwitch.kt
index 414b8425e..687f0e54a 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/OptionSwitch.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/components/OptionSwitch.kt
@@ -99,6 +99,7 @@ fun OptionSwitch(
             ) {
                 Text(
                     text = label,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.textM,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt
index f56d9b62e..2e3b08e2c 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/theme/SoraTheme.kt
@@ -69,7 +69,7 @@ private val LightColors = androidx.compose.material.lightColors(
     onBackground = ThemeColors.Background
 )
 
-private val DarkColors = androidx.compose.material.lightColors(
+private val DarkColors = androidx.compose.material.darkColors(
     primary = ThemeColorsDark.Primary,
     onPrimary = ThemeColorsDark.OnPrimary,
     secondary = ThemeColorsDark.Secondary,
@@ -85,9 +85,8 @@ fun SoraAppTheme(
 ) {
     AppTheme(
         darkTheme = darkTheme,
-        // todo fix
         lightColors = soraLightColors,
-        darkColors = soraLightColors,
+        darkColors = soraDarkColors,
         typography = soraTypography,
         borderRadius = soraBorderRadius,
         content = content
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/PagerTextIndicator.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/PagerTextIndicator.kt
index c0b7ebe50..f19184761 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/PagerTextIndicator.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/uikit/organisms/PagerTextIndicator.kt
@@ -52,7 +52,6 @@ import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.boundsInParent
 import androidx.compose.ui.layout.onPlaced
 import androidx.compose.ui.platform.LocalLayoutDirection
@@ -63,6 +62,7 @@ import jp.co.soramitsu.common.presentation.compose.extension.noRippleClickable
 import jp.co.soramitsu.common.presentation.compose.uikit.tokens.Text
 import jp.co.soramitsu.common.presentation.compose.uikit.tokens.retrieveString
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 import kotlin.math.abs
 
@@ -80,6 +80,11 @@ fun PagerTextIndicator(
 
     val layoutDirection = LocalLayoutDirection.current
 
+    val surfaceColor = MaterialTheme.customColors.bgSurfaceInverted
+
+    val selectedItemTextColor = MaterialTheme.customColors.fgInverted
+    val notSelectedItemTextColor = MaterialTheme.customColors.fgPrimary
+
     Row(
         modifier = modifier
             .drawWithCache {
@@ -118,7 +123,7 @@ fun PagerTextIndicator(
                         val sectorHeight = size.height
 
                         drawRoundRect(
-                            color = Color.Black,
+                            color = surfaceColor,
                             topLeft = Offset(sectorOffsetXLerp, sectorOffsetY),
                             size = Size(sectorWidthLerp, sectorHeight),
                             cornerRadius = cornerRadius
@@ -142,7 +147,7 @@ fun PagerTextIndicator(
                 text = indicatorsArray[index].retrieveString(),
                 style = MaterialTheme.customTypography.textSBold,
                 color = if (index == currentPageRetriever())
-                    Color.White else Color.Black,
+                    selectedItemTextColor else notSelectedItemTextColor,
             )
         }
     }
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebView.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebView.kt
index c2d071862..b325148ce 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebView.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/compose/webview/WebView.kt
@@ -34,13 +34,16 @@ package jp.co.soramitsu.common.presentation.compose.webview
 
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.viewinterop.AndroidView
 import jp.co.soramitsu.common.base.ProgressDialog
+import jp.co.soramitsu.ui_core.theme.customColors
 
 @Composable
 fun WebView(
@@ -48,11 +51,15 @@ fun WebView(
     onPageFinished: () -> Unit
 ) {
     Box(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .background(color = MaterialTheme.customColors.bgPage)
+            .fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
         AndroidView(
-            modifier = Modifier.fillMaxSize(),
+            modifier = Modifier
+                .background(color = MaterialTheme.customColors.bgSurface)
+                .fillMaxSize(),
             factory = { context ->
                 WebView(context).apply {
                     webViewClient = object : WebViewClient() {
diff --git a/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraBaseActivity.kt b/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraBaseActivity.kt
index ae6122d3e..924f84168 100644
--- a/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraBaseActivity.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/presentation/view/SoraBaseActivity.kt
@@ -50,28 +50,41 @@ import androidx.compose.material.Scaffold
 import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import javax.inject.Inject
 import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.base.AlertDialogData
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.presentation.compose.components.AlertDialogContent
 import jp.co.soramitsu.common.presentation.compose.components.Toolbar
 import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
+import jp.co.soramitsu.common.util.ext.attrColor
 import jp.co.soramitsu.ui_core.theme.customColors
 
 abstract class SoraBaseActivity<T : BaseViewModel> : AppCompatActivity() {
 
     abstract val viewModel: T
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
-            SoraAppTheme {
+            val isDarkModeOn: State<Boolean> =
+                darkThemeManager.darkModeStatusFlow.collectAsState()
+
+            SoraAppTheme(
+                darkTheme = isDarkModeOn.value
+            ) {
                 val scaffoldState = rememberScaffoldState()
                 val scrollState = rememberScrollState()
                 val openAlertDialog = remember { mutableStateOf(AlertDialogData()) }
@@ -120,7 +133,7 @@ abstract class SoraBaseActivity<T : BaseViewModel> : AppCompatActivity() {
                             .statusBarsPadding()
                             .imePadding(),
                         scaffoldState = scaffoldState,
-                        backgroundColor = MaterialTheme.customColors.fgPrimary.copy(alpha = 0f),
+                        backgroundColor = MaterialTheme.customColors.bgPage.copy(alpha = 0f),
                         topBar = {
                             Toolbar(
                                 toolbarState = viewModel.toolbarState.observeAsState().value,
@@ -146,8 +159,16 @@ abstract class SoraBaseActivity<T : BaseViewModel> : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        window.statusBarColor = attrColor(backgroundColor())
+        window.navigationBarColor = attrColor(backgroundColor())
+    }
+
     abstract fun onToolbarNavigation()
 
+    open fun backgroundColor() = R.attr.baseBackground
+
     @Composable
     abstract fun Content(padding: PaddingValues, scrollState: ScrollState)
 }
diff --git a/common/src/main/res/values-night/styles.xml b/common/src/main/res/values-night/styles.xml
index c2153b995..8e73a84a9 100644
--- a/common/src/main/res/values-night/styles.xml
+++ b/common/src/main/res/values-night/styles.xml
@@ -25,7 +25,7 @@
         <item name="contentSecondary">@color/grey_700</item>
         <item name="contentTertiary">@color/grey_500</item>
         <item name="contentQuaternary">@color/grey_400</item>
-        <item name="baseBackground">@color/neu_color_300</item>
+        <item name="baseBackground">#FF070707</item>
         <item name="baseBackgroundSecond">@color/neu_color_white</item>
         <item name="baseBackgroundDark">@color/backgroundDarkColor</item>
         <item name="baseBorderPrimary">@color/grey_300</item>
@@ -43,12 +43,12 @@
         <item name="disabledButtonTextColor">@color/neu_disabled_text_grey</item>
         <item name="disabledButtonTextColor2">@color/neu_disabled_text_grey_2</item>
 
-        <item name="secondaryBackground">@color/grey_100</item>
+        <item name="secondaryBackground">@color/grey_900</item>
         <item name="secondaryHover">@color/hoverSecondaryColor</item>
         <item name="secondaryPressed">@color/pressedSecondaryColor</item>
         <item name="secondaryFocused">@color/focusedSecondaryColor</item>
 
-        <item name="polkaswapBackground">@color/polkaswap_background_alfa</item>
+        <item name="polkaswapBackground">#FF070707</item>
         <item name="polkaswapMainColor">@color/neu_brand_polkaswap</item>
         <item name="dividerColor">@color/neu_divider_color</item>
         <item name="balanceColorDefault">@color/neu_black_default</item>
@@ -70,7 +70,7 @@
         <item name="statusColor">@color/neu_status</item>
         <item name="statusWarningColor">@color/neu_status_warning_day</item>
         <item name="pureBlackOnDay">@color/neu_color_black</item>
-        <item name="pureWhiteOnDay">@color/neu_color_white</item>
+        <item name="pureWhiteOnDay">@color/neu_color_black</item>
         <item name="pureRedOnDay">@color/neu_color_red</item>
         <item name="statusPinkWarning">@color/neu_status_pink_warning_day</item>
         <item name="colorOnGrey">@color/neu_color_grey_100</item>
@@ -80,7 +80,7 @@
         <item name="iconTintColorPositive">@color/neu_positive</item>
         <item name="iconTintColorNegative">@color/neu_selected_primary</item>
         <item name="iconTintAboveBackground">@color/tint_above_background</item>
-        <item name="redesignTokenName">#281818</item>
+        <item name="redesignTokenName">#FFFCFCFC</item>
         <item name="redesignTokenBalance">#9d8181</item>
 
         <item name="uikit_pinCodeButtonTitleColor">@color/neu_disabled_on_night</item>
@@ -88,4 +88,12 @@
         <item name="uikit_pinCodeButtonBackground">@drawable/rounded_button_background</item>
     </style>
 
+    <style name="AppTheme.Onboarding">
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="baseBackground">#FF070707</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
index d01982639..fc8c3667f 100644
--- a/common/src/main/res/values/styles.xml
+++ b/common/src/main/res/values/styles.xml
@@ -93,6 +93,7 @@
         <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="baseBackground">@color/neu_color_300</item>
     </style>
 
     <style name="BottomSheetDialog" parent="Theme.MaterialComponents.BottomSheetDialog">
diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt
index 68ed0bc1f..8b0b116ff 100644
--- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt
+++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsBalanceCard.kt
@@ -105,10 +105,12 @@ internal fun AssetDetailsBalanceCard(
                 ) {
                     Text(
                         text = stringResource(id = R.string.asset_details_liquid_balance),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.headline2
                     )
                     Text(
                         text = amountFiat,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.headline2
                     )
                 }
@@ -148,6 +150,7 @@ internal fun AssetDetailsBalanceCard(
                         }
                         Text(
                             text = frozenAmountFiat,
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.headline2
                         )
                     }
diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsTokenPriceCard.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsTokenPriceCard.kt
index 48e784c98..c628d5d1c 100644
--- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsTokenPriceCard.kt
+++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetDetailsTokenPriceCard.kt
@@ -99,6 +99,7 @@ internal fun AssetDetailsTokenPriceCard(
                 Spacer(modifier = Modifier.height(Dimens.x1))
                 Text(
                     modifier = Modifier.wrapContentSize(),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.headline1,
                     textAlign = TextAlign.Center,
                     text = tokenName,
diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetIdCard.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetIdCard.kt
index 707b6a63c..e9a168990 100644
--- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetIdCard.kt
+++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/AssetIdCard.kt
@@ -72,6 +72,7 @@ internal fun AssetIdCard(
             )
             Text(
                 text = id,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphXS
             )
         }
diff --git a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/XorBalancesDialog.kt b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/XorBalancesDialog.kt
index 22ebfdf5a..18d295e76 100644
--- a/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/XorBalancesDialog.kt
+++ b/feature_assets_impl/src/main/java/jp/co/soramitsu/feature_assets_impl/presentation/components/compose/assetdetails/XorBalancesDialog.kt
@@ -82,6 +82,7 @@ internal fun XorBalancesDialog(
                     Row {
                         Text(
                             text = stringResource(id = R.string.details_frozen),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.headline2
                         )
                         Icon(
@@ -97,6 +98,7 @@ internal fun XorBalancesDialog(
                     Text(
                         text = state.frozen,
                         textAlign = TextAlign.End,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.headline2
                     )
                 }
@@ -174,6 +176,7 @@ private fun BalanceItem(title: String, amount: String, amountFiat: String) {
         Text(
             text = amount,
             textAlign = TextAlign.End,
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textM
         )
     }
diff --git a/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListItem.kt b/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListItem.kt
index 9b94ec7aa..91f5b21c9 100644
--- a/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListItem.kt
+++ b/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListItem.kt
@@ -72,6 +72,7 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventLiquidityAddUiModel -> {
             EventLiquidity(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel
             )
@@ -79,6 +80,7 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventLiquiditySwapUiModel -> {
             EventSwap(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel
             )
@@ -86,6 +88,7 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventReferralProgramUiModel -> {
             EventReferral(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel
             )
@@ -93,6 +96,7 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventTransferInUiModel -> {
             EventTransferReceived(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel
             )
@@ -100,6 +104,7 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventTransferOutUiModel -> {
             EventTransferSent(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel
             )
@@ -107,12 +112,16 @@ fun TxHistoryListItem(
         is EventUiModel.EventTxUiModel.EventEthTransfer -> {
             EventEthTransfer(
                 modifier = modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .clickable { onTxHistoryItemClick(eventUiModel.txHash) },
                 eventUiModel = eventUiModel,
             )
         }
         EventUiModel.EventUiLoading -> {
-            CircularProgressIndicator(modifier = Modifier.size(Size.Small))
+            CircularProgressIndicator(
+                modifier = Modifier.size(Size.Small),
+                color = MaterialTheme.customColors.accentPrimary
+            )
         }
     }
 }
diff --git a/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListScreen.kt b/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListScreen.kt
index 0d9e856e1..2ac455184 100644
--- a/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListScreen.kt
+++ b/feature_blockexplorer_api/src/main/java/jp/co/soramitsu/feature_blockexplorer_api/presentation/screen/TxHistoryListScreen.kt
@@ -123,6 +123,7 @@ private fun TxHistoryScreen(
 
             Column(
                 modifier = Modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
@@ -155,6 +156,7 @@ private fun TxHistoryScreen(
         HistoryState.Loading -> {
             Box(
                 modifier = Modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .fillMaxSize(),
                 contentAlignment = Alignment.Center
             ) {
@@ -167,6 +169,7 @@ private fun TxHistoryScreen(
         HistoryState.NoData -> {
             Box(
                 modifier = Modifier
+                    .background(color = MaterialTheme.customColors.bgSurface)
                     .fillMaxSize()
                     .padding(horizontal = Dimens.x6),
                 contentAlignment = Alignment.Center
@@ -194,6 +197,7 @@ private fun TxHistoryList(
     LazyColumn(
         state = listState,
         modifier = Modifier
+            .background(color = MaterialTheme.customColors.bgSurface)
             .fillMaxSize(),
     ) {
         listItems.forEach { event ->
@@ -226,9 +230,9 @@ private fun EventUiModelItem(
 ) {
     Spacer(
         modifier = Modifier
+            .background(MaterialTheme.customColors.bgSurface)
             .fillMaxWidth()
             .height(Dimens.x1)
-            .background(MaterialTheme.customColors.bgSurface)
     )
     TxHistoryListItem(
         modifier = modifier,
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainActivity.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainActivity.kt
index 5cc413804..1d71335f1 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainActivity.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/MainActivity.kt
@@ -60,6 +60,7 @@ import java.util.Date
 import javax.inject.Inject
 import jp.co.soramitsu.common.domain.BarsColorhandler
 import jp.co.soramitsu.common.domain.BottomBarController
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.inappupdate.InAppUpdateManager
 import jp.co.soramitsu.common.presentation.view.ToolbarActivity
 import jp.co.soramitsu.common.util.DebounceClickHandler
@@ -153,6 +154,9 @@ class MainActivity :
     @Inject
     lateinit var debounceClickHandler: DebounceClickHandler
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     private var timeInBackground: Date? = null
 
     private var navController: NavController? = null
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/inappupdate/FlexibleUpdateDialog.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/inappupdate/FlexibleUpdateDialog.kt
index 25837167f..5d016ef8d 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/inappupdate/FlexibleUpdateDialog.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/inappupdate/FlexibleUpdateDialog.kt
@@ -36,9 +36,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import javax.inject.Inject
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.presentation.compose.theme.SoraAppTheme
 
 class FlexibleUpdateDialog : Fragment() {
@@ -47,6 +50,9 @@ class FlexibleUpdateDialog : Fragment() {
         const val UPDATE_REPLY = "update_reply"
     }
 
+    @Inject
+    lateinit var darkThemeManager: DarkThemeManager
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -54,7 +60,12 @@ class FlexibleUpdateDialog : Fragment() {
     ): View {
         return ComposeView(requireContext()).apply {
             setContent {
-                SoraAppTheme {
+                val isDarkThemeOn =
+                    darkThemeManager.darkModeStatusFlow.collectAsState()
+
+                SoraAppTheme(
+                    darkTheme = isDarkThemeOn.value
+                ) {
                     InAppUpdateScreen(
                         onUpdate = {
                             findNavController().run {
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/pincode/PincodeScreen.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/pincode/PincodeScreen.kt
index 57541486e..cb3acb125 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/pincode/PincodeScreen.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/pincode/PincodeScreen.kt
@@ -90,6 +90,7 @@ internal fun PincodeScreen(
                     modifier = Modifier.padding(bottom = Dimens.x2),
                     textAlign = TextAlign.Center,
                     text = pinCodeScreenState.toolbarTitleString,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.headline2
                 )
 
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsScreen.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsScreen.kt
index 8856d9247..4af3c48f6 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsScreen.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsScreen.kt
@@ -68,7 +68,7 @@ internal fun AppSettingsScreen(
                 icon = null,
                 label = stringResource(id = R.string.system_appearance),
                 bottomDivider = false,
-                available = false,
+                available = true,
                 checked = checkedSystem,
                 onClick = onSystemToggle,
             )
@@ -76,7 +76,7 @@ internal fun AppSettingsScreen(
                 icon = null,
                 label = stringResource(id = R.string.dark_mode),
                 bottomDivider = false,
-                available = false,
+                available = true,
                 checked = checkedDark,
                 onClick = onDarkToggle,
             )
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsViewModel.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsViewModel.kt
index 0592f7c63..2d470fffc 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsViewModel.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/appsettings/AppSettingsViewModel.kt
@@ -35,16 +35,22 @@ package jp.co.soramitsu.feature_main_impl.presentation.profile.appsettings
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import jp.co.soramitsu.common.R
+import jp.co.soramitsu.common.domain.DarkThemeManager
 import jp.co.soramitsu.common.presentation.compose.components.initSmallTitle2
 import jp.co.soramitsu.common.presentation.viewmodel.BaseViewModel
 import jp.co.soramitsu.feature_main_api.launcher.MainRouter
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 
 @HiltViewModel
 class AppSettingsViewModel @Inject constructor(
     private val mainRouter: MainRouter,
+    private val darkThemeManager: DarkThemeManager
 ) : BaseViewModel() {
 
     internal var state by mutableStateOf(
@@ -59,6 +65,10 @@ class AppSettingsViewModel @Inject constructor(
         _toolbarState.value = initSmallTitle2(
             title = R.string.settings_header_app,
         )
+
+        darkThemeManager.darkModeStatusFlow.onEach { isSwitchEnabled ->
+            state = state.copy(darkModeChecked = isSwitchEnabled)
+        }.launchIn(viewModelScope)
     }
 
     fun onLanguageClick() {
@@ -66,10 +76,24 @@ class AppSettingsViewModel @Inject constructor(
     }
 
     fun toggleSystemAppearance(checked: Boolean) {
-        state = state.copy(systemAppearanceChecked = checked)
+        viewModelScope.launch {
+            tryCatch { darkThemeManager.setSystemDrivenUiEnabled(checked) }
+        }.invokeOnCompletion {
+            state = state.copy(
+                systemAppearanceChecked = checked,
+                darkModeChecked = false // check DarkThemeManager.setDarkThemeEnabled
+            )
+        }
     }
 
     fun toggleDarkMode(checked: Boolean) {
-        state = state.copy(darkModeChecked = checked)
+        viewModelScope.launch {
+            tryCatch { darkThemeManager.setDarkThemeEnabled(checked) }
+        }.invokeOnCompletion {
+            state = state.copy(
+                systemAppearanceChecked = false, // check DarkThemeManager.setDarkThemeEnabled
+                darkModeChecked = checked
+            )
+        }
     }
 }
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuFragment.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuFragment.kt
index 290366b9c..346f5ca9f 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuFragment.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuFragment.kt
@@ -46,6 +46,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material.Button
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.remember
@@ -63,6 +64,7 @@ import jp.co.soramitsu.common.domain.ResponseCode
 import jp.co.soramitsu.common.domain.SoraException
 import jp.co.soramitsu.common.util.ext.getOsName
 import jp.co.soramitsu.common.util.ext.getSize
+import jp.co.soramitsu.ui_core.theme.customColors
 
 @AndroidEntryPoint
 class DebugMenuFragment : SoraBaseFragment<DebugMenuViewModel>() {
@@ -103,17 +105,35 @@ class DebugMenuFragment : SoraBaseFragment<DebugMenuViewModel>() {
             val pushEnabled =
                 (pushState != null) && (pushState.size > 0) && ((pushState[0].state == WorkInfo.State.RUNNING) || (pushState[0].state == WorkInfo.State.ENQUEUED))
             Column(modifier = Modifier.fillMaxSize()) {
-                Text(text = "%s %.3f".format("Density", dm?.first ?: 0.0))
-                Text(text = "%s %d".format("Width", dm?.second ?: 0.0))
-                Text(text = "%s %d".format("Height", dm?.third ?: 0.0))
-                Text(text = activity?.getOsName().orEmpty())
+                Text(
+                    color = MaterialTheme.customColors.fgPrimary,
+                    text = "%s %.3f".format("Density", dm?.first ?: 0.0)
+                )
+                Text(
+                    color = MaterialTheme.customColors.fgPrimary,
+                    text = "%s %d".format("Width", dm?.second ?: 0.0)
+                )
+                Text(
+                    color = MaterialTheme.customColors.fgPrimary,
+                    text = "%s %d".format("Height", dm?.third ?: 0.0)
+                )
+                Text(
+                    color = MaterialTheme.customColors.fgPrimary,
+                    text = activity?.getOsName().orEmpty()
+                )
                 Button(onClick = {
                     viewModel.onChangeGoogleAccount(launcher)
                 }) {
-                    Text(text = "Change google account")
+                    Text(
+                        color = MaterialTheme.customColors.fgPrimary,
+                        text = "Change google account"
+                    )
                 }
                 Button(onClick = viewModel::onResetRuntimeClick) {
-                    Text(text = "Reset runtime")
+                    Text(
+                        color = MaterialTheme.customColors.fgPrimary,
+                        text = "Reset runtime"
+                    )
                 }
                 Button(
                     modifier = Modifier
@@ -127,7 +147,10 @@ class DebugMenuFragment : SoraBaseFragment<DebugMenuViewModel>() {
                         }
                     },
                     content = {
-                        Text(text = if (pushEnabled) "Disable" else "Enable")
+                        Text(
+                            color = MaterialTheme.customColors.fgPrimary,
+                            text = if (pushEnabled) "Disable" else "Enable"
+                        )
                     }
                 )
                 DebugMenuScreen(state = viewModel.state)
diff --git a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuScreen.kt b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuScreen.kt
index 58e2c84c5..6f0c626fe 100644
--- a/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuScreen.kt
+++ b/feature_main_impl/src/main/java/jp/co/soramitsu/feature_main_impl/presentation/profile/debugmenu/DebugMenuScreen.kt
@@ -49,6 +49,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import jp.co.soramitsu.ui_core.component.card.ContentCard
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @Composable
@@ -74,6 +75,7 @@ internal fun DebugMenuScreen(
                 ) {
                     Text(
                         text = item.name,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.textM,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
@@ -83,6 +85,7 @@ internal fun DebugMenuScreen(
                     )
                     Text(
                         text = item.value,
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.textM,
                         maxLines = 1,
                         overflow = TextOverflow.Ellipsis,
diff --git a/feature_main_impl/src/main/res/layout/activity_main.xml b/feature_main_impl/src/main/res/layout/activity_main.xml
index 37e7898c2..8d50d944f 100644
--- a/feature_main_impl/src/main/res/layout/activity_main.xml
+++ b/feature_main_impl/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
     android:id="@+id/clMainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/brand_white">
+    android:background="?attr/baseBackground">
 
     <FrameLayout
         android:id="@+id/flContainer"
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingActivity.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingActivity.kt
index 714914354..9c59bd23a 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingActivity.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingActivity.kt
@@ -158,12 +158,14 @@ class OnboardingActivity : SoraBaseActivity<OnboardingViewModel>() {
                     title = {
                         Text(
                             text = stringResource(id = R.string.import_account_not_backed_up),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.textSBold
                         )
                     },
                     text = {
                         Text(
                             text = stringResource(id = R.string.import_account_not_backed_up_alert_description),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.paragraphSBold
                         )
                     },
@@ -184,6 +186,7 @@ class OnboardingActivity : SoraBaseActivity<OnboardingViewModel>() {
                             onClick = viewModel::skipDialogDismiss
                         ) {
                             Text(
+                                color = MaterialTheme.customColors.fgPrimary,
                                 text = stringResource(id = R.string.common_cancel),
                             )
                         }
@@ -235,7 +238,10 @@ class OnboardingActivity : SoraBaseActivity<OnboardingViewModel>() {
                             }
                         )
 
-                        MaterialDialog(dialogState = dialogState) {
+                        MaterialDialog(
+                            backgroundColor = MaterialTheme.customColors.bgSurface,
+                            dialogState = dialogState
+                        ) {
                             title(text = stringResource(id = R.string.recovery_source_type))
                             listItems(
                                 listOf(
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
index cc581096a..f1075f74d 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
@@ -474,7 +474,7 @@ class OnboardingViewModel @Inject constructor(
 
     fun onRecoveryClicked(navController: NavController, index: Int) {
         _recoveryState.value = when (index) {
-            1 -> {
+            0 -> {
                 isValidMethod = multiaccountInteractor::isMnemonicValid
                 recoverSoraAccountMethod = multiaccountInteractor::recoverSoraAccountFromMnemonic
                 errorMessageCode = ResponseCode.MNEMONIC_IS_NOT_VALID
@@ -488,7 +488,7 @@ class OnboardingViewModel @Inject constructor(
                 )
             }
 
-            2 -> {
+            1 -> {
                 isValidMethod = multiaccountInteractor::isRawSeedValid
                 recoverSoraAccountMethod = multiaccountInteractor::recoverSoraAccountFromRawSeed
                 errorMessageCode = ResponseCode.RAW_SEED_IS_NOT_VALID
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt
index 4ad15bd5d..dbb3f52fa 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/backup_password/BackupPasswordScreen.kt
@@ -86,6 +86,7 @@ fun BackupPasswordScreen(
                 modifier = Modifier
                     .fillMaxWidth(),
                 text = stringResource(id = R.string.backup_password_title_2),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/create_account/CreateAccountScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/create_account/CreateAccountScreen.kt
index db4c141a1..859fc6ac3 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/create_account/CreateAccountScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/create_account/CreateAccountScreen.kt
@@ -81,6 +81,7 @@ fun CreateAccountScreen(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x3),
                 text = stringResource(id = R.string.onboarding_create_account_description),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/enter_passphrase/EnterPassphraseScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/enter_passphrase/EnterPassphraseScreen.kt
index dcb1870b9..3c21259c9 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/enter_passphrase/EnterPassphraseScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/enter_passphrase/EnterPassphraseScreen.kt
@@ -83,6 +83,7 @@ fun EnterPassphraseScreen(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x3),
                 text = stringResource(id = recoveryState.title),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_details/AccountDetailsFragment.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_details/AccountDetailsFragment.kt
index 6c5e8fa9a..4182a2a6c 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_details/AccountDetailsFragment.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_details/AccountDetailsFragment.kt
@@ -107,12 +107,14 @@ class AccountDetailsFragment : SoraBaseFragment<AccountDetailsViewModel>() {
                         title = {
                             Text(
                                 text = stringResource(id = R.string.delete_backup_alert_title),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.textSBold
                             )
                         },
                         text = {
                             Text(
                                 text = stringResource(id = R.string.delete_backup_alert_description),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.paragraphSBold
                             )
                         },
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_list/AccountWithIcon.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_list/AccountWithIcon.kt
index 0fa86b3cd..0ef2b35b4 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_list/AccountWithIcon.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/account_list/AccountWithIcon.kt
@@ -106,6 +106,7 @@ private fun AccountWithIcon(
                 text = accountName,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textM,
             )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/BackupScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/BackupScreen.kt
index 3a0b5c682..0a685b4e0 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/BackupScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/BackupScreen.kt
@@ -59,6 +59,7 @@ import jp.co.soramitsu.ui_core.component.button.properties.Order
 import jp.co.soramitsu.ui_core.component.button.properties.Size
 import jp.co.soramitsu.ui_core.component.card.ContentCard
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @Composable
@@ -82,6 +83,7 @@ internal fun BackupScreen(
                     .wrapContentHeight()
                     .fillMaxWidth(),
                 text = stringResource(id = R.string.mnemonic_text),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
@@ -97,6 +99,7 @@ internal fun BackupScreen(
                         end = Dimens.x4
                     ),
                     text = state.seedString,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphMBold,
                     textAlign = TextAlign.Center
                 )
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/MnemonicWordsColumn.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/MnemonicWordsColumn.kt
index 6ed7b427e..588701710 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/MnemonicWordsColumn.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/MnemonicWordsColumn.kt
@@ -42,6 +42,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.constraintlayout.compose.ConstraintLayout
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @Composable
@@ -61,6 +62,7 @@ internal fun MnemonicWordsColumn(
                     start.linkTo(parent.start)
                 },
                 text = (startNumber + index).toString(),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textL
             )
         }
@@ -78,6 +80,7 @@ internal fun MnemonicWordsColumn(
                     start.linkTo(barrier)
                 },
                 text = s,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textLBold
             )
         }
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/json/BackupJsonScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/json/BackupJsonScreen.kt
index 2e7830cd4..3b80ca0f8 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/json/BackupJsonScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/export_account/backup/json/BackupJsonScreen.kt
@@ -84,6 +84,7 @@ internal fun BackupJsonScreen(
         ) {
             Text(
                 text = stringResource(R.string.export_json_description),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
             Spacer(modifier = Modifier.size(Dimens.x3))
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt
index 0581154a2..e141c3a8c 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_password/ImportAccountPasswordScreen.kt
@@ -94,6 +94,7 @@ fun ImportAccountPasswordScreen(
                         bottom = Dimens.x3
                     ),
                 text = stringResource(id = R.string.enter_password_description),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM
             )
             importAccountScreenState.selectedAccount?.let {
@@ -171,6 +172,7 @@ fun AccountWithIcon(
                 text = accountName,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textS,
             )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_success/ImportAccountSuccessScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_success/ImportAccountSuccessScreen.kt
index a1944d9ab..cbf3011e6 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_success/ImportAccountSuccessScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/import_account_list/import_account_success/ImportAccountSuccessScreen.kt
@@ -77,6 +77,7 @@ fun ImportAccountSuccessScreen(
                 modifier = Modifier
                     .padding(Dimens.x3),
                 text = stringResource(id = R.string.succesfully_imported_account_title),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.headline2,
                 textAlign = TextAlign.Center
             )
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/mnemonic_confirmation/MnemonicConfirmationScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/mnemonic_confirmation/MnemonicConfirmationScreen.kt
index e47b32779..7c824d066 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/mnemonic_confirmation/MnemonicConfirmationScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/mnemonic_confirmation/MnemonicConfirmationScreen.kt
@@ -78,6 +78,7 @@ fun MnemonicConfirmationScreen(
                     modifier = Modifier
                         .padding(bottom = Dimens.x2),
                     text = stringResource(id = R.string.mnemonic_confirmation_select_word_number),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphM,
                 )
 
@@ -85,6 +86,7 @@ fun MnemonicConfirmationScreen(
                     modifier = Modifier
                         .padding(bottom = Dimens.x2),
                     text = mnemonicConfirmationState.currentWordIndex.toString(),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphXSBold.copy(
                         fontSize = 128.sp
                     ),
@@ -94,6 +96,7 @@ fun MnemonicConfirmationScreen(
                     modifier = Modifier
                         .padding(bottom = Dimens.x2),
                     text = stringResource(id = R.string.mnemonic_confirmation_select_word_2),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphM,
                 )
 
diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/tutorial/TutorialScreen.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/tutorial/TutorialScreen.kt
index 8a454f1f6..2327ec5db 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/tutorial/TutorialScreen.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/tutorial/TutorialScreen.kt
@@ -126,6 +126,7 @@ internal fun TutorialScreen(
                     text = stringResource(id = R.string.tutorial_many_world_desc),
                     textAlign = TextAlign.Center,
                     style = MaterialTheme.customTypography.paragraphS,
+                    color = MaterialTheme.customColors.fgPrimary,
                 )
 
                 TutorialButtons(
@@ -140,6 +141,13 @@ internal fun TutorialScreen(
                     val startingString =
                         stringResource(id = R.string.tutorial_terms_and_conditions_template_1) + "\n"
                     append(startingString)
+                    addStyle(
+                        style = SpanStyle(
+                            color = MaterialTheme.customColors.fgPrimary,
+                            textDecoration = TextDecoration.None
+                        ),
+                        start = 0, end = startingString.length
+                    )
 
                     val termsWord = stringResource(id = R.string.tutorial_terms_and_conditions_3)
                     val startIndex = startingString.length
@@ -163,6 +171,13 @@ internal fun TutorialScreen(
 
                     val andWord = " ${stringResource(id = R.string.common_and)} "
                     append(andWord)
+                    addStyle(
+                        style = SpanStyle(
+                            color = MaterialTheme.customColors.fgPrimary,
+                            textDecoration = TextDecoration.None
+                        ),
+                        start = endIndex, end = endIndex + andWord.length
+                    )
 
                     val privacyWord = stringResource(id = R.string.tutorial_privacy_policy)
                     val privacyWordStartIndex =
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityAddConfirmScreen.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityAddConfirmScreen.kt
index 3e230222f..cd784462b 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityAddConfirmScreen.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityAddConfirmScreen.kt
@@ -143,6 +143,7 @@ internal fun LiquidityAddConfirmScreen(
                         .wrapContentHeight(),
                     textAlign = TextAlign.Center,
                     text = state.confirm.text,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphS,
                 )
                 Divider(color = Color.Transparent, modifier = Modifier.height(Dimens.x2))
@@ -240,6 +241,7 @@ internal fun LiquidityAddConfirmScreen(
                             modifier = Modifier.wrapContentSize(),
                             textAlign = TextAlign.Center,
                             text = stringResource(id = if (state.confirm.confirmResult == true) R.string.wallet_transaction_submitted_1 else R.string.wallet_transaction_rejected),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.paragraphSBold,
                         )
                     }
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityRemoveConfirmScreen.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityRemoveConfirmScreen.kt
index 2d23a9733..96f7b9bbe 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityRemoveConfirmScreen.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/LiquidityRemoveConfirmScreen.kt
@@ -142,6 +142,7 @@ internal fun LiquidityRemoveConfirmScreen(
                         .wrapContentHeight(),
                     textAlign = TextAlign.Center,
                     text = state.confirm.text,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphS,
                 )
                 Divider(color = Color.Transparent, modifier = Modifier.height(Dimens.x2))
@@ -237,6 +238,7 @@ internal fun LiquidityRemoveConfirmScreen(
                             modifier = Modifier.wrapContentSize(),
                             textAlign = TextAlign.Center,
                             text = stringResource(id = if (state.confirm.confirmResult == true) R.string.wallet_transaction_submitted_1 else R.string.wallet_transaction_rejected),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.paragraphSBold,
                         )
                     }
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapAmountSquare.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapAmountSquare.kt
index 21afd130e..de4b651a9 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapAmountSquare.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapAmountSquare.kt
@@ -86,6 +86,7 @@ internal fun SwapAmountSquare(
                 text = amount,
                 textAlign = TextAlign.Center,
                 maxLines = 1,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.displayS,
             )
             Text(
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapConfirmScreen.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapConfirmScreen.kt
index f11e86447..e2ca2d20e 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapConfirmScreen.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapConfirmScreen.kt
@@ -144,6 +144,7 @@ internal fun SwapConfirmScreen(
                         .wrapContentHeight(),
                     textAlign = TextAlign.Center,
                     text = state.confirmText,
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphS,
                 )
                 Divider(color = Color.Transparent, modifier = Modifier.height(Dimens.x2))
@@ -233,6 +234,7 @@ internal fun SwapConfirmScreen(
                             modifier = Modifier.wrapContentSize(),
                             textAlign = TextAlign.Center,
                             text = stringResource(id = if (state.confirmResult == true) R.string.wallet_transaction_submitted_1 else R.string.wallet_transaction_rejected),
+                            color = MaterialTheme.customColors.fgPrimary,
                             style = MaterialTheme.customTypography.paragraphSBold,
                         )
                     }
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapMarketsScreen.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapMarketsScreen.kt
index bd001e542..c8c2e3f5b 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapMarketsScreen.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/components/compose/SwapMarketsScreen.kt
@@ -120,12 +120,14 @@ private fun MarketScreenItem(
                 title = {
                     Text(
                         text = stringResource(id = market.titleResource),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.textSBold
                     )
                 },
                 text = {
                     Text(
                         text = stringResource(id = market.descriptionResource),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.paragraphSBold
                     )
                 },
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddFragment.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddFragment.kt
index 7c6c41241..304f86ee2 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddFragment.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityadd/LiquidityAddFragment.kt
@@ -46,7 +46,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavGraphBuilder
@@ -58,11 +57,13 @@ import jp.co.soramitsu.common.R
 import jp.co.soramitsu.common.base.SoraBaseFragment
 import jp.co.soramitsu.common.domain.BottomBarController
 import jp.co.soramitsu.common.presentation.compose.components.PercentContainer
+import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearchTokenScreen
 import jp.co.soramitsu.core_di.viewmodel.CustomViewModelFactory
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.LiquidityAddConfirmScreen
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.LiquidityAddScreen
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.screens.swap.SwapSlippageScreen
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
@@ -96,7 +97,11 @@ class LiquidityAddFragment : SoraBaseFragment<LiquidityAddViewModel>() {
     }
 
     @Composable
-    override fun backgroundColorComposable() = colorResource(id = R.color.polkaswap_background_alfa)
+    override fun backgroundColorComposable() = Color(
+        color = requireContext().getColorFromAttrs(
+            R.attr.polkaswapBackground
+        ).data
+    )
 
     override fun backgroundColor(): Int = R.attr.polkaswapBackground
 
@@ -164,12 +169,14 @@ class LiquidityAddFragment : SoraBaseFragment<LiquidityAddViewModel>() {
                         title = {
                             Text(
                                 text = stringResource(id = R.string.common_supply),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.textSBold
                             )
                         },
                         text = {
                             Text(
                                 text = stringResource(id = R.string.add_liquidity_alert_text),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.paragraphSBold
                             )
                         },
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveFragment.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveFragment.kt
index 06aced9c8..74f6cda77 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveFragment.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/liquidityremove/LiquidityRemoveFragment.kt
@@ -46,7 +46,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.stringResource
 import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
@@ -60,10 +59,12 @@ import jp.co.soramitsu.common.base.SoraBaseFragment
 import jp.co.soramitsu.common.domain.BottomBarController
 import jp.co.soramitsu.common.presentation.compose.components.PercentContainer
 import jp.co.soramitsu.common.util.StringPair
+import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.core_di.viewmodel.CustomViewModelFactory
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.LiquidityRemoveConfirmScreen
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.LiquidityRemoveScreen
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.screens.swap.SwapSlippageScreen
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @AndroidEntryPoint
@@ -89,7 +90,11 @@ class LiquidityRemoveFragment : SoraBaseFragment<LiquidityRemoveViewModel>() {
     }
 
     @Composable
-    override fun backgroundColorComposable() = colorResource(id = R.color.polkaswap_background_alfa)
+    override fun backgroundColorComposable() = Color(
+        color = requireContext().getColorFromAttrs(
+            R.attr.polkaswapBackground
+        ).data
+    )
 
     override fun backgroundColor(): Int = R.attr.polkaswapBackground
 
@@ -132,12 +137,14 @@ class LiquidityRemoveFragment : SoraBaseFragment<LiquidityRemoveViewModel>() {
                         title = {
                             Text(
                                 text = stringResource(id = R.string.remove_liquidity_title),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.textSBold
                             )
                         },
                         text = {
                             Text(
                                 text = stringResource(id = R.string.remove_liquidity_info_text),
+                                color = MaterialTheme.customColors.fgPrimary,
                                 style = MaterialTheme.customTypography.paragraphSBold
                             )
                         },
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt
index 6611b5b26..3fed8af5a 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/pooldetails/PoolDetailsFragment.kt
@@ -42,7 +42,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.graphics.Color
 import androidx.core.os.bundleOf
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavGraphBuilder
@@ -55,6 +55,7 @@ import jp.co.soramitsu.common.base.SoraBaseFragment
 import jp.co.soramitsu.common.base.theOnlyRoute
 import jp.co.soramitsu.common.domain.BottomBarController
 import jp.co.soramitsu.common.util.StringPair
+import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.core_di.viewmodel.CustomViewModelFactory
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.PoolDetailsScreen
 import jp.co.soramitsu.ui_core.resources.Dimens
@@ -82,7 +83,11 @@ class PoolDetailsFragment : SoraBaseFragment<PoolDetailsViewModel>() {
     }
 
     @Composable
-    override fun backgroundColorComposable() = colorResource(id = R.color.polkaswap_background_alfa)
+    override fun backgroundColorComposable() = Color(
+        color = requireContext().getColorFromAttrs(
+            R.attr.polkaswapBackground
+        ).data
+    )
 
     override fun backgroundColor(): Int = R.attr.polkaswapBackground
 
diff --git a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapFragment.kt b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapFragment.kt
index cab8c8b6d..723ba5d5f 100644
--- a/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapFragment.kt
+++ b/feature_polkaswap_impl/src/main/java/jp/co/soramitsu/feature_polkaswap_impl/presentation/screens/swap/SwapFragment.kt
@@ -43,7 +43,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.graphics.Color
 import androidx.fragment.app.viewModels
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
@@ -59,6 +59,7 @@ import jp.co.soramitsu.common.presentation.args.tokenFromId
 import jp.co.soramitsu.common.presentation.args.tokenToId
 import jp.co.soramitsu.common.presentation.compose.components.PercentContainer
 import jp.co.soramitsu.common.presentation.compose.components.PolkaswapDisclaimer
+import jp.co.soramitsu.common.util.ext.getColorFromAttrs
 import jp.co.soramitsu.common_wallet.presentation.compose.components.SelectSearchTokenScreen
 import jp.co.soramitsu.core_di.viewmodel.CustomViewModelFactory
 import jp.co.soramitsu.feature_polkaswap_impl.presentation.components.compose.SwapConfirmScreen
@@ -91,7 +92,11 @@ class SwapFragment : SoraBaseFragment<SwapViewModel>() {
     }
 
     @Composable
-    override fun backgroundColorComposable() = colorResource(id = R.color.polkaswap_background_alfa)
+    override fun backgroundColorComposable() = Color(
+        color = requireContext().getColorFromAttrs(
+            R.attr.polkaswapBackground
+        ).data
+    )
 
     override fun backgroundColor(): Int = R.attr.polkaswapBackground
 
diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralBondUnbondXor.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralBondUnbondXor.kt
index 551c5c137..0b3452720 100644
--- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralBondUnbondXor.kt
+++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferralBondUnbondXor.kt
@@ -96,6 +96,7 @@ fun ReferralBondXor(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x2),
                 text = stringResource(id = R.string.referral_input_reward_title),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.headline2,
             )
 
@@ -107,6 +108,7 @@ fun ReferralBondXor(
                     id = R.string.referral_input_reward_description,
                     common.referrerFee
                 ),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
@@ -184,6 +186,7 @@ fun ReferralUnbondXor(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x2),
                 text = stringResource(id = R.string.referral_unbond_title),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.headline2,
             )
 
@@ -195,6 +198,7 @@ fun ReferralUnbondXor(
                     id = R.string.referral_unbond_description,
                     common.referrerFee
                 ),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerFilled.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerFilled.kt
index 1adee4111..255ce9f7f 100644
--- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerFilled.kt
+++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerFilled.kt
@@ -71,6 +71,7 @@ fun ReferrerFilled(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x3),
                 text = stringResource(id = R.string.referral_referrer_description),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
@@ -88,6 +89,7 @@ fun ReferrerFilled(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x3),
                 text = state.referrer.orEmpty(),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textXS,
             )
 
diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerInput.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerInput.kt
index 5c7570183..17987ce77 100644
--- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerInput.kt
+++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/ReferrerInput.kt
@@ -83,6 +83,7 @@ fun ReferrerInput(
                     .fillMaxWidth()
                     .padding(bottom = Dimens.x3),
                 text = stringResource(id = R.string.referral_referrer_description),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM,
             )
 
diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/YourReferralsCard.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/YourReferralsCard.kt
index 21f18fd8d..e19f4f5b8 100644
--- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/YourReferralsCard.kt
+++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/YourReferralsCard.kt
@@ -110,6 +110,7 @@ private fun ReferralsCardHeader(
         Text(
             text = stringResource(id = R.string.referral_your_referrals),
             textAlign = TextAlign.Start,
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.headline2
         )
         Image(
@@ -124,6 +125,7 @@ private fun ReferralsCardHeader(
             text = size,
             textAlign = TextAlign.End,
             modifier = Modifier.weight(1f),
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.headline2
         )
     }
@@ -141,6 +143,7 @@ private fun ReferralsCardHeader(
             modifier = Modifier.weight(1f),
             maxLines = 1,
             overflow = TextOverflow.Ellipsis,
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textM,
 
         )
@@ -149,6 +152,7 @@ private fun ReferralsCardHeader(
             textAlign = TextAlign.End,
             maxLines = 1,
             modifier = Modifier.wrapContentSize(),
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textM
         )
     }
@@ -164,12 +168,14 @@ private fun ReferralsCardItem(referral: ReferralModel) {
         Text(
             text = referral.address,
             textAlign = TextAlign.Start,
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textM
         )
         Text(
             text = referral.amountFormatted,
             textAlign = TextAlign.End,
             modifier = Modifier.weight(1f),
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textM
         )
     }
diff --git a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/screens/ReferralWelcomePage.kt b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/screens/ReferralWelcomePage.kt
index 519b5be96..eb73d9361 100644
--- a/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/screens/ReferralWelcomePage.kt
+++ b/feature_referral_impl/src/main/java/jp/co/soramitsu/feature_referral_impl/presentation/screens/ReferralWelcomePage.kt
@@ -63,6 +63,7 @@ import jp.co.soramitsu.ui_core.component.card.ContentCard
 import jp.co.soramitsu.ui_core.component.input.InputTextState
 import jp.co.soramitsu.ui_core.component.wrappedtext.WrappedTextState
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @Composable
@@ -136,6 +137,7 @@ fun ReferralWelcomePageScreen(
                         width = Dimension.fillToConstraints
                     },
                 text = stringResource(id = R.string.referral_title),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.headline2
             )
 
@@ -150,6 +152,7 @@ fun ReferralWelcomePageScreen(
                     },
                 text = stringResource(id = R.string.referral_subtitle),
                 textAlign = TextAlign.Start,
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.paragraphM
             )
 
diff --git a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardScreen.kt b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardScreen.kt
index db3dfb8cb..a9400fb43 100644
--- a/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardScreen.kt
+++ b/feature_sora_card_impl/src/main/java/jp/co/soramitsu/feature_sora_card_impl/presentation/get/card/GetSoraCardScreen.kt
@@ -95,6 +95,7 @@ fun GetSoraCardScreen(
                         .fillMaxWidth()
                         .padding(top = Dimens.x2, start = Dimens.x1, end = Dimens.x1),
                     text = stringResource(R.string.sora_card_title),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.headline2,
                 )
 
@@ -103,6 +104,7 @@ fun GetSoraCardScreen(
                         .fillMaxWidth()
                         .padding(top = Dimens.x2, start = Dimens.x1, end = Dimens.x1),
                     text = stringResource(jp.co.soramitsu.oauth.R.string.details_description),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphM,
                 )
 
@@ -115,6 +117,7 @@ fun GetSoraCardScreen(
                         .fillMaxWidth()
                         .padding(top = Dimens.x2, start = Dimens.x1, end = Dimens.x1),
                     text = stringResource(R.string.sora_card_blacklisted_countires_warning),
+                    color = MaterialTheme.customColors.fgPrimary,
                     style = MaterialTheme.customTypography.paragraphXS.copy(textAlign = TextAlign.Center),
                 )
                 Text(
@@ -152,7 +155,7 @@ private fun AnnualFee() {
     ContentCard(
         modifier = Modifier
             .fillMaxWidth()
-            .padding(top = Dimens.x2, start = Dimens.x1, end = Dimens.x1)
+            .padding(top = Dimens.x2, start = Dimens.x1, end = Dimens.x1),
     ) {
         Text(
             modifier = Modifier
@@ -162,6 +165,7 @@ private fun AnnualFee() {
                     top = Dimens.x2, bottom = Dimens.x2, start = Dimens.x3, end = Dimens.x3,
                 ),
             text = stringResource(R.string.sora_card_annual_service_fee),
+            color = MaterialTheme.customColors.fgPrimary,
             style = MaterialTheme.customTypography.textL,
         )
     }
@@ -184,6 +188,7 @@ private fun FreeCardIssuance() {
                     .fillMaxWidth()
                     .wrapContentHeight(),
                 text = stringResource(R.string.sora_card_free_card_issuance),
+                color = MaterialTheme.customColors.fgPrimary,
                 style = MaterialTheme.customTypography.textL,
             )
 
diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/buycrypto/BuyCryptoScreen.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/buycrypto/BuyCryptoScreen.kt
index da3ee3174..24ba37b5f 100644
--- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/buycrypto/BuyCryptoScreen.kt
+++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/buycrypto/BuyCryptoScreen.kt
@@ -38,6 +38,7 @@ import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
@@ -61,6 +62,7 @@ import jp.co.soramitsu.ui_core.component.button.FilledButton
 import jp.co.soramitsu.ui_core.component.button.properties.Order
 import jp.co.soramitsu.ui_core.component.button.properties.Size
 import jp.co.soramitsu.ui_core.resources.Dimens
+import jp.co.soramitsu.ui_core.theme.customColors
 import jp.co.soramitsu.ui_core.theme.customTypography
 
 @Composable
@@ -71,11 +73,15 @@ fun BuyCryptoScreen(
     onAlertCloseClick: () -> Unit
 ) {
     Box(
-        modifier = Modifier.fillMaxSize(),
+        modifier = Modifier
+            .background(color = MaterialTheme.customColors.bgPage)
+            .fillMaxSize(),
         contentAlignment = Alignment.Center
     ) {
         AndroidView(
-            modifier = Modifier.fillMaxSize(),
+            modifier = Modifier
+                .background(color = MaterialTheme.customColors.bgSurface)
+                .fillMaxSize(),
             factory = { context ->
                 WebView(context).apply {
                     layoutParams = ViewGroup.LayoutParams(
@@ -133,6 +139,7 @@ private fun PaymentWidgetUnavailableAlert(onCloseClick: () -> Unit) {
                 .fillMaxWidth()
                 .padding(top = Dimens.x3),
             style = MaterialTheme.customTypography.headline1.copy(textAlign = TextAlign.Center),
+            color = MaterialTheme.customColors.fgPrimary,
             text = stringResource(id = SoraCardR.string.payment_widget_unavailable_message),
         )
         Text(
@@ -140,6 +147,7 @@ private fun PaymentWidgetUnavailableAlert(onCloseClick: () -> Unit) {
                 .fillMaxWidth()
                 .padding(top = Dimens.x3),
             style = MaterialTheme.customTypography.paragraphM.copy(textAlign = TextAlign.Center),
+            color = MaterialTheme.customColors.fgPrimary,
             text = stringResource(id = SoraCardR.string.payment_widget_unavailable_description),
         )
         FilledButton(
diff --git a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimScreen.kt b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimScreen.kt
index 9770f4b9d..585b4471d 100644
--- a/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimScreen.kt
+++ b/feature_wallet_impl/src/main/java/jp/co/soramitsu/feature_wallet_impl/presentation/claim/ClaimScreen.kt
@@ -115,6 +115,7 @@ internal fun ClaimScreen(
                             .fillMaxWidth(),
                         textAlign = TextAlign.Center,
                         text = stringResource(id = R.string.claim_subtitle_confirmed),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.headline3,
                     )
 
@@ -124,6 +125,7 @@ internal fun ClaimScreen(
                             .padding(top = Dimens.x2),
                         textAlign = TextAlign.Center,
                         text = stringResource(id = R.string.claim_subtitle_confirmed_v2),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.paragraphS,
                     )
                 } else {
@@ -132,6 +134,7 @@ internal fun ClaimScreen(
                             .padding(top = Dimens.x2)
                             .fillMaxWidth(),
                         text = stringResource(id = R.string.claim_subtitle_v2),
+                        color = MaterialTheme.customColors.fgPrimary,
                         style = MaterialTheme.customTypography.paragraphS,
                     )
                 }

From 628bbbbab27ed4ec5ccd5ace884258b3ef0b7caa Mon Sep 17 00:00:00 2001
From: AmadeyKuspakov <SteveDrumble1@gmail.com>
Date: Tue, 1 Aug 2023 20:12:55 +0400
Subject: [PATCH 2/3] Addition of Soramitsu disclaimer

---
 .../common/domain/DarkThemeManager.kt         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt b/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt
index c7c9ba92a..3f49cee7f 100644
--- a/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt
+++ b/common/src/main/java/jp/co/soramitsu/common/domain/DarkThemeManager.kt
@@ -1,3 +1,35 @@
+/*
+This file is part of the SORA network and Polkaswap app.
+
+Copyright (c) 2020, 2021, Polka Biome Ltd. All rights reserved.
+SPDX-License-Identifier: BSD-4-Clause
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+All advertising materials mentioning features or use of this software must display
+the following acknowledgement: This product includes software developed by Polka Biome
+Ltd., SORA, and Polkaswap.
+
+Neither the name of the Polka Biome Ltd. nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY Polka Biome Ltd. AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Polka Biome Ltd. BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
 package jp.co.soramitsu.common.domain
 
 import android.content.Context

From 3aad8b22cbf7c1230e49654a8a9eb063cce675a3 Mon Sep 17 00:00:00 2001
From: AmadeyKuspakov <SteveDrumble1@gmail.com>
Date: Tue, 5 Sep 2023 17:53:02 +0400
Subject: [PATCH 3/3] Minor fix

---
 .../presentation/OnboardingViewModel.kt                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
index db67931b6..9a790f877 100644
--- a/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
+++ b/feature_multiaccount_impl/src/main/java/jp/co/soramitsu/feature_multiaccount_impl/presentation/OnboardingViewModel.kt
@@ -494,7 +494,7 @@ class OnboardingViewModel @Inject constructor(
     fun onRecoveryClicked(navController: NavController, index: Int) {
         _recoveryDialog.value = false
         _recoveryState.value = when (index) {
-            0 -> {
+            1 -> {
                 isValidMethod = multiaccountInteractor::isMnemonicValid
                 recoverSoraAccountMethod = multiaccountInteractor::recoverSoraAccountFromMnemonic
                 errorMessageCode = ResponseCode.MNEMONIC_IS_NOT_VALID
@@ -508,7 +508,7 @@ class OnboardingViewModel @Inject constructor(
                 )
             }
 
-            1 -> {
+            2 -> {
                 isValidMethod = multiaccountInteractor::isRawSeedValid
                 recoverSoraAccountMethod = multiaccountInteractor::recoverSoraAccountFromRawSeed
                 errorMessageCode = ResponseCode.RAW_SEED_IS_NOT_VALID