diff --git a/app/build.gradle b/app/build.gradle
index 3296bf7..2f43d52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,188 +1,193 @@
 plugins {
     id 'com.google.protobuf'
-    id 'kotlin-kapt'
-    id 'kotlin-android'
+    id 'org.jetbrains.kotlin.android'
     id 'com.android.application'
+    id 'com.google.devtools.ksp'
 }
 
 
 android {
-    compileSdk 35
+    compileSdk 36
     namespace "it.reyboz.bustorino"
 
     defaultConfig {
         applicationId "it.reyboz.bustorino"
         minSdkVersion 24
-        targetSdkVersion 35
-        buildToolsVersion = '35.0.1'
+        //noinspection EditedTargetSdkVersion
+        targetSdkVersion 36
+        buildToolsVersion = '36.0.0'
         versionCode 66
         versionName "2.4.3"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = ["room.schemaLocation": "$projectDir/assets/schemas/".toString()]
             }
         }
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     testOptions {
         unitTests.returnDefaultValues = true
     }
 
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/assets/schemas/".toString())
 
     }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             versionNameSuffix "-dev"
         }
         gitpull{
             applicationIdSuffix ".gitdev"
             versionNameSuffix "-gitdev"
         }
     }
 
 
     repositories {
         mavenCentral()
         mavenLocal()
     }
 
     dependencies {
         //new libraries
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
     kotlin {
         jvmToolchain 17
     }
     lint {
         abortOnError false
     }
     androidResources {
         generateLocaleConfig true
     }
 
     buildFeatures{
         buildConfig = true
     }
 
     splits{
         abi{
             enable true
             reset()
             // Specifies a list of ABIs for Gradle to create APKs for.
             include "x86", "x86_64","armeabi-v7a", "arm64-v8a"
             universalApk true
         }
     }
 
     packagingOptions { resources.excludes.add("META-INF/*") }
 
 }
 
 protobuf {
     protoc {
         artifact = 'com.google.protobuf:protoc:3.22.3'
     }
     generateProtoTasks {
         all().each { task ->
             task.builtins {
                 java {
                     option 'lite'
                 }
             }
         }
     }
 }
 
+ksp {
+    arg("room.schemaLocation", "$projectDir/assets/schemas")
+}
+
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Guava implementation for DBUpdateWorker
-    implementation 'com.google.guava:guava:32.0.1-android'
+    implementation 'com.google.guava:guava:33.5.0-android'
     
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "androidx.activity:activity:$activity_version"
+    implementation "androidx.activity:activity-ktx:$activity_version"
     implementation "androidx.annotation:annotation:1.9.1"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
     implementation "androidx.appcompat:appcompat-resources:$appcompat_version"
-    implementation "androidx.preference:preference:$preference_version"
+    implementation "androidx.preference:preference-ktx:$preference_version"
 
     implementation "androidx.work:work-runtime:$work_version"
     implementation "androidx.work:work-runtime-ktx:$work_version"
 
 
-    implementation "com.google.android.material:material:1.12.0"
+    implementation "com.google.android.material:material:1.13.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.3.0"
 
 
-    implementation 'org.jsoup:jsoup:1.15.3'
+    implementation 'org.jsoup:jsoup:1.21.2'
     implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
     implementation 'com.android.volley:volley:1.2.1'
     //maplibre
-    implementation 'org.maplibre.gl:android-sdk:11.8.6'
+    implementation 'org.maplibre.gl:android-sdk:12.0.1'
     implementation 'org.maplibre.gl:android-sdk-turf:6.0.1'
 
     implementation 'org.maplibre.gl:android-plugin-annotation-v9:3.0.2'
 
     // remember to enable maven repo jitpack.io when wanting to use osmbonuspack
     //implementation 'com.github.MKergall:osmbonuspack:6.9.0'
     // ACRA
     implementation "ch.acra:acra-mail:$acra_version"
     implementation "ch.acra:acra-dialog:$acra_version"
     // google transit realtime
-    implementation 'com.google.protobuf:protoc:3.22.3'
+    implementation 'com.google.protobuf:protoc:4.33.0'
 
-    implementation 'com.google.protobuf:protobuf-javalite:3.22.3'
+    implementation 'com.google.protobuf:protobuf-javalite:4.33.0'
     // mqtt library
     //implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     //implementation 'com.github.hannesa2:paho.mqtt.android:4.4'
     implementation("com.hivemq:hivemq-mqtt-client:1.3.10")
     implementation(platform("com.hivemq:hivemq-mqtt-client-websocket:1.3.10"))
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     // LiveData
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     // Lifecycles only (without ViewModel or LiveData)
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     // Legacy
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     // Room components
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
+    ksp "androidx.room:room-compiler:$room_version"
     //multidex - we need this to build the app
     implementation "androidx.multidex:multidex:$multidex_version"
 
     implementation 'de.siegmar:fastcsv:2.2.2'
 
-    testImplementation 'junit:junit:4.12'
-    implementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
+    implementation 'junit:junit:4.13.2'
 
-    implementation "androidx.test.ext:junit:1.1.5"
+    implementation "androidx.test.ext:junit:1.3.0"
     implementation "androidx.test:core:$androidXTestVersion"
     implementation "androidx.test:runner:$androidXTestVersion"
     implementation "androidx.room:room-testing:$room_version"
 
-    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test.ext:junit:1.3.0"
     androidTestImplementation "androidx.test:core:$androidXTestVersion"
     androidTestImplementation "androidx.test:runner:$androidXTestVersion"
     androidTestImplementation "androidx.test:rules:$androidXTestVersion"
     androidTestImplementation "androidx.room:room-testing:$room_version"
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 693c30f..34f967c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,146 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission
             android:name="android.permission.POST_NOTIFICATIONS"/>
     <!-- this is to REMOVE the permission from MQTT service -->
     <!--<uses-permission
             android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
             tools:node="remove"/>
             -->
 
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="http"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="geo"/>
         </intent>
         <intent>
             <action android:name="android.intent.action.VIEW"/>
             <data android:scheme="https"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.SCAN"/>
         </intent>
         <intent>
             <action android:name="com.google.zxing.client.android.ENCODE"/>
         </intent>
     </queries>
 
     <application
             android:name=".BustoApp"
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:networkSecurityConfig="@xml/networks_security_config"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:theme="@style/AppTheme.NoActionBar">
         <activity
                 android:name=".ActivityBackup"
                 android:label="@string/backup_activity"
                 android:parentActivityName=".ActivityPrincipal"
-                android:theme="@style/AppTheme"
+                android:theme="@style/MapTheme"
                 android:exported="false"/>
         <activity
                 android:name=".ActivityIntro"
-                android:exported="false"/>
+                android:exported="false"
+                android:theme="@style/AppTheme.NoActionBar.Light"
+        />
         <activity
                 android:name=".ActivityExperiments"
                 android:label="@string/experiments"
                 android:theme="@style/MapTheme">
         </activity>
         <activity
                 android:name=".ActivityPrincipal"
                 android:exported="true"
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="www.gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="gtt.to.it"
                         android:pathPrefix="/cms/percorari/arrivi"
                         android:scheme="http"/>
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
 
                 <data
                         android:host="m.gtt.to.it"
                         android:pathPrefix="/m/it/arrivi.jsp"
                         android:scheme="http"/>
             </intent-filter>
         </activity>
         <activity
                 android:name=".ActivityAbout"
                 android:label="@string/about_activity"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AboutTheme">
 
             <!-- API < 16: -->
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".ActivityPrincipal"/>
         </activity>
 
         <provider
                 android:name=".data.AppDataProvider"
                 android:authorities="it.reyboz.bustorino.provider"
                 android:enabled="true"
                 android:exported="false">
         </provider> <!-- Don't show the additional frame on samsung phones -->
         <meta-data
                 android:name="com.samsung.android.icon_container.has_icon_container"
                 android:value="true"/>
 
         <activity
                 android:name=".ActivitySettings"
                 android:label="@string/title_activity_settings"
                 android:parentActivityName=".ActivityPrincipal"
                 android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value="it.reyboz.bustorino.ActivityPrincipal"/>
         </activity>
 
         <service tools:node="replace" android:name="info.mqtt.android.service.MqttService"
                  android:exported="false"
         />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
index 7c930c5..4fd327c 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityAbout.kt
@@ -1,105 +1,137 @@
 /*
 	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.view.ViewGroup.MarginLayoutParams
 import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.OnApplyWindowInsetsListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 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);
 
          */
+        val mToolbar = findViewById<Toolbar>(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 versionTextView = findViewById<TextView>(R.id.versionTextView)
+        Log.d("BusTO About", "The version text view is: $versionTextView")
+        versionTextView.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()
         }
+
+        // handle the device "insets"
+        ViewCompat.setOnApplyWindowInsetsListener(versionTextView,
+            OnApplyWindowInsetsListener { v: View?, windowInsets: WindowInsetsCompat? ->
+                val insets = windowInsets!!.getInsets(WindowInsetsCompat.Type.systemBars())
+                // Apply the insets as a margin to the view. This solution sets only the
+                // bottom, left, and right dimensions, but you can apply whichever insets are
+                // appropriate to your layout. You can also update the view padding if that's
+                // more appropriate.
+                val mlp = v!!.layoutParams as MarginLayoutParams
+                mlp.leftMargin = insets.left
+                mlp.bottomMargin = insets.bottom
+                mlp.rightMargin = insets.right
+                v.layoutParams = mlp
+
+                WindowInsetsCompat.CONSUMED
+            })
+
+        ViewCompat.setOnApplyWindowInsetsListener(mToolbar) { v: View?, windowInsets: WindowInsetsCompat? ->
+            val insets = windowInsets!!.getInsets(WindowInsetsCompat.Type.systemBars())
+            v?.updatePadding(top=insets.top)
+            windowInsets
+        }
     }
 
     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/ActivityBackup.kt b/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
index fd8f287..bda20af 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityBackup.kt
@@ -1,26 +1,44 @@
 package it.reyboz.bustorino
 
 import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import it.reyboz.bustorino.fragments.BackupImportFragment
 import it.reyboz.bustorino.middleware.GeneralActivity
 
 class ActivityBackup : GeneralActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_container_fragment)
 
+        val mToolbar = findViewById<Toolbar>(R.id.default_toolbar)
+        setSupportActionBar(mToolbar)
+
         val actionBar = supportActionBar
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.setIcon(R.drawable.ic_launcher)
-            actionBar.show()
+            //actionBar.setIcon(R.drawable.ic_launcher)
         }
         if (savedInstanceState == null) {
             supportFragmentManager.beginTransaction()
                 .setReorderingAllowed(true)
                 .add(R.id.fragment_container_view, BackupImportFragment::class.java, null)
                 .commit()
         }
+
+        ViewCompat.setOnApplyWindowInsetsListener(
+            findViewById<View>(R.id.fragment_container_view),
+            this.applyBottomAndBordersInsetsListener
+        )
+
+        ViewCompat.setOnApplyWindowInsetsListener(mToolbar) { v: View?, windowInsets: WindowInsetsCompat? ->
+            val insets = windowInsets!!.getInsets(WindowInsetsCompat.Type.systemBars())
+            v?.updatePadding(top=insets.top)
+            windowInsets
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
index 7962796..8e3a71e 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityIntro.kt
@@ -1,133 +1,138 @@
 package it.reyboz.bustorino
 
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.widget.ImageButton
+import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import it.reyboz.bustorino.data.PreferencesHolder
 import it.reyboz.bustorino.fragments.IntroFragment
 import it.reyboz.bustorino.middleware.GeneralActivity
 
 class ActivityIntro : GeneralActivity(), IntroFragment.IntroListener {
 
     private lateinit var viewPager : ViewPager2
     private lateinit var btnForward: ImageButton
     private lateinit var btnBackward: ImageButton
     private lateinit var closeBottomButton: ImageButton
 
     private var restartMain = true
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_intro)
 
         viewPager = findViewById(R.id.viewPager)
         btnBackward = findViewById(R.id.btnPrevious)
         btnForward = findViewById(R.id.btnNext)
         closeBottomButton = findViewById(R.id.btnCompactClose)
 
         val extras = intent.extras
         if(extras!=null){
             restartMain = extras.getBoolean(RESTART_MAIN)
         }
 
 
         val adapter = IntroPagerAdapter(this)
         viewPager.adapter = adapter
 
         val tabLayout = findViewById<TabLayout>(R.id.tab_layout)
         val tabLayoutMediator = TabLayoutMediator(tabLayout, viewPager) { tab, pos ->
             Log.d(DEBUG_TAG, "tabview on position $pos")
 
         }
         tabLayoutMediator.attach()
 
 
         btnForward.setOnClickListener {
             viewPager.setCurrentItem(viewPager.currentItem+1,true)
         }
         btnBackward.setOnClickListener {
             viewPager.setCurrentItem(viewPager.currentItem-1, true)
         }
         /*closeBottomButton.setOnClickListener {
             closeIntroduction()
         }
 
          */
 
         viewPager.registerOnPageChangeCallback(object : OnPageChangeCallback() {
 
             override fun onPageSelected(position: Int) {
                 if(position == 0){
                     btnBackward.visibility = View.INVISIBLE
                 } else{
                     btnBackward.visibility = View.VISIBLE
                 }
                 if(position == NUM_ITEMS-1){
                     btnForward.visibility = View.INVISIBLE
                     closeBottomButton.visibility = View.VISIBLE
                 }else if(position == NUM_ITEMS-2){
                     if(closeBottomButton.visibility == View.VISIBLE) {
                         closeBottomButton.visibility = View.INVISIBLE
                         btnForward.visibility = View.VISIBLE
                     }
                     //btnForward.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.arrow_forward_white, null))
                     //btnForward.setBackgroundColor(ResourcesCompat.getColor(resources,R.attr.colorAccent, theme))
                     /*val
                     GET THE COLOR VALUE OF THE THEMER
                     colo = TypedValue()
                     theme.resolveAttribute(R.attr.colorAccent,colo, true)
                     btnForward.backgroundTintList  //(colo.data)
 
                      */
                 }
             }
 
 
         })
 
         closeBottomButton.setOnClickListener {
             closeIntroduction()
         }
+        ViewCompat.setOnApplyWindowInsetsListener(
+            findViewById<View>(R.id.theConstraintLayout),
+            this.applyBottomAndBordersInsetsListener
+        )
     }
 
 
 
     /**
      * A simple pager adapter that represents 5 ScreenSlidePageFragment objects, in
      * sequence.
      */
     private inner class IntroPagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
         override fun getItemCount(): Int = NUM_ITEMS
 
         override fun createFragment(position: Int): Fragment = IntroFragment.newInstance(position)
     }
 
     companion object{
         const private val DEBUG_TAG = "BusTO-IntroActivity"
         const val RESTART_MAIN = "restartMainActivity"
 
         val NUM_ITEMS = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) 8 else 7
     }
 
     override fun closeIntroduction() {
         if(restartMain) startActivity(Intent(this, ActivityPrincipal::class.java))
         val pref = PreferencesHolder.getMainSharedPreferences(this)
         val editor = pref.edit()
         editor.putBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN, true)
         //use commit so we don't "lose" info
         editor.commit()
         finish()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
index fe7b251..5294dcc 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java
@@ -1,814 +1,859 @@
 /*
 	BusTO - Arrival times for Turin public transport.
     Copyright (C) 2021 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;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
+import android.view.*;
 import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import androidx.core.view.GravityCompat;
-import androidx.core.view.ViewCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.*;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.PreferenceManager;
 import androidx.work.WorkInfo;
 import androidx.work.WorkManager;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
 import it.reyboz.bustorino.backend.Stop;
 import it.reyboz.bustorino.backend.utils;
 import it.reyboz.bustorino.data.DBUpdateWorker;
 import it.reyboz.bustorino.data.DatabaseUpdate;
 import it.reyboz.bustorino.data.PreferencesHolder;
 import it.reyboz.bustorino.data.gtfs.GtfsDatabase;
 import it.reyboz.bustorino.fragments.*;
 import it.reyboz.bustorino.middleware.GeneralActivity;
 
 import static it.reyboz.bustorino.backend.utils.getBusStopIDFromUri;
 import static it.reyboz.bustorino.backend.utils.openIceweasel;
 
 public class ActivityPrincipal extends GeneralActivity implements FragmentListenerMain {
     private DrawerLayout mDrawer;
     private NavigationView mNavView;
     private ActionBarDrawerToggle drawerToggle;
     private final static String DEBUG_TAG="BusTO Act Principal";
 
     private final static String TAG_FAVORITES="favorites_frag";
     private Snackbar snackbar;
 
     private boolean showingMainFragmentFromOther = false;
     private boolean onCreateComplete = false;
 
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Log.d(DEBUG_TAG, "onCreate, savedInstanceState is: "+savedInstanceState);
         setContentView(R.layout.activity_principal);
         /*if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             getWindow().setNavigationBarContrastEnforced(false);
         }
          */
         boolean showingArrivalsFromIntent = false;
 
-        Toolbar mToolbar = findViewById(R.id.default_toolbar);
+        final Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
         if (getSupportActionBar()!=null)
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         else Log.w(DEBUG_TAG, "NO ACTION BAR");
 
         mToolbar.setOnMenuItemClickListener(new ToolbarItemClickListener(this));
 
         mDrawer = findViewById(R.id.drawer_layout);
         drawerToggle = setupDrawerToggle(mToolbar);
 
         // Setup toggle to display hamburger icon with nice animation
         drawerToggle.setDrawerIndicatorEnabled(true);
 
         drawerToggle.syncState();
         mDrawer.addDrawerListener(drawerToggle);
 
         mDrawer.addDrawerListener(new DrawerLayout.DrawerListener() {
             @Override
             public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
 
             }
 
             @Override
             public void onDrawerOpened(@NonNull View drawerView) {
                 hideKeyboard();
             }
 
             @Override
             public void onDrawerClosed(@NonNull View drawerView) {
 
             }
 
             @Override
             public void onDrawerStateChanged(int newState) {
             }
         });
 
 
         mNavView = findViewById(R.id.nvView);
 
         setupDrawerContent(mNavView);
         /*View header = mNavView.getHeaderView(0);
 
         */
         //mNavView.getMenu().findItem(R.id.versionFooter).
 
         /// LEGACY CODE
         //---------------------------- START INTENT CHECK QUEUE ------------------------------------
 
         // Intercept calls from URL intent
         boolean tryedFromIntent = false;
 
         String busStopID = null;
         Uri data = getIntent().getData();
         if (data != null) {
 
             busStopID = getBusStopIDFromUri(data);
             Log.d(DEBUG_TAG, "Opening Intent: busStopID: "+busStopID);
             tryedFromIntent = true;
         }
 
         // Intercept calls from other activities
         if (!tryedFromIntent) {
             Bundle b = getIntent().getExtras();
             if (b != null) {
                 busStopID = b.getString("bus-stop-ID");
 
                 /*
                  * I'm not very sure if you are coming from an Intent.
                  * Some launchers work in strange ways.
                  */
                 tryedFromIntent = busStopID != null;
             }
         }
 
         //---------------------------- END INTENT CHECK QUEUE --------------------------------------
 
         if (busStopID == null) {
             // Show keyboard if can't start from intent
             // JUST DON'T
             // showKeyboard();
 
             // You haven't obtained anything... from an intent?
             if (tryedFromIntent) {
 
                 // This shows a luser warning
                 Toast.makeText(getApplicationContext(),
                         R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
             }
         } else {
             // If you are here an intent has worked successfully
             //setBusStopSearchByIDEditText(busStopID);
             //Log.d(DEBUG_TAG, "Requesting arrivals for stop "+busStopID+" from intent");
             requestArrivalsForStopID(busStopID); //this shows the fragment, too
             showingArrivalsFromIntent = true;
         }
         //database check
         GtfsDatabase gtfsDB = GtfsDatabase.Companion.getGtfsDatabase(this);
 
         final int db_version = gtfsDB.getOpenHelper().getReadableDatabase().getVersion();
         boolean dataUpdateRequested = false;
         final SharedPreferences theShPr = getMainSharedPreferences();
 
         final int old_version = PreferencesHolder.getGtfsDBVersion(theShPr);
         Log.d(DEBUG_TAG, "GTFS Database: old version is "+old_version+ ", new version is "+db_version);
         if (old_version < db_version){
             //decide update conditions in the future
             if(old_version < 2 && db_version >= 2) {
                 dataUpdateRequested = true;
                 DatabaseUpdate.requestDBUpdateWithWork(this, true, true);
             }
             PreferencesHolder.setGtfsDBVersion(theShPr, db_version);
         }
         //Try (hopefully) database update
         if(!dataUpdateRequested)
             DatabaseUpdate.requestDBUpdateWithWork(this, false, false);
 
         /*
         Watch for database update
          */
         final WorkManager workManager = WorkManager.getInstance(this);
         workManager.getWorkInfosForUniqueWorkLiveData(DBUpdateWorker.DEBUG_TAG)
                 .observe(this, workInfoList -> {
                     // If there are no matching work info, do nothing
                     if (workInfoList == null || workInfoList.isEmpty()) {
                         return;
                     }
                     Log.d(DEBUG_TAG, "WorkerInfo: "+workInfoList);
 
                     boolean showProgress = false;
                     for (WorkInfo workInfo : workInfoList) {
                         if (workInfo.getState() == WorkInfo.State.RUNNING) {
                             showProgress = true;
                             break;
                         }
                     }
 
                     if (showProgress) {
                         createDefaultSnackbar();
                     } else {
                         if(snackbar!=null) {
                             snackbar.dismiss();
                             snackbar = null;
                         }
                     }
 
                 });
         // show the main fragment
         Fragment f = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         Log.d(DEBUG_TAG, "OnCreate the fragment is "+f);
         String vl = PreferenceManager.getDefaultSharedPreferences(this).getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
         //if (vl.length() == 0 || vl.equals("arrivals")) {
         //    showMainFragment();
         Log.d(DEBUG_TAG, "The default screen to open is: "+vl);
         if (showingArrivalsFromIntent){
             //do nothing but exclude a case
         }else if (savedInstanceState==null) {
             //we are not restarting the activity from nothing
             if (vl.equals("map")) {
                 requestMapFragment(false);
             } else if (vl.equals("favorites")) {
                 checkAndShowFavoritesFragment(getSupportFragmentManager(), false);
             } else if (vl.equals("lines")) {
                 showLinesFragment(getSupportFragmentManager(), false, null);
             } else {
                 showMainFragment(false);
             }
         }
         onCreateComplete = true;
 
         //last but not least, set the good default values
         setDefaultSettingsValuesWhenMissing();
+        // handle the device "insets"
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.rootRelativeLayout), (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            // Apply the insets as a margin to the view. This solution sets only the
+            // bottom, left, and right dimensions, but you can apply whichever insets are
+            // appropriate to your layout. You can also update the view padding if that's
+            // more appropriate.
+            ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+            mlp.leftMargin = insets.left;
+            mlp.bottomMargin = insets.bottom;
+            mlp.rightMargin = insets.right;
+            v.setLayoutParams(mlp);
+            //set for toolbar
+            //mlp = (ViewGroup.MarginLayoutParams) mToolbar.getLayoutParams();
+            //mlp.topMargin = insets.top;
+            //mToolbar.setLayoutParams(mlp);
+            mToolbar.setPadding(0, insets.top, 0, 0);
+
+            // Return CONSUMED if you don't want the window insets to keep passing
+            // down to descendant views.
+            return WindowInsetsCompat.CONSUMED;
+        });
+
+        /*
+        ViewCompat.setOnApplyWindowInsetsListener(mToolbar, (v, windowInsets) -> {
+            Insets statusBarInsets = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars());
+            // Apply the insets as a margin to the view.
+            ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+            mlp.topMargin = statusBarInsets.top;
+            v.setLayoutParams(mlp);
+            v.setPadding(0, statusBarInsets.top, 0, 0);
+
+            // Return CONSUMED if you don't want the window insets to keep passing
+            // down to descendant views.
+            return WindowInsetsCompat.CONSUMED;
+        });
+
+         */
+        //to properly handle IME
+        WindowInsetsControllerCompat insetsController =
+                WindowCompat.getInsetsController(getWindow(), getWindow().getDecorView());
+
+        if (insetsController != null) {
+            insetsController.setSystemBarsBehavior(
+                    WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+            );
+        }
+
 
         //check if first run activity (IntroActivity) has been started once or not
         boolean hasIntroRun = theShPr.getBoolean(PreferencesHolder.PREF_INTRO_ACTIVITY_RUN,false);
         if(!hasIntroRun){
             startIntroductionActivity();
         }
     }
     private ActionBarDrawerToggle setupDrawerToggle(Toolbar toolbar) {
         // NOTE: Make sure you pass in a valid toolbar reference.  ActionBarDrawToggle() does not require it
         // and will not render the hamburger icon without it.
         return new ActionBarDrawerToggle(this, mDrawer, toolbar, R.string.drawer_open,  R.string.drawer_close);
 
     }
 
     /**
      * Setup drawer actions
      * @param navigationView the navigation view on which to set the callbacks
      */
     private void setupDrawerContent(NavigationView navigationView) {
         navigationView.setNavigationItemSelectedListener(
                 menuItem -> {
                     if (menuItem.getItemId() == R.id.drawer_action_settings) {
                         Log.d("MAINBusTO", "Pressed button preferences");
                         closeDrawerIfOpen();
                         startActivity(new Intent(ActivityPrincipal.this, ActivitySettings.class));
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_favorites_item){
                         closeDrawerIfOpen();
                         //get Fragment
                         checkAndShowFavoritesFragment(getSupportFragmentManager(), true);
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_arrivals){
                         closeDrawerIfOpen();
                         showMainFragment(true);
                         return true;
                     } else if(menuItem.getItemId() == R.id.nav_map_item){
                         closeDrawerIfOpen();
                         requestMapFragment(true);
                         return true;
                     } else if (menuItem.getItemId() == R.id.nav_lines_item) {
                         closeDrawerIfOpen();
                         showLinesFragment(getSupportFragmentManager(), true,null);
                         return true;
                     } else if(menuItem.getItemId() ==  R.id.drawer_action_info) {
                         closeDrawerIfOpen();
                         startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                         return true;
                     }
                     //selectDrawerItem(menuItem);
                     Log.d(DEBUG_TAG, "pressed item "+menuItem);
 
                     return true;
 
                 });
 
     }
 
     private void closeDrawerIfOpen(){
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
     }
 
 
     // `onPostCreate` called when activity start-up is complete after `onStart()`
     // NOTE 1: Make sure to override the method with only a single `Bundle` argument
     // Note 2: Make sure you implement the correct `onPostCreate(Bundle savedInstanceState)` method.
     // There are 2 signatures and only `onPostCreate(Bundle state)` shows the hamburger icon.
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         drawerToggle.syncState();
     }
 
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         // Pass any configuration change to the drawer toggles
         drawerToggle.onConfigurationChanged(newConfig);
 
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.principal_menu, menu);
         MenuItem experimentsMenuItem = menu.findItem(R.id.action_experiments);
         SharedPreferences shPr = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         boolean exper_On = shPr.getBoolean(getString(R.string.pref_key_experimental), false);
         experimentsMenuItem.setVisible(exper_On);
         return super.onCreateOptionsMenu(menu);
     }
 
     //requesting permissions
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (requestCode==STORAGE_PERMISSION_REQ){
             final String storagePerm = Manifest.permission.WRITE_EXTERNAL_STORAGE;
             if (permissionDoneRunnables.containsKey(storagePerm)) {
                 Runnable toRun = permissionDoneRunnables.get(storagePerm);
                 if (toRun != null)
                     toRun.run();
                 permissionDoneRunnables.remove(storagePerm);
             }
 
             if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                 Log.d(DEBUG_TAG, "Permissions check: " + Arrays.toString(permissions));
 
                 if (permissionDoneRunnables.containsKey(storagePerm)) {
                     Runnable toRun = permissionDoneRunnables.get(storagePerm);
                     if (toRun != null)
                         toRun.run();
                     permissionDoneRunnables.remove(storagePerm);
                 }
             } else {
                 //permission denied
                 showToastMessage(R.string.permission_storage_maps_msg, false);
             }
         }
     }
 
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
         int[] cases = {R.id.nav_arrivals, R.id.nav_favorites_item};
         Log.d(DEBUG_TAG, "Item pressed");
 
 
         if (item.getItemId() == android.R.id.home) {
             mDrawer.openDrawer(GravityCompat.START);
             return true;
         }
 
         if (drawerToggle.onOptionsItemSelected(item)) {
 
             return true;
 
         }
         return super.onOptionsItemSelected(item);
 
     }
 
     @Override
     public void onBackPressed() {
         boolean foundFragment = false;
         Fragment shownFrag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (mDrawer.isDrawerOpen(GravityCompat.START))
             mDrawer.closeDrawer(GravityCompat.START);
         else if(shownFrag != null && shownFrag.isVisible() && shownFrag.getChildFragmentManager().getBackStackEntryCount() > 0){
             //if we have been asked to show a stop from another fragment, we should go back even in the main
             if(shownFrag instanceof MainScreenFragment){
                 //we have to stop the arrivals reload
                 ((MainScreenFragment) shownFrag).cancelReloadArrivalsIfNeeded();
             }
             shownFrag.getChildFragmentManager().popBackStack();
             if(showingMainFragmentFromOther && getSupportFragmentManager().getBackStackEntryCount() > 0){
                 getSupportFragmentManager().popBackStack();
                 Log.d(DEBUG_TAG, "Popping main back stack also");
             }
         }
         else if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
             getSupportFragmentManager().popBackStack();
             Log.d(DEBUG_TAG, "Popping main frame backstack for fragments");
         }
         else
             super.onBackPressed();
     }
 
     /**
      * Create and show the SnackBar with the message
      */
     private void createDefaultSnackbar() {
 
         View baseView = null;
         boolean showSnackbar = true;
         final Fragment frag = getSupportFragmentManager().findFragmentById(R.id.mainActContentFrame);
         if (frag instanceof ScreenBaseFragment){
             baseView = ((ScreenBaseFragment) frag).getBaseViewForSnackBar();
             showSnackbar = ((ScreenBaseFragment) frag).showSnackbarOnDBUpdate();
         }
         if (baseView == null) baseView = findViewById(R.id.mainActContentFrame);
         //if (baseView == null) Log.e(DEBUG_TAG, "baseView null for default snackbar, probably exploding now");
         if (baseView !=null && showSnackbar) {
             this.snackbar = Snackbar.make(baseView, R.string.database_update_msg_inapp, Snackbar.LENGTH_INDEFINITE);
             if (frag instanceof ScreenBaseFragment){
                 ((ScreenBaseFragment) frag).setSnackbarPropertiesBeforeShowing(this.snackbar);
             }
             this.snackbar.show();
 
         } else{
             Log.e(DEBUG_TAG, "Asked to show the snackbar but the baseView is null");
         }
     }
 
     /**
      * Show the fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param fragment the fragment
      */
     private static void showMainFragment(FragmentManager fraMan, MainScreenFragment fragment, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, fragment, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         if (addToBackStack)  ft.addToBackStack(null);
         ft.commit();
     }
     /**
      * Show the fragment by adding it to the backstack
      * @param fraMan the fragmentManager
      * @param arguments args for the fragment
      */
     private static void createShowMainFragment(FragmentManager fraMan,@Nullable Bundle arguments, boolean addToBackStack){
         FragmentTransaction ft  = fraMan.beginTransaction()
                 .replace(R.id.mainActContentFrame, MainScreenFragment.class, arguments, MainScreenFragment.FRAGMENT_TAG)
                 .setReorderingAllowed(false)
                 /*.setCustomAnimations(
                         R.anim.slide_in,  // enter
                         R.anim.fade_out,  // exit
                         R.anim.fade_in,   // popEnter
                         R.anim.slide_out  // popExit
                 )*/
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         if (addToBackStack)  ft.addToBackStack(null);
         ft.commit();
     }
 
     private void requestMapFragment(final boolean allowReturn){
         // starting from Android 11, we don't need to have the STORAGE permission anymore for the map cache
 
         /*if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R){
             //nothing to do
             Log.d(DEBUG_TAG, "Build codes allow the showing of the map");
             createAndShowMapFragment(null, allowReturn);
             return;
         }
         final String permission = Manifest.permission.WRITE_EXTERNAL_STORAGE;
         int result = askForPermissionIfNeeded(permission, STORAGE_PERMISSION_REQ);
         Log.d(DEBUG_TAG, "Permission for storage: "+result);
         switch (result) {
             case PERMISSION_OK:
                 createAndShowMapFragment(null, allowReturn);
                 break;
             case PERMISSION_ASKING:
                 permissionDoneRunnables.put(permission,
                         () -> createAndShowMapFragment(null, allowReturn));
                 break;
             case PERMISSION_NEG_CANNOT_ASK:
                 String storage_perm = getString(R.string.storage_permission);
                 String text = getString(R.string.too_many_permission_asks,  storage_perm);
                 Toast.makeText(getApplicationContext(),text, Toast.LENGTH_LONG).show();
         }
 
          */
         //The permissions are handled in the MapLibreFragment instead
         createAndShowMapFragment(null, allowReturn);
     }
 
     private static void checkAndShowFavoritesFragment(FragmentManager fragmentManager,  boolean addToBackStack){
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment fragment = fragmentManager.findFragmentByTag(TAG_FAVORITES);
         if(fragment!=null){
             ft.replace(R.id.mainActContentFrame, fragment, TAG_FAVORITES);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,FavoritesFragment.class,null,TAG_FAVORITES);
         }
         if (addToBackStack)
             ft.addToBackStack("favorites_main");
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .setReorderingAllowed(false);
         ft.commit();
     }
 
     private static void showLinesFragment(@NonNull FragmentManager fragmentManager,  boolean addToBackStack, @Nullable Bundle fragArgs){
         FragmentTransaction ft = fragmentManager.beginTransaction();
         Fragment f = fragmentManager.findFragmentByTag(LinesGridShowingFragment.FRAGMENT_TAG);
         if(f!=null){
             ft.replace(R.id.mainActContentFrame, f, LinesGridShowingFragment.FRAGMENT_TAG);
         }else{
             //use new method
             ft.replace(R.id.mainActContentFrame,LinesGridShowingFragment.class,fragArgs,
                     LinesGridShowingFragment.FRAGMENT_TAG);
         }
         if (addToBackStack)
             ft.addToBackStack("linesGrid");
         ft.setReorderingAllowed(true)
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
                 .commit();
     }
 
     private void showMainFragment(boolean addToBackStack){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         final MainScreenFragment mainScreenFragment;
         if (fragment==null | !(fragment instanceof MainScreenFragment)){
             createShowMainFragment(fraMan, null, addToBackStack);
         }
         else if(!fragment.isVisible()){
 
 
             mainScreenFragment = (MainScreenFragment) fragment;
             showMainFragment(fraMan, mainScreenFragment, addToBackStack);
             Log.d(DEBUG_TAG, "Found the main fragment");
         } else{
             mainScreenFragment = (MainScreenFragment) fragment;
         }
         //return mainScreenFragment;
     }
     @Nullable
     private MainScreenFragment getMainFragmentIfVisible(){
         FragmentManager fraMan = getSupportFragmentManager();
         Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
         if (fragment!= null && fragment.isVisible()) return (MainScreenFragment) fragment;
         else return null;
     }
 
 
     @Override
     public void showFloatingActionButton(boolean yes) {
         //TODO
     }
     /*
     public void setDrawerSelectedItem(String fragmentTag){
         switch (fragmentTag){
             case MainScreenFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MapFragment.FRAGMENT_TAG:
 
                 break;
 
             case FavoritesFragment.FRAGMENT_TAG:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 break;
         }
     }*/
 
     @Override
     public void readyGUIfor(FragmentKind fragmentType) {
         MainScreenFragment mainFragmentIfVisible = getMainFragmentIfVisible();
         if (mainFragmentIfVisible!=null){
             mainFragmentIfVisible.readyGUIfor(fragmentType);
         }
         int titleResId;
         switch (fragmentType){
             case MAP:
                 mNavView.setCheckedItem(R.id.nav_map_item);
                 titleResId = R.string.map;
                 break;
             case FAVORITES:
                 mNavView.setCheckedItem(R.id.nav_favorites_item);
                 titleResId = R.string.nav_favorites_text;
                 break;
             case ARRIVALS:
                 titleResId = R.string.nav_arrivals_text;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case STOPS:
                 titleResId = R.string.stop_search_view_title;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case MAIN_SCREEN_FRAGMENT:
             case NEARBY_STOPS:
             case NEARBY_ARRIVALS:
                 titleResId=R.string.app_name_full;
                 mNavView.setCheckedItem(R.id.nav_arrivals);
                 break;
             case LINES:
                 titleResId=R.string.lines;
                 mNavView.setCheckedItem(R.id.nav_lines_item);
                 break;
             default:
                 titleResId = 0;
         }
         if(getSupportActionBar()!=null && titleResId!=0)
             getSupportActionBar().setTitle(titleResId);
     }
 
     @Override
     public void requestArrivalsForStopID(String ID) {
         //register if the request came from the main fragment or not
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         showingMainFragmentFromOther = (probableFragment==null);
 
         if (showingMainFragmentFromOther){
             FragmentManager fraMan = getSupportFragmentManager();
             Fragment fragment = fraMan.findFragmentByTag(MainScreenFragment.FRAGMENT_TAG);
             Log.d(DEBUG_TAG, "Requested main fragment, not visible. Search by TAG returned: "+fragment);
             if(fragment!=null){
                 //the fragment is there but not shown
                 probableFragment = (MainScreenFragment) fragment;
                 // set the flag
                 probableFragment.setSuppressArrivalsReload(true);
                 showMainFragment(fraMan, probableFragment, true);
                 probableFragment.requestArrivalsForStopID(ID);
             } else {
                 // we have no fragment
                 final Bundle args = new Bundle();
                 args.putString(MainScreenFragment.PENDING_STOP_SEARCH, ID);
                 //if onCreate is complete, then we are not asking for the first showing fragment
                 boolean addtobackstack = onCreateComplete;
                 createShowMainFragment(fraMan, args ,addtobackstack);
             }
         } else {
             //the MainScreeFragment is shown, nothing to do
             probableFragment.requestArrivalsForStopID(ID);
         }
 
         mNavView.setCheckedItem(R.id.nav_arrivals);
     }
     @Override
     public void showLineOnMap(String routeGtfsId, @Nullable String stopIDFrom){
 
         readyGUIfor(FragmentKind.LINES);
 
         FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
         tr.replace(R.id.mainActContentFrame, LinesDetailFragment.class,
                 LinesDetailFragment.Companion.makeArgs(routeGtfsId, stopIDFrom));
         tr.addToBackStack("LineonMap-"+routeGtfsId);
         tr.commit();
 
 
     }
 
     @Override
     public void toggleSpinner(boolean state) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.toggleSpinner(state);
         }
     }
 
     @Override
     public void enableRefreshLayout(boolean yes) {
         MainScreenFragment probableFragment = getMainFragmentIfVisible();
         if (probableFragment!=null){
             probableFragment.enableRefreshLayout(yes);
         }
     }
 
 
     @Override
     public void showMapCenteredOnStop(Stop stop) {
         createAndShowMapFragment(stop, true);
     }
 
     //Map Fragment stuff
     void createAndShowMapFragment(@Nullable Stop stop, boolean addToBackStack){
         final FragmentManager fm = getSupportFragmentManager();
         final FragmentTransaction ft = fm.beginTransaction();
         final MapLibreFragment fragment = MapLibreFragment.newInstance(stop);
         ft.replace(R.id.mainActContentFrame, fragment, MapLibreFragment.FRAGMENT_TAG);
         if (addToBackStack) ft.addToBackStack(null);
         ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
         ft.commit();
     }
 
     void startIntroductionActivity(){
         Intent intent = new Intent(ActivityPrincipal.this, ActivityIntro.class);
         intent.putExtra(ActivityIntro.RESTART_MAIN, false);
         startActivity(intent);
     }
 
     class ToolbarItemClickListener implements Toolbar.OnMenuItemClickListener{
         private final Context activityContext;
 
         public ToolbarItemClickListener(Context activityContext) {
             this.activityContext = activityContext;
         }
 
         @Override
         public boolean onMenuItemClick(MenuItem item) {
             final int id = item.getItemId();
             if(id == R.id.action_about){
                 startActivity(new Intent(ActivityPrincipal.this, ActivityAbout.class));
                 return true;
             } else if (id == R.id.action_hack) {
                 openIceweasel(getString(R.string.hack_url), activityContext);
                 return true;
             } else if (id == R.id.action_source){
                 openIceweasel("https://gitpull.it/source/libre-busto/", activityContext);
                 return true;
             } else if (id == R.id.action_licence){
                 openIceweasel("https://www.gnu.org/licenses/gpl-3.0.html", activityContext);
                 return true;
             } else if (id == R.id.action_experiments) {
                 startActivity(new Intent(ActivityPrincipal.this, ActivityExperiments.class));
                 return true;
             } else if (id == R.id.action_tutorial) {
                 startIntroductionActivity();
                 return true;
             }
 
             return false;
         }
     }
 
     /**
      * Adjust setting to match the default ones
      */
     private void setDefaultSettingsValuesWhenMissing(){
         SharedPreferences mainSharedPref = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = mainSharedPref.edit();
         //Main fragment to show
         String screen = mainSharedPref.getString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "");
         boolean edit = false;
         if (screen.isEmpty()){
             editor.putString(SettingsFragment.PREF_KEY_STARTUP_SCREEN, "arrivals");
             edit=true;
         }
         //Fetchers
         final Set<String> setSelected = mainSharedPref.getStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, new HashSet<>());
         if (setSelected.isEmpty()){
             String[] defaultVals = getResources().getStringArray(R.array.arrivals_sources_values_default);
             editor.putStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, utils.convertArrayToSet(defaultVals));
             edit=true;
         }
         //Live bus positions
         final String keySourcePositions=getString(R.string.pref_positions_source);
         final String positionsSource = mainSharedPref.getString(keySourcePositions, "");
         if(positionsSource.isEmpty()){
             String[] defaultVals = getResources().getStringArray(R.array.positions_source_values);
             editor.putString(keySourcePositions, defaultVals[0]);
             edit=true;
         }
         //Map style
         final String mapStylePref = mainSharedPref.getString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, "");
         if(mapStylePref.isEmpty()){
             final String[] defaultVals = getResources().getStringArray(R.array.map_style_pref_values);
             editor.putString(SettingsFragment.LIBREMAP_STYLE_PREF_KEY, defaultVals[0]);
             edit=true;
         }
         if (edit){
             editor.commit();
         }
 
 
     }
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java b/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
index d73275b..00d5e00 100644
--- a/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
+++ b/app/src/main/java/it/reyboz/bustorino/ActivitySettings.java
@@ -1,39 +1,58 @@
 package it.reyboz.bustorino;
 
 import android.os.Bundle;
+import android.view.ViewGroup;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import it.reyboz.bustorino.fragments.SettingsFragment;
+import it.reyboz.bustorino.middleware.GeneralActivity;
 
-public class ActivitySettings extends AppCompatActivity {
+public class ActivitySettings extends GeneralActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_settings);
-        Toolbar mToolbar = findViewById(R.id.default_toolbar);
+        final Toolbar mToolbar = findViewById(R.id.default_toolbar);
         setSupportActionBar(mToolbar);
         ActionBar ab = getSupportActionBar();
         if(ab!=null) {
             //ab.setIcon(R.drawable.ic_launcher);
             ab.setDisplayHomeAsUpEnabled(true);
         } else {
             Log.e("SETTINGS_ACTIV","ACTION BAR IS NULL");
         }
 
         FragmentManager framan = getSupportFragmentManager();
         FragmentTransaction ft = framan.beginTransaction();
         ft.replace(R.id.setting_container,new SettingsFragment());
         ft.commit();
+
+        ViewCompat.setOnApplyWindowInsetsListener(mToolbar, (v, windowInsets) -> {
+            Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+
+            v.setPadding(0, insets.top, 0, 0);
+
+            // Return CONSUMED if you don't want the window insets to keep passing
+            // down to descendant views.
+            return WindowInsetsCompat.CONSUMED;
+        });
+
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.setting_container)
+                ,this.applyBottomAndBordersInsetsListener);
+
     }
 
 }
 /*
  * Interesting thing
  * Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
  *                         .setAction("Action", null).show();
  */
diff --git a/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
index f564428..d35c609 100644
--- a/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
+++ b/app/src/main/java/it/reyboz/bustorino/data/gtfs/GtfsDatabase.kt
@@ -1,90 +1,91 @@
 /*
 	BusTO - Data components
     Copyright (C) 2021 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.data.gtfs
 
 import android.content.Context
 import android.util.Log
 import androidx.room.*
 import androidx.room.migration.Migration
 
 @Database(
     entities = [
         GtfsFeed::class,
         GtfsAgency::class,
         GtfsServiceDate::class,
         GtfsStop::class,
         GtfsService::class,
         GtfsRoute::class,
         GtfsStopTime::class,
         GtfsTrip::class,
         GtfsShape::class,
         MatoPattern::class,
         PatternStop::class
                ],
     version = GtfsDatabase.VERSION,
     autoMigrations = [
         AutoMigration(from=2,to=3)
-    ]
+    ],
+    exportSchema = true
 )
 @TypeConverters(Converters::class)
 abstract class GtfsDatabase : RoomDatabase() {
 
     abstract fun gtfsDao() : GtfsDBDao
 
 
     companion object{
         @Volatile
         private var INSTANCE: GtfsDatabase? =null
 
         const val DB_NAME="gtfs_database"
 
         fun getGtfsDatabase(context: Context): GtfsDatabase{
             return INSTANCE ?: synchronized(this){
                 val instance = Room.databaseBuilder(context.applicationContext,
                     GtfsDatabase::class.java,
                     DB_NAME)
                         .addMigrations(MIGRATION_1_2)
                         .build()
                 INSTANCE = instance
                 instance
             }
         }
 
         const val VERSION = 3
         const val FOREIGNKEY_ONDELETE = ForeignKey.CASCADE
 
         val MIGRATION_1_2 = Migration(1,2) {
             Log.d("BusTO-Database", "Upgrading from version 1 to version 2 the Room Database")
             //create table for feeds
             it.execSQL("CREATE TABLE IF NOT EXISTS `gtfs_feeds` (`feed_id` TEXT NOT NULL, PRIMARY KEY(`feed_id`))")
             //create table gtfs_agencies
             it.execSQL("CREATE TABLE IF NOT EXISTS `gtfs_agencies` (`gtfs_id` TEXT NOT NULL, `ag_name` TEXT NOT NULL, `ag_url` TEXT NOT NULL, `fare_url` TEXT, `phone` TEXT, `feed_id` TEXT, PRIMARY KEY(`gtfs_id`))")
 
             //recreate routes
             it.execSQL("DROP TABLE IF EXISTS `routes_table`")
             it.execSQL("CREATE TABLE IF NOT EXISTS `routes_table` (`route_id` TEXT NOT NULL, `agency_id` TEXT NOT NULL, `route_short_name` TEXT NOT NULL, `route_long_name` TEXT NOT NULL, `route_desc` TEXT NOT NULL, `route_mode` TEXT NOT NULL, `route_color` TEXT NOT NULL, `route_text_color` TEXT NOT NULL, PRIMARY KEY(`route_id`))")
 
             //create patterns and stops
             it.execSQL("CREATE TABLE IF NOT EXISTS `mato_patterns` (`pattern_name` TEXT NOT NULL, `pattern_code` TEXT NOT NULL, `pattern_hash` TEXT NOT NULL, `pattern_direction_id` INTEGER NOT NULL, `pattern_route_id` TEXT NOT NULL, `pattern_headsign` TEXT, `pattern_polyline` TEXT NOT NULL, `pattern_polylength` INTEGER NOT NULL, PRIMARY KEY(`pattern_code`), FOREIGN KEY(`pattern_route_id`) REFERENCES `routes_table`(`route_id`) ON UPDATE NO ACTION ON DELETE CASCADE )")
             it.execSQL("CREATE TABLE IF NOT EXISTS `patterns_stops` (`pattern_gtfs_id` TEXT NOT NULL, `stop_gtfs_id` TEXT NOT NULL, `stop_order` INTEGER NOT NULL, PRIMARY KEY(`pattern_gtfs_id`, `stop_gtfs_id`, `stop_order`), FOREIGN KEY(`pattern_gtfs_id`) REFERENCES `mato_patterns`(`pattern_code`) ON UPDATE NO ACTION ON DELETE CASCADE )")
 
         }
 
 
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java b/app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java
index 7c4f935..327e5a9 100644
--- a/app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java
+++ b/app/src/main/java/it/reyboz/bustorino/fragments/CommonFragmentListener.java
@@ -1,47 +1,44 @@
 package it.reyboz.bustorino.fragments;
 
-import android.location.Location;
-import android.view.View;
+import androidx.annotation.Nullable;
 import it.reyboz.bustorino.backend.Stop;
 
-import javax.annotation.Nullable;
-
 public interface CommonFragmentListener {
 
 
     /**
      * Tell the activity that we need to disable/enable its floatingActionButton
      * @param yes or no
      */
     void showFloatingActionButton(boolean yes);
 
     /**
      * Sends the message to the activity to adapt the GUI
      * to the fragment that has been attached
      * @param fragmentType the type of fragment attached
      */
     void readyGUIfor(FragmentKind fragmentType);
     /**
      * Houston, we need another fragment!
      *
      * @param ID the Stop ID
      */
     void requestArrivalsForStopID(String ID);
 
     /**
      * Method to call when we want to hide the keyboard
      */
     void hideKeyboard();
 
     /**
      * We want to open the map on the specified stop
      * @param stop needs to have location data (latitude, longitude)
      */
     void showMapCenteredOnStop(Stop stop);
 
     /**
      * We want to show the line in detail for route
      * @param routeGtfsId the route gtfsID (eg, "gtt:10U")
      */
     void showLineOnMap(String routeGtfsId,@Nullable String fromStopID);
 }
diff --git a/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
index ff6a2fd..3bfda66 100644
--- a/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
+++ b/app/src/main/java/it/reyboz/bustorino/middleware/GeneralActivity.java
@@ -1,191 +1,230 @@
 /*
 	BusTO - Arrival times for Turin public transport.
     Copyright (C) 2021 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.middleware;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.os.Build;
+import android.view.ViewGroup;
+import androidx.core.graphics.Insets;
+import androidx.core.view.OnApplyWindowInsetsListener;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import com.google.android.material.snackbar.Snackbar;
 
 import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.util.Log;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import java.util.HashMap;
 
 import it.reyboz.bustorino.R;
 import it.reyboz.bustorino.backend.utils;
 import it.reyboz.bustorino.data.PreferencesHolder;
 
 /**
  * Activity class that contains all the generally useful methods
  */
 public abstract class GeneralActivity extends AppCompatActivity {
     final static protected int PERMISSION_REQUEST_POSITION = 33;
     final static protected String LOCATION_PERMISSION_GIVEN = "loc_permission";
     final static protected int STORAGE_PERMISSION_REQ = 291;
 
     final static protected int PERMISSION_OK = 0;
     final static protected int PERMISSION_ASKING = 11;
     final static protected int PERMISSION_NEG_CANNOT_ASK = -3;
 
     final static private String DEBUG_TAG = "BusTO-GeneralAct";
 
     /*
      * Permission stuff
      */
     protected HashMap<String,Runnable> permissionDoneRunnables = new HashMap<>();
     protected HashMap<String,Integer> permissionAsked = new HashMap<>();
 
     protected void setOption(String optionName, boolean value) {
         SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
         editor.putBoolean(optionName, value);
         editor.commit();
     }
 
     protected boolean getOption(String optionName, boolean optDefault) {
         SharedPreferences preferences = getPreferences(MODE_PRIVATE);
         return preferences.getBoolean(optionName, optDefault);
     }
 
     protected SharedPreferences getMainSharedPreferences(){
         return PreferencesHolder.getMainSharedPreferences(this);
     }
     public void hideKeyboard() {
         View view = getCurrentFocus();
         if (view != null) {
             ((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
                     .hideSoftInputFromWindow(view.getWindowToken(),
                             InputMethodManager.HIDE_NOT_ALWAYS);
         }
     }
 
     public void showToastMessage(int messageID, boolean short_lenght) {
         final int length = short_lenght ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG;
         Toast.makeText(getApplicationContext(), messageID, length).show();
     }
 
     public int askForPermissionIfNeeded(String permission, int requestID){
 
         if(ContextCompat.checkSelfPermission(getApplicationContext(),permission)==PackageManager.PERMISSION_GRANTED){
             return PERMISSION_OK;
         }
         //need to ask for the permission
         //consider scenario when we have already asked for permission
         boolean alreadyAsked = false;
         Integer num_trials = 0;
         synchronized (this){
             if (permissionAsked.containsKey(permission)){
                 num_trials = permissionAsked.get(permission);
                 if (num_trials != null && num_trials > 4)
                     alreadyAsked = true;
 
             }
         }
         Log.d(DEBUG_TAG,"Already asked for permission: "+permission+" -> "+num_trials);
 
         if(!alreadyAsked){
             ActivityCompat.requestPermissions(this,new String[]{permission}, requestID);
             synchronized (this){
                 if (num_trials!=null){
                     permissionAsked.put(permission, num_trials+1);
                 }
             }
             return PERMISSION_ASKING;
         } else {
 
             return PERMISSION_NEG_CANNOT_ASK;
         }
 
     }
 
     public void createSnackbar(int ViewID, String message,int duration){
         Snackbar.make(findViewById(ViewID),message,duration);
     }
 
     /*
     METHOD THAT MIGHT BE USEFUL LATER
     public void assertPermissions(String[] permissions){
         ArrayList<String> permissionstoRequest = new ArrayList<>();
 
         for(int i=0;i<permissions.length;i++){
             if(ContextCompat.checkSelfPermission(getApplicationContext(),permissions[i])!=PackageManager.PERMISSION_GRANTED){
                 permissionstoRequest.add(permissions[i]);
             }
         }
 
         ActivityCompat.requestPermissions(this,permissionstoRequest.toArray(new String[permissionstoRequest]));
     }
     */
 
     //KEYBOARD STUFF
     protected  View getRootView() {
         return findViewById(android.R.id.content);
     }
 
     /**
      * This method doesn't work, DO NOT USE
      * @return if the keyboard is open
      * TODO: fix this if you want
      */
     @Deprecated
     public Boolean isKeyboardOpen(){
         Rect visibleBounds = new Rect();
         this.getRootView().getWindowVisibleDisplayFrame(visibleBounds);
 
         double heightDiff = getRootView().getHeight() - visibleBounds.height();
         final double marginOfError = Math.round(utils.convertDipToPixels(this,50f));
         return heightDiff > marginOfError;
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 
     protected void setSystemBarAppearance(boolean isSystemInDarkTheme) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             if (isSystemInDarkTheme) {
                 if (getWindow() != null && getWindow().getInsetsController() != null) {
                     getWindow().getInsetsController().setSystemBarsAppearance(
                             0,
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
                     );
                 }
             } else {
                 if (getWindow() != null && getWindow().getInsetsController() != null) {
                     getWindow().getInsetsController().setSystemBarsAppearance(
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS,
                             android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS
                     );
                 }
             }
         }
     }
 
+    protected OnApplyWindowInsetsListener applyBottomAndBordersInsetsListener = (v, windowInsets) -> {
+        Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+        // Apply the insets as a margin to the view. This solution sets only the
+        // bottom, left, and right dimensions, but you can apply whichever insets are
+        // appropriate to your layout. You can also update the view padding if that's
+        // more appropriate.
+        ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+        mlp.leftMargin = insets.left;
+        mlp.bottomMargin = insets.bottom;
+        mlp.rightMargin = insets.right;
+        v.setLayoutParams(mlp);
+        //set for toolbar
+
+        // Return CONSUMED if you don't want the window insets to keep passing
+        // down to descendant views.
+        return WindowInsetsCompat.CONSUMED;
+    };
+
+    protected OnApplyWindowInsetsListener applyBottomInsetsListener = (v, windowInsets) -> {
+        Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+        // Apply the insets as a margin to the view. This solution sets only the
+        // bottom, left, and right dimensions, but you can apply whichever insets are
+        // appropriate to your layout. You can also update the view padding if that's
+        // more appropriate.
+        ViewGroup.MarginLayoutParams mlp = (ViewGroup.MarginLayoutParams) v.getLayoutParams();
+        mlp.bottomMargin = insets.bottom;
+        v.setLayoutParams(mlp);
+        //set for toolbar
+
+        // Return CONSUMED if you don't want the window insets to keep passing
+        // down to descendant views.
+        return WindowInsetsCompat.CONSUMED;
+    };
+
 }
diff --git a/app/src/main/res/drawable/gradient_toolbar.xml b/app/src/main/res/drawable/gradient_toolbar.xml
new file mode 100644
index 0000000..5bf51fc
--- /dev/null
+++ b/app/src/main/res/drawable/gradient_toolbar.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:startColor="?attr/colorPrimary"
+            android:endColor="?attr/colorPrimaryDark"
+            android:angle="90" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index c4e1175..ebc95f3 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,201 +1,217 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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 -->
+    <androidx.appcompat.widget.Toolbar
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:id="@+id/default_toolbar"
+           android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+           android:background="@drawable/gradient_toolbar"
+           android:elevation="4dp"
+           app:layout_constraintTop_toTopOf="parent"
+           app:layout_constraintStart_toStartOf="parent"
+           app:layout_constraintEnd_toEndOf="parent"
 
-   <!-- <include
-            layout="@layout/default_toobar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-            -->
+           android:fitsSystemWindows="false"
+           app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
     <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="0.9"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="0.9"
             android:scrollbars="vertical"
+            android:id="@+id/aboutNestedScrollView"
+            app:layout_constraintTop_toBottomOf="@id/default_toolbar"
+            app:layout_constraintBottom_toTopOf="@id/theDivider"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:gravity="center"
     >
         <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>
 
 
     <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_constraintTop_toBottomOf="@id/aboutNestedScrollView"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             android:id="@+id/theDivider"
             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_marginLeft="20dp"
             android:layout_marginStart="10dp"
-            android:layout_below="@id/openTelegramButton"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/theDivider"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             android:textColor="@color/black" android:layout_marginTop="10dp" android:layout_marginEnd="10dp"
             android:layout_marginBottom="10dp"/>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_container_fragment.xml b/app/src/main/res/layout/activity_container_fragment.xml
index 100ef9d..792b59c 100644
--- a/app/src/main/res/layout/activity_container_fragment.xml
+++ b/app/src/main/res/layout/activity_container_fragment.xml
@@ -1,15 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".ActivityExperiments">
 
+    <include
+            layout="@layout/default_toobar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"/>
+
     <androidx.fragment.app.FragmentContainerView
             android:id="@+id/fragment_container_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_below="@id/default_toolbar"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
     />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_intro.xml b/app/src/main/res/layout/activity_intro.xml
index f0fc12a..92ae1c5 100644
--- a/app/src/main/res/layout/activity_intro.xml
+++ b/app/src/main/res/layout/activity_intro.xml
@@ -1,59 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                xmlns:tools="http://schemas.android.com/tools"
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:context=".ActivityIntro"
+>
 <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/theConstraintLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ActivityIntro">
-
+        android:layout_height="match_parent">
+    <!-- Maybe the three bottom element could be grouped together into a single layout? -->
     <ImageButton
             android:src="@drawable/arrow_forward_white"
             android:rotation="180"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" android:id="@+id/btnPrevious"
             android:backgroundTint="?colorAccent"
             android:textColor="@color/white"
             android:contentDescription="@string/previous"
-            app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent"/>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"/>
     <ImageButton
             android:src="@drawable/arrow_forward_white"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" android:id="@+id/btnNext"
             android:backgroundTint="?colorAccent"
             android:textColor="@color/white"
             app:circularflow_radiusInDP="5dp"
             android:contentDescription="@string/next"
 
-            app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     <ImageButton
             android:src="@drawable/close_white_large"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" android:id="@+id/btnCompactClose"
             android:backgroundTint="?colorAccent"
             android:textColor="@color/white"
             app:circularflow_radiusInDP="5dp"
             android:contentDescription="@string/next"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
     <androidx.viewpager2.widget.ViewPager2
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:id="@+id/viewPager"
             app:layout_constraintBottom_toTopOf="@+id/btnPrevious" android:layout_marginBottom="8dp"
             app:layout_constraintTop_toTopOf="parent"
 
             app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"/>
     <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:tabBackground="@drawable/tab_selector"
             app:tabGravity="center"
             app:tabIndicatorHeight="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toRightOf="@id/btnPrevious"
             app:layout_constraintRight_toLeftOf="@id/btnNext"
     />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_principal.xml b/app/src/main/res/layout/activity_principal.xml
index 07c0277..6815296 100644
--- a/app/src/main/res/layout/activity_principal.xml
+++ b/app/src/main/res/layout/activity_principal.xml
@@ -1,52 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.drawerlayout.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_height="match_parent">
     <RelativeLayout
+            android:id="@+id/rootRelativeLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
     <!-- The ActionBar displayed at the top -->
 
         <include
             layout="@layout/default_toobar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"/>
         <!-- The main content view where fragments are loaded -->
 
         <FrameLayout
             android:id="@+id/mainActContentFrame"
             android:layout_below="@id/default_toolbar"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
         />
 
     </RelativeLayout>
 
     <com.google.android.material.navigation.NavigationView
 
         android:id="@+id/nvView"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:background="@color/grey_050"
         android:theme="@style/ThemeOverlay.AppCompat.Light"
         app:headerLayout="@layout/nav_header"
         app:itemIconTint="@color/teal_500"
         app:itemTextAppearance="?android:attr/textAppearanceMedium"
         app:itemTextColor="@color/black_900"
-        android:fitsSystemWindows="true"
+        android:fitsSystemWindows="false"
         app:menu="@menu/drawer_main" />
 
 
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/default_toobar.xml b/app/src/main/res/layout/default_toobar.xml
index 16fb446..3ba935a 100644
--- a/app/src/main/res/layout/default_toobar.xml
+++ b/app/src/main/res/layout/default_toobar.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
                                    android:layout_height="?attr/actionBarSize"
                                    android:id="@+id/default_toolbar"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    android:background="?attr/colorPrimary"
-    android:fitsSystemWindows="true"
+    android:background="?attr/colorPrimaryDark"
+    android:fitsSystemWindows="false"
 
     android:elevation="4dp"
     app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
 </androidx.appcompat.widget.Toolbar>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_test_saving.xml b/app/src/main/res/layout/fragment_test_saving.xml
index cfb2fe8..cf77e5d 100644
--- a/app/src/main/res/layout/fragment_test_saving.xml
+++ b/app/src/main/res/layout/fragment_test_saving.xml
@@ -1,63 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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=".fragments.BackupImportFragment">
     <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
         <Button
                 android:text="@string/btn_backup_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/saveButton"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@id/favoritesCheckBox"
                 android:layout_marginTop="50dp"
                 android:layout_marginBottom="50dp"
                 app:layout_constraintVertical_bias="0.0"
                 app:layout_constraintVertical_chainStyle="packed"
+                android:backgroundTint="?attr/colorAccent"
 
         />
 
 
         <CheckBox
                 android:text="@string/load_file_favorites"
                 android:layout_width="wrap_content"
                 android:checked="true"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/saveButton"
                 app:layout_constraintBottom_toTopOf="@id/preferencesCheckBox"
                 app:layout_constraintVertical_bias="0.0"
                 android:minHeight="48dp"
 
                 android:layout_height="wrap_content" android:id="@+id/favoritesCheckBox"/>
         <CheckBox
                 android:text="@string/load_preferences"
                 android:layout_width="wrap_content"
                 android:checked="true"
                 app:layout_constraintTop_toBottomOf="@id/favoritesCheckBox"
                 app:layout_constraintBottom_toTopOf="@id/loadDataButton"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintVertical_bias="0.0"
                 android:minHeight="48dp"
                 android:layout_marginTop="8dp"
 
                 android:layout_height="wrap_content" android:id="@+id/preferencesCheckBox"/>
         <Button
                 android:text="@string/btn_load_backup_message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" android:id="@+id/loadDataButton"
                 app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/preferencesCheckBox"
                 app:layout_constraintBottom_toBottomOf="parent"
                 android:layout_marginTop="18dp"
                 app:layout_constraintVertical_bias="0.0"
+                android:backgroundTint="?attr/colorAccent"
 
 
         />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v35/styles.xml b/app/src/main/res/values-v35/styles.xml
index 5dd1447..ae2e815 100644
--- a/app/src/main/res/values-v35/styles.xml
+++ b/app/src/main/res/values-v35/styles.xml
@@ -1,17 +1,15 @@
 <resources>
     <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!--
             This forces the app to not use Edge-to-Edge. However, on API 36 it will be ignored!
         -->
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
 
     </style>
 
     <style name="AppMaterialTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!--
             This forces the app to not use Edge-to-Edge. However, on API 36 it will be ignored!
         -->
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c0b1d74..5764814 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,85 +1,85 @@
 <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">
+    <style name="AppBaseTheme" parent="Theme.MaterialComponents.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>
     <style name="AppMaterialTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
 
     </style>
     <style name="AppMaterialTheme.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
 
     </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>
 
         <item name="android:textColor">@color/grey_700</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 c0a80a0..8fba583 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="FavTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="FavTheme" parent="AppMaterialTheme.NoActionBar">
         <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="AppMaterialTheme">
+    <style name="AboutTheme" parent="AppMaterialTheme.NoActionBar">
         <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">
+    <style name="MapTheme" parent="AppMaterialTheme.NoActionBar">
         <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>
-
     </style>
 
     <style name="preferenceTheme" parent="PreferenceThemeOverlay"></style>
 
+    <style name="AppTheme.NoActionBar.Light" parent="AppTheme.NoActionBar">
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
 
 
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4170bc6..fc2fe96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,50 +1,51 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     repositories {
         mavenCentral()
         maven { url 'https://maven.google.com' }
         google()
         maven { url 'https://jitpack.io' }
 
 
     }
-    //TODO: Migrate tfrom kapt to KSP
     //kotlin
-    ext.kotlin_version = '2.1.10'
+    ext.kotlin_version = '2.2.20'
     ext.coroutines_version = "1.10.2"
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4' // or latest
-        classpath 'com.android.tools.build:gradle:8.6.1'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.5' // or latest
+        classpath 'com.android.tools.build:gradle:8.12.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-2.0.4"
+
     }
 }
 
 ext {
-        androidXTestVersion = "1.5.0"
+        androidXTestVersion = "1.7.0"
 
         //multidex
         multidex_version = "2.0.1"
         //libraries versions
-        fragment_version = "1.6.1"
-        activity_version = "1.7.2"
-        appcompat_version = "1.7.0"
+        fragment_version = "1.8.9"
+        activity_version = "1.11.0"
+        appcompat_version = "1.7.1"
         preference_version = "1.2.1"
-        work_version = "2.9.0"
+        work_version = "2.11.0"
 
-        acra_version = "5.11.3"
-        lifecycle_version = "2.7.0"
+        acra_version = "5.13.1"
+        lifecycle_version = "2.9.4"
         arch_version = "2.1.0"
-        room_version = "2.5.2"
+        room_version = "2.8.3"
 
     }
 
 allprojects {
     repositories {
         maven { url 'https://maven.google.com' }
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
 
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..37f853b 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists