diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/components/DrawerMenuItem.kt b/app/src/main/java/org/scottishtecharmy/soundscape/components/DrawerMenuItem.kt
index 8cdbd213..ad8e2d3c 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/components/DrawerMenuItem.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/components/DrawerMenuItem.kt
@@ -6,7 +6,6 @@ import androidx.compose.material3.NavigationDrawerItem
 import androidx.compose.material3.NavigationDrawerItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 
 @Composable
@@ -14,7 +13,7 @@ fun DrawerMenuItem(onClick: () -> Unit, label: String, icon: ImageVector) {
     NavigationDrawerItem(
         label = { Text(
             text = label,
-            color = Color.White
+            color = MaterialTheme.colorScheme.onBackground
         ) },
         colors = NavigationDrawerItemDefaults.colors(
             unselectedContainerColor = MaterialTheme.colorScheme.background
@@ -23,7 +22,7 @@ fun DrawerMenuItem(onClick: () -> Unit, label: String, icon: ImageVector) {
             Icon(
                 icon,
                 null,
-                tint = Color.White
+                tint = MaterialTheme.colorScheme.onBackground
             )
         },
         selected = false,
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/components/LocationItem.kt b/app/src/main/java/org/scottishtecharmy/soundscape/components/LocationItem.kt
index 47eca458..15591cfd 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/components/LocationItem.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/components/LocationItem.kt
@@ -72,14 +72,14 @@ fun LocationItem(
             Icon(
                 Icons.Rounded.LocationOn,
                 contentDescription = null,
-                tint = Color.White,
+                tint = MaterialTheme.colorScheme.onBackground,
                 modifier = Modifier.width(spacing.icon)
             )
         } else if (decoration.index != -1) {
             Text(
                 text = (decoration.index + 1).toString(),
                 style = MaterialTheme.typography.titleLarge,
-                color = Color.White,
+                color = MaterialTheme.colorScheme.onBackground,
                 modifier = Modifier.width(spacing.targetSize).align(Alignment.CenterVertically)
             )
         }
@@ -90,7 +90,7 @@ fun LocationItem(
                 Text(
                     text = it,
                     style = MaterialTheme.typography.titleLarge,
-                    color = Color.White,
+                    color = MaterialTheme.colorScheme.onBackground,
                 )
             }
             if(distanceString.isNotEmpty()) {
@@ -122,7 +122,7 @@ fun LocationItem(
             Icon(
                 Icons.Rounded.ChevronRight,
                 contentDescription = null,
-                tint = Color.White,
+                tint = MaterialTheme.colorScheme.onBackground,
                 modifier = Modifier.width(spacing.icon)
             )
         }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/components/MainSearchBar.kt b/app/src/main/java/org/scottishtecharmy/soundscape/components/MainSearchBar.kt
index e61e6d3c..33705d83 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/components/MainSearchBar.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/components/MainSearchBar.kt
@@ -21,7 +21,6 @@ import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.CollectionInfo
 import androidx.compose.ui.semantics.CollectionItemInfo
@@ -56,7 +55,7 @@ fun MainSearchBar(
                     },
                 ),
         shape = RoundedCornerShape(spacing.small),
-        colors = SearchBarDefaults.colors(containerColor = Color.White),
+        colors = SearchBarDefaults.colors(containerColor = MaterialTheme.colorScheme.surface),
         inputField = {
             SearchBarDefaults.InputField(
                 query = searchText,
@@ -71,7 +70,7 @@ fun MainSearchBar(
                             Icon(
                                 imageVector = Icons.Rounded.Search,
                                 contentDescription = null,
-                                tint = Color.Gray,
+                                tint = MaterialTheme.colorScheme.onSurfaceVariant,
                             )
                         }
 
@@ -83,13 +82,13 @@ fun MainSearchBar(
                                     Icons.AutoMirrored.Rounded.ArrowBack,
                                     contentDescription =
                                         stringResource(R.string.cancel_search_contentDescription),
-                                    tint = Color.Gray,
+                                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
                                 )
                             }
                         }
                     }
                 },
-                colors = SearchBarDefaults.inputFieldColors(focusedTextColor = Color.Black),
+                colors = SearchBarDefaults.inputFieldColors(focusedTextColor = MaterialTheme.colorScheme.onSurface),
             )
         },
         expanded = isSearching,
@@ -134,7 +133,7 @@ fun MainSearchBar(
                                 },
                             userLocation = userLocation
                         )
-                        HorizontalDivider(color = Color.White)
+                        HorizontalDivider(color = MaterialTheme.colorScheme.onPrimary)
                     }
                 }
             }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/components/NavigationButton.kt b/app/src/main/java/org/scottishtecharmy/soundscape/components/NavigationButton.kt
index ef689aa2..bf2f1b61 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/components/NavigationButton.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/components/NavigationButton.kt
@@ -16,7 +16,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -51,7 +50,7 @@ fun NavigationButton(
                 Icon(
                     icon,
                     null,
-                    tint = Color.White
+                    tint = MaterialTheme.colorScheme.onPrimary
                 )
                 Spacer(modifier = Modifier.width(spacing.small))
             }
@@ -64,7 +63,7 @@ fun NavigationButton(
             Icon(
                 Icons.Rounded.ChevronRight,
                 null,
-                tint = Color.White,
+                tint = MaterialTheme.colorScheme.onPrimary,
                 modifier = Modifier.defaultMinSize(spacing.targetSize)
             )
         }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/DrawerContent.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/DrawerContent.kt
index 943ea802..ff07989f 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/DrawerContent.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/DrawerContent.kt
@@ -19,7 +19,6 @@ import androidx.compose.material3.ModalDrawerSheet
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import kotlinx.coroutines.launch
@@ -61,7 +60,7 @@ fun DrawerContent(
                         .size(spacing.targetSize)
                         .padding(start = spacing.extraSmall),
                 contentDescription = stringResource(R.string.ui_menu_close),
-                tint = Color.White,
+                tint = MaterialTheme.colorScheme.onPrimary,
             )
         }
         DrawerMenuItem(
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HelpScreen.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HelpScreen.kt
index 90284c5c..6c815dac 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HelpScreen.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HelpScreen.kt
@@ -18,7 +18,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
@@ -414,7 +413,7 @@ fun HelpScreen(
                                             )
                                         )                                        ),
                                     style = MaterialTheme.typography.bodyMedium,
-                                    color = OnSurface,
+                                    color = MaterialTheme.colorScheme.onPrimary,
                                 )
                             }
 
@@ -438,7 +437,7 @@ fun HelpScreen(
                                             text = stringResource(section.textId),
                                             textAlign = TextAlign.Start,
                                             style = MaterialTheme.typography.titleMedium,
-                                            color = OnSurface,
+                                            color = MaterialTheme.colorScheme.onPrimary,
                                         )
                                     }
                                     Box(
@@ -447,7 +446,7 @@ fun HelpScreen(
                                         Icon(
                                             Icons.Rounded.ChevronRight,
                                             null,
-                                            tint = Color.White,
+                                            tint = MaterialTheme.colorScheme.onPrimary,
                                             modifier = Modifier.align(Alignment.CenterEnd)
                                         )
                                     }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/Home.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/Home.kt
index 49f58520..979bbffe 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/Home.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/Home.kt
@@ -20,7 +20,6 @@ import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
@@ -45,7 +44,6 @@ import org.scottishtecharmy.soundscape.screens.home.StreetPreviewFunctions
 import org.scottishtecharmy.soundscape.screens.home.data.LocationDescription
 import org.scottishtecharmy.soundscape.screens.home.locationDetails.generateLocationDetailsRoute
 import org.scottishtecharmy.soundscape.services.RoutePlayerState
-import org.scottishtecharmy.soundscape.ui.theme.OnPrimary
 import org.scottishtecharmy.soundscape.ui.theme.SoundscapeTheme
 import org.scottishtecharmy.soundscape.viewmodels.home.HomeState
 
@@ -161,7 +159,7 @@ fun HomeTopAppBar(
                 Icon(
                     imageVector = Icons.Rounded.Menu,
                     contentDescription = stringResource(R.string.ui_menu),
-                    tint = Color.White,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                     modifier = Modifier.semantics { heading() },
                 )
             }
@@ -177,7 +175,7 @@ fun HomeTopAppBar(
                     .semantics { onClick(label = sleepHint, action = { false }) }
             ) {
                 Icon(Icons.Rounded.Snooze,
-                    tint = OnPrimary,
+                    tint = MaterialTheme.colorScheme.onPrimary,
                     contentDescription = stringResource(R.string.sleep_sleep))
             }
         },
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HomeContent.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HomeContent.kt
index ab8684df..66a84173 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HomeContent.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HomeContent.kt
@@ -1,12 +1,12 @@
 package org.scottishtecharmy.soundscape.screens.home.home
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
@@ -16,12 +16,12 @@ import androidx.compose.material.icons.filled.SkipNext
 import androidx.compose.material.icons.filled.SkipPrevious
 import androidx.compose.material3.Button
 import androidx.compose.material3.Card
+import androidx.compose.material3.CardColors
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.onClick
@@ -45,7 +45,6 @@ import org.scottishtecharmy.soundscape.services.RoutePlayerState
 import org.scottishtecharmy.soundscape.ui.theme.extraSmallPadding
 import org.scottishtecharmy.soundscape.ui.theme.smallPadding
 import org.scottishtecharmy.soundscape.ui.theme.spacing
-import org.scottishtecharmy.soundscape.ui.theme.tinyPadding
 
 @Composable
 fun HomeContent(
@@ -68,129 +67,145 @@ fun HomeContent(
 
     Column(
         verticalArrangement = Arrangement.spacedBy(spacing.small),
-        modifier = modifier.verticalScroll(rememberScrollState()),
+        modifier = modifier
     ) {
-        if(streetPreviewState.enabled != StreetPreviewEnabled.OFF) {
-            StreetPreview(streetPreviewState, heading, streetPreviewFunctions)
-        } else {
-            searchBar()
+        searchBar()
 
-            // Places Nearby
-            NavigationButton(
-                onClick = {
-                    onNavigate(HomeRoutes.PlacesNearby.route)
-                },
-                text = stringResource(R.string.search_nearby_screen_title),
-                horizontalPadding = spacing.small,
-                modifier = Modifier.semantics {
-                    heading()
-                    onClick(label = placesNearbyHint, action = { false })
-                },
-            )
-            // Markers and routes
-            NavigationButton(
-                onClick = {
-                    onNavigate(HomeRoutes.MarkersAndRoutes.route)
-                },
-                text = stringResource(R.string.search_view_markers),
-                horizontalPadding = spacing.small,
-                modifier = Modifier
-                    .semantics { onClick(label = markersHint, action = { false }) }
-            )
-            // Current location
-            NavigationButton(
-                onClick = {
-                    if (location != null) {
-                        val ld = getCurrentLocationDescription()
-                        onNavigate(generateLocationDetailsRoute(ld))
-                    }
-                },
-                text = stringResource(R.string.search_use_current_location),
-                horizontalPadding = spacing.small,
-                modifier = Modifier
-                    .semantics { onClick(label = currentLocationHint, action = { false }) }
-            )
-        }
-        if (location != null) {
-            if(routePlayerState.routeData != null) {
-                Card(modifier = Modifier.smallPadding()) {
-//                    Column {
-                        Row(modifier = Modifier.height(spacing.large)) {
-                            Text(
-                                text = "${routePlayerState.routeData.name} - ${routePlayerState.currentWaypoint + 1}/${routePlayerState.routeData.waypoints.size}",
-                                style = MaterialTheme.typography.labelLarge,
-                                modifier = Modifier.smallPadding()
-                            )
-                        }
-                        Row(modifier = Modifier.fillMaxWidth().aspectRatio(2.0f)) {
-                            MapContainerLibre(
-                                beaconLocation = beaconLocation,
-                                routeData = routePlayerState.routeData,
-                                mapCenter = location,
-                                allowScrolling = false,
-                                mapViewRotation = 0.0F,
-                                userLocation = location,
-                                userSymbolRotation = heading,
-                                onMapLongClick = onMapLongClick,
-                                modifier = Modifier.fillMaxWidth()                            )
+        Column(
+            verticalArrangement = Arrangement.spacedBy(spacing.small),
+            modifier = Modifier.verticalScroll(rememberScrollState()),
+        ) {
+            if (streetPreviewState.enabled != StreetPreviewEnabled.OFF) {
+                StreetPreview(streetPreviewState, heading, streetPreviewFunctions)
+            } else {
+                // Places Nearby
+                NavigationButton(
+                    onClick = {
+                        onNavigate(HomeRoutes.PlacesNearby.route)
+                    },
+                    text = stringResource(R.string.search_nearby_screen_title),
+                    horizontalPadding = spacing.small,
+                    modifier = Modifier.semantics {
+                        heading()
+                        onClick(label = placesNearbyHint, action = { false })
+                    },
+                )
+                // Markers and routes
+                NavigationButton(
+                    onClick = {
+                        onNavigate(HomeRoutes.MarkersAndRoutes.route)
+                    },
+                    text = stringResource(R.string.search_view_markers),
+                    horizontalPadding = spacing.small,
+                    modifier = Modifier
+                        .semantics { onClick(label = markersHint, action = { false }) }
+                )
+                // Current location
+                NavigationButton(
+                    onClick = {
+                        if (location != null) {
+                            val ld = getCurrentLocationDescription()
+                            onNavigate(generateLocationDetailsRoute(ld))
                         }
-                        Row(modifier = Modifier.fillMaxWidth().height(spacing.targetSize).extraSmallPadding(),
-                            horizontalArrangement = Arrangement.SpaceEvenly,
-                            verticalAlignment = androidx.compose.ui.Alignment.Bottom) {
-                            Button(onClick = { routeFunctions.skipPrevious() })
-                            {
-                                Icon(
-                                    modifier = Modifier,
-                                    imageVector = Icons.Filled.SkipPrevious,
-                                    tint = if(routePlayerState.currentWaypoint == 0) Color.Unspecified else Color.White,
-                                    contentDescription = "",
+                    },
+                    text = stringResource(R.string.search_use_current_location),
+                    horizontalPadding = spacing.small,
+                    modifier = Modifier
+                        .semantics { onClick(label = currentLocationHint, action = { false }) }
+                )
+            }
+            if (location != null) {
+                if (routePlayerState.routeData != null) {
+                    Card(modifier = Modifier
+                        .smallPadding(),
+                        colors = CardColors(
+                            contentColor = MaterialTheme.colorScheme.onPrimary,
+                            containerColor = MaterialTheme.colorScheme.primary,
+                            disabledContentColor = MaterialTheme.colorScheme.onPrimary,
+                            disabledContainerColor = MaterialTheme.colorScheme.primary,
+                        )
+                    ) {
+                        Column(verticalArrangement = Arrangement.spacedBy(spacing.small)) {
+                            Row {
+                                Text(
+                                    text = "${routePlayerState.routeData.name} - ${routePlayerState.currentWaypoint + 1}/${routePlayerState.routeData.waypoints.size}",
+                                    style = MaterialTheme.typography.labelLarge,
+                                    modifier = Modifier.smallPadding()
                                 )
                             }
-                            Button(onClick = { routeFunctions.skipNext() })
-                            {
-                                Icon(
-                                    modifier = Modifier,
-                                    imageVector = Icons.Filled.SkipNext,
-                                    tint = if(routePlayerState.currentWaypoint < routePlayerState.routeData.waypoints.size - 1) Color.White else Color.Unspecified,
-                                    contentDescription = "",
+                            Row(modifier = Modifier.fillMaxWidth().aspectRatio(2.0f)) {
+                                MapContainerLibre(
+                                    beaconLocation = beaconLocation,
+                                    routeData = routePlayerState.routeData,
+                                    mapCenter = location,
+                                    allowScrolling = false,
+                                    mapViewRotation = 0.0F,
+                                    userLocation = location,
+                                    userSymbolRotation = heading,
+                                    onMapLongClick = onMapLongClick,
+                                    modifier = Modifier.fillMaxWidth()
                                 )
                             }
-                            Button(onClick = {
+                            Row(
+                                modifier = Modifier.fillMaxWidth().height(spacing.targetSize),
+                                horizontalArrangement = Arrangement.SpaceEvenly,
+                                verticalAlignment = androidx.compose.ui.Alignment.Bottom
+                            ) {
+                                Button(onClick = { routeFunctions.skipPrevious() })
+                                {
+                                    Icon(
+                                        modifier = Modifier,
+                                        imageVector = Icons.Filled.SkipPrevious,
+                                        tint = if (routePlayerState.currentWaypoint == 0) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.onPrimary,
+                                        contentDescription = "",
+                                    )
+                                }
+                                Button(onClick = { routeFunctions.skipNext() })
+                                {
+                                    Icon(
+                                        modifier = Modifier,
+                                        imageVector = Icons.Filled.SkipNext,
+                                        tint = if (routePlayerState.currentWaypoint < routePlayerState.routeData.waypoints.size - 1) MaterialTheme.colorScheme.onPrimary else MaterialTheme.colorScheme.onSurface,
+                                        contentDescription = "",
+                                    )
+                                }
+                                Button(onClick = {
                                     onNavigate("${HomeRoutes.RouteDetails.route}/${routePlayerState.routeData.objectId.toHexString()}")
                                 }
-                            )
-                            {
-                                Icon(
-                                    modifier = Modifier,
-                                    imageVector = Icons.Filled.Info,
-                                    contentDescription = "",
-                                )
-                            }
-                            Button(onClick = { routeFunctions.mute() })
-                            {
-                                Icon(
-                                    modifier = Modifier,
-                                    imageVector = Icons.AutoMirrored.Filled.VolumeMute,
-                                    contentDescription = "",
                                 )
+                                {
+                                    Icon(
+                                        modifier = Modifier,
+                                        imageVector = Icons.Filled.Info,
+                                        contentDescription = "",
+                                    )
+                                }
+                                Button(onClick = { routeFunctions.mute() })
+                                {
+                                    Icon(
+                                        modifier = Modifier,
+                                        imageVector = Icons.AutoMirrored.Filled.VolumeMute,
+                                        contentDescription = "",
+                                    )
+                                }
                             }
-//                        }
+                        }
                     }
+                } else {
+                    MapContainerLibre(
+                        beaconLocation = beaconLocation,
+                        routeData = null,
+                        mapCenter = location,
+                        allowScrolling = false,
+                        mapViewRotation = 0.0F,
+                        userLocation = location,
+                        userSymbolRotation = heading,
+                        onMapLongClick = onMapLongClick,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .aspectRatio(1f)
+                    )
                 }
-            } else  {
-                MapContainerLibre(
-                    beaconLocation = beaconLocation,
-                    routeData = null,
-                    mapCenter = location,
-                    allowScrolling = false,
-                    mapViewRotation = 0.0F,
-                    userLocation = location,
-                    userSymbolRotation = heading,
-                    onMapLongClick = onMapLongClick,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .aspectRatio(1f)
-                )
             }
         }
     }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/settings/Settings.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/settings/Settings.kt
index 8fc46107..a543ea4d 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/settings/Settings.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/home/settings/Settings.kt
@@ -1,6 +1,7 @@
 package org.scottishtecharmy.soundscape.screens.home.settings
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -18,6 +19,7 @@ import me.zhanghai.compose.preference.switchPreference
 import org.scottishtecharmy.soundscape.MainActivity
 import org.scottishtecharmy.soundscape.R
 import org.scottishtecharmy.soundscape.screens.markers_routes.components.CustomAppBar
+import org.scottishtecharmy.soundscape.ui.theme.PurpleGradientDark
 import org.scottishtecharmy.soundscape.viewmodels.SettingsViewModel
 
 // This code uses the library https://github.com/zhanghai/ComposePreference
@@ -43,7 +45,7 @@ fun Settings(
     val beaconTypes = uiState.beaconTypes.map { stringResource(it) }
 
     ProvidePreferenceLocals {
-        LazyColumn (modifier = modifier){
+        LazyColumn (modifier = modifier.background(PurpleGradientDark)){
             stickyHeader {
                 Surface {
                     CustomAppBar(stringResource(R.string.general_alert_settings),
@@ -57,40 +59,64 @@ fun Settings(
             item {
                 Text(
                     text = stringResource(R.string.menu_manage_callouts),
-                    color = MaterialTheme.colorScheme.onPrimary,
+                    color = MaterialTheme.colorScheme.onBackground,
                     modifier = Modifier.semantics { heading() },
                 )
             }
             switchPreference(
                 key = MainActivity.ALLOW_CALLOUTS_KEY,
                 defaultValue = MainActivity.ALLOW_CALLOUTS_DEFAULT,
-                title = { Text(text = stringResource(R.string.callouts_allow_callouts)) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.callouts_allow_callouts),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
             )
             switchPreference(
                 key = MainActivity.PLACES_AND_LANDMARKS_KEY,
                 defaultValue = MainActivity.PLACES_AND_LANDMARKS_DEFAULT,
-                title = { Text(text = stringResource(R.string.callouts_places_and_landmarks)) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.callouts_places_and_landmarks),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
             )
             switchPreference(
                 key = MainActivity.MOBILITY_KEY,
                 defaultValue = MainActivity.MOBILITY_DEFAULT,
-                title = { Text(text = stringResource(R.string.callouts_mobility)) },
+                title = {
+                    Text(text = stringResource(R.string.callouts_mobility),
+                    color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
             )
             switchPreference(
                 key = MainActivity.DISTANCE_TO_BEACON_KEY,
                 defaultValue = MainActivity.DISTANCE_TO_BEACON_DEFAULT,
-                title = { Text(text = stringResource(R.string.callouts_audio_beacon)) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.callouts_audio_beacon),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
             )
             switchPreference(
                 key = MainActivity.UNNAMED_ROADS_KEY,
                 defaultValue = MainActivity.UNNAMED_ROADS_DEFAULT,
-                title = { Text(text = stringResource(R.string.preview_include_unnamed_roads_title)) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.preview_include_unnamed_roads_title),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
             )
 
             item {
                 Text(
                     text = stringResource(R.string.menu_manage_audio),
-                    color = MaterialTheme.colorScheme.onPrimary,
+                    color = MaterialTheme.colorScheme.onBackground,
                     modifier = Modifier.semantics { heading() },
                     )
             }
@@ -98,25 +124,40 @@ fun Settings(
                 key = MainActivity.BEACON_TYPE_KEY,
                 defaultValue = MainActivity.BEACON_TYPE_DEFAULT,
                 values = beaconTypes,
-                title = { Text(text = stringResource(R.string.beacon_settings_style)) },
-                summary = { Text(text = it, color = MaterialTheme.colorScheme.onPrimary) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.beacon_settings_style),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
+                summary = { Text(text = it, color = MaterialTheme.colorScheme.onBackground) },
             )
 
             listPreference(
                 key = MainActivity.VOICE_TYPE_KEY,
                 defaultValue = MainActivity.VOICE_TYPE_DEFAULT,
                 values = uiState.voiceTypes,
-                title = { Text(text = stringResource(R.string.voice_voices)) },
-                summary = { Text(text = it, color = MaterialTheme.colorScheme.onPrimary) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.voice_voices),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
+                summary = { Text(text = it, color = MaterialTheme.colorScheme.onBackground) },
             )
 
             sliderPreference(
                 key = MainActivity.SPEECH_RATE_KEY,
                 defaultValue = MainActivity.SPEECH_RATE_DEFAULT,
-                title = { Text(text = stringResource(R.string.voice_settings_speaking_rate)) },
+                title = {
+                    Text(
+                        text = stringResource(R.string.voice_settings_speaking_rate),
+                        color = MaterialTheme.colorScheme.onBackground
+                    )
+                },
                 valueRange = 0.5f..2.0f,
                 valueSteps = 10,
-                valueText = { Text(text = "%.1fx".format(it), color = MaterialTheme.colorScheme.onPrimary) },
+                valueText = { Text(text = "%.1fx".format(it), color = MaterialTheme.colorScheme.onBackground) },
             )
         }
     }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/addandeditroutescreen/AddAndEditRouteScreen.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/addandeditroutescreen/AddAndEditRouteScreen.kt
index 4f163391..588804fe 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/addandeditroutescreen/AddAndEditRouteScreen.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/addandeditroutescreen/AddAndEditRouteScreen.kt
@@ -30,7 +30,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -359,7 +358,7 @@ fun AddAndEditRouteScreen(
                                                 Icon(
                                                     imageVector = Icons.Rounded.DragIndicator,
                                                     contentDescription = "",
-                                                    tint = Color.White,
+                                                    tint = MaterialTheme.colorScheme.onBackground,
                                                 )
                                             }
                                         }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/routedetailsscreen/RouteDetailsScreen.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/routedetailsscreen/RouteDetailsScreen.kt
index b6d682b7..5eee9fda 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/routedetailsscreen/RouteDetailsScreen.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/routedetailsscreen/RouteDetailsScreen.kt
@@ -175,7 +175,7 @@ fun RouteDetailsScreen(
                                 IconWithTextButton(
                                     modifier = Modifier.fillMaxWidth(),
                                     icon = Icons.Default.Stop,
-                                    iconModifier = Modifier.size(spacing.icon).smallPadding(),
+                                    iconModifier = Modifier.size(spacing.icon),
                                     textModifier = Modifier.padding(horizontal = spacing.extraSmall),
                                     iconText = stringResource(R.string.route_detail_action_stop_route),
                                     fontSize = 24.sp,
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/audiobeacons/AudioBeacons.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/audiobeacons/AudioBeacons.kt
index 19005578..6169afa5 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/audiobeacons/AudioBeacons.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/audiobeacons/AudioBeacons.kt
@@ -23,7 +23,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.heading
 import androidx.compose.ui.semantics.semantics
@@ -140,7 +139,7 @@ fun AudioBeacons(
                     .clip(RoundedCornerShape(spacing.extraSmall))
                     .fillMaxWidth()
                     .heightIn(spacing.extraLarge, spacing.extraLarge * 5)
-                    .background(Color.White)
+                    .background(MaterialTheme.colorScheme.onBackground)
             ) {
                 items(beacons) { beacon ->
                     AudioBeaconItem(
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/navigating/NavigatingScreen.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/navigating/NavigatingScreen.kt
index 3e87da3a..eae0988d 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/navigating/NavigatingScreen.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/navigating/NavigatingScreen.kt
@@ -133,7 +133,7 @@ fun Navigating(
                     Icon(
                         Icons.Rounded.LocationOn,
                         contentDescription = null,
-                        tint = Color.White
+                        tint = MaterialTheme.colorScheme.onBackground
                     )
                     Spacer(modifier = Modifier.width(spacing.medium))
                     Column(
@@ -162,7 +162,7 @@ fun Navigating(
                         Icon(
                             Icons.Rounded.Notifications,
                             contentDescription = null,
-                            tint = Color.White
+                            tint = MaterialTheme.colorScheme.onBackground
                         )
                         Spacer(modifier = Modifier.width(spacing.extraSmall))
                         Column(
@@ -195,7 +195,7 @@ fun Navigating(
                         Icons.AutoMirrored.Rounded.DirectionsRun,
                         //Icons.Rounded.FitnessCenter,
                         contentDescription = null,
-                        tint = Color.White
+                        tint = MaterialTheme.colorScheme.onBackground
                     )
                     Spacer(modifier = Modifier.width(spacing.medium))
                     Column(
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/terms/TermsScreen.kt b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/terms/TermsScreen.kt
index cc2cf84d..3ceffc6b 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/terms/TermsScreen.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/terms/TermsScreen.kt
@@ -73,7 +73,7 @@ fun TermsScreen(
                 modifier = Modifier
                     .clip(RoundedCornerShape(spacing.extraSmall))
                     .fillMaxWidth()
-                    .background(Color.White)
+                    .background(MaterialTheme.colorScheme.onBackground)
                     .verticalScroll(rememberScrollState())
             ) {
                 TermsItem(stringResource(R.string.terms_of_use_message))
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/ui/theme/Color.kt b/app/src/main/java/org/scottishtecharmy/soundscape/ui/theme/Color.kt
index 97c9c288..533e1538 100644
--- a/app/src/main/java/org/scottishtecharmy/soundscape/ui/theme/Color.kt
+++ b/app/src/main/java/org/scottishtecharmy/soundscape/ui/theme/Color.kt
@@ -13,7 +13,7 @@ val Surface = Color.White
 val OnPrimary = Color.White
 val OnSecondary = Color.Black
 val OnBackground = Color.White
-val OnSurface = Color.White
+val OnSurface = Color.Black
 val OnSurfaceVariant = Color.DarkGray
 val surfaceBright = Color.Cyan
 val transparent = Color.Transparent