diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..6bec355
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_4_XL_API_28.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-12-10T12:55:19.222514Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4f8eb39..ab03f59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
     apply plugin: "androidx.navigation.safeargs"
 
     defaultConfig {
-        applicationId "cc.pogoda.mobile.pogodacc"
+        applicationId "cc.pogoda.mobile.meteosystem"
         minSdkVersion 24
         targetSdkVersion 30
         versionCode 9
diff --git a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/SettingsActivity.java b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/SettingsActivity.java
index 7252aed..0bf234c 100644
--- a/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/SettingsActivity.java
+++ b/app/src/main/java/cc/pogoda/mobile/meteosystem/activity/SettingsActivity.java
@@ -2,6 +2,8 @@ package cc.pogoda.mobile.meteosystem.activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -30,6 +32,8 @@ public class SettingsActivity extends AppCompatActivity {
 
     EditText enditTextMinutesPeriod;
 
+    AppCompatActivity act;
+
     private static String languageNameFromShort(String shortName) {
         switch (shortName) {
             case "en-rUS": return "English";
@@ -63,6 +67,8 @@ public class SettingsActivity extends AppCompatActivity {
 
         confFile = new ConfigurationFile(getBaseContext());
 
+        act = this;
+
         windspdUnitDisplayTv = (TextView) findViewById(R.id.textViewSettingsWindspeedUnitDisp);
         updateWindspdUnitTv(AppConfiguration.replaceMsWithKnots);
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c7855f2..6083032 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -211,19 +211,6 @@
                     app:layout_constraintTop_toTopOf="@+id/imageButtonSettings" />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-            <TextView
-                android:id="@+id/textViewTestWarning"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:fontFamily="@font/alegreya_sans_sc_medium"
-                android:text="@string/test_warning"
-                android:textAlignment="center"
-                android:textSize="18sp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/constraintLayoutExport" />
-
             <TextView
                 android:id="@+id/textViewCredits1"
                 android:layout_width="wrap_content"
@@ -233,7 +220,7 @@
                 android:text="@string/credits_1"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/textViewTestWarning" />
+                app:layout_constraintTop_toBottomOf="@+id/constraintLayoutExport" />
 
             <TextView
                 android:id="@+id/textViewCredits2"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 5b89c66..9cba447 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -109,4 +109,18 @@
         app:layout_constraintStart_toEndOf="@+id/textViewSettingsLabelDecimationTimeStep"
         app:layout_constraintTop_toBottomOf="@+id/textViewSettingsLabelDecimation" />
 
+    <TextView
+        android:id="@+id/textView5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="64dp"
+        android:layout_marginEnd="16dp"
+        android:fontFamily="@font/alegreya_sans_sc_medium"
+        android:text="@string/lang_change_req_restart"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textViewSettingsLabelDecimationTimeStep" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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 1a64b11..898915a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -142,4 +142,5 @@
         <item>English</item>
         <item>Deutsch</item>
     </string-array>
+    <string name="lang_change_req_restart" translatable="false">Changing language requires app restart after making a choose in this window.</string>
 </resources>
\ No newline at end of file
diff --git a/doc/screenshots/all_stations_activity.png b/doc/screenshots/all_stations_activity.png
deleted file mode 100644
index ce2bf9d..0000000
Binary files a/doc/screenshots/all_stations_activity.png and /dev/null differ
diff --git a/doc/screenshots/favourites.png b/doc/screenshots/favourites.png
new file mode 100644
index 0000000..1d6bb42
Binary files /dev/null and b/doc/screenshots/favourites.png differ
diff --git a/doc/screenshots/main_activity.png b/doc/screenshots/main_activity.png
deleted file mode 100644
index 0c2c8d9..0000000
Binary files a/doc/screenshots/main_activity.png and /dev/null differ
diff --git a/doc/screenshots/main_window.png b/doc/screenshots/main_window.png
new file mode 100644
index 0000000..2c6a1c4
Binary files /dev/null and b/doc/screenshots/main_window.png differ
diff --git a/doc/screenshots/station_details_activity_skrzyczne.png b/doc/screenshots/station_details_activity_skrzyczne.png
deleted file mode 100644
index 7fd8ed1..0000000
Binary files a/doc/screenshots/station_details_activity_skrzyczne.png and /dev/null differ
diff --git a/doc/screenshots/station_details_summary_activity_skrzyczne.png b/doc/screenshots/station_details_summary_activity_skrzyczne.png
deleted file mode 100644
index 5848566..0000000
Binary files a/doc/screenshots/station_details_summary_activity_skrzyczne.png and /dev/null differ
diff --git a/doc/screenshots/station_details_wind_plot_activity_skrzyczne.png b/doc/screenshots/station_details_wind_plot_activity_skrzyczne.png
deleted file mode 100644
index c9bcbbe..0000000
Binary files a/doc/screenshots/station_details_wind_plot_activity_skrzyczne.png and /dev/null differ
diff --git a/doc/screenshots/station_screen.png b/doc/screenshots/station_screen.png
new file mode 100644
index 0000000..d27116c
Binary files /dev/null and b/doc/screenshots/station_screen.png differ
diff --git a/doc/screenshots/station_screen_with_menu.png b/doc/screenshots/station_screen_with_menu.png
new file mode 100644
index 0000000..7134bda
Binary files /dev/null and b/doc/screenshots/station_screen_with_menu.png differ
diff --git a/doc/screenshots/station_summary.png b/doc/screenshots/station_summary.png
new file mode 100644
index 0000000..3210a15
Binary files /dev/null and b/doc/screenshots/station_summary.png differ
diff --git a/doc/screenshots/trend.png b/doc/screenshots/trend.png
new file mode 100644
index 0000000..e5b8ccc
Binary files /dev/null and b/doc/screenshots/trend.png differ
diff --git a/doc/screenshots/wind_rose.png b/doc/screenshots/wind_rose.png
new file mode 100644
index 0000000..c6f58fb
Binary files /dev/null and b/doc/screenshots/wind_rose.png differ
diff --git a/doc/screenshots/windspeed_plot.png b/doc/screenshots/windspeed_plot.png
new file mode 100644
index 0000000..0bfbc98
Binary files /dev/null and b/doc/screenshots/windspeed_plot.png differ
diff --git a/settings.gradle b/settings.gradle
index 8479910..58df31d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 include ':app'
-rootProject.name = "Pogoda.cc"
\ No newline at end of file
+rootProject.name = "MeteoSystem"
\ No newline at end of file