diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.java b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.java
deleted file mode 100644
index cbed07c..0000000
--- a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-	BusTO - Arrival times for Turin public transports.
-    Copyright (C) 2014  Valerio Bozzolan
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package it.reyboz.bustorino;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.util.Log;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.app.AppCompatActivity;
-import android.text.Html;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import it.reyboz.bustorino.backend.utils;
-import it.reyboz.bustorino.middleware.BarcodeScanUtils;
-
-public class ActivityAbout extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        Spanned htmlText = utils.convertHtml(getResources().getString(
-                R.string.about_history));
-        TextView aboutTextView = findViewById(R.id.aboutTextView);
-        assert aboutTextView != null;
-        aboutTextView.setText(htmlText);
-        aboutTextView.setMovementMethod(LinkMovementMethod.getInstance());
-
-        Toolbar mToolbar = findViewById(R.id.default_toolbar);
-        setSupportActionBar(mToolbar);
-        if (getSupportActionBar()!=null)
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        TextView versionText = findViewById(R.id.versionTextView);
-        Log.d("BusTO About", "The version text view is: "+versionText);
-        versionText.setText(getResources().getText(R.string.app_version)+": "+BuildConfig.VERSION_NAME);
-
-        Button openTelegramButton = findViewById(R.id.openTelegramButton);
-        openTelegramButton.setOnClickListener(view -> {
-
-            Intent trueIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("tg://resolve?domain=busto_fdroid"));
-            if(BarcodeScanUtils.checkTargetPackageExists(this, trueIntent))
-                startActivity(trueIntent);
-            else{
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/busto_fdroid"));
-                startActivity(intent);
-               // Toast.makeText(this, "Install Telegram and retry", Toast.LENGTH_SHORT).show();
-            }
-
-        });
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Respond to the action bar's Up/Home button
-        if (item.getItemId() == android.R.id.home) {//NavUtils.navigateUpFromSameTask(this);
-            onBackPressed();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
new file mode 100644
index 0000000..7c930c5
--- /dev/null
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
@@ -0,0 +1,105 @@
+/*
+	BusTO - Arrival times for Turin public transports.
+    Copyright (C) 2014  Valerio Bozzolan
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package it.reyboz.bustorino
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.util.Log
+import android.view.MenuItem
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import it.reyboz.bustorino.backend.utils
+import it.reyboz.bustorino.middleware.BarcodeScanUtils
+
+class ActivityAbout : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_about)
+        //TOP TEXT VIEW
+        val topTextView = checkNotNull(findViewById<TextView>(R.id.topTextView))
+        val telegramTextView= checkNotNull(findViewById<TextView>(R.id.telegramTextView))
+        val howTextView = checkNotNull(findViewById<TextView>(R.id.howDoesItWorkTextView))
+        val bottomTextView= checkNotNull(findViewById<TextView>(R.id.bottomAboutTextView))
+
+        val textviews = arrayOf(topTextView, telegramTextView,howTextView,bottomTextView)
+        val stringsForTextViews  = arrayOf(R.string.about_history_top, R.string.about_channel, R.string.about_how, R.string.about_history_bottom)
+
+        for (i in 0 until 4) {
+            val htmlText = utils.convertHtml(
+                resources.getString(
+                    stringsForTextViews[i]
+                )
+            )
+            //val aboutTextView = checkNotNull(findViewById<TextView>(R.id.aboutTextView))
+            val textView = textviews[i]
+            textView.text = htmlText
+            textView.movementMethod = LinkMovementMethod.getInstance()
+        }
+
+        /*Toolbar mToolbar = findViewById(R.id.default_toolbar);
+        setSupportActionBar(mToolbar);
+
+         */
+        if (supportActionBar != null) supportActionBar!!.setDisplayHomeAsUpEnabled(true)
+
+        val versionText = findViewById<TextView>(R.id.versionTextView)
+        Log.d("BusTO About", "The version text view is: $versionText")
+        versionText.text = resources.getText(R.string.app_version).toString() + ": " + BuildConfig.VERSION_NAME
+
+        val openTelegramButton = findViewById<Button>(R.id.openTelegramButton)
+        openTelegramButton.setOnClickListener { view: View? ->
+            val trueIntent = Intent(Intent.ACTION_VIEW, Uri.parse("tg://resolve?domain=busto_fdroid"))
+            if (BarcodeScanUtils.checkTargetPackageExists(this, trueIntent)) startActivity(trueIntent)
+            else {
+                val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/busto_fdroid"))
+                startActivity(intent)
+                // Toast.makeText(this, "Install Telegram and retry", Toast.LENGTH_SHORT).show();
+            }
+        }
+        val openSourceButton = findViewById<Button>(R.id.openSourceButton)
+        openSourceButton.setOnClickListener { view: View? ->
+            utils.openIceweasel(utils.SOURCE_CODE_URL, this)
+        }
+        val contributeButton = findViewById<Button>(R.id.openContributeButton)
+        contributeButton.setOnClickListener { view: View? ->
+            utils.openIceweasel(getString(R.string.hack_url), this)
+        }
+        val openTutorialButton = findViewById<Button>(R.id.openTutorialButton)
+        openTutorialButton.setOnClickListener {
+            startIntroductionActivity()
+        }
+    }
+
+    fun startIntroductionActivity() {
+        val intent = Intent(this, ActivityIntro::class.java)
+        intent.putExtra(ActivityIntro.RESTART_MAIN, false)
+        startActivity(intent)
+    }
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        // Respond to the action bar's Up/Home button
+        if (item.itemId == android.R.id.home) { //NavUtils.navigateUpFromSameTask(this);
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/app/src/main/java/it/reyboz/bustorino/backend/utils.java b/app/src/main/java/it/reyboz/bustorino/backend/utils.java
index 026b969..ec5567d 100644
--- a/app/src/main/java/it/reyboz/bustorino/backend/utils.java
+++ b/app/src/main/java/it/reyboz/bustorino/backend/utils.java
@@ -1,390 +1,391 @@
 /*
 	BusTO (backend components)
     Copyright (C) 2019 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.backend;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.text.Html;
 import android.text.Spanned;
 import android.util.Log;
 import android.util.TypedValue;
 import androidx.annotation.Nullable;
 import androidx.preference.PreferenceManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import it.reyboz.bustorino.backend.mato.MatoAPIFetcher;
 import it.reyboz.bustorino.fragments.SettingsFragment;
 
 public abstract class utils {
     private static final double EARTH_RADIUS = 6371.009e3;
+    public static final String SOURCE_CODE_URL ="https://gitpull.it/source/libre-busto/";
 
 
     public static Double measuredistanceBetween(double lat1,double long1,double lat2,double long2){
         final double phi1 = Math.toRadians(lat1);
         final double phi2 = Math.toRadians(lat2);
 
         final double deltaPhi = Math.toRadians(lat2-lat1);
         final double deltaTheta = Math.toRadians(long2-long1);
 
         final double a = Math.sin(deltaPhi/2)*Math.sin(deltaPhi/2)+
                 Math.cos(phi1)*Math.cos(phi2)*Math.sin(deltaTheta/2)*Math.sin(deltaTheta/2);
         final double c = 2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));
 
         return Math.abs(EARTH_RADIUS *c);
 
     }
     public static Double angleRawDifferenceFromMeters(double distanceInMeters){
          return Math.toDegrees(distanceInMeters/ EARTH_RADIUS);
     }
 
     public static int convertDipToPixelsInt(Context con,double dips)
     {
         return (int) (dips * con.getResources().getDisplayMetrics().density + 0.5f);
     }
 
     /**
      * Convert distance in meters on Earth in degrees of latitude, keeping the same longitude
      * @param distanceMeters distance in meters
      * @return angle in degrees
      */
     public static Double latitudeDelta(Double distanceMeters){
         final double angleRad =  distanceMeters/EARTH_RADIUS;
         return Math.toDegrees(angleRad);
     }
 
     /**
      * Convert distance in meters on Earth in degrees of longitude, keeping the same latitude
      * @param distanceMeters distance in meters
      * @param latitude the latitude that is fixed
      * @return angle in degrees
      */
     public static Double longitudeDelta(Double distanceMeters, Double latitude){
         final double theta = Math.toRadians(latitude);
         final double denom = Math.abs(Math.cos(theta));
         final double angleRad =  2*Math.asin(Math.sin(distanceMeters / EARTH_RADIUS) / denom);
         return Math.toDegrees(angleRad);
     }
 
     public static float convertDipToPixels(Context con, float dp){
         return convertDipToPixels(con.getResources(), dp);
     }
     public static float convertDipToPixels(Resources res, float dp){
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,res.getDisplayMetrics());
     }
 
     /*
     public static int calculateNumColumnsFromSize(View containerView, int pixelsize){
         int width = containerView.getWidth();
         float ncols = ((float)width)/pixelsize;
         return (int) Math.floor(ncols);
     }
      */
 
     /**
      * Check if there is an internet connection
      * @param con context object to get the system service
      * @return true if we are
      */
     public static boolean isConnected(Context con) {
         ConnectivityManager connMgr = (ConnectivityManager) con.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
         return networkInfo != null && networkInfo.isConnected();
     }
 
 
     ///////////////////// INTENT HELPER ////////////////////////////////////////////////////////////
 
     /**
      * Try to extract the bus stop ID from a URi
      *
      * @param uri The URL
      * @return bus stop ID or null
      */
     public static String getBusStopIDFromUri(Uri uri) {
         String busStopID;
 
         // everithing catches fire when passing null to a switch.
         String host = uri.getHost();
         if (host == null) {
             Log.e("ActivityMain", "Not an URL: " + uri);
             return null;
         }
 
         switch (host) {
             case "m.gtt.to.it":
                 // http://m.gtt.to.it/m/it/arrivi.jsp?n=1254
                 busStopID = uri.getQueryParameter("n");
                 if (busStopID == null) {
                     Log.e("ActivityMain", "Expected ?n from: " + uri);
                 }
                 break;
             case "www.gtt.to.it":
             case "gtt.to.it":
                 // http://www.gtt.to.it/cms/percorari/arrivi?palina=1254
                 busStopID = uri.getQueryParameter("palina");
                 if (busStopID == null) {
                     Log.e("ActivityMain", "Expected ?palina from: " + uri);
                 }
                 break;
             default:
                 Log.e("ActivityMain", "Unexpected intent URL: " + uri);
                 busStopID = null;
         }
         return busStopID;
     }
     final static Pattern ROMAN_PATTERN =  Pattern.compile(
             "^M{0,4}(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$");
     private static boolean isRomanNumber(String str){
         if(str.isEmpty()) return false;
         final Matcher matcher = ROMAN_PATTERN.matcher(str);
         return matcher.find();
     }
 
     public static String toTitleCase(String givenString, boolean lowercaseRest) {
         String[] arr = givenString.trim().split(" ");
         StringBuilder sb = new StringBuilder();
         //Log.d("BusTO chars", "String parsing: "+givenString+" in array: "+ Arrays.toString(arr));
         for (String s : arr) {
             if (s.length() > 0) {
                 String[] allsubs = s.split("\\.");
 
                 boolean addPoint = s.contains(".");
                 /*if (s.contains(".lli")|| s.contains(".LLI")) //Fratelli
                 {
                 DOESN'T ALWAYS WORK
                     addPoint = false;
                     allsubs = new String[]{s};
                 }*/
                 boolean first = true;
                 for (String subs : allsubs) {
                     if(first) first=false;
                     else {
                         if (addPoint) sb.append(".");
                         sb.append(" ");
                     }
                     if(isRomanNumber(subs)){
                         //add and skip the rest
                         sb.append(subs);
                         continue;
                     }
                     //SPLIT ON ', check if contains "D'"
                     if(subs.toLowerCase(Locale.ROOT).startsWith("d'")){
                         sb.append("D'");
                         subs = subs.substring(2);
                     }
                     int index = 0;
                     char c = subs.charAt(index);
                     if(subs.length() > 1 && c=='('){
                         sb.append(c);
                         index += 1;
                         c = subs.charAt(index);
                     }
                     sb.append(Character.toUpperCase(c));
                     if (lowercaseRest)
                         sb.append(subs.substring(index+1).toLowerCase(Locale.ROOT));
                     else
                         sb.append(subs.substring(index+1));
 
                 }
                 if(addPoint && allsubs.length == 1) sb.append('.');
                 sb.append(" ");
                 /*sb.append(Character.toUpperCase(arr[i].charAt(0)));
                 if (lowercaseRest)
                     sb.append(arr[i].substring(1).toLowerCase(Locale.ROOT));
                 else
                     sb.append(arr[i].substring(1));
                 sb.append(" ");
 
                  */
             } else sb.append(s);
         }
         return sb.toString().trim();
     }
 
 
     /**
      * Open an URL in the default browser.
      *
      * @param url URL
      */
     public static void openIceweasel(String url, Context context) {
         Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
         if (browserIntent1.resolveActivity(context.getPackageManager()) != null) {
             //check we have an activity ready to receive intents (otherwise, there will be a crash)
             context.startActivity(browserIntent1);
         } else{
             Log.e("BusTO","openIceweasel can't find a browser");
         }
     }
 
     /**
      * Get the default list of fetchers for arrival times
      * @return array of ArrivalsFetchers to use
      */
     public static ArrivalsFetcher[] getDefaultArrivalsFetchers(){
         return  new ArrivalsFetcher[]{  new MatoAPIFetcher(),
                  new GTTJSONFetcher(), new FiveTScraperFetcher()};
     }
     /**
      * Get the default list of fetchers for arrival times
      * @return array of ArrivalsFetchers to use
      */
     public static List<ArrivalsFetcher> getDefaultArrivalsFetchers(Context context){
         SharedPreferences defSharPref = PreferenceManager.getDefaultSharedPreferences(context);
         final Set<String> setSelected = new HashSet<>(defSharPref.getStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE,
                 new HashSet<>()));
         if (setSelected.isEmpty()) {
             return Arrays.asList(new MatoAPIFetcher(),
                     new GTTJSONFetcher(), new FiveTScraperFetcher());
         }else{
             ArrayList<ArrivalsFetcher> outFetchers = new ArrayList<>(4);
             /*for(String s: setSelected){
                 switch (s){
                     case "matofetcher":
                         outFetchers.add(new MatoAPIFetcher());
                         break;
                     case "fivetapifetcher":
                         outFetchers.add(new FiveTAPIFetcher());
                         break;
                     case "gttjsonfetcher":
                         outFetchers.add(new GTTJSONFetcher());
                         break;
                     case "fivetscraper":
                         outFetchers.add(new FiveTScraperFetcher());
                         break;
                     default:
                         throw  new IllegalArgumentException();
                 }
             }*/
             if (setSelected.contains("matofetcher")) {
                 outFetchers.add(new MatoAPIFetcher());
                 setSelected.remove("matofetcher");
             }
             if (setSelected.contains("fivetapifetcher")) {
                 outFetchers.add(new FiveTAPIFetcher());
                 setSelected.remove("fivetapifetcher");
             }
             if (setSelected.contains("gttjsonfetcher")){
                 outFetchers.add(new GTTJSONFetcher());
                 setSelected.remove("gttjsonfetcher");
             }
             if (setSelected.contains("fivetscraper")) {
                 outFetchers.add(new FiveTScraperFetcher());
                 setSelected.remove("fivetscraper");
             }
             if(!setSelected.isEmpty()){
                 Log.e("BusTO-Utils","Getting some fetchers values which are not contemplated: "+setSelected);
             }
 
             return outFetchers;
         }
     }
     /*public String getShorterDirection(String headSign){
         String[] parts = headSign.split(",");
         if (parts.length<=1){
             return  headSign.trim();
         }
         String first = parts[0].trim();
         String second = parts[1].trim();
         String firstLower = first.toLowerCase(Locale.ITALIAN);
         switch (firstLower){
             case "circolare destra":
             case "circolare sinistra":
                 case
         }
     }*/
     /**
      * Print the first i lines of the the trace of an exception
      * https://stackoverflow.com/questions/21706722/fetch-only-first-n-lines-of-a-stack-trace
      */
     /*
     public static String traceCaller(Exception ex, int i) {
         StringWriter sw = new StringWriter();
         PrintWriter pw = new PrintWriter(sw);
         StringBuilder sb = new StringBuilder();
         ex.printStackTrace(pw);
         String ss = sw.toString();
         String[] splitted = ss.split("\n");
         sb.append("\n");
         if(splitted.length > 2 + i) {
             for(int x = 2; x < i+2; x++) {
                 sb.append(splitted[x].trim());
                 sb.append("\n");
             }
             return sb.toString();
         }
         return "Trace too Short.";
     }
      */
     public static String joinList(@Nullable List<String> dat, String separator){
         StringBuilder sb = new StringBuilder();
         if(dat==null || dat.size()==0)
             return "";
         else if(dat.size()==1)
             return dat.get(0);
         sb.append(dat.get(0));
         for (int i=1; i<dat.size(); i++){
             sb.append(separator);
             sb.append(dat.get(i));
         }
         return sb.toString();
     }
 
     public static <T> Set<T> convertArrayToSet(T[] array)
     {
         // Create an empty Set
         Set<T> set = new HashSet<>();
         // Add each element into the set
         set.addAll(Arrays.asList(array));
 
         // Return the converted Set
         return set;
     }
 
     public static <T> String giveClassesForArray(T[] array){
         StringBuilder sb = new StringBuilder();
         for (T f: array){
             sb.append("");
             sb.append(f.getClass().getSimpleName());
             sb.append("; ");
         }
         return sb.toString();
     }
 
     public static Spanned convertHtml(String text) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return Html.fromHtml(text, Html.FROM_HTML_MODE_COMPACT);
         } else {
             return Html.fromHtml(text);
         }
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
index 1be3f1f..7c6dcb7 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/NearbyStopsFragment.java
@@ -1,678 +1,682 @@
 /*
 	BusTO  - Fragments components
     Copyright (C) 2018 Fabio Mazza
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package it.reyboz.bustorino.fragments;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 
 import android.content.SharedPreferences;
 import android.location.Location;
 import android.location.LocationManager;
 import android.os.Bundle;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.location.LocationListenerCompat;
 import androidx.core.location.LocationManagerCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.core.util.Pair;
 import androidx.preference.PreferenceManager;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.work.WorkInfo;
 
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import it.reyboz.bustorino.BuildConfig;
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.adapters.ArrivalsStopAdapter;
 import it.reyboz.bustorino.backend.*;
 import it.reyboz.bustorino.data.DatabaseUpdate;
 import it.reyboz.bustorino.middleware.AppLocationManager;
 import it.reyboz.bustorino.adapters.SquareStopAdapter;
 import it.reyboz.bustorino.middleware.AutoFitGridLayoutManager;
 import it.reyboz.bustorino.util.LocationCriteria;
 import it.reyboz.bustorino.util.Permissions;
 import it.reyboz.bustorino.util.StopSorterByDistance;
 import it.reyboz.bustorino.viewmodels.NearbyStopsViewModel;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
 public class NearbyStopsFragment extends Fragment {
 
     public enum FragType{
         STOPS(1), ARRIVALS(2);
         private final int num;
         FragType(int num){
             this.num = num;
         }
         public static FragType fromNum(int i){
             switch (i){
                 case 1: return STOPS;
                 case 2: return ARRIVALS;
                 default:
                     throw new IllegalArgumentException("type not recognized");
             }
         }
     }
     private enum LocationShowingStatus {SEARCHING, FIRST_FIX, DISABLED, NO_PERMISSION}
 
     private FragmentListenerMain mListener;
     private FragmentLocationListener fragmentLocationListener;
 
     private final static String DEBUG_TAG = "NearbyStopsFragment";
     private final static String FRAGMENT_TYPE_KEY = "FragmentType";
     //public final static int TYPE_STOPS = 19, TYPE_ARRIVALS = 20;
     private FragType fragment_type = FragType.STOPS;
 
     public final static String FRAGMENT_TAG="NearbyStopsFrag";
 
     private RecyclerView gridRecyclerView;
 
     private SquareStopAdapter dataAdapter;
     private AutoFitGridLayoutManager gridLayoutManager;
     private GPSPoint lastPosition = null;
     private ProgressBar circlingProgressBar,flatProgressBar;
     private int distance = 10;
     protected SharedPreferences globalSharedPref;
     private SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener;
     private TextView messageTextView,titleTextView, loadingTextView;
     private CommonScrollListener scrollListener;
     private AppCompatButton switchButton;
     private boolean firstLocForStops = true,firstLocForArrivals = true;
     public static final int COLUMN_WIDTH_DP = 250;
 
 
     private Integer MAX_DISTANCE = -3;
     private int MIN_NUM_STOPS = -1;
     private int TIME_INTERVAL_REQUESTS = -1;
     private LocationManager locManager;
 
     //These are useful for the case of nearby arrivals
     private NearbyArrivalsDownloader arrivalsManager = null;
     private ArrivalsStopAdapter arrivalsStopAdapter = null;
 
     private boolean dbUpdateRunning = false;
 
     private ArrayList<Stop> currentNearbyStops = new ArrayList<>();
     private NearbyArrivalsDownloader nearbyArrivalsDownloader;
 
     private LocationShowingStatus showingStatus = LocationShowingStatus.NO_PERMISSION;
 
     private final NearbyArrivalsDownloader.ArrivalsListener arrivalsListener = new NearbyArrivalsDownloader.ArrivalsListener() {
         @Override
         public void setProgress(int completedRequests, int pendingRequests) {
             if(flatProgressBar!=null) {
                 if (pendingRequests == 0) {
                     flatProgressBar.setIndeterminate(true);
                     flatProgressBar.setVisibility(View.GONE);
                 } else {
                     flatProgressBar.setIndeterminate(false);
                     flatProgressBar.setProgress(completedRequests);
                 }
             }
         }
 
         @Override
         public void onAllRequestsCancelled() {
             if(flatProgressBar!=null) flatProgressBar.setVisibility(View.GONE);
         }
 
         @Override
         public void showCompletedArrivals(ArrayList<Palina> completedPalinas) {
             showArrivalsInRecycler(completedPalinas);
         }
     };
 
     //ViewModel
     private NearbyStopsViewModel viewModel;
 
     public NearbyStopsFragment() {
         // Required empty public constructor
     }
 
     /**
      * Use this factory method to create a new instance of
      * this fragment using the provided parameters.
      * @return A new instance of fragment NearbyStopsFragment.
      */
     public static NearbyStopsFragment newInstance(FragType type) {
         //if(fragmentType != TYPE_STOPS && fragmentType != TYPE_ARRIVALS )
         //    throw new IllegalArgumentException("WRONG KIND OF FRAGMENT USED");
         NearbyStopsFragment fragment = new NearbyStopsFragment();
         final Bundle args = new Bundle(1);
         args.putInt(FRAGMENT_TYPE_KEY,type.num);
         fragment.setArguments(args);
         return fragment;
     }
 
 
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getArguments() != null) {
             setFragmentType(FragType.fromNum(getArguments().getInt(FRAGMENT_TYPE_KEY)));
         }
         locManager = (LocationManager) requireContext().getSystemService(Context.LOCATION_SERVICE);
         fragmentLocationListener = new FragmentLocationListener();
         if (getContext()!=null) {
             globalSharedPref = getContext().getSharedPreferences(getString(R.string.mainSharedPreferences), Context.MODE_PRIVATE);
             globalSharedPref.registerOnSharedPreferenceChangeListener(preferenceChangeListener);
         }
 
         nearbyArrivalsDownloader = new NearbyArrivalsDownloader(getContext().getApplicationContext(), arrivalsListener);
 
 
     }
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         if (getContext() == null) throw new RuntimeException();
         View root = inflater.inflate(R.layout.fragment_nearby_stops, container, false);
         gridRecyclerView = root.findViewById(R.id.stopGridRecyclerView);
         gridLayoutManager = new AutoFitGridLayoutManager(getContext().getApplicationContext(), Float.valueOf(utils.convertDipToPixels(getContext(),COLUMN_WIDTH_DP)).intValue());
         gridRecyclerView.setLayoutManager(gridLayoutManager);
         gridRecyclerView.setHasFixedSize(false);
         circlingProgressBar = root.findViewById(R.id.circularProgressBar);
         flatProgressBar = root.findViewById(R.id.horizontalProgressBar);
         messageTextView = root.findViewById(R.id.messageTextView);
         titleTextView = root.findViewById(R.id.titleTextView);
         loadingTextView = root.findViewById(R.id.positionLoadingTextView);
         switchButton = root.findViewById(R.id.switchButton);
 
         scrollListener = new CommonScrollListener(mListener,false);
         switchButton.setOnClickListener(v -> switchFragmentType());
         Log.d(DEBUG_TAG, "onCreateView");
 
         final Context appContext =requireContext().getApplicationContext();
         DatabaseUpdate.watchUpdateWorkStatus(getContext(), this, new Observer<List<WorkInfo>>() {
             @SuppressLint("MissingPermission")
             @Override
             public void onChanged(List<WorkInfo> workInfos) {
                 if(workInfos.isEmpty()) return;
 
                 WorkInfo wi = workInfos.get(0);
                 if (wi.getState() == WorkInfo.State.RUNNING && fragmentLocationListener.isRegistered) {
                     locManager.removeUpdates(fragmentLocationListener);
                     fragmentLocationListener.isRegistered = true;
                     dbUpdateRunning = true;
                 } else{
                     //start the request
                     if(!fragmentLocationListener.isRegistered){
                         requestLocationUpdates();
                     }
                     dbUpdateRunning = false;
                 }
             }
         });
 
         //observe the livedata
         viewModel.getStopsAtDistance().observe(getViewLifecycleOwner(), stops -> {
             if (!dbUpdateRunning && (stops.size() < MIN_NUM_STOPS && distance <= MAX_DISTANCE)) {
                 distance = distance + 40;
                 viewModel.requestStopsAtDistance(distance, true);
                 //Log.d(DEBUG_TAG, "Doubling distance now!");
                 return;
             }
             if(!stops.isEmpty()) {
                 Log.d(DEBUG_TAG, "Showing "+stops.size()+" stops nearby");
                 currentNearbyStops =stops;
                 showStopsInViews(currentNearbyStops, lastPosition);
             }
         });
         if(Permissions.anyLocationPermissionsGranted(appContext)){
             setShowingStatus(LocationShowingStatus.SEARCHING);
         } else {
             setShowingStatus(LocationShowingStatus.NO_PERMISSION);
 
         }
         return root;
     }
 
     //because linter is stupid and cannot look inside *anyLocationPermissionGranted*
     @SuppressLint("MissingPermission")
     private boolean requestLocationUpdates(){
         if(Permissions.anyLocationPermissionsGranted(requireContext())) {
             locManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
                     3000, 10.0f, fragmentLocationListener
             );
             fragmentLocationListener.isRegistered = true;
             return true;
         } else return false;
     }
 
 
 
     /**
      * Use this method to set the fragment type
      * @param type the type, TYPE_ARRIVALS or TYPE_STOPS
      */
     private void setFragmentType(FragType type){
         this.fragment_type = type;
         switch(type){
             case ARRIVALS:
                 TIME_INTERVAL_REQUESTS = 5*1000;
                 break;
             case STOPS:
                 TIME_INTERVAL_REQUESTS = 1000;
 
         }
     }
     private void setShowingStatus(@NonNull LocationShowingStatus newStatus){
         if(newStatus == showingStatus){
             Log.d(DEBUG_TAG, "Asked to set new displaying status but it's the same");
             return;
         }
         switch (newStatus){
             case FIRST_FIX:
                 circlingProgressBar.setVisibility(View.GONE);
                 loadingTextView.setVisibility(View.GONE);
                 gridRecyclerView.setVisibility(View.VISIBLE);
                 messageTextView.setVisibility(View.GONE);
                 break;
             case NO_PERMISSION:
                 circlingProgressBar.setVisibility(View.GONE);
                 loadingTextView.setVisibility(View.GONE);
                 messageTextView.setText(R.string.enable_position_message_nearby);
                 messageTextView.setVisibility(View.VISIBLE);
                 break;
             case DISABLED:
                 if (showingStatus== LocationShowingStatus.SEARCHING){
                     circlingProgressBar.setVisibility(View.GONE);
                     loadingTextView.setVisibility(View.GONE);
                 }
                 messageTextView.setText(R.string.enableGpsText);
                 messageTextView.setVisibility(View.VISIBLE);
                 break;
             case SEARCHING:
                 circlingProgressBar.setVisibility(View.VISIBLE);
                 loadingTextView.setVisibility(View.VISIBLE);
                 gridRecyclerView.setVisibility(View.GONE);
                 messageTextView.setVisibility(View.GONE);
         }
         showingStatus = newStatus;
     }
 
 
     @Override
     public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof FragmentListenerMain) {
             mListener = (FragmentListenerMain) context;
         } else {
             throw new RuntimeException(context
                     + " must implement OnFragmentInteractionListener");
         }
         Log.d(DEBUG_TAG, "OnAttach called");
         viewModel =  new ViewModelProvider(this).get(NearbyStopsViewModel.class);
 
 
     }
 
     @Override
     public void onPause() {
         super.onPause();
 
         gridRecyclerView.setAdapter(null);
         locManager.removeUpdates(fragmentLocationListener);
         fragmentLocationListener.isRegistered = false;
         Log.d(DEBUG_TAG,"On paused called");
     }
 
     @Override
     public void onResume() {
         super.onResume();
         try{
             if(!dbUpdateRunning && !fragmentLocationListener.isRegistered) {
                 requestLocationUpdates();
             }
         } catch (SecurityException ex){
             //ignored
             //try another location provider
         }
         //fix view if we were showing the stops or the arrivals
         prepareForFragmentType();
         switch(fragment_type){
             case STOPS:
                 if(dataAdapter!=null){
                     //gridRecyclerView.setAdapter(dataAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                     loadingTextView.setVisibility(View.GONE);
                 }
                 break;
             case ARRIVALS:
                 if(arrivalsStopAdapter!=null){
                     //gridRecyclerView.setAdapter(arrivalsStopAdapter);
                     circlingProgressBar.setVisibility(View.GONE);
                     loadingTextView.setVisibility(View.GONE);
                 }
         }
 
         mListener.enableRefreshLayout(false);
         Log.d(DEBUG_TAG,"OnResume called");
         if(getContext()==null){
             Log.e(DEBUG_TAG, "NULL CONTEXT, everything is going to crash now");
             MIN_NUM_STOPS = 5;
             MAX_DISTANCE = 600;
             return;
         }
         //Re-read preferences
         SharedPreferences shpr = PreferenceManager.getDefaultSharedPreferences(getContext().getApplicationContext());
         //For some reason, they are all saved as strings
         MAX_DISTANCE = shpr.getInt(getString(R.string.pref_key_radius_recents),600);
         boolean isMinStopInt = true;
         try{
             MIN_NUM_STOPS = shpr.getInt(getString(R.string.pref_key_num_recents), 5);
         } catch (ClassCastException ex){
             isMinStopInt = false;
         }
         if(!isMinStopInt)
             try {
                 MIN_NUM_STOPS = Integer.parseInt(shpr.getString(getString(R.string.pref_key_num_recents), "5"));
             } catch (NumberFormatException ex){
                 MIN_NUM_STOPS = 5;
             }
         if(BuildConfig.DEBUG)
             Log.d(DEBUG_TAG, "Max distance for stops: "+MAX_DISTANCE+ ", Min number of stops: "+MIN_NUM_STOPS);
 
     }
 
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         gridRecyclerView.setVisibility(View.INVISIBLE);
         gridRecyclerView.addOnScrollListener(scrollListener);
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
         mListener = null;
         if(arrivalsManager!=null) arrivalsManager.cancelAllRequests();
     }
 
     /**
      * Display the stops, or run new set of requests for arrivals
      */
     private void showStopsInViews(ArrayList<Stop> stops, GPSPoint location){
         if (stops.isEmpty()) {
             setNoStopsLayout();
             return;
         }
+        if (location == null){
+            // we could do something better, but it's better to do this for now
+            return;
+        }
 
         double minDistance = Double.POSITIVE_INFINITY;
         for(Stop s: stops){
             minDistance = Math.min(minDistance, s.getDistanceFromLocation(location.getLatitude(), location.getLongitude()));
         }
 
 
         //quick trial to hopefully always get the stops in the correct order
         Collections.sort(stops,new StopSorterByDistance(location));
         switch (fragment_type){
             case STOPS:
                 showStopsInRecycler(stops);
                 break;
             case ARRIVALS:
                 if(getContext()==null) break; //don't do anything if we're not attached
                 if(arrivalsManager==null)
                     arrivalsManager = new NearbyArrivalsDownloader(getContext().getApplicationContext(), arrivalsListener);
                 arrivalsManager.requestArrivalsForStops(stops);
                 /*flatProgressBar.setVisibility(View.VISIBLE);
                 flatProgressBar.setProgress(0);
                 flatProgressBar.setIndeterminate(false);
                  */
                 //for the moment, be satisfied with only one location
                 //AppLocationManager.getInstance(getContext()).removeLocationRequestFor(fragmentLocationListener);
                 break;
             default:
         }
 
     }
 
     /**
      * To enable targeting from the Button
      */
     public void switchFragmentType(View v){
         switchFragmentType();
     }
 
     /**
      * Call when you need to switch the type of fragment
      */
     private void switchFragmentType(){
         switch (fragment_type){
             case ARRIVALS:
                 setFragmentType(FragType.STOPS);
                 break;
             case STOPS:
                 setFragmentType(FragType.ARRIVALS);
                 break;
             default:
         }
         prepareForFragmentType();
         fragmentLocationListener.lastUpdateTime = -1;
         //locManager.removeLocationRequestFor(fragmentLocationListener);
         //locManager.addLocationRequestFor(fragmentLocationListener);
         showStopsInViews(currentNearbyStops, lastPosition);
     }
 
     /**
      * Prepare the views for the set fragment type
      */
     private void prepareForFragmentType(){
         if(fragment_type==FragType.STOPS){
             switchButton.setText(getString(R.string.show_arrivals));
             titleTextView.setText(getString(R.string.nearby_stops_message));
             if(arrivalsManager!=null)
                 arrivalsManager.cancelAllRequests();
             if(dataAdapter!=null)
                 gridRecyclerView.setAdapter(dataAdapter);
 
         } else if (fragment_type==FragType.ARRIVALS){
             titleTextView.setText(getString(R.string.nearby_arrivals_message));
             switchButton.setText(getString(R.string.show_stops));
             if(arrivalsStopAdapter!=null)
                 gridRecyclerView.setAdapter(arrivalsStopAdapter);
         }
     }
 
     //useful methods
 
     /////// GUI METHODS ////////
     private void showStopsInRecycler(List<Stop> stops){
 
         if(firstLocForStops) {
             dataAdapter = new SquareStopAdapter(stops, mListener, lastPosition);
             gridRecyclerView.setAdapter(dataAdapter);
             firstLocForStops = false;
         }else {
             dataAdapter.setStops(stops);
             dataAdapter.setUserPosition(lastPosition);
         }
         dataAdapter.notifyDataSetChanged();
 
         //showRecyclerHidingLoadMessage();
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             loadingTextView.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
 
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_STOPS);
     }
 
     private void showArrivalsInRecycler(List<Palina> palinas){
         Collections.sort(palinas,new StopSorterByDistance(lastPosition));
 
         final ArrayList<Pair<Stop,Route>> routesPairList = new ArrayList<>(10);
         //int maxNum = Math.min(MAX_STOPS, stopList.size());
         for(Palina p: palinas){
             //if there are no routes available, skip stop
             if(p.queryAllRoutes().isEmpty()) continue;
             for(Route r: p.queryAllRoutes()){
                 //if there are no routes, should not do anything
                 if (r.passaggi != null && !r.passaggi.isEmpty())
                     routesPairList.add(new Pair<>(p,r));
             }
         }
         if (getContext()==null){
             Log.e(DEBUG_TAG, "Trying to show arrivals in Recycler but we're not attached");
             return;
         }
         if(firstLocForArrivals){
             arrivalsStopAdapter = new ArrivalsStopAdapter(routesPairList,mListener,getContext(),lastPosition);
             gridRecyclerView.setAdapter(arrivalsStopAdapter);
             firstLocForArrivals = false;
         } else {
             arrivalsStopAdapter.setRoutesPairListAndPosition(routesPairList,lastPosition);
         }
 
         //arrivalsStopAdapter.notifyDataSetChanged();
 
         showRecyclerHidingLoadMessage();
         if(mListener!=null) mListener.readyGUIfor(FragmentKind.NEARBY_ARRIVALS);
 
     }
 
     private void setNoStopsLayout(){
         messageTextView.setVisibility(View.VISIBLE);
         messageTextView.setText(R.string.no_stops_nearby);
         circlingProgressBar.setVisibility(View.GONE);
         loadingTextView.setVisibility(View.GONE);
     }
 
     /**
      * Does exactly what is says on the tin
      */
     private void showRecyclerHidingLoadMessage(){
         if (gridRecyclerView.getVisibility() != View.VISIBLE) {
             circlingProgressBar.setVisibility(View.GONE);
             loadingTextView.setVisibility(View.GONE);
             gridRecyclerView.setVisibility(View.VISIBLE);
         }
         messageTextView.setVisibility(View.GONE);
     }
 
     /**
      * Local locationListener, to use for the GPS
      */
     class FragmentLocationListener implements LocationListenerCompat {
 
         private long lastUpdateTime = -1;
         public boolean isRegistered = false;
 
         @Override
         public void onLocationChanged(Location location) {
             //set adapter
 
             if(location==null){
                 Log.e(DEBUG_TAG, "Location is null, cannot request stops");
                 return;
             } else if(viewModel==null){
                 return;
             }
             if(location.getAccuracy()<200 && !dbUpdateRunning) {
                if(viewModel.getDistanceMtLiveData().getValue()==null){
                     //never run request
                    distance = 40;
                }
                lastPosition = new GPSPoint(location.getLatitude(), location.getLongitude());
                viewModel.requestStopsAtDistance(location.getLatitude(), location.getLongitude(), distance, true);
             }
             lastUpdateTime = System.currentTimeMillis();
             Log.d("BusTO:NearPositListen","can start request for stops: "+ !dbUpdateRunning);
         }
 
         @Override
         public void onProviderEnabled(@NonNull String provider) {
             Log.d(DEBUG_TAG, "Location provider "+provider+" enabled");
             if(provider.equals(LocationManager.GPS_PROVIDER)){
                 setShowingStatus(LocationShowingStatus.SEARCHING);
             }
         }
 
         @Override
         public void onProviderDisabled(@NonNull String provider) {
             Log.d(DEBUG_TAG, "Location provider "+provider+" disabled");
             if(provider.equals(LocationManager.GPS_PROVIDER)) {
                setShowingStatus(LocationShowingStatus.DISABLED);
             }
         }
 
         @Override
         public void onStatusChanged(@NonNull @NotNull String provider, int status, @Nullable @org.jetbrains.annotations.Nullable Bundle extras) {
             LocationListenerCompat.super.onStatusChanged(provider, status, extras);
         }
         /*
         @Override
         public void onLocationStatusChanged(int status) {
             switch(status){
                 case AppLocationManager.LOCATION_GPS_AVAILABLE:
                     messageTextView.setVisibility(View.GONE);
 
                     break;
                 case AppLocationManager.LOCATION_UNAVAILABLE:
                     messageTextView.setText(R.string.enableGpsText);
                     messageTextView.setVisibility(View.VISIBLE);
                     break;
                 default:
                     Log.e(DEBUG_TAG,"Location status not recognized");
             }
         }
 
         @Override
         public @NotNull LocationCriteria getLocationCriteria() {
 
             return new LocationCriteria(200,TIME_INTERVAL_REQUESTS);
         }
 
         @Override
         public long getLastUpdateTimeMillis() {
             return lastUpdateTime;
         }
         void resetUpdateTime(){
             lastUpdateTime = -1;
         }
 
         @Override
         public void onLocationProviderAvailable() {
 
         }
 
         @Override
         public void onLocationDisabled() {
 
         }
 
          */
     }
 }
diff --git a/app/src/main/res/drawable/cog_8_question_transp.xml b/app/src/main/res/drawable/cog_8_question_transp.xml
new file mode 100644
index 0000000..95ca28a
--- /dev/null
+++ b/app/src/main/res/drawable/cog_8_question_transp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="64"
+        android:tint="?attr/colorOnPrimary"
+    android:viewportHeight="64">
+  <path
+      android:pathData="m31.488,3c-2.725,0 -5.051,1.969 -5.5,4.658l-0.273,1.633c-0.153,0.834 -0.74,1.528 -1.539,1.813 -0.481,0.18 -0.951,0.375 -1.418,0.588 -0.766,0.364 -1.673,0.289 -2.371,-0.193L19.039,10.535C16.82,8.95 13.781,9.204 11.854,11.133l-0.721,0.721c-1.928,1.928 -2.183,4.967 -0.598,7.186l0.963,1.348c0.482,0.698 0.558,1.605 0.193,2.371 -0.213,0.467 -0.408,0.937 -0.588,1.418 -0.285,0.799 -0.978,1.386 -1.813,1.539L7.658,25.988C4.971,26.437 3.001,28.763 3,31.488v1.023c0,2.725 1.969,5.051 4.658,5.5l1.633,0.273c0.836,0.14 1.515,0.745 1.813,1.539 0.178,0.482 0.377,0.951 0.588,1.418 0.364,0.766 0.289,1.673 -0.193,2.371l-0.963,1.348c-1.585,2.219 -1.331,5.258 0.598,7.186l0.721,0.721c1.927,1.927 4.967,2.183 7.186,0.598l1.348,-0.963c0.698,-0.482 1.605,-0.558 2.371,-0.193 0.467,0.211 0.936,0.406 1.418,0.588 0.794,0.297 1.399,0.977 1.539,1.813l0.273,1.633C26.434,59.028 28.761,61 31.488,61h1.023c2.725,0 5.051,-1.969 5.5,-4.658l0.273,-1.633c0.153,-0.834 0.74,-1.528 1.539,-1.813 0.481,-0.18 0.951,-0.375 1.418,-0.588 0.766,-0.364 1.673,-0.289 2.371,0.193l1.348,0.963c2.219,1.585 5.258,1.331 7.186,-0.598l0.721,-0.721c1.927,-1.927 2.183,-4.967 0.598,-7.186l-0.963,-1.348c-0.482,-0.698 -0.558,-1.605 -0.193,-2.371 0.211,-0.467 0.406,-0.936 0.588,-1.418 0.297,-0.794 0.977,-1.399 1.813,-1.539l1.633,-0.273c2.689,-0.449 4.659,-2.774 4.658,-5.5v-1.023c0,-2.725 -1.969,-5.051 -4.658,-5.5l-1.633,-0.273c-0.834,-0.153 -1.528,-0.74 -1.813,-1.539 -0.18,-0.481 -0.375,-0.951 -0.588,-1.418 -0.364,-0.766 -0.289,-1.673 0.193,-2.371l0.963,-1.348c1.585,-2.219 1.331,-5.258 -0.598,-7.186L52.146,11.133C50.219,9.204 47.18,8.95 44.961,10.535l-1.348,0.963c-0.698,0.482 -1.605,0.558 -2.371,0.193 -0.467,-0.213 -0.937,-0.408 -1.418,-0.588 -0.799,-0.285 -1.386,-0.978 -1.539,-1.813L38.012,7.658C37.562,4.969 35.238,2.999 32.512,3ZM32.789,16c1.219,0 2.347,0.178 3.381,0.533 1.05,0.355 1.953,0.856 2.709,1.504 0.756,0.648 1.349,1.435 1.781,2.361 0.432,0.926 0.648,1.969 0.648,3.127 0,1.173 -0.176,2.184 -0.531,3.033 -0.34,0.849 -0.78,1.598 -1.32,2.246 -0.525,0.633 -1.103,1.188 -1.736,1.666l-1.76,1.32c-0.556,0.417 -1.034,0.833 -1.436,1.25 -0.386,0.417 -0.61,0.879 -0.672,1.389L33.438,37.973h-2.824l-0.279,-3.844c-0.062,-0.695 0.07,-1.297 0.395,-1.807 0.324,-0.525 0.749,-1.009 1.273,-1.457 0.525,-0.463 1.103,-0.912 1.736,-1.344 0.633,-0.448 1.22,-0.942 1.76,-1.482 0.556,-0.54 1.018,-1.149 1.389,-1.828 0.37,-0.695 0.557,-1.522 0.557,-2.479 0,-0.664 -0.132,-1.264 -0.395,-1.805 -0.262,-0.54 -0.617,-0.997 -1.064,-1.367 -0.448,-0.386 -0.98,-0.678 -1.598,-0.879 -0.602,-0.201 -1.251,-0.301 -1.945,-0.301 -0.942,0 -1.752,0.116 -2.432,0.348 -0.664,0.232 -1.226,0.486 -1.689,0.764 -0.463,0.278 -0.841,0.532 -1.135,0.764 -0.278,0.232 -0.51,0.348 -0.695,0.348 -0.386,0 -0.686,-0.178 -0.902,-0.533L24.5,19.334c0.479,-0.448 1.003,-0.872 1.574,-1.273 0.587,-0.401 1.219,-0.756 1.898,-1.064 0.695,-0.309 1.435,-0.549 2.223,-0.719C30.998,16.092 31.863,16 32.789,16ZM31.887,42.189c0.401,0 0.778,0.076 1.133,0.23 0.355,0.154 0.665,0.363 0.928,0.625 0.262,0.262 0.471,0.571 0.625,0.926 0.154,0.355 0.23,0.733 0.23,1.135 0,0.417 -0.076,0.803 -0.23,1.158 -0.154,0.34 -0.363,0.64 -0.625,0.902 -0.262,0.262 -0.573,0.463 -0.928,0.602C32.665,47.922 32.288,48 31.887,48c-0.401,0 -0.78,-0.078 -1.135,-0.232 -0.355,-0.139 -0.663,-0.339 -0.926,-0.602 -0.247,-0.262 -0.449,-0.563 -0.604,-0.902 -0.139,-0.355 -0.207,-0.741 -0.207,-1.158 0,-0.401 0.068,-0.78 0.207,-1.135 0.154,-0.355 0.357,-0.663 0.604,-0.926 0.262,-0.262 0.571,-0.471 0.926,-0.625 0.355,-0.154 0.733,-0.23 1.135,-0.23z"
+      android:strokeWidth="2.97436"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/file_earmark_code_fill.xml b/app/src/main/res/drawable/file_earmark_code_fill.xml
new file mode 100644
index 0000000..a3259fa
--- /dev/null
+++ b/app/src/main/res/drawable/file_earmark_code_fill.xml
@@ -0,0 +1,6 @@
+<vector android:height="32dp" android:viewportHeight="16"
+    android:viewportWidth="16" android:width="32dp"
+        android:tint="?attr/colorOnPrimary"
+        xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#000000" android:pathData="M9.293,0L4,0a2,2 0,0 0,-2 2v12a2,2 0,0 0,2 2h8a2,2 0,0 0,2 -2L14,4.707A1,1 0,0 0,13.707 4L10,0.293A1,1 0,0 0,9.293 0M9.5,3.5v-2l3,3h-2a1,1 0,0 1,-1 -1M6.646,7.646a0.5,0.5 0,1 1,0.708 0.708L5.707,10l1.647,1.646a0.5,0.5 0,0 1,-0.708 0.708l-2,-2a0.5,0.5 0,0 1,0 -0.708zM9.354,7.646 L11.354,9.646a0.5,0.5 0,0 1,0 0.708l-2,2a0.5,0.5 0,0 1,-0.708 -0.708L10.293,10 8.646,8.354a0.5,0.5 0,1 1,0.708 -0.708"/>
+</vector>
diff --git a/app/src/main/res/drawable/journals.xml b/app/src/main/res/drawable/journals.xml
new file mode 100644
index 0000000..2daa6a4
--- /dev/null
+++ b/app/src/main/res/drawable/journals.xml
@@ -0,0 +1,7 @@
+<vector android:autoMirrored="true" android:height="32sp"
+    android:viewportHeight="16" android:viewportWidth="16"
+    android:width="32sp" xmlns:android="http://schemas.android.com/apk/res/android"
+        android:tint="?attr/colorOnPrimary">
+    <path android:fillColor="#000000    " android:pathData="M5,0h8a2,2 0,0 1,2 2v10a2,2 0,0 1,-2 2,2 2,0 0,1 -2,2H3a2,2 0,0 1,-2 -2h1a1,1 0,0 0,1 1h8a1,1 0,0 0,1 -1V4a1,1 0,0 0,-1 -1H3a1,1 0,0 0,-1 1H1a2,2 0,0 1,2 -2h8a2,2 0,0 1,2 2v9a1,1 0,0 0,1 -1V2a1,1 0,0 0,-1 -1H5a1,1 0,0 0,-1 1H3a2,2 0,0 1,2 -2"/>
+    <path android:fillColor="#000000" android:pathData="M1,6v-0.5a0.5,0.5 0,0 1,1 0L2,6h0.5a0.5,0.5 0,0 1,0 1h-2a0.5,0.5 0,0 1,0 -1zM1,9v-0.5a0.5,0.5 0,0 1,1 0L2,9h0.5a0.5,0.5 0,0 1,0 1h-2a0.5,0.5 0,0 1,0 -1zM1,11.5v0.5L0.5,12a0.5,0.5 0,0 0,0 1h2a0.5,0.5 0,0 0,0 -1L2,12v-0.5a0.5,0.5 0,0 0,-1 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/telegram_logo_50.xml b/app/src/main/res/drawable/telegram_logo_50.xml
index f0698e1..a3a2428 100644
--- a/app/src/main/res/drawable/telegram_logo_50.xml
+++ b/app/src/main/res/drawable/telegram_logo_50.xml
@@ -1,28 +1,28 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="50dp"
-    android:height="50dp"
+    android:width="40dp"
+    android:height="40dp"
     android:viewportWidth="50"
     android:viewportHeight="50">
   <path
       android:pathData="M50,25C50,38.8086 38.8086,50 25,50C11.1914,50 0,38.8086 0,25C0,11.1914 11.1914,0 25,0C38.8086,0 50,11.1914 50,25ZM50,25"
       android:fillType="evenOdd"
       android:strokeColor="#00000000">
     <aapt:attr name="android:fillColor">
       <gradient 
           android:startY="0"
           android:startX="25"
           android:endY="49.62915"
           android:endX="25"
           android:type="linear">
         <item android:offset="0" android:color="#FF2AABEE"/>
         <item android:offset="1" android:color="#FF229ED9"/>
       </gradient>
     </aapt:attr>
   </path>
   <path
       android:pathData="M11.3164,24.7344C18.6055,21.5625 23.4648,19.4688 25.8945,18.457C32.8398,15.5703 34.2813,15.0664 35.2227,15.0508C35.4297,15.0469 35.8906,15.0977 36.1914,15.3398C36.4414,15.5469 36.5117,15.8242 36.5469,16.0195C36.5781,16.2109 36.6211,16.6563 36.5898,17.0039C36.2109,20.957 34.582,30.5469 33.7539,34.9766C33.4063,36.8477 32.7148,37.4766 32.0469,37.5391C30.5938,37.6719 29.4922,36.5781 28.0859,35.6563C25.8867,34.2148 24.6445,33.3164 22.5078,31.9102C20.0391,30.2852 21.6406,29.3906 23.0469,27.9297C23.4141,27.5469 29.8125,21.7266 29.9336,21.1992C29.9492,21.1328 29.9648,20.8867 29.8164,20.7578C29.6719,20.6289 29.457,20.6719 29.3008,20.707C29.0781,20.7578 25.5664,23.082 18.7539,27.6797C17.7578,28.3633 16.8555,28.6953 16.043,28.6797C15.1523,28.6602 13.4336,28.1758 12.1563,27.7578C10.5938,27.25 9.3477,26.9805 9.457,26.1172C9.5117,25.668 10.1328,25.207 11.3164,24.7344ZM11.3164,24.7344"
       android:fillColor="#FFFFFF"
       android:fillType="evenOdd"
       android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/drawable/telegram_logo_white.xml b/app/src/main/res/drawable/telegram_logo_white.xml
new file mode 100644
index 0000000..a65f5a0
--- /dev/null
+++ b/app/src/main/res/drawable/telegram_logo_white.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32sp"
+    android:height="32sp"
+    android:viewportWidth="16"
+        android:tint="?attr/colorOnPrimary"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M16,8A8,8 0,1 1,0 8a8,8 0,0 1,16 0M8.287,5.906q-1.168,0.486 -4.666,2.01 -0.567,0.225 -0.595,0.442c-0.03,0.243 0.275,0.339 0.69,0.47l0.175,0.055c0.408,0.133 0.958,0.288 1.243,0.294q0.39,0.01 0.868,-0.32 3.269,-2.206 3.374,-2.23c0.05,-0.012 0.12,-0.026 0.166,0.016s0.042,0.12 0.037,0.141c-0.03,0.129 -1.227,1.241 -1.846,1.817 -0.193,0.18 -0.33,0.307 -0.358,0.336a8,8 0,0 1,-0.188 0.186c-0.38,0.366 -0.664,0.64 0.015,1.088 0.327,0.216 0.589,0.393 0.85,0.571 0.284,0.194 0.568,0.387 0.936,0.629q0.14,0.092 0.27,0.187c0.331,0.236 0.63,0.448 0.997,0.414 0.214,-0.02 0.435,-0.22 0.547,-0.82 0.265,-1.417 0.786,-4.486 0.906,-5.751a1.4,1.4 0,0 0,-0.013 -0.315,0.34 0.34,0 0,0 -0.114,-0.217 0.53,0.53 0,0 0,-0.31 -0.093c-0.3,0.005 -0.763,0.166 -2.984,1.09"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/volunteer_36.xml b/app/src/main/res/drawable/volunteer_36.xml
new file mode 100644
index 0000000..61b944e
--- /dev/null
+++ b/app/src/main/res/drawable/volunteer_36.xml
@@ -0,0 +1,9 @@
+<vector android:autoMirrored="true"
+        android:height="36dp"
+    android:tint="?attr/colorOnPrimary" android:viewportHeight="24"
+    android:viewportWidth="24"
+        android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,11h4v11h-4z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M16,3.25C16.65,2.49 17.66,2 18.7,2C20.55,2 22,3.45 22,5.3c0,2.27 -2.91,4.9 -6,7.7c-3.09,-2.81 -6,-5.44 -6,-7.7C10,3.45 11.45,2 13.3,2C14.34,2 15.35,2.49 16,3.25z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20,17h-7l-2.09,-0.73l0.33,-0.94L13,16h2.82c0.65,0 1.18,-0.53 1.18,-1.18v0c0,-0.49 -0.31,-0.93 -0.77,-1.11L8.97,11H7v9.02L14,22l8.01,-3v0C22,17.9 21.11,17 20,17z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 4e794a9..c4e1175 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,60 +1,201 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
               android:layout_height="match_parent"
               tools:context="it.reyboz.bustorino.ActivityAbout" android:orientation="vertical"
         android:gravity="center">
     <!-- The ActionBar displayed at the top -->
 
-    <include
+   <!-- <include
             layout="@layout/default_toobar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"/>
+            -->
+    <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.9"
+            android:scrollbars="vertical"
+    >
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" android:layout_height="wrap_content"
+        android:paddingTop="10dp">
+            <TextView
+                    android:id="@+id/topTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dip"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/openTutorialButton"
+                    android:autoLink="web"
+                    android:fontFamily="@font/nevermind_compact"
+                    android:textColor="@color/grey_700"
+            />
+            <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:id="@+id/openTutorialButton"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    app:icon="@drawable/cog_8_question_transp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/topTextView"
+                    app:iconGravity="start"
+                    android:text="@string/show_introduction"
+                    android:fontFamily="@font/pitagon_semibold"
+            />
+            <TextView
+                    android:id="@+id/telegramTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dip"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    app:layout_constraintTop_toBottomOf="@id/openTutorialButton"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:autoLink="web"
+                    android:fontFamily="@font/nevermind_compact"
+                    android:textColor="@color/grey_700"
+            />
+            <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:id="@+id/openTelegramButton"
+                    android:paddingBottom="8dp"
+                    android:paddingTop="8dp"
+                    app:icon="@drawable/telegram_logo_white"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/telegramTextView"
+                    app:iconGravity="start"
+                    android:text="@string/open_telegram"
+                    android:fontFamily="@font/pitagon_semibold"
+
+            />
+            <TextView
+                    android:id="@+id/howDoesItWorkTextView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dip"
+                    android:layout_marginBottom="5dip"
+                    android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                    android:layout_marginRight="@dimen/activity_horizontal_margin"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    app:layout_constraintTop_toBottomOf="@id/openTelegramButton"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:autoLink="web"
+                    android:fontFamily="@font/nevermind_compact"
+                    android:textColor="@color/grey_700"
+            />
+
+            <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:id="@+id/openContributeButton"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    app:icon="@drawable/journals"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/howDoesItWorkTextView"
+                    app:iconGravity="start"
+                    android:text="@string/action_wiki"
+                    android:fontFamily="@font/pitagon_semibold"
+
+            />
+            <com.google.android.material.button.MaterialButton
+                    style="@style/Widget.MaterialComponents.Button.Icon"
+                    android:id="@+id/openSourceButton"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp"
+                    app:icon="@drawable/file_earmark_code_fill"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/openContributeButton"
+                    app:iconGravity="start"
+                    android:text="@string/action_source"
+                    android:fontFamily="@font/pitagon_semibold"
+
+            />
+            <TextView
+                android:id="@+id/bottomAboutTextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dip"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                app:layout_constraintTop_toBottomOf="@id/openSourceButton"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:autoLink="web"
+                android:fontFamily="@font/nevermind_compact"
+                android:textColor="@color/grey_700"
+        /><!--android:layout_weight="0.85"-->
+
+            <!--<Button
+                    android:text="@string/open_telegram"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="10dp"
+                    android:layout_below="@id/aboutTextView"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    android:id="@+id/openTelegramButton"
+                    android:drawableEnd="@drawable/telegram_logo_50"
+                    android:fontFamily="@font/pitagon_semibold"
+                    android:backgroundTint="@color/orange_500"
+                    android:textColor="@color/white"
+                    app:layout_constraintBottom_toTopOf="@id/newTelegramButton"
+            />
+            -->
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
 
-    <TextView
-            android:id="@+id/aboutTextView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_marginTop="5dip"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:layout_weight="0.85"
-            android:fontFamily="@font/nevermind_compact"
-            android:textColor="@color/grey_700"
-    />
     <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginLeft="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginEnd="8dp"
             android:layout_marginTop="2dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             android:id="@+id/theDivider"
-            android:background="@android:color/darker_gray"/>
-
-    <Button
-            android:text="@string/open_telegram"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
-            android:id="@+id/openTelegramButton"
-            android:drawableLeft = "@drawable/telegram_logo_50"
-            android:drawableStart="@drawable/telegram_logo_50"
-            android:fontFamily="@font/pitagon_semibold"/>
+            android:background="@android:color/darker_gray"
+            app:layout_constraintBottom_toTopOf="@id/versionTextView"
+    />
 
     <TextView
             android:text="@string/app_version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" android:id="@+id/versionTextView"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:gravity="center_horizontal|center_vertical"
-            android:layout_margin="10dp"
             android:layout_marginLeft="20dp"
-            android:layout_marginStart="20dp"
-
-            android:textColor="@color/black"/>
-
+            android:layout_marginStart="10dp"
+            android:layout_below="@id/openTelegramButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:textColor="@color/black" android:layout_marginTop="10dp" android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index f8e5690..ee594f0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,296 +1,309 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
 
     <string name="app_description">Stai utilizzando l\'ultimo ritrovato in materia di rispetto della tua privacy.</string>
     <string name="search">Cerca</string>
     <string name="qrcode">QR Code</string>
     <string name="yes">Si</string>
     <string name="no">No</string>
     <string name="next">Prossimo</string>
     <string name="previous">Precedente</string>
     <string name="title_barcode_scanner_install">Installare Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">Questa azione richiede un\'altra app per scansionare i codici QR. Vuoi installare Barcode Scanner?</string>
     <string name="insert_bus_stop_number">Numero fermata</string>
     <string name="insert_bus_stop_name">Nome fermata</string>
     <string name="insert_bus_stop_number_error">Inserisci il numero della fermata</string>
     <string name="insert_bus_stop_name_error">Inserisci il nome della fermata</string>
     <string name="network_error">Verifica l\'accesso ad Internet!</string>
     <string name="no_bus_stop_have_this_name">Sembra che nessuna fermata abbia questo nome</string>
     <string name="no_arrivals_stop">Nessun passaggio trovato alla fermata</string>
     <string name="parsing_error">Errore di lettura del sito 5T/GTT (dannato sito!)</string>
     <string name="passages">Fermata: %1$s</string>
     <string name="line">Linea</string>
     <string name="lines">Linee</string>
     <string name="urban_lines">Linee urbane</string>
     <string name="extraurban_lines">Linee extraurbane</string>
     <string name="turist_lines">Linee turistiche</string>
     <string name="direction_duep">Direzione:</string>
 
 
     <string name="line_fill">Linea: %1$s</string>
     <string name="lines_fill">Linee: %1$s</string>
     <string name="results">Scegli la fermata…</string>
     <string name="no_passages">Nessun passaggio</string>
     <string name="no_qrcode">Nessun QR code trovato, prova ad usare un\'altra app</string>
     <string name="action_favorites">Preferiti</string>
     <string name="action_help">Aiuto</string>
     <string name="action_about">Informazioni</string>
     <string name="action_about_more">Più informazioni</string>
     <string name="action_wiki">Contribuisci</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/it/</string>
     <string name="action_source">Codice sorgente</string>
     <string name="action_licence">Licenza</string>
     <string name="action_author">Incontra l\'autore</string>
     <string name="added_in_favorites">Fermata aggiunta ai preferiti</string>
     <string name="cant_add_to_favorites">Impossibile aggiungere ai preferiti (memoria piena o database corrotto?)!</string>
     <string name="title_activity_favorites">Preferiti</string>
     <string name="title_activity_map">Mappa</string>
     <string name="tip_add_favorite">Nessun preferito? Arghh!\nSchiaccia sulla stella di una fermata per aggiungerla a questa lista!</string>
     <string name="action_remove_from_favourites">Rimuovi</string>
     <string name="action_rename_bus_stop_username">Rinomina</string>
     <string name="dialog_rename_bus_stop_username_title">Rinomina fermata</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">Informazioni</string>
     <string name="howDoesItWork"><b>Tocca la stella</b> per aggiungere la fermata ai preferiti\n\n<b>Come leggere gli orari:</b>
         \n<b>&#160;&#160;&#160;12:56*</b> Orario in tempo reale\n<b>&#160;&#160;&#160;12:56</b> &#160; Orario programmato\n\n<b>Trascina giù per aggiornare</b> l\'orario.
         \n<b>Tocca a lungo</b> su <b>Fonte Orari</b> per cambiare sorgente degli orari di arrivo.
     </string>
     <string name="hint_button">OK!</string>
-    <string name="about_history">
+    <string name="about_history_top">
 <![CDATA[
-        <h1>Benvenuto!</h1>
+        <h1>Benvenuto/a/ə!</h1>
         
-        <p>Grazie per aver scelto BusTO, un\'app <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>:</p>
-		<br>
-		<p>Perché usare BusTO?</p>
-		<p>
-        - Non sei <b>monitorato</b><br>
-        - Non ci sono <b>pubblicità</b><br>
-        - La tua <b>privacy</b> è al sicuro<br>
-        - Inoltre l\'app è molto leggera!<br>
-        </p>
+        <p>Grazie per aver scelto BusTO, un\'app <b>open source</b> e <b>indipendente</b> da GTT/5T, per spostarsi a Torino attraverso <b>software libero</b>!</p>
+        <p>BusTO rispetta la tua <b>privacy</b> non raccogliendo nessun dato sull\'utilizzo, ed è <b>leggera</b> e senza <b>pubblicità</b>!</p>
         <br>
-        <h2>Come funziona?</h2>
+        <p>Qui puoi trovare più informazioni e link riguardo al progetto.</p>
+		<br>
+        <h2>Schermata iniziale</h2>
+        <p>Se vuoi rivedere la schermata iniziale, usa il pulsante qui sotto:</b>
+     ]]></string>
+    <string name="about_channel">
+        <![CDATA[
+        <h2>Notizie e aggiornamenti</h2>
+        <p>Nel canale Telegram puoi trovare informazioni sugli ultimi aggiornamenti dell\'app</p>
+        ]]></string>
+    <string name="about_how">
+        <![CDATA[
+        <h2>Ma come funziona?</h2>
         <p>Quest\'app ottiene i passaggi dei bus, le fermate e altre informazioni utili unendo dati forniti dal sito <b>www.gtt.to.it</b>, <i>www.5t.torino.it</i>, <b>muoversiatorino.it</b> "per uso personale" e altre fonti Open Data (aperto.comune.torino.it).</p>
         <br>
 		<p>Ingredienti:<br>
 		- <b>Fabio Mazza</b> attuale rockstar developer anziano.<br>
 		- <b>Andrea Ugo</b> attuale rockstar developer in formazione.<br>
 		- <b>Silviu Chiriac</b> designer del logo 2021.<br>
 		- <b>Marco M</b> formidabile tester e cacciatore di bug.<br>
 		- <b>Ludovico Pavesi</b> ex rockstar developer anziano asd.<br>
 		- <b>Valerio Bozzolan</b> attuale manutentore.<br>
 		- <b>Marco Gagino</b> apprezzato ex collaboratore, ideatore icona e grafica.<br>
 		- <b>JSoup</b> libreria per "<i>web scaping</i>".<br>
-		- <b>Google</b> icone e libreria di supporto per il Material Design.<br>
+		- <b>Google</b> icone e librerie di supporto e design.<br>
+		- Altre icone da <b>Bootstrap</b>, <b>Feather</b> e <b>Hero Icons</b><br>
 		- Tutti i contributori e i beta tester!
 		</p>
         <br>
+		Se vuoi avere più informazioni tecniche e contribuire allo sviluppo, usa i pulsanti qui sotto!</b>
+
+         ]]></string>
+    <string name="about_history_bottom">
+        <![CDATA[
 		<h2>Licenze</h2>
-		<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3+</i>.
-		Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan.
+		<p>L\'app e il relativo codice sorgente sono distribuiti sotto la licenza <i>GNU General Public License v3</i> (https://www.gnu.org/licenses/gpl-3.0.html).
+		Ciò <b>significa</b> che puoi usare, studiare, migliorare e ricondividere quest\'app con <b>qualunque mezzo</b> e per <b>qualsiasi scopo</b>: a patto di mantenere sempre questi diritti a tua volta e di dare credito a Valerio Bozzolan e agli altri autori del codice dell\'app.
 		</p>
 
 		<br>
 		<h2>Note</h2>
 		<p>Quest\'applicazione è rilasciata <b>nella speranza che sia utile a tutti</b> ma senza NESSUNA garanzia sul suo funzionamento attuale e/o futuro.</p>
 		<p>Tutti i dati utilizzati dall\'app provengono <b>direttamente</b> da GTT o da simili agenzie pubbliche: se trovi che sono inesatti per qualche motivo, ti invitiamo a rivolgerti a loro.</p>
 		<p>Buon utilizzo! :)</p>
     ]]>
     </string>
     <string name="query_too_short">Nome troppo corto, digita più caratteri e riprova</string>
     <string name="route_towards_destination">%1$s verso %2$s</string>
     <string name="route_towards_unknown">%s (destinazione sconosciuta)</string>
     <string name="internal_error">Errore interno inaspettato, impossibile estrarre dati dal sito GTT/5T</string>
     <string name="action_view_on_map">Visualizza sulla mappa</string>
     <string name="cannot_show_on_map_no_activity">Non trovo un\'applicazione dove mostrarla</string>
     <string name="cannot_show_on_map_no_position">Posizione della fermata non trovata</string>
 
 
     <string name="nearby_stops_message">Fermate vicine</string>
     <string name="position_searching_message">Ricerca della posizione</string>
     <string name="no_stops_nearby">Nessuna fermata nei dintorni</string>
     <string name="main_menu_pref">Preferenze</string>
     <string name="database_update_msg_inapp">Aggiornamento del database&#8230;</string>
     <string name="database_update_msg_notif">Aggiornamento del database</string>
     <string name="database_update_req">Aggiornamento database forzato</string>
     <string name="database_update_req_descr">Tocca per aggiornare ora il database</string>
     <string name="pref_num_elements">Numero minimo di fermate</string>
     <string name="num_stops_nearby_not_number">Il numero di fermate da ricercare non è valido</string>
     <string name="invalid_number">Valore errato, inserisci un numero</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="settings_search_radius">Distanza massima di ricerca (m)</string>
     <string name="settings_experimental">Funzionalità sperimentali</string>
     <string name="action_settings">Impostazioni</string>
     <string name="general_settings">Generali</string>
     <string name="pref_recents_group_title">Fermate recenti</string>
     <string name="settings_group_general">Impostazioni generali</string>
     <string name="settings_group_database">Gestione del database</string>
     <string name="settings_reset_database">Comincia aggiornamento manuale del database</string>
 
 
     <string name="enable_position_message_map">Consenti l\'accesso alla posizione per mostrarla sulla mappa</string>
     <string name="enable_position_message_nearby">Consenti l\'accesso alla posizione per mostrare le fermate vicine</string>
 
     <string name="enableGpsText">Abilitare il GPS</string>
     <string name="bus_arriving_at">arriva alle</string>
     <string name="arrivals_card_at_the_stop">alla fermata</string>
     <string name="show_arrivals">Mostra arrivi</string>
     <string name="show_stops">Mostra fermate</string>
     <string name="nearby_arrivals_message">Arrivi qui vicino</string>
     <string name="removed_from_favorites">Fermata rimossa dai preferiti</string>
     <!--
     Mixed button strings
     !-->
-    <string name="open_telegram"> Canale Telegram</string>
+    <string name="open_telegram">Canale telegram</string>
+    <string name="show_introduction">Mostra introduzione</string>
+
 
     <!--
     Map view buttons strings
     !-->
     <string name="bt_center_map_description">La mia posizione</string>
     <string name="bt_follow_me_description">Segui posizione</string>
     <string name="enable_position">Attiva o disattiva posizione</string>
     <string name="location_enabled">Posizione attivata</string>
     <string name="location_disabled">Posizione disattivata</string>
     <string name="map_location_disabled_device">La posizione è disabilitata sul dispositivo</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Fonte orari: %1$s</string>
     <string name="fivetapifetcher">App GTT</string>
     <string name="gttjsonfetcher">Sito GTT</string>
     <string name="fivetscraper">Sito 5T Torino</string>
     <string name="source_mato">App Muoversi a Torino</string>
     <string name="undetermined_source">Sconosciuta</string>
 
     <string name="arrival_times_choice_title">Fonti orari di arrivo</string>
     <string name="arrival_times_choice_explanation">Scegli le fonti di orari da usare</string>
 
     <string name="arrival_source_changing">Cambiamento sorgente orari…</string>
     <string name="change_arrivals_source_message">Premi a lungo per cambiare la sorgente degli orari</string>
     <string name="no_passages_title">Nessun passaggio per le linee:</string>
 
 
 
     <string name="default_notification_channel_description">Canale default delle notifiche</string>
     <string name="database_notification_channel">Operazioni sul database</string>
     <string name="database_notification_channel_desc">Informazioni sul database (aggiornamento)</string>
     <string name="live_position_service_name">BusTO - posizioni in tempo reale</string>
 
     <string name="live_positions_notification_channel">Posizioni in tempo reale</string>
     <string name="live_positions_notification_channel_desc">Attività del servizio delle posizioni in tempo reale</string>
 
     <string name="mqtt_notification_text">Servizio posizioni MaTO in tempo reale attivo</string>
 
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
 
     <string name="too_many_permission_asks">Chiesto troppe volte per il permesso %1$s</string>
     <string name="permission_storage_maps_msg">Non si può usare questa funzionalità senza il permesso di archivio</string>
     <string name="storage_permission">di archivio</string>
     <string name="message_crash">Un bug ha fatto crashare l\'app!
         \nPremi \"OK\" per inviare il report agli sviluppatori via email, così potranno scovare e risolvere il tuo bug!
         \nIl report contiene piccole informazioni non sensibili sulla configurazione del tuo telefono e sullo stato dell\'app al momento del crash.
     </string>
     <string name="acra_email_message">L\'applicazione è crashata, e il crash report è stato messo negli allegati. Se vuoi, descrivi cosa stavi facendo prima che si interrompesse: \n</string>
     <string name="nav_arrivals_text">Arrivi</string>
     <string name="nav_map_text">Mappa</string>
     <string name="nav_favorites_text">Preferiti</string>
     <string name="drawer_open">Apri drawer</string>
     <string name="drawer_close">Chiudi drawer</string>
     <string name="experiments">Esperimenti</string>
     <string name="donate_now">Offrici un caffè</string>
     <string name="map">Mappa</string>
     <string name="stop_search_view_title">Ricerca fermate</string>
     <string name="app_version">Versione app</string>
     <string name="arrival_times">Orari di arrivo</string>
 
     <!--  Preferences -->
     <string name="requesting_db_update">Richiesto aggiornamento del database</string>
     <string name="downloading_data_mato">Download dati dal server MaTO</string>
 
 
 
     <string name="pref_directions_capitalize">Mostra direzioni in maiuscolo</string>
     <string-array name="directions_capitalize">
         <item>Non cambiare</item>
         <item>Tutto in maiuscolo</item>
         <item>Solo la prima lettera maiuscola</item>
     </string-array>
     <string name="pref_lines_click_msg">Mostra arrivi quando tocchi una fermata</string>
     <string name="pref_experimental_msg">Abilita esperimenti</string>
     <string name="pref_shown_startup">Schermata da mostrare all\'avvio</string>
     <string name="pref_shown_startup_def_desc">Tocca per cambiare</string>
 
     <string name="positions_source_pref_title">Fonte posizioni in tempo reale di bus e tram</string>
     <array name="positions_source_sel">
         <item>MaTO (aggiornate più spesso, può non funzionare)</item>
         <item>GTFS RT (più stabile)</item>
     </array>
 
     <string name="favorites_line_add">Linea aggiunta ai preferiti</string>
     <string name="favorites_line_remove">Linea rimossa dai preferiti</string>
     <string name="favorites_lines">Preferite</string>
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Tocca a lungo la fermata per le opzioni</string>
     <string name="remove_all_trips">Rimuovi i dati dei trip (libera spazio)</string>
     <string name="all_trips_removed">Tutti i trip GTFS sono rimossi dal database</string>
 
     <!-- tutorial -->
     <string name="tutorial_action">Mostra introduzione</string>
     <string name="tutorial_first">
         <![CDATA[Grazie per aver installato BusTO, l\'app gratuita, libera e <b>open source</b> per il trasporto pubblico di Torino. Stai usando un\'app <b>indipendente</b>, senza pubblicità e senza nessun tracciamento.
 ]]> </string>
     <string name="tutorial_search"><![CDATA[Puoi cercare gli orari d\'arrivo ad una fermata inserendo il numero nella casella di ricerca.<br>
 Se ti trovi a una fermata, puoi scansionare il codice QR presente sulla palina toccando l\'icona a sinistra della barra di ricerca.]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Una volta trovata una fermata, puoi aggiungerla ai <b>preferiti</b> toccando la stella a fianco del nome.]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[Con la posizione abilitata, puoi vedere le <b>fermate più vicine</b> a te direttamente nella schermata principale...]]>
     </string>
     <string name="tutorial_map">
         <![CDATA[...oppure puoi trovarle sulla mappa, assieme alle <b>posizioni in tempo reale</b> dei bus e tram (in <font color="#2F59CC">blu</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[Scopri il percorso e le fermate della linea che preferisci, insieme alle posizioni in tempo reale dei bus/tram che la servono. Ricorda di scegliere la direzione che ti interessa!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[Tutte queste funzioni si trovano nel menu laterale.<br>
 Guarda nelle <b>Impostazioni</b> per personalizzare l\'app come preferisci, e su <b>Informazioni</b> per sapere di più sull\'app e il team di sviluppo.]]>
     </string>
     <string name="close_tutorial">Capito, chiudi introduzione</string>
     <string name="close_tutorial_short">Chiudi introduzione</string>
     <string name="tutorial_permissions">
         <![CDATA[
          L\'app usa le notifiche per fornire informazioni sullo stato delle attività.
          Tocca il bottone per abilitarle.
         ]]>
     </string>
 
     <string name="grant_location_permission">Abilita accesso alla posizione</string>
     <string name="location_permission_granted">Accesso alla posizione abilitato</string>
     <string name="location_permission_not_granted">Accesso alla posizione non consentito dall\'utente</string>
 
     <string name="grant_notification_permission">Abilita notifiche</string>
     <string name="notification_permission_granted">Notifiche abilitate</string>
 
     <!-- BACKUP -->
     <string name="backup_restore">Backup e ripristino</string>
     <string name="backup_activity">Importa / esporta dati</string>
     <string name="saved_data">Dati salvati</string>
     <string name="btn_backup_message">Salva backup</string>
     <string name="btn_load_backup_message">Importa i dati dal backup</string>
     <string name="data_imported_backup">Backup importato</string>
 
     <string name="message_check_at_least_one">Seleziona almeno un elemento da importare!</string>
     <string name="load_file_favorites">Importa preferiti dal backup</string>
     <string name="load_preferences">Importa preferenze dal backup</string>
 
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 87baff0..99c8dc1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,61 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <color name="orange_500">#ff9800</color>
     <color name="orange_700">#F57C00</color>
     <color name="orange_700_40light">#cc6600</color>
     <color name="orange_700_30light">#994d00</color>
     <color name="blue_500">#2196F3</color>
     <color name="blue_620">#2a65e8</color>
     <color name="blue_700">#2060dd</color>
     <color name="brown_vd">#8A4247</color><!-- #1976D2 -->
 
     <color name="blue_mid_2">#2378e8</color>
     <color name="blue_c_or_700">#0079f5</color>
     <color name="teal_dark">#2a968b</color>
     <color name="blue_comp_500">#0067ff</color>
 
     <color name="blue_extra">#2F59CC</color>
     <color name="brown_mattone">#CC5E43</color>
-    <color name="green_dark">#548017</color>
+    <color name="olivegreen">#548017</color>
+    <color name="forest_green">#228b22</color>
+    <color name="green_extra">#0ABA34</color>
 
     <color name="teal_500">#009688</color>
     <color name="teal_300">#4DB6AC</color>
     <color name="teal_200">#80cbc4</color>
+    <color name="teal_900">#008175</color>
     <color name="grey_100">#F5F5F5</color>
     <color name="grey_200">#dddddd</color>
     <color name="grey_050">#f8f8f8</color>
     <color name="grey_600">#757575</color>
     <color name="grey_700">#444</color>
     <color name="grey_800">#353535</color>
     <color name="grey_900">#303030</color>
 
     <!--<color name="white">#FFFFFF</color>
     <color name="accent">#009688</color>-->
     <color name="metro_red">#DE0908</color>
     <color name="red_darker">#b30000</color>
     <color name="red_orange">#dd441f</color>
     <color name="red_dark">#b30d0d</color>
     <color name="blue_extraurbano">#2060DD</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="black_900">#1c1c1c</color>
 
     <color name="line_pattern_color">@color/blue_mid_2</color><!-- 2e8df0-->
 
     <color name="line_drawn_poly">@color/red_dark</color>
 
     <color name="bus_marker_color">@color/blue_extra</color>
     <color name="light_blue_600">#FF039BE5</color>
     <color name="light_blue_900">#FF01579B</color>
     <color name="light_blue_A200">#FF40C4FF</color>
     <color name="light_blue_A400">#FF00B0FF</color>
     <color name="black_overlay">#66000000</color>
 
 
     <color name="colorTransparent">#00000000</color>
 
     <color name="urban_bus_bg">@color/orange_500</color>
     <color name="extraurban_bus_bg">@color/blue_extraurbano</color>
     <color name="metro_bg">@color/metro_red</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 7ee94cf..c928bfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,321 +1,336 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="app_name" translatable="false">BusTO</string>
     <string name="app_name_full" translatable="false">Libre BusTO</string>
     <string name="app_name_debug" translatable="false">BusTO dev</string>
     <string name="app_name_gitpull" translatable="false">BusTO git</string>
     <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
     </string>
     <string name="search">Search</string>
     <string name="qrcode">Scan QR Code</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="next">Next</string>
     <string name="previous">Previous</string>
 
     <string name="title_barcode_scanner_install">Install Barcode Scanner?</string>
     <string name="message_install_barcode_scanner">This application requires an app to scan the QR codes. Would you like
         to install Barcode Scanner now?
     </string>
 
     <string name="insert_bus_stop_number">Bus stop number</string>
     <string name="insert_bus_stop_name">Bus stop name</string>
     <string name="insert_bus_stop_number_error">Insert bus stop number</string>
     <string name="insert_bus_stop_name_error">Insert bus stop name</string>
     <string name="route_towards_destination">%1$s towards %2$s</string>
     <string name="route_towards_unknown">%s (unknown destination)</string>
     <string name="network_error">Verify your Internet connection!</string>
     <string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
     <string name="no_arrivals_stop">No arrivals found for this stop</string>
     <string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
     <string name="query_too_short">Name too short, type more characters and retry
     </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
     <string name="passages">Arrivals at: %1$s</string>
     <string name="results">Choose the bus stop…</string>
     <string name="line">Line</string>
     <string name="lines">Lines</string>
     <string name="urban_lines">Urban lines</string>
     <string name="extraurban_lines">Extra urban lines</string>
     <string name="turist_lines">Tourist lines</string>
 
     <string name="direction_duep">Destination:</string>
     <string name="lines_fill">Lines: %1$s</string>
     <string name="line_fill">Line: %1$s</string>
     <string name="no_passages">No timetable found</string>
     <string name="no_qrcode">No QR code found, try using another app to scan</string>
     <string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
     <string name="action_help">Help</string>
     <string name="action_about">About the app</string>
     <string name="action_about_more">More about</string>
     <string name="action_wiki">Contribute</string>
     <string name="hack_url">https://gitpull.it/w/librebusto/en/</string>
     <string name="action_source">Source code</string>
     <string name="action_licence">Licence</string>11
     <string name="action_author">Meet the author</string>
     <string name="added_in_favorites">Bus stop is now in your favorites</string>
     <string name="removed_from_favorites">Bus stop removed from your favorites</string>
     <string name="favorites_line_add">Added line to favorites</string>
     <string name="favorites_line_remove">Remove line from favorites</string>
     <string name="favorites_lines">Favorites</string>
     <string name="action_favorites">Favorites</string>
     <string name="title_activity_favorites">Favorites</string>
     <string name="title_activity_map">Map</string>
     <string name="tip_add_favorite">No favorites? Arghh! Press on a bus stop star to populate this list!</string>
     <string name="action_remove_from_favourites">Delete</string>
     <string name="action_rename_bus_stop_username">Rename</string>
     <string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
     <string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
     <string name="about_activity">About the app</string>
     <string name="howDoesItWork">
         <b>Tap the star</b>
         to add the bus stop to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
         arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
         \n <b>Long press on Arrivals source</b> to change the source of the arrival times
     </string>
     <string name="hint_button">GOT IT!</string>
     <string name="arrival_times">Arrival times</string>
     <string name="no_passages_title">No arrivals found for lines:</string>
-    <string name="about_history">
+    <string name="about_history_top">
         <![CDATA[
         <h1>Welcome!</h1>
 
-        <p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
+        <p>Thanks for using BusTO, an <b>open source</b> and <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
         <br>
         <p>Why use this app?</p>
 		<p>
         - You\'ll never be <b>tracked</b><br>
         - You\'ll never see boring <b>ads</b><br>
         - We\'ll always respect your <b>privacy</b><br>
         - Moreover, it\'s lightweight!<br>
         </p>
         <br>
-        <h2>How does it work?</h2>
+        <h2>Introductory tutorial</h2>
+        <p>If you want to see the introduction again, use the button below:</p>
+        ]]></string>
+    <string name="about_channel">
+        <![CDATA[
+    <h2>News and Updates</h2>
+    <p>On the Telegram channel, you can find information about the latest app updates</p>
+    ]]></string>
+    <string name="about_how">
+        <![CDATA[
+    <h2>How does it work?</h2>
         <p>This app is able to do all the amazing things it does by pulling data from <b>www.gtt.to.it</b>, <b>www.5t.torino.it</b> or <b>muoversiatorino.it</b> "for personal use", along with open data from the AperTO (aperto.comune.torino.it) website.</p>
         <br>
 		<p>The work of several people is behind this app, in particular:<br>
 		- <b>Fabio Mazza</b>, current senior rockstar developer.<br>
         - <b>Andrea Ugo</b>, current junior rockstar developer.<br>
 		- <b>Silviu Chiriac</b>, designer of the 2021 logo.<br>
 		- <b>Marco M</b>, rockstar tester and bug hunter.<br>
 		- <b>Ludovico Pavesi</b>, previous senior rockstar developer (asd).<br>
 		- <b>Valerio Bozzolan</b>, maintainer and infrastructure (sponsor).<br>
 		- <b>Marco Gagino</b>, contributor and first icon creator.<br>
 		- <b>JSoup</b> web scraper library.<br>
 		- <b>makovkastar</b> floating buttons.<br>
-		- <b>Google</b> Material Design icons and Volley framework.<br>
-		- <b>Android</b> app components.<br>
+        - <b>Google</b> for icons and support and design libraries.<br>
+        - Other icons from <b>Bootstrap</b>, <b>Feather</b>, and <b>Hero Icons</b>.<br>
 		- All the contributors, and the beta testers, too!
 		</p>
 		<br>
+		 If you want more technical information or to contribute to development, use the buttons below!</b>
+    ]]></string>
+    <string name="about_history_bottom">
+        <![CDATA[
 		<h2>Licenses</h2>
 		<p>The app and the related source code are released by Valerio Bozzolan and the other authors under the terms of the <i>GNU General Public License v3+</i>).
 		So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
         <br>
 		<h2>Notes</h2>
 		<p>This app has been developed with the <b>hope to be useful to everyone</b>, but comes without ANY warranty of any kind.</p>
 		<p>The data used by the app comes <b>directly</b> from GTT and other public agencies: if you find any errors, please take it up to them, not to us.</p>
 		<p>This translation is kindly provided by Riccardo Caniato, Marco Gagino and Fabio Mazza.</p>
 		<p>Now you can hack public transport, too! :)</p>
     ]]>
     </string>
 
     <string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
     <string name="action_view_on_map">View on a map</string>
     <string name="cannot_show_on_map_no_activity">Cannot find any application to show it in</string>
     <string name="cannot_show_on_map_no_position">Cannot find the position of the stop</string>
 
     <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
     <string name="mainSharedPreferences" translatable="false">it.reyboz.bustorino.preferences</string>
     <string name="databaseUpdatingPref" translatable="false">db_is_updating</string>
     <!-- Settings -->
     <string name="nearby_stops_message">Nearby stops</string>
     <string name="nearby_arrivals_message">Nearby connections</string>
     <string name="app_version">App version</string>
     <string name="num_stops_nearby_not_number">The number of stops to show in the recent stops is invalid</string>
     <string name="invalid_number">Invalid value, put a valid number</string>
 
     <string name="position_searching_message">Finding location</string>
     <string name="no_stops_nearby">No stops nearby</string>
     <string name="pref_num_elements">Minimum number of stops</string>
     <string name="main_menu_pref">Preferences</string>
     <string name="title_activity_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="general_settings">General</string>
     <string name="settings_experimental">Experimental features</string>
     <string name="settings_search_radius">Maximum distance (meters)</string>
     <string name="pref_recents_group_title">Recent stops</string>
     <string name="settings_group_general">General settings</string>
     <string name="settings_group_database">Database management</string>
     <string name="settings_reset_database">Launch manual database update</string>
 
     <string name="enable_position_message_map">Allow access to location to show it on the map</string>
     <string name="enable_position_message_nearby">Allow access to location to show stops nearby</string>
     <string name="enableGpsText">Please enable location on the device</string>
     <string name="database_update_msg_inapp">Database update in progress&#8230;</string>
     <string name="database_update_msg_notif">Updating the database</string>
     <string name="database_update_req">Force database update</string>
     <string name="database_update_req_descr">Touch to update the app database now</string>
     <string name="bus_arriving_at">is arriving at</string>
     <string name="arrivals_card_at_the_stop">at the stop</string>
     <string name="two_strings_format" translatable="false">%1$s - %2$s</string>
     <string name="show_arrivals">Show arrivals</string>
     <string name="show_stops">Show stops</string>
     <!--
     Mixed button strings
     !-->
     <string name="open_telegram">Join Telegram channel</string>
+    <string name="show_introduction">Show introduction</string>
     <!--
    Map view buttons strings
    !-->
     <string name="bt_center_map_description">Center on my location</string>
     <string name="bt_follow_me_description">Follow me</string>
     <string name="enable_position">Enable or disable location</string>
     <string name="location_enabled">Location enabled</string>
     <string name="location_disabled">Location disabled</string>
     <string name="map_location_disabled_device">Location is disabled on device</string>
 
     <!--
     Arrival times sources
     !-->
     <string name="times_source_fmt">Arrivals source: %1$s</string>
     <string name="fivetapifetcher">GTT App</string>
     <string name="gttjsonfetcher">GTT Website</string>
     <string name="fivetscraper">5T Torino website</string>
     <string name="source_mato">Muoversi a Torino app</string>
     <string name="undetermined_source">Undetermined</string>
     <string name="arrival_source_changing">Changing arrival times source…</string>
     <string name="change_arrivals_source_message">Long press to change the source of arrivals</string>
     <string-array name="arrival_times_source_list">
         <item>@string/source_mato</item>
         <item>@string/fivetapifetcher</item>
         <item>@string/gttjsonfetcher</item>
         <item>@string/fivetscraper</item>
     </string-array>
     <string name="arrival_times_choice_title">Sources of arrival times</string>
     <string name="arrival_times_choice_explanation">Select which sources of arrival times to use</string>
 
 
     <!--
     Notifications
     -->
     <string name="default_notification_channel" translatable="false">Default</string>
     <string name="default_notification_channel_description">Default channel for notifications</string>
     <string name="database_notification_channel">Database operations</string>
     <string name="database_notification_channel_desc">Updates of the app database</string>
     <string name="live_position_service_name">BusTO - live position service</string>
     <string name="live_positions_notification_channel">Live positions</string>
     <string name="live_positions_notification_channel_desc">Showing activity related to the live positions service</string>
     <string name="mqtt_notification_text">MaTO live bus positions service is running</string>
 
     <string name="db_trips_download_message">Downloading trips from MaTO server</string>
 
     <string name="too_many_permission_asks">Asked for %1$s permission too many times</string>
     <string name="permission_storage_maps_msg">Cannot use the map with the storage permission!</string>
     <string name="storage_permission">storage</string>
     <string name="message_crash">The application has crashed because you encountered a bug.
         \nIf you want, you can help the developers by sending the crash report via email.
         \nNote that no sensitive data is contained in the report, just small bits of info on your phone and app
         configuration/state.
     </string>
     <string name="acra_email_message">The application crashed and the crash report is in the attachments. Please
         describe what you were doing before the crash: \n
     </string>
     <string name="nav_arrivals_text">Arrivals</string>
     <string name="nav_map_text">Map</string>
     <string name="nav_favorites_text">Favorites</string>
     <string name="drawer_open">Open navigation drawer</string>
     <string name="drawer_close">Close navigation drawer</string>
     <string name="experiments">Experiments</string>
     <string name="donate_now">Buy us a coffee</string>
     <string name="map">Map</string>
     <string name="stop_search_view_title">Search by stop</string>
     <string name="requesting_db_update">Launching database update</string>
     <string name="downloading_data_mato">Downloading data from MaTO server</string>
 
     <!-- preferences -->
     <string name="pref_directions_capitalize">Capitalize directions</string>
     <string-array name="directions_capitalize">
         <item>Do not change arrivals directions</item>
         <item>Capitalize everything</item>
         <item>Capitalize only first letter</item>
     </string-array>
     <array name="directions_capitalize_keys">
         <item>KEEP</item>
         <item>CAPITALIZE_ALL</item>
         <item>CAPITALIZE_FIRST</item>
 
     </array>
     <string name="pref_shown_startup">Section to show on startup</string>
     <string name="pref_shown_startup_def_desc">Touch to change it</string>
     <string name="pref_lines_click_msg">Show arrivals touching on stop</string>
     <string name="pref_experimental_msg">Enable experiments</string>
 
 
     <!-- lines -->
     <string name="long_press_stop_4_options">Long press the stop for options</string>
 
     <array name="first_screen_shown">
         <item>@string/nav_arrivals_text</item>
         <item>@string/nav_favorites_text</item>
         <item>@string/nav_map_text</item>
         <item>@string/lines</item>
     </array>
 
     <string name="positions_source_pref_title">Source of real time positions for buses and trams</string>
     <array name="positions_source_sel">
         <item>MaTO (updated more frequently, might be offline)</item>
         <item>GTFS RT (more stable, less frequently updated)</item>
     </array>
 
     <string name="remove_all_trips">Remove trips data (free up space)</string>
     <string name="all_trips_removed">All GTFS trips have been removed from the database</string>
 
     <!-- Tutorial strings -->
     <string name="tutorial_action">Show tutorial</string>
     <string name="tutorial_first">
         <![CDATA[Thank you for installing BusTO, the free and <b>open source</b> app for Turin public transport. This is an <b>independent</b> app, with no ads and no tracking whatsoever.]]> </string>
     <string name="tutorial_search"> <![CDATA[You can search for the arrival times at a bus stop by inserting the number in the top, or scanning a QR code when you are at the stop
         touching the icon on the left ]]>
     </string>
     <string name="tutorial_arrivals">
         <![CDATA[Once you have found a bus stop, you can save it in the <b>favorites</b> by touching the star next to its name]]>
     </string>
     <string name="tutorial_stops">
         <![CDATA[You can see the stops near your position directly in the main screen...]]>
     </string>
 
     <string name="tutorial_map">
         <![CDATA[...or you can find them in the map, along with the real-time positions of the buses running in the city (in <font color="#2F59CC">blue</font>)]]>
     </string>
     <string name="tutorial_line">
         <![CDATA[You can also look at the line you want and see where the stops are, together with the vehicles serving the line at the moment. Remember to choose the direction you\'re interested in!]]>
     </string>
     <string name="tutorial_menu">
         <![CDATA[You can find all of this from the lateral menu.
 Look in the <b>Settings</b> to customize the app behaviour, and in the <b>About the app</b> section if you want to know more about the app and the developers.]]>
     </string>
     <string name="tutorial_permissions">
         <![CDATA[The app needs the <b>Notifications</b> permission to show the information about background processing.
          Press the button below to grant it]]>
     </string>
     <string name="grant_location_permission">Grant location permission</string>
     <string name="location_permission_granted">Location permission granted</string>
     <string name="location_permission_not_granted">Location permission has not been granted</string>
 
     <string name="close_tutorial">OK, close the tutorial</string>
     <string name="close_tutorial_short">Close the tutorial</string>
     <string name="grant_notification_permission">Enable notifications</string>
     <string name="notification_permission_granted">Notifications enabled</string>
     <!-- BACKUP -->
     <string name="backup_restore">Backup and restore</string>
     <string name="backup_activity">Import/export preferences</string>
     <string name="saved_data">Data saved</string>
     <string name="btn_backup_message">Backup to file</string>
     <string name="btn_load_backup_message">Import data from backup</string>
     <string name="data_imported_backup">Backup has been imported</string>
     <string name="message_check_at_least_one">Check at least one item to import!</string>
     <string name="load_file_favorites">Import favorites from backup</string>
     <string name="load_preferences">Import preferences from backup</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 72381bc..3cf7656 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,75 +1,76 @@
 <resources>
 
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
 
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!--
             Theme customizations available in newer API levels can go in
             res/values-vXX/styles.xml, while customizations related to
             backward-compatibility can go here.
         -->
     </style>
 
     <!-- Application theme. -->
     <style name="AppTheme" parent="AppBaseTheme">
 
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
+        <item name="colorOnPrimary">@color/white</item>
         <!-- For the preferences Fragment -->
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
 
     </style>
 
     <style name="Widget.MyApp.Button" parent="Widget.MaterialComponents.Button">
         <item name="backgroundTint">?attr/colorSecondary</item>
     </style>
 
     <style name="AppTheme.NoActionBar" parent="AppTheme">
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 
     <!-- For the preferences Fragment -->
     <style name="PreferenceThemeOverlay.">
         <item name="preferenceScreenStyle">@style/Preference.PreferenceScreen</item>
         <item name="preferenceFragmentStyle">@style/PreferenceFragment</item>
         <item name="preferenceCategoryStyle">@style/Preference.Category</item>
         <item name="preferenceStyle">@style/Preference</item>
         <item name="preferenceInformationStyle">@style/Preference.Information</item>
         <item name="checkBoxPreferenceStyle">@style/Preference.CheckBoxPreference</item>
         <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat</item>
         <item name="dialogPreferenceStyle">@style/Preference.DialogPreference</item>
         <item name="editTextPreferenceStyle">@style/Preference.DialogPreference.EditTextPreference</item>
         <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList</item>
     </style>
     <style name="Widget.AppTheme.NoActionBar.ActionBar.Fullscreen" parent="Widget.AppCompat.ActionBar">
         <item name="android:background">@color/black_overlay</item>
     </style>
 
     <style name="Widget.AppTheme.NoActionBar.ButtonBar.Fullscreen" parent="">
         <item name="android:background">@color/black_overlay</item>
         <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
     </style>
 
     <!-- styles that support night mode -->
     <style name="AppThemeDayNight" parent="Theme.MaterialComponents.DayNight">
     </style>
 
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
 
         <item name="android:windowTranslucentStatus">false</item>
 
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 7ecbe2d..48c0dde 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <style name="FavTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/blue_500</item>
         <item name="colorPrimaryDark">@color/blue_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
-    <style name="AboutTheme" parent="AppTheme.NoActionBar">
-        <item name="colorPrimary">@color/teal_300</item>
-        <item name="colorPrimaryDark">@color/teal_500</item>
+    <style name="AboutTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+        <item name="colorPrimary">@color/teal_500</item>
+        <item name="colorPrimaryDark">@color/teal_900</item>
         <item name="colorAccent">@color/blue_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+
     </style>
 
     <style name="MapTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/orange_500</item>
         <item name="colorPrimaryDark">@color/orange_700</item>
         <item name="colorAccent">@color/teal_500</item>
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
 
 
 </resources>
\ No newline at end of file