diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 7c992bc..9569af1 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -6,12 +6,12 @@
         <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_3_API_30.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="169c682e0410" />
           </Key>
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-06-13T17:12:57.976962772Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-06-13T19:18:58.935719104Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/eu/piotro/sondechaser/data/DataCollector.java b/app/src/main/java/eu/piotro/sondechaser/data/DataCollector.java
index 5dffa0e..3d19068 100644
--- a/app/src/main/java/eu/piotro/sondechaser/data/DataCollector.java
+++ b/app/src/main/java/eu/piotro/sondechaser/data/DataCollector.java
@@ -151,7 +151,7 @@ public class DataCollector implements Runnable {
 
 
         // Prediction data
-        if (sh_col.getPrediction() != null)
+        if (sh_col.getPredictionPoint() != null)
             updatePredictionData(sh_col.getPredictionPoint(), rs_col.getStartTime(), "SONDEHUB");
         else
             updatePredictionData(rs_col.getPredictionPoint(), rs_col.getStartTime(), "RADIOSONDY");
diff --git a/app/src/main/java/eu/piotro/sondechaser/data/RadiosondyCollector.java b/app/src/main/java/eu/piotro/sondechaser/data/RadiosondyCollector.java
index cbb0e5c..c1cac6b 100644
--- a/app/src/main/java/eu/piotro/sondechaser/data/RadiosondyCollector.java
+++ b/app/src/main/java/eu/piotro/sondechaser/data/RadiosondyCollector.java
@@ -138,7 +138,6 @@ public class RadiosondyCollector implements Runnable {
                 for (int i=path.length()-1; i>=0; i-=10) {
                     JSONArray entry = path.getJSONArray(i);
                     gps.add(new GeoPoint(entry.getDouble(1), entry.getDouble(0)));
-                    System.out.println(entry.getDouble(0));
                 }
                 synchronized (dataLock) {
                     track = gps;
@@ -169,7 +168,6 @@ public class RadiosondyCollector implements Runnable {
                 int last_alt = 0;
 
                 while (cidx<cstr.length()) {
-                    System.out.println(cidx);
                     int fsti = cstr.indexOf(",", cidx);
                     float lon = Float.parseFloat(cstr.substring(cidx, fsti-1));
                     cidx = fsti+1;
diff --git a/app/src/main/java/eu/piotro/sondechaser/ui/home/MapUpdater.java b/app/src/main/java/eu/piotro/sondechaser/ui/home/MapUpdater.java
index ee2f6f8..2df9aac 100644
--- a/app/src/main/java/eu/piotro/sondechaser/ui/home/MapUpdater.java
+++ b/app/src/main/java/eu/piotro/sondechaser/ui/home/MapUpdater.java
@@ -9,6 +9,7 @@ import android.view.View;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
 
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.overlay.Marker;
@@ -181,7 +182,7 @@ public class MapUpdater {
                                     ((sonde.vspeed >= 0 ? "+?" : "-?") + " (r: "+Math.abs(sonde.vspeed)+")"));
                     homeFragment.requireView().findViewById(R.id.imagevsarrow).setRotation(180 * ((sonde.vspeed < 0) ? 1 : 0));
                     ((TextView) homeFragment.requireView().findViewById(R.id.textposage)).setText(data_age + "s");
-                    ((TextView) homeFragment.requireView().findViewById(R.id.textposage)).setTextColor(data_age > 120 ? Color.RED : Color.BLACK);
+                    ((TextView) homeFragment.requireView().findViewById(R.id.textposage)).setTextColor(data_age > 120 ? Color.RED : ResourcesCompat.getColor(homeFragment.getResources(), android.R.color.secondary_text_dark, null));
                     ((TextView) homeFragment.requireView().findViewById(R.id.textposdist)).setText(final_posdist_km);
                     ((TextView) homeFragment.requireView().findViewById(R.id.textposhdg)).setText(final_bearing_str);
                     ((TextView) homeFragment.requireView().findViewById(R.id.textpossrc)).setText("(" + source + ")");
diff --git a/app/src/main/java/eu/piotro/sondechaser/ui/slideshow/SlideshowFragment.java b/app/src/main/java/eu/piotro/sondechaser/ui/slideshow/SlideshowFragment.java
index 57c5239..cf33364 100644
--- a/app/src/main/java/eu/piotro/sondechaser/ui/slideshow/SlideshowFragment.java
+++ b/app/src/main/java/eu/piotro/sondechaser/ui/slideshow/SlideshowFragment.java
@@ -81,7 +81,8 @@ public class SlideshowFragment extends Fragment {
 
             final String[] diro = {"N", "NE", "E", "SE", "S", "SW", "W", "NW"};
             int idx = (((bear + (360/8/2)))%360)/(360/8);
-            binding.ctftydir.setText(bear + "° (" + (diro[idx]) + ") " + (use_gps_az?"GPS":"COMPASS"));
+            binding.tvsource.setText(use_gps_az ? "GPS BEARING":"COMPASS SENSOR");
+            binding.ctftydir.setText(bear + "° (" + (diro[idx]) + ")");
 
             if (target != null) {
                 binding.ctftcord.setText(cordformat.format(target.getLatitude()) + "° " + cordformat.format(target.getLongitude()) + "° ");
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index e120e1c..a6e2bc0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -37,7 +37,8 @@
             android:scaleType="fitCenter"
             android:src="@drawable/location"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:tint="@color/blackaware" />
 
         <ImageButton
             android:id="@+id/refrbtn"
@@ -50,7 +51,8 @@
             android:scaleType="fitCenter"
             android:src="@drawable/baseline_refresh_24"
             app:layout_constraintBottom_toTopOf="@+id/predbtn"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:tint="@color/blackaware" />
 
         <ImageButton
             android:id="@+id/northbtn"
@@ -88,7 +90,7 @@
             android:padding="7dp"
             android:scaleType="fitCenter"
             android:src="@drawable/distance"
-            android:tint="#009688"
+            app:tint="#009688"
             app:layout_constraintBottom_toTopOf="@+id/posbtn"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -253,7 +255,8 @@
             android:src="@drawable/mountains"
             app:layout_constraintBottom_toBottomOf="@+id/textaog"
             app:layout_constraintEnd_toStartOf="@+id/textaog"
-            app:layout_constraintTop_toTopOf="@+id/textaog" />
+            app:layout_constraintTop_toTopOf="@+id/textaog"
+            app:tint="@color/blackaware" />
 
         <ImageView
             android:id="@+id/imageView3"
@@ -262,7 +265,8 @@
             android:src="@drawable/height"
             app:layout_constraintBottom_toBottomOf="@+id/textalt"
             app:layout_constraintEnd_toStartOf="@+id/textalt"
-            app:layout_constraintTop_toTopOf="@+id/textalt" />
+            app:layout_constraintTop_toTopOf="@+id/textalt"
+            app:tint="@color/blackaware" />
 
         <TextView
             android:id="@+id/textView17"
@@ -309,7 +313,8 @@
             android:src="@drawable/distance"
             app:layout_constraintBottom_toBottomOf="@+id/textpreddist"
             app:layout_constraintEnd_toStartOf="@+id/textpreddist"
-            app:layout_constraintTop_toTopOf="@+id/textpreddist" />
+            app:layout_constraintTop_toTopOf="@+id/textpreddist"
+            app:tint="@color/blackaware" />
 
         <ImageView
             android:id="@+id/imageView6"
@@ -319,7 +324,8 @@
             app:layout_constraintBottom_toBottomOf="@+id/textposdist"
             app:layout_constraintStart_toStartOf="@+id/imageView4"
             app:layout_constraintTop_toTopOf="@+id/textposdist"
-            app:layout_constraintVertical_bias="0.0" />
+            app:layout_constraintVertical_bias="0.0"
+            app:tint="@color/blackaware" />
 
         <ImageView
             android:id="@+id/imageView5"
@@ -329,7 +335,8 @@
             app:layout_constraintBottom_toBottomOf="@+id/textpredtime"
             app:layout_constraintEnd_toStartOf="@+id/textpredtime"
             app:layout_constraintTop_toTopOf="@+id/textpredtime"
-            app:layout_constraintVertical_bias="0.25" />
+            app:layout_constraintVertical_bias="0.25"
+            app:tint="@color/blackaware" />
 
         <ImageView
             android:id="@+id/imageView7"
@@ -338,7 +345,8 @@
             android:src="@drawable/stopwatch"
             app:layout_constraintBottom_toBottomOf="@+id/textpostime"
             app:layout_constraintEnd_toStartOf="@+id/textpostime"
-            app:layout_constraintTop_toTopOf="@+id/textpostime" />
+            app:layout_constraintTop_toTopOf="@+id/textpostime"
+            app:tint="@color/blackaware" />
 
         <TextView
             android:id="@+id/textposage"
@@ -367,7 +375,8 @@
             android:src="@drawable/hourglass"
             app:layout_constraintBottom_toBottomOf="@+id/textpredage"
             app:layout_constraintEnd_toStartOf="@+id/textpredage"
-            app:layout_constraintTop_toTopOf="@+id/textpredage" />
+            app:layout_constraintTop_toTopOf="@+id/textpredage"
+            app:tint="@color/blackaware" />
 
         <ImageView
             android:id="@+id/imageView9"
@@ -376,7 +385,8 @@
             android:src="@drawable/hourglass"
             app:layout_constraintBottom_toBottomOf="@+id/textposage"
             app:layout_constraintEnd_toStartOf="@+id/textposage"
-            app:layout_constraintTop_toTopOf="@+id/textposage" />
+            app:layout_constraintTop_toTopOf="@+id/textposage"
+            app:tint="@color/blackaware" />
 
         <TextView
             android:id="@+id/textstats"
@@ -418,7 +428,8 @@
             app:layout_constraintBottom_toBottomOf="@+id/textvspeed"
             app:layout_constraintStart_toEndOf="@+id/textalt"
             app:layout_constraintTop_toTopOf="@+id/textvspeed"
-            app:layout_constraintVertical_bias="0.0" />
+            app:layout_constraintVertical_bias="0.0"
+            app:tint="@color/blackaware" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_slideshow.xml b/app/src/main/res/layout/fragment_slideshow.xml
index 21246c7..491aa10 100644
--- a/app/src/main/res/layout/fragment_slideshow.xml
+++ b/app/src/main/res/layout/fragment_slideshow.xml
@@ -13,7 +13,8 @@
         android:src="@drawable/distance"
         app:layout_constraintBottom_toBottomOf="@+id/ctfycord"
         app:layout_constraintEnd_toStartOf="@+id/ctfycord"
-        app:layout_constraintTop_toTopOf="@+id/ctfycord" />
+        app:layout_constraintTop_toTopOf="@+id/ctfycord"
+        app:tint="@color/blackaware" />
 
     <TextView
         android:id="@+id/textView10"
@@ -242,7 +243,8 @@
         android:src="@drawable/icon_compass"
         app:layout_constraintBottom_toBottomOf="@+id/ctftydir"
         app:layout_constraintEnd_toStartOf="@+id/ctftydir"
-        app:layout_constraintTop_toTopOf="@+id/ctftydir" />
+        app:layout_constraintTop_toTopOf="@+id/ctftydir"
+        app:tint="@color/blackaware" />
 
     <ImageView
         android:id="@+id/imageView11"
@@ -251,7 +253,8 @@
         android:src="@drawable/hourglass"
         app:layout_constraintBottom_toBottomOf="@+id/ctftage"
         app:layout_constraintEnd_toStartOf="@+id/ctftage"
-        app:layout_constraintTop_toTopOf="@+id/ctftage" />
+        app:layout_constraintTop_toTopOf="@+id/ctftage"
+        app:tint="@color/blackaware" />
 
     <ImageView
         android:id="@+id/imageView12"
@@ -260,7 +263,8 @@
         android:src="@drawable/height"
         app:layout_constraintBottom_toBottomOf="@+id/ctfyalt"
         app:layout_constraintEnd_toStartOf="@+id/ctfyalt"
-        app:layout_constraintTop_toTopOf="@+id/ctfyalt" />
+        app:layout_constraintTop_toTopOf="@+id/ctfyalt"
+        app:tint="@color/blackaware" />
 
     <ImageView
         android:id="@+id/imageView13"
@@ -269,7 +273,8 @@
         android:src="@drawable/height"
         app:layout_constraintBottom_toBottomOf="@+id/ctftalt"
         app:layout_constraintEnd_toStartOf="@+id/ctftalt"
-        app:layout_constraintTop_toTopOf="@+id/ctftalt" />
+        app:layout_constraintTop_toTopOf="@+id/ctftalt"
+        app:tint="@color/blackaware" />
 
     <ImageView
         android:id="@+id/imageView14"
@@ -278,6 +283,16 @@
         android:src="@drawable/distance"
         app:layout_constraintBottom_toBottomOf="@+id/ctftcord"
         app:layout_constraintEnd_toStartOf="@+id/ctftcord"
-        app:layout_constraintTop_toTopOf="@+id/ctftcord" />
+        app:layout_constraintTop_toTopOf="@+id/ctftcord"
+        app:tint="@color/blackaware" />
+
+    <TextView
+        android:id="@+id/tvsource"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="GPS"
+        app:layout_constraintBottom_toTopOf="@+id/ctftydir"
+        app:layout_constraintStart_toStartOf="@+id/imageView10" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..6d392df
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+
+    <color name="blackaware">#FFFFFFFF</color>
+    <color name="whiteaware">#FF000000</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..695d2d3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="blackaware">#FF000000</color>
+    <color name="whiteaware">#FFFFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8020c1a..47eb0cd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_title">SondeChaser</string>
-    <string name="nav_header_subtitle">*BETA* v0.2 by Piotr Węgrzyn SP6PI</string>
+    <string name="nav_header_subtitle">v0.2-BETA by Piotr Węgrzyn SP6PI</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>