diff --git a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/ExploreListModel.kt b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/ExploreListModel.kt
index 6665b70..7421a37 100644
--- a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/ExploreListModel.kt
+++ b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/ExploreListModel.kt
@@ -16,7 +16,7 @@ data class PlacePreview(var title: String, var description: String, var location
         var lastLine = ""
 
         for (word in words) {
-            if (lastLine.length + word.length < 40) {
+            if (lastLine.length + word.length < 25) {
                 if (lastLine != "") {
                     lastLine += " "
                     description += " "
diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_another_debug.xml b/app/WikiSpot/app/src/main/res/layout/fragment_another_debug.xml
index dfd3a38..6645de0 100644
--- a/app/WikiSpot/app/src/main/res/layout/fragment_another_debug.xml
+++ b/app/WikiSpot/app/src/main/res/layout/fragment_another_debug.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#E04C4C"
+    android:background="?attr/debugFragmentBackround"
     tools:context=".fragments.anotherDebugFragment">
 
     <TextView
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Another Debug Fragment"
+        android:text="@string/another_debug_fragment"
         android:textColor="#FFFFFF"
         android:textSize="30sp"
         android:textStyle="bold"
@@ -27,8 +27,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="32dp"
-        android:layout_marginRight="32dp"
-        android:text="1"
+        android:text="@string/_1"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView3" />
 
@@ -39,7 +38,7 @@
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:text="Generate and save data"
+        android:text="@string/generate_and_save_data"
         app:layout_constraintEnd_toStartOf="@+id/goFirstDegubFragmentBtn"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView3" />
@@ -50,7 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginTop="16dp"
-        android:text="Load and Show data"
+        android:text="@string/load_and_show_data"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/generateAndSaveDataBtn" />
 
@@ -69,7 +68,7 @@
             android:id="@+id/dataContentView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="data content"
+            android:text="@string/data_content"
             android:textAlignment="center" />
     </ScrollView>
 
@@ -79,7 +78,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="50dp"
         android:ems="10"
-        android:hint="attribute path"
+        android:hint="@string/attribute_path"
         android:inputType="textPersonName"
         app:layout_constraintStart_toStartOf="@+id/loadAndShowDataBtn"
         app:layout_constraintTop_toBottomOf="@+id/loadAndShowDataBtn" />
@@ -89,7 +88,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text="Create View Connection"
+        android:text="@string/create_view_connection"
         android:textSize="12sp"
         app:layout_constraintStart_toStartOf="@+id/attributePathInput"
         app:layout_constraintTop_toBottomOf="@+id/attributePathInput" />
@@ -99,8 +98,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:text="Stop Connection"
-        android:textSize="10sp"
+        android:text="@string/stop_connection"
+        android:textSize="13sp"
         app:layout_constraintBottom_toBottomOf="@+id/attributePathInput"
         app:layout_constraintStart_toEndOf="@+id/attributePathInput"
         app:layout_constraintTop_toTopOf="@+id/attributePathInput" />
@@ -110,7 +109,7 @@
         android:layout_width="160dp"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:hint="file path"
+        android:hint="@string/file_path"
         android:inputType="textPersonName"
         app:layout_constraintBottom_toTopOf="@+id/attributePathInput"
         app:layout_constraintStart_toStartOf="@+id/loadAndShowDataBtn"
diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_debug.xml b/app/WikiSpot/app/src/main/res/layout/fragment_debug.xml
index c5a15eb..d4aee81 100644
--- a/app/WikiSpot/app/src/main/res/layout/fragment_debug.xml
+++ b/app/WikiSpot/app/src/main/res/layout/fragment_debug.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#E34B4B"
+    android:background="?attr/debugFragmentBackround"
     tools:context=".fragments.debugFragment">
 
     <Button
@@ -13,7 +13,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:text="2"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/_2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/debugFragmentTitle" />
 
@@ -22,7 +23,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Get number of sent requests"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/get_number_of_sent_requests"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/goSecondDebugFragmentBtn"
         app:layout_constraintStart_toStartOf="parent"
@@ -33,6 +35,7 @@
         android:layout_width="252dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
+        android:textColor="?attr/generalTextColor"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -50,7 +53,7 @@
                 android:background="#6A5252"
                 android:backgroundTint="#E39595"
                 android:padding="4dp"
-                android:text="output" />
+                android:text="@string/output" />
         </LinearLayout>
     </ScrollView>
 
@@ -59,7 +62,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Change Url"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/change_url"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/editTextIp" />
@@ -71,7 +75,7 @@
         android:layout_marginTop="16dp"
         android:ems="10"
         android:inputType="textPersonName"
-        android:text="Name"
+        android:text="@string/name"
         app:layout_constraintEnd_toEndOf="@+id/scrollView3"
         app:layout_constraintStart_toStartOf="@+id/scrollView3"
         app:layout_constraintTop_toBottomOf="@+id/scrollView3" />
@@ -81,7 +85,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Clear server connections"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/clear_server_connections"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -92,7 +97,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Restart app partially"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/restart_app_partially"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -103,7 +109,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:text="Debug fragment"
+        android:text="@string/debug_fragment"
         android:textColor="#FFFFFF"
         android:textSize="30sp"
         android:textStyle="bold"
@@ -117,7 +123,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Close app"
+        android:textColor="?attr/generalTextColor"
+        android:text="@string/close_app"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/WikiSpot/app/src/main/res/values/attrs.xml b/app/WikiSpot/app/src/main/res/values/attrs.xml
index 8484a19..b73c574 100644
--- a/app/WikiSpot/app/src/main/res/values/attrs.xml
+++ b/app/WikiSpot/app/src/main/res/values/attrs.xml
@@ -38,6 +38,8 @@
     <attr name="infoFragmentGradientCenterColor" format="color"/>
     <attr name="infoFragmentGradientEndColor" format="color"/>
 
+    <attr name="debugFragmentBackround" format="color"/>
+
     <attr name="contrastingGradientStartColor" format="color"/>
     <attr name="contrastingGradientCenterColor" format="color"/>
     <attr name="contrastingGradientEndColor" format="color"/>
diff --git a/app/WikiSpot/app/src/main/res/values/colors.xml b/app/WikiSpot/app/src/main/res/values/colors.xml
index 0847b5a..a9d9eb5 100644
--- a/app/WikiSpot/app/src/main/res/values/colors.xml
+++ b/app/WikiSpot/app/src/main/res/values/colors.xml
@@ -4,105 +4,109 @@
     <color name="white">#FFFFFFFF</color>
 
     <!-- Light Theme -->
-    <color name="primary">#4CAF50</color>
-    <color name="primaryVariant">#388E3C</color>
+    <color name="primary">#A6BFFF</color>
+    <color name="primaryVariant">#6994FF</color>
     <color name="onPrimary">@color/white</color>
 
-    <color name="secondary">#E91E63</color>
+    <color name="secondary">#321EE9</color>
     <color name="secondaryVariant">#F48FB1</color>
     <color name="onSecondary">@color/black</color>
 
     <color name="textOnTextBgColor">#fff</color>
-    <color name="generalIconsColor">#89000000</color>
-    <color name="generalTextColor">#89000000</color>
+    <color name="generalIconsColor">#BA000000</color>
+    <color name="generalTextColor">#8A000000</color>
 
-    <color name="bottomNavBarCheckedItemColor">#ECD21A1A</color>
-    <color name="bottomNavBarItemColor">#320747</color>
-    <color name="bottomNavBarRippleColor">#33C4BCC9</color>
-    <color name="statusBarColor">#EC000000</color>
+    <color name="bottomNavBarCheckedItemColor">#EC1D5CFD</color>
+    <color name="bottomNavBarItemColor">#EC5B89FF</color>
+    <color name="bottomNavBarRippleColor">#7D8DC1</color>
+    <color name="statusBarColor">#EDEDED</color>
 
-    <color name="textBackgroundGradientStartColor" >#80E5BEFF</color>
-    <color name="textBackgroundGradientEndColor" >#80FFB5F0</color>
+    <color name="textBackgroundGradientStartColor" >#74DDFF</color>
+    <color name="textBackgroundGradientEndColor" >#7DE0FF</color>
 
-    <color name="bottomNavBarGradientStartColor" >#FCDD94</color>
-    <color name="bottomNavBarGradientEndColor" >#C5F8AB</color>
+    <color name="bottomNavBarGradientStartColor" >#EDEDED</color>
+    <color name="bottomNavBarGradientEndColor" >#F6F6F6</color>
 
-    <color name="chatFragmentGradientStartColor" >#FCB0EF</color>
-    <color name="chatFragmentGradientCenterColor" >#9ECFFF</color>
-    <color name="chatFragmentGradientEndColor" >#9FE7FF</color>
-    <color name="chatFragmentBgStrokeColor" >#7FFFFFFF</color>
-    <color name="chatFragmentWriteBarBgColor">#FFF</color>
+    <color name="debugFragmentBg">#FF7272</color>
 
-    <color name="exploreFragmentGradientStartColor" >#A1DEFC</color>
-    <color name="exploreFragmentGradientCenterColor" >#A5CBFF</color>
-    <color name="exploreFragmentGradientEndColor" >#F9B6F6</color>
-    <color name="exploreFragmentListItemBackgroundColor">#fff</color>
+    <color name="chatFragmentGradientStartColor" >#83E1FF</color>
+    <color name="chatFragmentGradientCenterColor" >#4ED4FF</color>
+    <color name="chatFragmentGradientEndColor" >#83E1FF</color>
+    <color name="chatFragmentBgStrokeColor" >#CB4DD4FF</color>
+    <color name="chatFragmentWriteBarBgColor">#43FFFFFF</color>
 
-    <color name="homeFragmentGradientStartColor" >#83E1FF</color>
-    <color name="homeFragmentGradientCenterColor" >#9EC6FF</color>
-    <color name="homeFragmentGradientEndColor" >#FEBBFF</color>
+    <color name="exploreFragmentGradientStartColor" >#83E1FF</color>
+    <color name="exploreFragmentGradientCenterColor" >#4ED4FF</color>
+    <color name="exploreFragmentGradientEndColor" >#83E1FF</color>
+    <color name="exploreFragmentListItemBackgroundColor">#FDFDFD</color>
 
-    <color name="settingsFragmentGradientStartColor" >#92EB97FC</color>
-    <color name="settingsFragmentGradientCenterColor" >#A198F9</color>
-    <color name="settingsFragmentGradientEndColor" >#74C7F7</color>
+    <color name="homeFragmentGradientStartColor" >#7BDFFF</color>
+    <color name="homeFragmentGradientCenterColor" >#4ED4FF</color>
+    <color name="homeFragmentGradientEndColor" >#7BDFFF</color>
 
-    <color name="infoFragmentGradientStartColor" >#FFB6FB</color>
-    <color name="infoFragmentGradientCenterColor" >#A7D2FF</color>
-    <color name="infoFragmentGradientEndColor" >#96E7FF</color>
+    <color name="settingsFragmentGradientStartColor" >#83E1FF</color>
+    <color name="settingsFragmentGradientCenterColor" >#4ED4FF</color>
+    <color name="settingsFragmentGradientEndColor" >#83E1FF</color>
 
-    <color name="contrastingGradientStartColor">#C4FFA5</color>
-    <color name="contrastingGradientCenterColor">#D1FBA0</color>
-    <color name="contrastingGradientEndColor">#F6FEBA</color>
+    <color name="infoFragmentGradientStartColor" >#83E1FF</color>
+    <color name="infoFragmentGradientCenterColor" >#4ED4FF</color>
+    <color name="infoFragmentGradientEndColor" >#83E1FF</color>
+
+    <color name="contrastingGradientStartColor">#63D9FF</color>
+    <color name="contrastingGradientCenterColor">#44D2FF</color>
+    <color name="contrastingGradientEndColor">#59D7FF</color>
 
     <!-- Dark Theme -->
-    <color name="primaryDark">#B078F4</color>
-    <color name="primaryVariantDark">#5100B3</color>
+    <color name="primaryDark">#000F9E</color>
+    <color name="primaryVariantDark">#000B75</color>
     <color name="onPrimaryDark">@color/black</color>
 
-    <color name="secondaryDark">#FF03DAC5</color>
-    <color name="secondaryVariantDark">#FF03DAC5</color>
+    <color name="secondaryDark">#0320DA</color>
+    <color name="secondaryVariantDark">#3954FF</color>
     <color name="onSecondaryDark">@color/black</color>
 
     <color name="textOnTextBgColorDark">#aaa</color>
-    <color name="generalIconsColorDark">#96FFFFFF</color>
-    <color name="generalTextColorDark">#AAFFFFFF</color>
+    <color name="generalIconsColorDark">#96AEAEAE</color>
+    <color name="generalTextColorDark">#9F9F9F</color>
 
-    <color name="bottomNavBarCheckedItemColorDark">#FFB571</color>
-    <color name="bottomNavBarItemColorDark">#320747</color>
-    <color name="bottomNavBarRippleColorDark">#33222222</color>
+    <color name="bottomNavBarCheckedItemColorDark">#002F80</color>
+    <color name="bottomNavBarItemColorDark">#003697</color>
+    <color name="bottomNavBarRippleColorDark">#091961</color>
     <color name="statusBarColorDark">#000000</color>
 
-    <color name="textBackgroundGradientStartColorDark" >#80A185B4</color>
-    <color name="textBackgroundGradientEndColorDark" >#80926789</color>
+    <color name="textBackgroundGradientStartColorDark" >#80000C5C</color>
+    <color name="textBackgroundGradientEndColorDark" >#80001A5C</color>
 
-    <color name="bottomNavBarGradientStartColorDark" >#9F8B5D</color>
-    <color name="bottomNavBarGradientEndColorDark" >#749265</color>
+    <color name="bottomNavBarGradientStartColorDark" >#1B1B1B</color>
+    <color name="bottomNavBarGradientEndColorDark" >#0E0E0E</color>
 
-    <color name="chatFragmentGradientStartColorDark" >#885E81</color>
-    <color name="chatFragmentGradientCenterColorDark" >#516B85</color>
-    <color name="chatFragmentGradientEndColorDark" >#5E8A99</color>
-    <color name="chatFragmentBgStrokeColorDark" >#D43E3E3E</color>
-    <color name="chatFragmentWriteBarBgColorDark">#444</color>
+    <color name="debugFragmentBgDark">#5E0000</color>
 
-    <color name="exploreFragmentGradientStartColorDark" >#587A8B</color>
-    <color name="exploreFragmentGradientCenterColorDark" >#657C9C</color>
-    <color name="exploreFragmentGradientEndColorDark" >#896488</color>
-    <color name="exploreFragmentListItemBackgroundColorDark">#636363</color>
+    <color name="chatFragmentGradientStartColorDark" >#00143A</color>
+    <color name="chatFragmentGradientCenterColorDark" >#001235</color>
+    <color name="chatFragmentGradientEndColorDark" >#00143A</color>
+    <color name="chatFragmentBgStrokeColorDark" >#00062C</color>
+    <color name="chatFragmentWriteBarBgColorDark">#BF1C1C1C</color>
 
-    <color name="homeFragmentGradientStartColorDark" >#4F889A</color>
-    <color name="homeFragmentGradientCenterColorDark" >#647EA3</color>
-    <color name="homeFragmentGradientEndColorDark" >#977098</color>
+    <color name="exploreFragmentGradientStartColorDark" >#00143A</color>
+    <color name="exploreFragmentGradientCenterColorDark" >#001235</color>
+    <color name="exploreFragmentGradientEndColorDark" >#00143A</color>
+    <color name="exploreFragmentListItemBackgroundColorDark">#171717</color>
 
-    <color name="settingsFragmentGradientStartColorDark" >#92875691</color>
-    <color name="settingsFragmentGradientCenterColorDark" >#6863A2</color>
-    <color name="settingsFragmentGradientEndColorDark" >#4B7F9D</color>
+    <color name="homeFragmentGradientStartColorDark" >#00143A</color>
+    <color name="homeFragmentGradientCenterColorDark" >#001235</color>
+    <color name="homeFragmentGradientEndColorDark" >#00143A</color>
 
-    <color name="infoFragmentGradientStartColorDark" >#966B94</color>
-    <color name="infoFragmentGradientCenterColorDark" >#69829D</color>
-    <color name="infoFragmentGradientEndColorDark" >#54818E</color>
+    <color name="settingsFragmentGradientStartColorDark" >#00143A</color>
+    <color name="settingsFragmentGradientCenterColorDark" >#001235</color>
+    <color name="settingsFragmentGradientEndColorDark" >#00143A</color>
 
-    <color name="contrastingGradientStartColorDark">#729360</color>
-    <color name="contrastingGradientCenterColorDark">#809A62</color>
-    <color name="contrastingGradientEndColorDark">#8F936C</color>
+    <color name="infoFragmentGradientStartColorDark" >#001030</color>
+    <color name="infoFragmentGradientCenterColorDark" >#000D27</color>
+    <color name="infoFragmentGradientEndColorDark" >#001030</color>
+
+    <color name="contrastingGradientStartColorDark">#132855</color>
+    <color name="contrastingGradientCenterColorDark">#0E275C</color>
+    <color name="contrastingGradientEndColorDark">#132855</color>
 
 </resources>
\ No newline at end of file
diff --git a/app/WikiSpot/app/src/main/res/values/strings.xml b/app/WikiSpot/app/src/main/res/values/strings.xml
index 185853b..a01a334 100644
--- a/app/WikiSpot/app/src/main/res/values/strings.xml
+++ b/app/WikiSpot/app/src/main/res/values/strings.xml
@@ -8,4 +8,22 @@
 
     <string name="files">Files</string>
     <string name="dark_theme">Dark theme</string>
+    <string name="get_number_of_sent_requests" translatable="false">Get number of sent requests</string>
+    <string name="_2">2</string>
+    <string name="output">output</string>
+    <string name="change_url">Change Url</string>
+    <string name="name">Name</string>
+    <string name="clear_server_connections">Clear server connections</string>
+    <string name="restart_app_partially">Restart app partially</string>
+    <string name="debug_fragment">Debug fragment</string>
+    <string name="close_app">Close app</string>
+    <string name="another_debug_fragment">Another Debug Fragment</string>
+    <string name="_1">1</string>
+    <string name="generate_and_save_data">Generate and save data</string>
+    <string name="load_and_show_data">Load and Show data</string>
+    <string name="data_content">data content</string>
+    <string name="attribute_path">attribute path</string>
+    <string name="create_view_connection">Create View Connection</string>
+    <string name="stop_connection">Stop Connection</string>
+    <string name="file_path">file path</string>
 </resources>
\ No newline at end of file
diff --git a/app/WikiSpot/app/src/main/res/values/themes.xml b/app/WikiSpot/app/src/main/res/values/themes.xml
index c5133c6..740f0db 100644
--- a/app/WikiSpot/app/src/main/res/values/themes.xml
+++ b/app/WikiSpot/app/src/main/res/values/themes.xml
@@ -22,6 +22,8 @@
         <item name="textBackgroundGradientStartColor" >@color/textBackgroundGradientStartColor</item>
         <item name="textBackgroundGradientEndColor" >@color/textBackgroundGradientEndColor</item>
 
+        <item name="debugFragmentBackround" >@color/debugFragmentBg</item>
+
         <item name="bottomNavBarGradientStartColor" >@color/bottomNavBarGradientStartColor</item>
         <item name="bottomNavBarGradientEndColor" >@color/bottomNavBarGradientEndColor</item>
 
@@ -60,6 +62,7 @@
 
         <!-- StatusBarColor -->
         <item name="android:statusBarColor" tools:targetApi="l">@color/statusBarColor</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
     <style name="Widget.App.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
@@ -95,6 +98,8 @@
         <item name="bottomNavBarGradientStartColor" >@color/bottomNavBarGradientStartColorDark</item>
         <item name="bottomNavBarGradientEndColor" >@color/bottomNavBarGradientEndColorDark</item>
 
+        <item name="debugFragmentBackround" >@color/debugFragmentBgDark</item>
+
         <item name="chatFragmentGradientStartColor" >@color/chatFragmentGradientStartColorDark</item>
         <item name="chatFragmentGradientCenterColor" >@color/chatFragmentGradientCenterColorDark</item>
         <item name="chatFragmentGradientEndColor" >@color/chatFragmentGradientEndColorDark</item>
@@ -130,6 +135,8 @@
 
         <!-- StatusBarColor -->
         <item name="android:statusBarColor" tools:targetApi="l">@color/statusBarColorDark</item>
+        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="l">false</item>
     </style>