diff --git a/mobile/com.sap.sailing.android.tracking.app/lint.xml b/mobile/com.sap.sailing.android.tracking.app/lint.xml
index a54ac01c09c..53ee9c7f6b1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/lint.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/lint.xml
@@ -4,19 +4,24 @@
         <ignore path="res/values/preferences.xml" />
     </issue>
 
-		<!-- Reason:  Don't want to use apply() instead of commit() -->
+	<!-- Reason:  Don't want to use apply() instead of commit() -->
     <issue id="CommitPrefEdits">
     		<ignore path="src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java" />
     </issue>
 
-		<!-- Reason: Eclipse users don't get the override -->
+	<!-- Reason: Eclipse users don't get the override -->
     <issue id="GradleOverrides">
     		<ignore path="AndroidManifest.xml" />
     </issue>
 
-		<!-- Reason: Yes, overlap possible, but can easily be caught by testers / also: not critical -->
+	<!-- Reason: Yes, overlap possible, but can easily be caught by testers / also: not critical -->
     <issue id="RelativeOverlap">
     		<ignore path="res/layout/fragment_tracking.xml" />
     		<ignore path="res/layout-land/fragment_tracking.xml" />
     </issue>
+
+    <!-- Reason: Looks like it belongs to vpi__dark_theme -->
+    <issue id="UnusedResources">
+        <ignore path="res/color/vpi__light_theme.xml" />
+    </issue>
 </lint>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/menu/regatta.xml b/mobile/com.sap.sailing.android.tracking.app/res/menu/regatta.xml
deleted file mode 100644
index b30579469b8..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/menu/regatta.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="com.sap.sailing.android.tracking.app.RegattaActivity" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
-
-</menu>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
index d124bdcfd26..47d1f589221 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
@@ -3,57 +3,21 @@
     <string name="yes">Ja</string>
     <string name="no">Nein</string>
 	<string name="empty"></string>
-	<string name="correct">Korrekt</string>
-	<string name="not_correct">Nein, Ich bin nicht</string>
-	<string name="stop_race">Rennen schließen</string>
-	<string name="stop_race_question">Wollen Sie das Tracking beenden?</string>
-	<string name="confirm_profile">Hallo #USERNAME#\nSie sind dabei in #EVENT#.</string>
-	<string name="checkout_regatta">Regatta checkout</string>
-	<string name="confirm_picture">Zustimmung</string>
-	<string name="confirm_picture_usage">Ich stimme zu, dass ich das Bild gemacht habe und dass SAP es verwenden darf.</string>
-	<string name="regatta_list_title">Eingecheckte Regatten</string>
-	<string name="show_more">Mehr anzeigen</string>
-	<string name="country_code">Ländercode</string>
-	<string name="menu_checkout">Checkout</string>
-	<string name="menu_settings">Einstellungen</string>
-	<string name="menu_about">Über diese app</string>
-	<string name="scan_intro">GPS-Tracker-Konfiguration</string>
-	<string name="add_team_picture">Team Foto hinzufügen</string>
-	<string name="messages">Nachrichten:</string>
-	<string name="last_refresh">(Letzte Aktualisierung vor XX min)</string>
-	<string name="next_race">Nächstes Rennen in voraussichtlich XX min</string>
-	<string name="announcement">Ankündigung</string>
-	<string name="empty_regatta_listview">Sie sind für keine Regatta gemeldet</string>
-	<string name="homefragment_volley_404">Datum ist auf dem Server nicht verfügbar. Bitte wiederholen.</string>
-	<string name="homefragment_volley_unknown">Der Server hat einen unbekannten Code (%s) zurückgegeben.</string>
-	<string name="homefragment_volley_unexpected">Der Server hat eine unerwartete Nachricht zurückgegeben.</string>
-	<string name="zero">0</string>
 	<string name="tracking_time">Tracking Zeit</string>
     <string name="app_name">SAP Sailing Tracking App</string>
-    <string name="not_tracking">Tracking aktiv</string>
-    <string name="tracking">Tracking nicht aktiv</string>
-    <string name="options_menu_info">Technische Informationen</string>
     <string name="options_menu_settings">Einstellungen</string>
     <string name="options_menu_checkout">Checkout</string>
-    <string name="settings_category_general">General</string>
     <string name="settings_category_other">Andere Einstellungen</string>
     <string name="scan_hint">Der QR-Code befindet sich auf Ihrer Teilnahmebestätigung</string>
-    <string name="server_url">Server</string>
     <string name="device_identifier">Geräte-ID</string>
-    <string name="play_services_available">Google Play Services sind verfügbar</string>
     <string name="stop_tracking">Stoppe Tracking</string>
     <string name="start_tracking">Starte Tracking</string>
-    <string name="next_activity">Nächste Activity</string>
     <string name="tracker_started">SAP Sailing Tracker gestartet</string>
     <string name="tracker_stopped">SAP Sailing Tracker gestoppt</string>
-    <string name="scan_qrcode">QRCode scannen</string>
-    <string name="gps_fix_interval">GPS Fix Interval</string>
     <string name="title_activity_regatta">Regatta</string>
     <string name="title_activity_webview">Leaderboard</string>
     <string name="title_activity_start">GPS Tracker einstellen</string>
     <string name="title_activity_tracking">Tracking</string>
-    <string name="hello_world">Hello wörld!</string>
-    <string name="action_settings">Einstellungen</string>
     <string name="please_confirm">Bitte bestätigen</string>
     <string name="do_you_really_want_to_stop_tracking">Soll das Tracking wirklich beendet werden?</string>
     <string name="ok">OK</string>
@@ -63,7 +27,6 @@
     <string name="great">sehr gut</string>
     <string name="no_signal">kein Signal</string>
     <string name="tracking_status_tracking">Tracking läuft</string>
-    <string name="tracking_status_not_tracking">Tracking gestoppt</string>
     <string name="tracking_status_no_gps_signal">Kein GPS Signal!</string>
     <string name="tracking_mode_offline">Offline</string>
     <string name="tracking_mode">Modus</string>
@@ -83,7 +46,6 @@
     <string name="getting_event">Hole Event-Daten..</string>
     <string name="getting_leaderboard">Hole Leaderboard-Daten..</string>
     <string name="getting_competitor">Hole Teilnehmer-Daten..</string>
-    <string name="contacting_server">Verbindung mit server..</string>
     <string name="error">Fehler</string>
     <string name="error_could_not_complete_operation_on_server_try_again">Konnte Operation nicht durchführen. Bitte versuchen Sie es noch einmal.</string>
     <string name="regatta_starts_in">Regatta beginnt in:</string>
@@ -104,12 +66,9 @@
 	<string name="tracking_colon">Tracke:</string>
 	<string name="tracking_gps_accuracy">GPS Genauigkeit</string>
 	<string name="regatta_in_progress">Die Regatta findet gerade statt.</string>
-	<string name="hud_heading_prefix">HDG: </string>
-	<string name="hud_speed_over_ground_prefix">SPD: </string>
 	<string name="heading">Kurs</string>
 	<string name="course_over_ground">Course over Ground</string>
     <string name="speed_over_ground">Speed over Ground</string>
-	<string name="sog">SOG</string>
 	<string name="none">Keine</string>
 	<string name="show_leaderboard">Leaderboard</string>
 	<string name="desc_regatta_user_image">Benutzerdefiniertes Bild für Regatta</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
index fe898f2427c..be61dbef562 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
@@ -3,27 +3,16 @@
 
     <string name="empty"></string>
     <string name="app_name">SAP Sailing Tracking App</string>
-    <string name="not_tracking">Not Tracking</string>
-    <string name="tracking">Tracking</string>
-    <string name="options_menu_info">Expert Information</string>
     <string name="options_menu_settings">Settings</string>
-    <string name="settings_category_general">General</string>
     <string name="options_menu_checkout">Checkout</string>
     <string name="settings_category_other">Other Settings</string>
-    <string name="server_url">Server</string>
     <string name="device_identifier">Device Identifier</string>
-    <string name="play_services_available">Google Play services is available</string>
-    <string name="next_activity">Next Activity</string>
     <string name="tracker_started">SAP Sailing Tracker started</string>
     <string name="tracker_stopped">SAP Sailing Tracker stopped</string>
-    <string name="scan_qrcode">Scan QRCode</string>
-    <string name="gps_fix_interval">GPS fix interval</string>
     <string name="title_activity_regatta">Regatta</string>
     <string name="title_activity_webview">Leader board</string>
     <string name="title_activity_start">Setup GPS-Tracker</string>
     <string name="title_activity_tracking">Tracking</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
     <string name="please_confirm">Please confirm</string>
     <string name="do_you_really_want_to_stop_tracking">Do you really want to stop tracking?</string>
     <string name="ok">OK</string>
@@ -32,9 +21,6 @@
     <string name="good">good</string>
     <string name="great">great</string>
     <string name="no_signal">no signal</string>
-    <string name="competitor_id" translatable="false">CompetitorId</string>
-	<string name="event_id" translatable="false">EventId</string>
-	<string name="leaderboard_name" translatable="false">LeaderboardName</string>
 	<string name="checkin_digest" translatable="false">CheckinDigest</string>
 	<string name="add_team_photo">Add Team Photo</string>
 	<string name="do_you_want_to_choose_existing_img_or_take_a_new_one">Do you want to use an existing image or take a new one?</string>
@@ -47,7 +33,6 @@
 	<string name="getting_event">Getting event informatiopn..</string>
 	<string name="getting_leaderboard">Getting leaderboard information..</string>
 	<string name="getting_competitor">Getting competitor information..</string>
-	<string name="contacting_server">Contacting server..</string>
 	<string name="error">Error</string>
 	<string name="error_could_not_complete_operation_on_server_try_again">Could not complete operation on server. Please try again.</string>
 	<string name="regatta_starts_in">Regatta starts in:</string>
@@ -68,7 +53,6 @@
 	<string name="heading">Heading</string>
 	<string name="course_over_ground">Course over Ground</string>
     <string name="speed_over_ground">Speed over Ground</string>
-	<string name="sog">Speed over Ground</string>
 	<string name="none">None</string>
 	<string name="show_leaderboard">Leader board</string>
 	<string name="error_play_store_and_scanning_not_available">"PlayStore and Scanning not available."</string>
@@ -83,7 +67,6 @@
 	<string name="preferences">Preferences</string>
 	
 	<string name="initial_timer_text_zerozero" translatable="false">00:00:00</string>
-	<string name="initial_zero" translatable="false">0</string>
 	<string name="initial_hyphen" translatable="false">-</string>
 	<string name="initial_hyphen_degrees" translatable="false">-°</string>
 	<string name="content_description_flag_icon" translatable="false">flag icon</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_dialog.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_dialog.xml
index 3f96f4b3c0e..2492dd387e3 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_dialog.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_dialog.xml
@@ -2,14 +2,6 @@
 
     <string name="yes">Yes</string>
     <string name="no">No</string>
-    <string name="correct">Correct</string>
-    <string name="not_correct">No, I\'m not</string>
-    <string name="stop_race">Close Race</string>
-    <string name="stop_race_question">Do you want to stop the race tracking?</string>
-    <string name="confirm_profile">Hello #USERNAME#\nYou are listed on #EVENT#.</string>
-	<string name="checkout_regatta">Checkout Regatta</string>
-	<string name="confirm_picture">Declaration of consent</string>
-	<string name="confirm_picture_usage">I agree that the pictures made by me in the tracking app can be used by SAP.</string>
 	<string name="notify_user_api_call_failed">An error occurred while contacting the server. Please try again.</string>
 	<string name="confirm_data_hello_name">Hello {full_name}</string>
 	<string name="confirm_data_you_are_signed_in_as_sail_id">You are signing in as {sail_id}</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml
index fb6143c2da6..49636ec1860 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_fragment.xml
@@ -1,43 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="regatta_list_title">Checked-In Regattas</string>
-    <string name="show_more">Show more</string>
-    <string name="scan_intro">GPS-Tracker Configuration for Regatta</string>
     <string name="scan_qr">Scan QR-Code</string>
     <string name="scan_hint">The QR-code can be found on your confirmation of participation</string>
     <string name="no_qr_code">You got no QR-Code?</string>
-    <string name="add_team_picture">Add team picture</string>
-    <string name="messages">Messages:</string>
-    <string name="last_refresh">(last refresh XX min ago)</string>
-    <string name="next_race">Next race in approximately XX min</string>
-    <string name="announcement">Note announcement</string>
     <string name="start_tracking">Start tracking</string>
     <string name="stop_tracking">Stop tracking</string>
-    <string name="empty_regatta_listview">You are not registered for any Regatta</string>
-    <string name="homefragment_volley_404">This data is not available at the server. Please retry.</string>
-    <string name="homefragment_volley_unknown">The server returned an unknown code (%s).</string>
-    <string name="homefragment_volley_unexpected">The server returned an unexpected value.</string>
 	<string name="tracking_gps_accuracy">GPS Accuracy</string>
 	<string name="tracking_mode">Mode</string>
 	<string name="tracking_mode_live">Live</string>
 	<string name="tracking_mode_battery_saving">Battery Saving</string>
 	<string name="tracking_unsent_fixes">Unsent fixes</string>
-	<string name="zero">0</string>
 	<string name="tracking_mode_caching">Offline</string>
 	<string name="tracking_mode_api_error">API-Error</string>
 	<string name="tracking_mode_offline">Offline</string>
 	<string name="tracking_time">Tracking Time</string>
-	<string name="regatta_name" translatable="false">RegattaName</string>
-	<string name="event_name" translatable="false">EventName</string>
-	<string name="competitor_name" translatable="false">CompetitorName</string>	
-	<string name="country_code">Country Code</string>
-	<string name="sail_id" translatable="false">SailId</string>
 	<string name="tracking_status" translatable="false">Status</string>
 	<string name="tracking_status_tracking">Tracking running</string>
-	<string name="tracking_status_not_tracking">Tracking stopped</string>
 	<string name="tracking_status_no_gps_signal">No GPS Signal!</string>
-	<string name="hud_heading_prefix">HDG: </string>
-	<string name="hud_speed_over_ground_prefix">SPD: </string>
 	<string name="desc_regatta_user_image">Regatta User Image</string>
 	<string name="desc_add_photo_button">Add Photo Button</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_menu.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_menu.xml
deleted file mode 100644
index ecb3a77c354..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="menu_checkout">Checkout Regatta</string>
-    <string name="menu_settings">Settings</string>
-    <string name="menu_about">About the app</string>
-
-</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_services.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_services.xml
index 3dc980f6955..6495f6d83e2 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_services.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_services.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
-    <string name="id" translatable="false">id</string>
     <string name="tracking_service" translatable="false">Tracking Service</string>
     <string name="tracking_service_start" translatable="false">tracking_start</string>
     <string name="tracking_service_stop" translatable="false">tracking_stop</string>
-    <string name="tracking_service_change" translatable="false">tracking_change</string>
     <string name="tracking_service_checkin_digest_parameter" translatable="false">trackingServiceCheckinDigest</string>
-    <string name="transmitting_service" translatable="false">Transmitting Service</string>
-    <string name="transmitting_service_start" translatable="false">transmitting_start</string>
-    <string name="transmitting_service_stop" translatable="false">transmitting_stop</string>
-    
     
 </resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_uri.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings_uri.xml
deleted file mode 100644
index 3ed9d469999..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings_uri.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    
-    <string name="uri_device_mapping" translatable="false">/sailingserver/rc/racelog</string>
-    
-</resources>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__colors.xml
index 62ca60704ae..73a3588d939 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__colors.xml
@@ -21,6 +21,4 @@
     <color name="vpi__bright_foreground_holo_light">@color/vpi__background_holo_dark</color>
     <color name="vpi__bright_foreground_disabled_holo_dark">#ff4c4c4c</color>
     <color name="vpi__bright_foreground_disabled_holo_light">#ffb2b2b2</color>
-    <color name="vpi__bright_foreground_inverse_holo_dark">@color/vpi__bright_foreground_holo_light</color>
-    <color name="vpi__bright_foreground_inverse_holo_light">@color/vpi__bright_foreground_holo_dark</color>
 </resources>