diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 538121546..c0b67324d 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -75,7 +75,7 @@ limitations under the License.
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/ThemeCustom">
+        android:theme="@style/OpenTracksTheme">
 
         <activity
             android:name=".publicapi.StartRecording"
diff --git a/src/main/res/values-night/themes_custom.xml b/src/main/res/values-night/styles_theme.xml
similarity index 94%
rename from src/main/res/values-night/themes_custom.xml
rename to src/main/res/values-night/styles_theme.xml
index c06eacb13..83d956268 100644
--- a/src/main/res/values-night/themes_custom.xml
+++ b/src/main/res/values-night/styles_theme.xml
@@ -1,6 +1,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="ThemeCustom" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="OpenTracksTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- Material3 tech documentation; https://github.com/material-components/material-components-android/blob/master/docs/components/ -->
 
         <item name="colorPrimary">@color/opentracks</item>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 99922e734..0e9fcde12 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -93,4 +93,11 @@ limitations under the License.
         <item name="colorOnSurface">@android:color/holo_red_dark</item>
     </style>
 
+    <style name="Widget.OpenTracks.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
+        <item name="fabCustomSize">64dp</item>
+    </style>
+
+    <style name="MaterialSwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
+        <item name="widgetLayout">@layout/view_preference_switch</item>
+    </style>
 </resources>
diff --git a/src/main/res/values/themes_custom.xml b/src/main/res/values/styles_theme.xml
similarity index 59%
rename from src/main/res/values/themes_custom.xml
rename to src/main/res/values/styles_theme.xml
index 04e97ab6c..f2da7cb9d 100644
--- a/src/main/res/values/themes_custom.xml
+++ b/src/main/res/values/styles_theme.xml
@@ -1,21 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright 2013 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="ThemeCustom" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="OpenTracksTheme" parent="Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">@color/opentracks</item>
         <item name="colorSecondary">@color/opentracks</item>
 
@@ -41,18 +27,10 @@ limitations under the License.
         <item name="windowSplashScreenBackground">@color/splashscreen_background</item>
 
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_logo_color_splashscreen</item>
-        <item name="postSplashScreenTheme">@style/ThemeCustom</item>
+        <item name="postSplashScreenTheme">@style/OpenTracksTheme</item>
     </style>
 
     <style name="Widget.OpenTracks.BottomAppBar" parent="Widget.Material3.BottomAppBar">
         <item name="backgroundTint">?attr/colorSurfaceContainer</item>
     </style>
-
-    <style name="Widget.OpenTracks.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="fabCustomSize">64dp</item>
-    </style>
-
-    <style name="MaterialSwitchPreferenceCompat" parent="@style/Preference.SwitchPreferenceCompat.Material">
-        <item name="widgetLayout">@layout/view_preference_switch</item>
-    </style>
 </resources>