diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index e42dc554..ce87429b 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -5,6 +5,12 @@
     <string name="app_version">අනුවාදය: %s</string>
     <string name="app_subtitle">චන්ද්‍රිකා tracker හා නිසැක පෙරැයින්නා</string>
 
+    <string name="menu_satellites">චන්ද්‍රිකා</string>
+    <string name="menu_passes">පසුකර යෑම්</string>
+    <string name="menu_map">ලෝක සිතියම</string>
+    <string name="menu_settings">පසුතල</string>
+    <string name="menu_about">ගැන</string>
+
     <!--Buttons-->
 
     <string name="btn_add">එකතු ක°</string>
@@ -30,8 +36,10 @@
     <string name="btn_web">මාර්ගගතව</string>
     <string name="btn_import">Import</string>
     <string name="btn_github">GitHub</string>
-    <string name="btn_support">දායකත්ව</string>
+    <string name="btn_donate">දායකත්ව</string>
     <string name="btn_fdroid">F-Droid</string>
+    <string name="btn_license">GPLv3 බලපත්‍රය</string>
+    <string name="btn_privacy">Privacy Policy</string>
 
     <!--Dialogs-->
 
@@ -70,7 +78,7 @@
     <string name="pass_satId">Id:%d</string>
     <string name="pass_aosAz">AOS - %.1f°</string>
     <string name="pass_elevation">උත්තෝලනය: %.1f°</string>
-    <string name="pass_los">%.1f° - LOS</string>
+    <string name="pass_losAz">%.1f° - LOS</string>
     <string name="pass_altitude">උන්නතාශය: %d km</string>
     <string name="pass_placeholder"> -- : -- : -- </string>
     <string name="pass_startTime">HH:mm:ss - EEE</string>
@@ -139,6 +147,8 @@
     <string name="data_success">යාවත්කාලීනය සම්පූර්ණ කිරීම සාර්ථකයි</string>
     <string name="data_clear_success">දත්ත ඉවත් කිරීම සාර්ථකයි</string>
 
+    <string name="last_updated_pattern" translatable="false">d MMM yyyy - HH:mm:ss</string>
+
     <string name="remote_title">භ්‍රමක මනාප</string>
     <string name="remote_switch">දුරස්ථ පාලනය සබල ක°</string>
     <string name="remote_ip_hint">IP ලිපිනය</string>
@@ -150,7 +160,6 @@
     <string name="BTremote_output_hint">දත්ත අකාරය</string>
     <string name="BTremote_perm_error">Bluetooth අවසර පරික්‍ෂා ක°</string>
 
-    <string name="other_title">වෙනත් මනාප</string>
     <string name="other_switch_utc">• පසුකර වේලාවන් UTC මගින්</string>
     <string name="other_switch_update">• ස්වයං දත්ත යාවත්කාලීනය</string>
     <string name="other_switch_sweep">• radar sweep සජීවිකරණය සබල කරන්න</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index 2a63063b..00000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="accent">#FFE082</color>
-    <color name="textMain">#CCFFFFFF</color>
-    <color name="textDisabled">#66FFFFFF</color>
-    <color name="buttonRegular">#2A2A2A</color>
-    <color name="toolbar">#1C1C1C</color>
-    <color name="cardRegular">#1C1C1C</color>
-    <color name="bottomBar">#1C1C1C</color>
-    <color name="background">#121212</color>
-    <color name="transparent">#00000000</color>
-</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 4b250220..00000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--    View values-->
-    <dimen name="toolbar_size">48dp</dimen>
-    <dimen name="toolbar_icon_size">48dp</dimen>
-    <dimen name="btn_corner_low">0dp</dimen>
-    <dimen name="btn_corner_high">12dp</dimen>
-    <dimen name="card_elev_low">0dp</dimen>
-    <dimen name="card_elev_high">8dp</dimen>
-    <dimen name="card_corner_low">0dp</dimen>
-    <dimen name="card_corner_high">12dp</dimen>
-    <dimen name="bottom_bar_size">56dp</dimen>
-    <dimen name="bottom_bar_inset">0dp</dimen>
-    <dimen name="surface_margin_top">60dp</dimen>
-    <dimen name="button_width_max">128dp</dimen>
-    <dimen name="button_width_med">96dp</dimen>
-    <dimen name="button_margin_side">2dp</dimen>
-    <dimen name="surface_margin_bot">62dp</dimen>
-    <dimen name="view_default_margin">6dp</dimen>
-    <!--    Text values-->
-    <dimen name="text_size_copyright">13sp</dimen>
-    <dimen name="text_size_small">15sp</dimen>
-    <dimen name="text_size_medium">16sp</dimen>
-    <dimen name="text_size_mediumLarge">18sp</dimen>
-    <dimen name="text_size_large">21sp</dimen>
-    <dimen name="text_size_frequency">24sp</dimen>
-    <dimen name="text_size_app_timer">42sp</dimen>
-    <dimen name="text_size_app_title">48sp</dimen>
-</resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e003ed24..b6c978b0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
+    <color name="accent">#FFE082</color>
+    <color name="background">#121212</color>
+
     <style name="Theme.Look4Sat.SplashScreen" parent="Theme.SplashScreen">
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="postSplashScreenTheme">@style/Theme.Look4Sat.Main</item>
@@ -10,7 +13,6 @@
     <style name="Theme.Look4Sat.Main" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
         <item name="android:navigationBarColor">@color/background</item>
-        <item name="android:textColorPrimary">@color/textMain</item>
         <item name="android:statusBarColor">@color/background</item>
         <item name="android:windowBackground">@color/background</item>
     </style>
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index 0c4f95ca..7b7d3cb5 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -5,7 +5,7 @@
 -->
 <data-extraction-rules>
     <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <!--
         <include .../>
         <exclude .../>
         -->