diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
deleted file mode 100644
index e2b160af1..000000000
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
-        <item name="colorPrimaryVariant">@android:color/black</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-</resources>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 5438c7341..000000000
--- a/android/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Night theme -->
-    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-        <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
-        <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
-        <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-        <item name="android:textColorPrimary">@color/text_light</item>
-        <item name="android:textColorPrimaryInverse">@color/text_dark</item>
-        <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-        <item name="android:windowBackground">?windowBackgroundForced</item>
-        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
-        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        <item name="android:fontFamily">@string/robotoRegular</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="clickableBackground">?selectableItemBackground</item>
-        <item name="android:statusBarColor">?colorPrimary</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-
-        <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
-        <item name="windowBackgroundForced">@color/bg_window_night</item>
-        <item name="cardBackground">@color/bg_cards_night</item>
-        <item name="titleDialogTheme">@color/white_primary</item>
-        <item name="textDialogTheme">@color/white_secondary</item>
-        <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
-        <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="colorControlNormal">?secondary</item>
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="colorAccentTransparent">@color/base_accent_transparent</item>
-        <item name="colorBtnHighlight">@color/white_24</item>
-        <item name="panel">@color/bg_panel_night</item>
-        <item name="colorLogo">@color/base_accent_night</item>
-        <item name="iconTint">@color/white_secondary</item>
-        <item name="iconTintDisabled">@color/white_12</item>
-        <item name="iconTintActive">@color/yellow</item>
-        <item name="iconTintLight">@color/icon_tint_light_night</item>
-
-        <item name="secondary">@color/text_light_hint</item>
-        <item name="dividerHorizontal">@color/divider_night</item>
-
-        <item name="ppBackground">@color/bg_cards_night</item>
-        <item name="ppButtonsBackground">@color/bg_window_night</item>
-        <item name="ppFloatingMarkerIconColor">@color/white_54</item>
-
-        <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
-        <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
-        <item name="navLanesBackgroundColor">@color/base_accent_night</item>
-        <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
-        <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
-
-        <item name="buttonBackground">@drawable/button_night</item>
-        <item name="buttonTextColor">@color/button_text_night</item>
-        <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
-        <item name="buttonDialogTextColor">@color/base_accent_night</item>
-
-        <item name="accentButtonBackground">@drawable/button_accent_night</item>
-        <item name="accentButtonTextColor">@color/button_accent_text_night</item>
-        <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
-                   accentButtonTextColor selector -->
-        <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
-
-        <item name="primaryButtonBackground">@drawable/button_accent_night</item>
-
-        <item name="menuBackground">@color/bg_menu_night</item>
-
-        <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
-        <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-        <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
-
-        <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
-        <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
-        <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
-        <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
-
-        <item name="routingButtonHint">@color/routing_button_tint</item>
-
-        <item name="android:listDivider">@drawable/list_divider_night</item>
-
-        <item name="transitPedestrianBackground">@color/white_4</item>
-        <item name="transitRulerBackground">@color/white_4</item>
-        <item name="transitStepDivider">@drawable/dot_divider_night</item>
-        <item name="accentColorSelector">@color/accent_color_selector_night</item>
-        <item name="android:textAppearance">@style/TextAppearance</item>
-        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-        <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-        <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-        <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-        <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-        <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-        <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-        <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-        <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-        <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-        <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-        <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-        <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-        <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
-        <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
-        <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
-        <item name="elevationProfilePropIconTint">@color/white_secondary</item>
-        <item name="altitudeBg">@drawable/bg_altitude_night</item>
-        <item name="elevationProfileAxisLabelColor">@color/white_54</item>
-        <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
-        <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
-        <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
-        <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
-        <item name="elevationProfileColor">@color/elevation_profile_dark</item>
-        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
-
-        <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
-        <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
-    </style>
-
-    <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
-
-    <style name="MwmTheme.Night.Splash">
-        <item name="android:windowBackground">@color/bg_primary_night</item>
-        <item name="android:textColorPrimary">@color/white_primary</item>
-        <item name="android:navigationBarColor">@color/bg_primary_night</item>
-        <item name="android:statusBarColor">@color/bg_primary_night</item>
-    </style>
-
-    <!-- Theme is overridden in v27 folder to handle cutouts -->
-    <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
-        <item name="colorPrimaryVariant">@android:color/black</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-    </style>
-
-    <style name="MwmTheme.Night.CardBg">
-        <item name="android:windowBackground">@color/bg_cards_night</item>
-    </style>
-
-
-    <style name="MwmTheme.Night.WindowBg">
-        <item name="android:windowBackground">@color/bg_window_night</item>
-    </style>
-
-    <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">?buttonDialogTextColor</item>
-        <item name="colorSecondary">?buttonDialogTextColor</item>
-        <item name="colorPrimary">?buttonDialogTextColor</item>
-        <item name="android:background">?cardBackground</item>
-        <!-- Used for the message in the dialog -->
-        <item name="android:textColorPrimary">?textDialogTheme</item>
-        <item name="android:textSize">@dimen/text_size_body_1</item>
-        <!-- Used for the title in the dialog -->
-        <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
-    </style>
-
-    <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
-        <item name="android:textColor">?titleDialogTheme</item>
-    </style>
-
-    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
-        <item name="android:colorPrimaryDark">?statusBar</item>
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="colorPrimaryVariant">?statusBar</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="clickableBackground">?selectableItemBackground</item>
-        <item name="colorControlNormal">@color/text_dark_hint</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:textColorHint">@color/text_light_hint</item>
-        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:fontFamily">@string/robotoRegular</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
-    </style>
-
-    <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="colorPrimary">?buttonDialogTextColor</item>
-        <item name="android:fontFamily">@string/robotoMedium</item>
-        <item name="android:windowBackground">@color/bg_cards_night</item>
-        <item name="android:background">@color/bg_cards_night</item>
-    </style>
-
-    <style name="MwmTheme.Downloader.Night">
-        <item name="status_done">@drawable/downloader_done_night</item>
-        <item name="status_downloadable">@drawable/downloader_download_night</item>
-        <item name="status_folder">@drawable/downloader_folder_night</item>
-        <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
-    </style>
-
-    <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
-        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
-    </style>
-
-    <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
-        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
-    </style>
-
-    <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
-        <item name="iconTint">@color/black_primary</item>
-    </style>
-
-    <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
-        <item name="android:popupBackground">?windowBackgroundForced</item>
-    </style>
-</resources>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index 1f4882c4d..be189822b 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -9,4 +9,12 @@
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
+  <style name="MwmTheme.Night.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
+    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+  </style>
 </resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index c248f16e8..24d351b77 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -134,7 +134,128 @@
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
   </style>
 
+    <!-- Night theme -->
+    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+      <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+      <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+      <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
+      <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+      <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+      <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+      <item name="android:textColorPrimary">@color/text_light</item>
+      <item name="android:textColorPrimaryInverse">@color/text_dark</item>
+      <item name="android:textColorSecondary">@color/text_light_subtitle</item>
+      <item name="android:windowBackground">?windowBackgroundForced</item>
+      <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+      <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
+      <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+      <item name="android:fontFamily">@string/robotoRegular</item>
+      <item name="android:colorBackgroundCacheHint">@null</item>
+      <item name="android:windowActionBarOverlay">true</item>
+      <item name="clickableBackground">?selectableItemBackground</item>
+      <item name="android:statusBarColor">?colorPrimary</item>
+      <item name="android:windowTranslucentNavigation">false</item>
+
+      <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
+      <item name="windowBackgroundForced">@color/bg_window_night</item>
+      <item name="cardBackground">@color/bg_cards_night</item>
+      <item name="titleDialogTheme">@color/white_primary</item>
+      <item name="textDialogTheme">@color/white_secondary</item>
+      <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
+      <item name="colorPrimary">@color/bg_primary_night</item>
+      <item name="colorControlNormal">?secondary</item>
+      <item name="colorAccent">@color/base_accent_night</item>
+      <item name="colorSecondary">@color/base_accent_night</item>
+      <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+      <item name="colorBtnHighlight">@color/white_24</item>
+      <item name="panel">@color/bg_panel_night</item>
+      <item name="colorLogo">@color/base_accent_night</item>
+      <item name="iconTint">@color/white_secondary</item>
+      <item name="iconTintDisabled">@color/white_12</item>
+      <item name="iconTintActive">@color/yellow</item>
+      <item name="iconTintLight">@color/icon_tint_light_night</item>
+
+      <item name="secondary">@color/text_light_hint</item>
+      <item name="dividerHorizontal">@color/divider_night</item>
+
+      <item name="ppBackground">@color/bg_cards_night</item>
+      <item name="ppButtonsBackground">@color/bg_window_night</item>
+      <item name="ppFloatingMarkerIconColor">@color/white_54</item>
+
+      <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
+      <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
+      <item name="navLanesBackgroundColor">@color/base_accent_night</item>
+      <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
+      <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
+
+      <item name="buttonBackground">@drawable/button_night</item>
+      <item name="buttonTextColor">@color/button_text_night</item>
+      <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
+      <item name="buttonDialogTextColor">@color/base_accent_night</item>
+
+      <item name="accentButtonBackground">@drawable/button_accent_night</item>
+      <item name="accentButtonTextColor">@color/button_accent_text_night</item>
+      <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+                 accentButtonTextColor selector -->
+      <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
+
+      <item name="primaryButtonBackground">@drawable/button_accent_night</item>
+
+      <item name="menuBackground">@color/bg_menu_night</item>
+
+      <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
+      <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+      <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
+
+      <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+      <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
+      <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
+      <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
+
+      <item name="routingButtonHint">@color/routing_button_tint</item>
+
+      <item name="android:listDivider">@drawable/list_divider_night</item>
+
+      <item name="transitPedestrianBackground">@color/white_4</item>
+      <item name="transitRulerBackground">@color/white_4</item>
+      <item name="transitStepDivider">@drawable/dot_divider_night</item>
+      <item name="accentColorSelector">@color/accent_color_selector_night</item>
+      <item name="android:textAppearance">@style/TextAppearance</item>
+      <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+      <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+      <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+      <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+      <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+      <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+      <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+      <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+      <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+      <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+      <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+      <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+      <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+      <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+      <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+      <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+      <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
+      <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
+      <item name="elevationProfilePropIconTint">@color/white_secondary</item>
+      <item name="altitudeBg">@drawable/bg_altitude_night</item>
+      <item name="elevationProfileAxisLabelColor">@color/white_54</item>
+      <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
+      <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
+      <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
+      <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
+      <item name="elevationProfileColor">@color/elevation_profile_dark</item>
+      <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+
+      <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+      <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+    </style>
+
   <style name="MwmTheme" parent="MwmTheme.Base"/>
+  <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
   <style name="MwmTheme.Splash">
     <item name="android:windowBackground">@color/bg_primary</item>
@@ -143,6 +264,13 @@
     <item name="android:statusBarColor">@color/bg_primary</item>
   </style>
 
+  <style name="MwmTheme.Night.Splash">
+    <item name="android:windowBackground">@color/bg_primary_night</item>
+    <item name="android:textColorPrimary">@color/white_primary</item>
+    <item name="android:navigationBarColor">@color/bg_primary_night</item>
+    <item name="android:statusBarColor">@color/bg_primary_night</item>
+  </style>
+
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
@@ -151,6 +279,14 @@
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
+  <!-- Theme is overridden in v27 folder to handle cutouts -->
+  <style name="MwmTheme.Night.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+  </style>
+
   <style name="MwmTheme.DownloadResourcesLegacy">
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -160,10 +296,18 @@
     <item name="android:windowBackground">@color/bg_cards</item>
   </style>
 
+  <style name="MwmTheme.Night.CardBg">
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+  </style>
+
   <style name="MwmTheme.WindowBg">
     <item name="android:windowBackground">@color/bg_window</item>
   </style>
 
+  <style name="MwmTheme.Night.WindowBg">
+    <item name="android:windowBackground">@color/bg_window_night</item>
+  </style>
+
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
     <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
@@ -174,6 +318,18 @@
     <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Light</item>
   </style>
 
+  <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+    <item name="colorAccent">?buttonDialogTextColor</item>
+    <item name="colorSecondary">?buttonDialogTextColor</item>
+    <item name="colorPrimary">?buttonDialogTextColor</item>
+    <item name="android:background">?cardBackground</item>
+    <!-- Used for the message in the dialog -->
+    <item name="android:textColorPrimary">?textDialogTheme</item>
+    <item name="android:textSize">@dimen/text_size_body_1</item>
+    <!-- Used for the title in the dialog -->
+    <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
+  </style>
+
   <style name="MwmTheme.DialogTitleBase">
     <item name="android:textSize">@dimen/text_size_alert_dialog_title</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
@@ -183,6 +339,10 @@
     <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
+  <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
+    <item name="android:textColor">?titleDialogTheme</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="android:colorPrimaryDark">?statusBar</item>
     <item name="colorAccent">@color/base_accent</item>
@@ -200,11 +360,33 @@
     <item name="android:statusBarColor">@android:color/transparent</item>
   </style>
 
+  <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+    <item name="android:colorPrimaryDark">?statusBar</item>
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="colorPrimary">@color/bg_primary_night</item>
+    <item name="colorPrimaryVariant">?statusBar</item>
+    <item name="colorSecondary">@color/base_accent_night</item>
+    <item name="clickableBackground">?selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:textColorHint">@color/text_light_hint</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:fontFamily">@string/robotoRegular</item>
+    <item name="android:windowTranslucentStatus">true</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.NoFullscreen" parent="MwmTheme.DialogFragment.Fullscreen">
     <item name="android:windowTranslucentStatus">false</item>
     <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
   </style>
 
+  <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
+    <item name="android:windowTranslucentStatus">false</item>
+    <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
@@ -222,6 +404,15 @@
     <item name="android:background">@color/bg_cards</item>
   </style>
 
+  <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="colorSecondary">@color/base_accent_night</item>
+    <item name="colorPrimary">?buttonDialogTextColor</item>
+    <item name="android:fontFamily">@string/robotoMedium</item>
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+    <item name="android:background">@color/bg_cards_night</item>
+  </style>
+
   <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
   </style>
@@ -235,19 +426,43 @@
     <item name="status_folder_done">@drawable/downloader_folder_done</item>
   </style>
 
+  <style name="MwmTheme.Downloader.Night">
+    <item name="status_done">@drawable/downloader_done_night</item>
+    <item name="status_downloadable">@drawable/downloader_download_night</item>
+    <item name="status_folder">@drawable/downloader_folder_night</item>
+    <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
+  </style>
+
   <style name="MwmTheme.NavButtonsRound">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
+  <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+  </style>
+
   <style name="MwmTheme.NavButtonsRect">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
   </style>
 
+  <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+  </style>
+
+
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
 
+  <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
+    <item name="iconTint">@color/black_primary</item>
+  </style>
+
   <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
+
+  <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
+    <item name="android:popupBackground">?windowBackgroundForced</item>
+  </style>
 </resources>