diff --git a/OsmAnd/build-common.gradle b/OsmAnd/build-common.gradle
index cb98c8e9e8..38dce71283 100644
--- a/OsmAnd/build-common.gradle
+++ b/OsmAnd/build-common.gradle
@@ -373,4 +373,5 @@ dependencies {
 	}
 	implementation 'com.jaredrummler:colorpicker:1.1.0'
 	implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
+	implementation 'com.google.android.play:core:1.9.1'
 }
\ No newline at end of file
diff --git a/OsmAnd/build-library.gradle b/OsmAnd/build-library.gradle
index 2c50079396..2104c9e3cb 100644
--- a/OsmAnd/build-library.gradle
+++ b/OsmAnd/build-library.gradle
@@ -57,5 +57,5 @@ project.afterEvaluate {
 }
 
 dependencies {
-	implementation 'com.google.android.gms:play-services-location:17.1.0'
+	implementation 'com.google.android.gms:play-services-location:18.0.0'
 }
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index c757d455d2..ce3dde09d9 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -190,22 +190,9 @@ dependencies {
 	opengldebugImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
 	openglImplementation "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
 	openglImplementation "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
-	implementation ("com.getkeepsafe.taptargetview:taptargetview:1.12.0"){
-		exclude group: 'com.android.support'
-	}
-	implementation 'com.github.PhilJay:MPAndroidChart:v3.0.1'
-	implementation ("com.github.HITGIF:TextFieldBoxes:1.4.5"){
-		exclude group: 'com.android.support'
-	}
-	implementation('com.github.scribejava:scribejava-apis:7.1.1'){
-		exclude group: "com.fasterxml.jackson.core"
-	}
-	implementation 'com.jaredrummler:colorpicker:1.1.0'
-	implementation "org.bouncycastle:bcpkix-jdk15on:1.56"
-	implementation 'com.google.android.play:core:1.9.1'
 
 	huaweiImplementation 'com.huawei.hms:iap:5.0.2.300'
 
-	gplayFreeImplementation 'com.google.android.gms:play-services-location:17.1.0'
-	gplayFullImplementation 'com.google.android.gms:play-services-location:17.1.0'
+	gplayFreeImplementation 'com.google.android.gms:play-services-location:18.0.0'
+	gplayFullImplementation 'com.google.android.gms:play-services-location:18.0.0'
 }
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 4648cba1cc..7f16bc4586 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -250,6 +250,8 @@
         <item name="image_help_announcement_time">@drawable/img_help_announcement_time_day</item>
         <item name="switch_button_active">@color/switch_button_active_light</item>
         <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_light</item>
+
+        <item name="android:forceDarkAllowed">false</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -549,6 +551,8 @@
         <item name="image_help_announcement_time">@drawable/img_help_announcement_time_night</item>
         <item name="switch_button_active">@color/switch_button_active_dark</item>
         <item name="bottom_navigation_item_background">@drawable/bottom_navigation_item_bg_dark</item>
+
+        <item name="android:forceDarkAllowed">false</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">