diff --git a/android/AllInOneJava/app/build.gradle b/android/AllInOneJava/app/build.gradle
index c85db88..09eddc1 100644
--- a/android/AllInOneJava/app/build.gradle
+++ b/android/AllInOneJava/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.allinonejava"
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.example.allinonejava'
 }
 
 dependencies {
@@ -40,5 +41,5 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation "com.trimblemaps.navigation:ui-components:1.6.2"
+    implementation "com.trimblemaps.navigation:ui-components:2.0.0"
 }
\ No newline at end of file
diff --git a/android/AllInOneJava/app/src/main/AndroidManifest.xml b/android/AllInOneJava/app/src/main/AndroidManifest.xml
index b093a2d..92c718f 100644
--- a/android/AllInOneJava/app/src/main/AndroidManifest.xml
+++ b/android/AllInOneJava/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.allinonejava">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/android/AllInOneJava/build.gradle b/android/AllInOneJava/build.gradle
index de81c02..a9e2adf 100644
--- a/android/AllInOneJava/build.gradle
+++ b/android/AllInOneJava/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
diff --git a/android/AllInOneJava/gradle.properties b/android/AllInOneJava/gradle.properties
index 831abc7..61d5022 100644
--- a/android/AllInOneJava/gradle.properties
+++ b/android/AllInOneJava/gradle.properties
@@ -22,4 +22,6 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/AllInOneJava/gradle/wrapper/gradle-wrapper.properties b/android/AllInOneJava/gradle/wrapper/gradle-wrapper.properties
index 2cd2802..3ea2e6e 100644
--- a/android/AllInOneJava/gradle/wrapper/gradle-wrapper.properties
+++ b/android/AllInOneJava/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 22 14:58:41 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/AllInOneKotlin/app/build.gradle b/android/AllInOneKotlin/app/build.gradle
index d6e2dc8..a2ad4cf 100644
--- a/android/AllInOneKotlin/app/build.gradle
+++ b/android/AllInOneKotlin/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.allinonekotlin"
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.example.allinonekotlin'
 }
 
 dependencies {
@@ -40,6 +41,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation "com.trimblemaps.navigation:ui-components:1.6.2"
+    implementation "com.trimblemaps.navigation:ui-components:2.0.0"
 
 }
\ No newline at end of file
diff --git a/android/AllInOneKotlin/app/src/main/AndroidManifest.xml b/android/AllInOneKotlin/app/src/main/AndroidManifest.xml
index 94f1071..24b13f7 100644
--- a/android/AllInOneKotlin/app/src/main/AndroidManifest.xml
+++ b/android/AllInOneKotlin/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.allinonekotlin">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/android/AllInOneKotlin/build.gradle b/android/AllInOneKotlin/build.gradle
index de81c02..a9e2adf 100644
--- a/android/AllInOneKotlin/build.gradle
+++ b/android/AllInOneKotlin/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
diff --git a/android/AllInOneKotlin/gradle.properties b/android/AllInOneKotlin/gradle.properties
index 831abc7..61d5022 100644
--- a/android/AllInOneKotlin/gradle.properties
+++ b/android/AllInOneKotlin/gradle.properties
@@ -22,4 +22,6 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/AllInOneKotlin/gradle/wrapper/gradle-wrapper.properties b/android/AllInOneKotlin/gradle/wrapper/gradle-wrapper.properties
index 265b7b2..884d23a 100644
--- a/android/AllInOneKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/android/AllInOneKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 22 10:25:05 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/MapLayersKotlin/app/build.gradle b/android/MapLayersKotlin/app/build.gradle
index 4e97b9d..51a3121 100644
--- a/android/MapLayersKotlin/app/build.gradle
+++ b/android/MapLayersKotlin/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.trimblemaps.maplayerskotlin"
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -29,6 +29,7 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'com.trimblemaps.maplayerskotlin'
 }
 
 dependencies {
@@ -40,7 +41,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-    implementation 'com.trimblemaps.mapsdk:maps-android-sdk:2.1.2'
-    implementation 'com.trimblemaps.mapsdk:maps-sdk-account:1.5.0'
+    implementation 'com.trimblemaps.mapsdk:maps-android-sdk:2.2.0'
+    implementation 'com.trimblemaps.mapsdk:maps-sdk-account:2.0.0'
     implementation 'com.trimblemaps.mapsdk:maps-android-core:1.1.0'
 }
\ No newline at end of file
diff --git a/android/MapLayersKotlin/app/src/main/AndroidManifest.xml b/android/MapLayersKotlin/app/src/main/AndroidManifest.xml
index b7202cf..634fc4d 100644
--- a/android/MapLayersKotlin/app/src/main/AndroidManifest.xml
+++ b/android/MapLayersKotlin/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.trimblemaps.maplayerskotlin">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
diff --git a/android/MapLayersKotlin/app/src/main/java/com/trimblemaps/maplayerskotlin/MapActivity.kt b/android/MapLayersKotlin/app/src/main/java/com/trimblemaps/maplayerskotlin/MapActivity.kt
index 172cf97..d8b3fd6 100644
--- a/android/MapLayersKotlin/app/src/main/java/com/trimblemaps/maplayerskotlin/MapActivity.kt
+++ b/android/MapLayersKotlin/app/src/main/java/com/trimblemaps/maplayerskotlin/MapActivity.kt
@@ -63,7 +63,7 @@ class MapActivity : AppCompatActivity() {
 
         mapView.getMapAsync { map ->
             map.setStyle(  Style.Builder()
-                .fromUri(Style.MOBILE_DAY)
+                .fromUri(Style.TrimbleMobileStyle.MOBILE_DAY)
                 .withSource(lineSource)
                 .withLayer(LineLayer("1", lineSourceName)
                     .withProperties(lineColor(Color.BLUE), lineWidth(1.0f)))
diff --git a/android/MapLayersKotlin/build.gradle b/android/MapLayersKotlin/build.gradle
index de81c02..a9e2adf 100644
--- a/android/MapLayersKotlin/build.gradle
+++ b/android/MapLayersKotlin/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
diff --git a/android/MapLayersKotlin/gradle.properties b/android/MapLayersKotlin/gradle.properties
index cd0519b..022338b 100644
--- a/android/MapLayersKotlin/gradle.properties
+++ b/android/MapLayersKotlin/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/MapLayersKotlin/gradle/wrapper/gradle-wrapper.properties b/android/MapLayersKotlin/gradle/wrapper/gradle-wrapper.properties
index 988e346..624b2cb 100644
--- a/android/MapLayersKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/android/MapLayersKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Jan 10 13:18:04 EST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/MapsSDKExamplesKotlin/app/build.gradle b/android/MapsSDKExamplesKotlin/app/build.gradle
index 4fb575b..67477d8 100644
--- a/android/MapsSDKExamplesKotlin/app/build.gradle
+++ b/android/MapsSDKExamplesKotlin/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.trimblemaps.mapssdkexampleskotlin"
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -32,6 +32,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.trimblemaps.mapssdkexampleskotlin'
 }
 
 dependencies {
@@ -44,8 +45,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation "com.trimblemaps.mapsdk:maps-sdk-services:1.5.0"
-    implementation "com.trimblemaps.mapsdk:maps-android-sdk:2.1.2"
-    implementation "com.trimblemaps.mapsdk:maps-android-plugin-route:1.6.2"
-    implementation "com.trimblemaps.mapsdk:maps-android-plugin-places:1.6.2"
+    implementation "com.trimblemaps.mapsdk:maps-sdk-services:2.0.0"
+    implementation "com.trimblemaps.mapsdk:maps-android-sdk:2.2.0"
+    implementation "com.trimblemaps.mapsdk:maps-android-plugin-route:2.0.0"
+    implementation "com.trimblemaps.mapsdk:maps-android-plugin-places:2.0.0"
 }
\ No newline at end of file
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/AndroidManifest.xml b/android/MapsSDKExamplesKotlin/app/src/main/AndroidManifest.xml
index 35ed223..fdd0469 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/AndroidManifest.xml
+++ b/android/MapsSDKExamplesKotlin/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.trimblemaps.mapssdkexampleskotlin">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/Sample3DBuildingsActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/Sample3DBuildingsActivity.kt
index 027e5a7..63884a1 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/Sample3DBuildingsActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/Sample3DBuildingsActivity.kt
@@ -37,7 +37,7 @@ class Sample3DBuildingsActivity : AppCompatActivity() {
         mapView?.getMapAsync { trimbleMapsMap ->
             map = trimbleMapsMap
             // The TrimbleMapsMap object is created, now a style can be applied to render a map.
-            trimbleMapsMap.setStyle(Style.MOBILE_DAY)
+            trimbleMapsMap.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
 
             // Set the initial position of the camera, as well as tilting the camera slightly
             // tilting the camera will make the 3D extrusions more obvious.
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimatedCameraActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimatedCameraActivity.kt
index 06973ee..560aed9 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimatedCameraActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimatedCameraActivity.kt
@@ -53,7 +53,7 @@ class SampleAnimatedCameraActivity : AppCompatActivity() {
         mapView?.getMapAsync { trimbleMapsMap ->
             map = trimbleMapsMap
             // The TrimbleMapsMap object is created, now a style can be applied to render a map.
-            trimbleMapsMap.setStyle(Style.MOBILE_DAY)
+            trimbleMapsMap.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
 
             // Set the initial position of the camera.
             map?.cameraPosition = CameraPosition.Builder()
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimationAroundActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimationAroundActivity.kt
index 0e601af..f169586 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimationAroundActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleAnimationAroundActivity.kt
@@ -46,7 +46,7 @@ class SampleAnimateAroundActivity : AppCompatActivity() {
             // Adding the source and layer for the buildings highlighted. Building outlines will be
             // displayed in yellow
 
-            trimbleMapsMap.setStyle(Style.MOBILE_DAY)
+            trimbleMapsMap.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
 
             map?.cameraPosition = CameraPosition.Builder()
                 .target(LatLng(39.90073499962372, -75.16745401827387))
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleBasicMapActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleBasicMapActivity.kt
index b3991f2..56b93ab 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleBasicMapActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleBasicMapActivity.kt
@@ -22,7 +22,7 @@ class SampleBasicMapActivity : Activity() {
         // the onMapReadyCallback is fired when the map is ready to be worked with
         mapView?.getMapAsync(OnMapReadyCallback { trimbleMapsMap ->
             // The TrimbleMapsMap object is created, now a style can be applied to render a map.
-            trimbleMapsMap.setStyle(Style.MOBILE_DAY) {
+            trimbleMapsMap.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY) {
                 // The style is loaded, you can add content to the map, move it etc.
             }
         })
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleChangeStylesActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleChangeStylesActivity.kt
index d73986b..6570fde 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleChangeStylesActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleChangeStylesActivity.kt
@@ -37,7 +37,7 @@ class SampleChangeStylesActivity : Activity(), Style.OnStyleLoaded {
             map!!.cameraPosition = position
 
             // Set the style, the callback is implemented into the class.
-            map!!.setStyle(Style.MOBILE_DAY, this@SampleChangeStylesActivity)
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY, this@SampleChangeStylesActivity)
         }
     }
 
@@ -47,15 +47,15 @@ class SampleChangeStylesActivity : Activity(), Style.OnStyleLoaded {
         when ((view as Button).text.toString()) {
             "Satellite" -> {
                 chosenStyle = "Satellite Style"
-                map?.setStyle(Style.SATELLITE, this)
+                map?.setStyle(Style.TrimbleMobileStyle.MOBILE_SATELLITE, this)
             }
             "Day" -> {
                 chosenStyle = "Day Style"
-                map?.setStyle(Style.MOBILE_DAY, this)
+                map?.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY, this)
             }
             "Night" -> {
                 chosenStyle = "Night Style"
-                map?.setStyle(Style.MOBILE_NIGHT, this)
+                map?.setStyle(Style.TrimbleMobileStyle.MOBILE_NIGHT, this)
             }
         }
     }
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleClickablePointsActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleClickablePointsActivity.kt
index 2fb04f7..5cd84b3 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleClickablePointsActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleClickablePointsActivity.kt
@@ -44,7 +44,7 @@ class SampleClickablePointsActivity : Activity(), Style.OnStyleLoaded {
                 .zoom(13.0)
                 .build()
             map?.cameraPosition = position
-            map?.setStyle(Style.SATELLITE, this@SampleClickablePointsActivity)
+            map?.setStyle(Style.TrimbleMobileStyle.MOBILE_SATELLITE, this@SampleClickablePointsActivity)
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDataDrivenStylingActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDataDrivenStylingActivity.kt
index 597790e..8a4215c 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDataDrivenStylingActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDataDrivenStylingActivity.kt
@@ -46,7 +46,7 @@ class SampleDataDrivenStylingActivity : Activity(), Style.OnStyleLoaded {
 
             // This class implements the onStyleLoaded method, that will be called when
             // the style has been loaded.
-            map!!.setStyle(Style.MOBILE_NIGHT, this@SampleDataDrivenStylingActivity)
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_NIGHT, this@SampleDataDrivenStylingActivity)
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDotsOnAMapActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDotsOnAMapActivity.kt
index 2450ce5..3095ac6 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDotsOnAMapActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleDotsOnAMapActivity.kt
@@ -43,7 +43,7 @@ class SampleDotsOnAMapActivity : Activity(), Style.OnStyleLoaded {
 
             // This class implements the onStyleLoaded method, that will be called when
             // the style has been loaded.
-            map!!.setStyle(Style.MOBILE_NIGHT, this@SampleDotsOnAMapActivity)
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_NIGHT, this@SampleDotsOnAMapActivity)
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFollowMeActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFollowMeActivity.kt
index e6c1dc3..2326dc2 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFollowMeActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFollowMeActivity.kt
@@ -50,7 +50,7 @@ class SampleFollowMeActivity : Activity(), OnMapReadyCallback,
         // The TrimbleMapsMap object is created, now a style can be applied to render a map.
         map = trimbleMapsMap
         map!!.addOnMoveListener(this)
-        map!!.setStyle(Style.MOBILE_DEFAULT) { // Not setting the start location here, as that will be tracked by the user's
+        map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY) { // Not setting the start location here, as that will be tracked by the user's
             // location. Instead, just defining the initial zoom.
             map!!.cameraPosition = CameraPosition.Builder().zoom(15.0).build()
             setupLocationComponent()
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFramingActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFramingActivity.kt
index b2687d3..1058de7 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFramingActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleFramingActivity.kt
@@ -47,7 +47,7 @@ class SampleFramingActivity : Activity(), Style.OnStyleLoaded {
                 .zoom(2.5)
                 .build()
             map?.cameraPosition = position
-            map?.setStyle(Style.MOBILE_DAY, this@SampleFramingActivity)
+            map?.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY, this@SampleFramingActivity)
         }
 
         // When the button is clicked, cycle through the lines using trimbleMapsMap.moveCamera
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleGeocodingActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleGeocodingActivity.kt
index 6927a0b..9959d14 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleGeocodingActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleGeocodingActivity.kt
@@ -35,7 +35,7 @@ class SampleGeocodingActivity : Activity() {
         mapView!!.getMapAsync { trimbleMapsMap ->
             // The TrimbleMapsMap object is created, now a style can be applied to render a map.
             map = trimbleMapsMap
-            map!!.setStyle(Style.MOBILE_DEFAULT) { // The style is loaded, you can add content to the map, move it etc.
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY) { // The style is loaded, you can add content to the map, move it etc.
                 // Style was loaded, do a geocode.
                 geocode()
             }
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightBuildingsActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightBuildingsActivity.kt
index 55ee5a3..bb0d5f5 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightBuildingsActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightBuildingsActivity.kt
@@ -47,7 +47,7 @@ class SampleHighlightBuildingActivity : AppCompatActivity() {
 
             trimbleMapsMap.setStyle(Style
                 .Builder()
-                .fromUri(Style.MOBILE_NIGHT)
+                .fromUri(Style.TrimbleMobileStyle.MOBILE_NIGHT)
                 .withSource(GeoJsonSource(highlightsSrcLayer, FeatureCollection.fromFeatures(highlights)))
                 .withLayer(LineLayer(highlightsSrcLayer, highlightsSrcLayer).withProperties(
                     lineWidth(4f),
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightFeaturesAfterPanningActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightFeaturesAfterPanningActivity.kt
index c1d0eb0..58659c8 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightFeaturesAfterPanningActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleHighlightFeaturesAfterPanningActivity.kt
@@ -50,7 +50,7 @@ class SampleHighlightFeaturesAfterPanningActivity : AppCompatActivity() {
             trimbleMapsMap.setStyle(
                 Style
                 .Builder()
-                .fromUri(Style.MOBILE_NIGHT)
+                .fromUri(Style.TrimbleMobileStyle.MOBILE_NIGHT)
                 .withSource(GeoJsonSource(highlightsSrcLayer, FeatureCollection.fromFeatures(highlights)))
                 .withLayer(
                     LineLayer(highlightsSrcLayer, highlightsSrcLayer).withProperties(
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleIconsOnMapActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleIconsOnMapActivity.kt
index 8f65ac5..7bbbf7a 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleIconsOnMapActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleIconsOnMapActivity.kt
@@ -87,7 +87,7 @@ class SampleIconsOnMapActivity : AppCompatActivity() {
             trimbleMapsMap.setStyle(
                 Style
                     .Builder()
-                    .fromUri(Style.MOBILE_DAY)
+                    .fromUri(Style.TrimbleMobileStyle.MOBILE_DAY)
                     // Add the image to the map so it can be referenced by our source and layers later
                     .withImage(
                         iconId, BitmapUtils.getBitmapFromDrawable(
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleLinesOnAMapActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleLinesOnAMapActivity.kt
index 7461d2e..a21d54a 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleLinesOnAMapActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleLinesOnAMapActivity.kt
@@ -43,7 +43,7 @@ class SampleLinesOnAMapActivity : Activity(), Style.OnStyleLoaded {
 
             // This class implements the onStyleLoaded method, that will be called when
             // the style has been loaded.
-            map!!.setStyle(Style.MOBILE_DAY, this@SampleLinesOnAMapActivity)
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY, this@SampleLinesOnAMapActivity)
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRegionalMapActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRegionalMapActivity.kt
index bb73e2f..9450d40 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRegionalMapActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRegionalMapActivity.kt
@@ -30,7 +30,7 @@ class SampleRegionalMapActivity : AppCompatActivity() {
         // the onMapReadyCallback is fired when the map is ready to be worked with
         mapView?.getMapAsync { trimbleMapsMap ->
             map = trimbleMapsMap
-            map?.setStyle(Style.MOBILE_DEFAULT)
+            map?.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
 
 
             map?.cameraPosition = CameraPosition.Builder()
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRestrictUserInteractionActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRestrictUserInteractionActivity.kt
index 78650fe..75e26e2 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRestrictUserInteractionActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRestrictUserInteractionActivity.kt
@@ -42,7 +42,7 @@ class SampleRestrictUserInteractionActivity : AppCompatActivity() {
         mapView?.getMapAsync { trimbleMapsMap ->
             map = trimbleMapsMap
             // The TrimbleMapsMap object is created, now a style can be applied to render a map.
-            trimbleMapsMap.setStyle(Style.MOBILE_DAY)
+            trimbleMapsMap.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
 
             val cameraPosition  = CameraPosition.Builder()
                 .target(LatLng(40.35406213631131, -74.66366338445839)) // Princeton NJ
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRoutingActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRoutingActivity.kt
index 02fd3c5..cab47ba 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRoutingActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleRoutingActivity.kt
@@ -46,7 +46,7 @@ class SampleRoutingActivity : Activity() {
                 .zoom(11.0)
                 .build()
             map!!.cameraPosition = position
-            map!!.setStyle(Style.MOBILE_DAY) { createSimpleRoute() }
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY) { createSimpleRoute() }
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleTrimbleLayersActivity.kt b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleTrimbleLayersActivity.kt
index 1254a89..daf764b 100644
--- a/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleTrimbleLayersActivity.kt
+++ b/android/MapsSDKExamplesKotlin/app/src/main/java/com/trimblemaps/mapssdkexampleskotlin/SampleTrimbleLayersActivity.kt
@@ -32,7 +32,7 @@ class SampleTrimbleLayersActivity : Activity() {
                 .zoom(13.0)
                 .build()
             map!!.cameraPosition = position
-            map!!.setStyle(Style.MOBILE_DEFAULT)
+            map!!.setStyle(Style.TrimbleMobileStyle.MOBILE_DAY)
         }
     }
 
diff --git a/android/MapsSDKExamplesKotlin/build.gradle b/android/MapsSDKExamplesKotlin/build.gradle
index de81c02..a9e2adf 100644
--- a/android/MapsSDKExamplesKotlin/build.gradle
+++ b/android/MapsSDKExamplesKotlin/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
diff --git a/android/MapsSDKExamplesKotlin/gradle.properties b/android/MapsSDKExamplesKotlin/gradle.properties
index cd0519b..022338b 100644
--- a/android/MapsSDKExamplesKotlin/gradle.properties
+++ b/android/MapsSDKExamplesKotlin/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/MapsSDKExamplesKotlin/gradle/wrapper/gradle-wrapper.properties b/android/MapsSDKExamplesKotlin/gradle/wrapper/gradle-wrapper.properties
index d885880..653f4bc 100644
--- a/android/MapsSDKExamplesKotlin/gradle/wrapper/gradle-wrapper.properties
+++ b/android/MapsSDKExamplesKotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Apr 27 19:04:13 BST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/NavigationExamples/app/build.gradle b/android/NavigationExamples/app/build.gradle
index 8235c53..a8ab4c6 100644
--- a/android/NavigationExamples/app/build.gradle
+++ b/android/NavigationExamples/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.trimblemaps.navigationexamples"
         minSdk 26
-        targetSdk 33
+        targetSdk 35
         versionCode 1
         versionName "1.0"
 
@@ -32,6 +32,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'com.trimblemaps.navigationexamples'
 }
 
 dependencies {
@@ -44,7 +45,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    implementation "com.trimblemaps.navigation:ui-components:1.6.2"
-    implementation "com.trimblemaps.mapsdk:maps-sdk-services:1.5.0"
-    implementation "com.trimblemaps.mapsdk:maps-android-plugin-route:1.6.2"
+    implementation "com.trimblemaps.navigation:ui-components:2.0.0"
+    implementation "com.trimblemaps.mapsdk:maps-sdk-services:2.0.0"
+    implementation "com.trimblemaps.mapsdk:maps-android-plugin-route:2.0.0"
 }
\ No newline at end of file
diff --git a/android/NavigationExamples/app/src/main/AndroidManifest.xml b/android/NavigationExamples/app/src/main/AndroidManifest.xml
index c5eff15..b5366ca 100644
--- a/android/NavigationExamples/app/src/main/AndroidManifest.xml
+++ b/android/NavigationExamples/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.trimblemaps.navigationexamples">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
diff --git a/android/NavigationExamples/build.gradle b/android/NavigationExamples/build.gradle
index de81c02..a9e2adf 100644
--- a/android/NavigationExamples/build.gradle
+++ b/android/NavigationExamples/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.1' apply false
-    id 'com.android.library' version '7.2.1' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
diff --git a/android/NavigationExamples/gradle.properties b/android/NavigationExamples/gradle.properties
index cd0519b..022338b 100644
--- a/android/NavigationExamples/gradle.properties
+++ b/android/NavigationExamples/gradle.properties
@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
\ No newline at end of file
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/android/NavigationExamples/gradle/wrapper/gradle-wrapper.properties b/android/NavigationExamples/gradle/wrapper/gradle-wrapper.properties
index db9e285..15a5c9a 100644
--- a/android/NavigationExamples/gradle/wrapper/gradle-wrapper.properties
+++ b/android/NavigationExamples/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 20 13:31:37 EDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME