diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4c5c90..14fe38f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,7 +38,8 @@ jobs:
         id: updateSecrets
         run: |
           echo "Updating Secrets.kt"
-          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt    
+          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt 
+          echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties      
 
       - name: Build with Gradle
         run: ./gradlew buildRelease
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
index 13294a8..8865dd8 100644
--- a/.github/workflows/upload.yml
+++ b/.github/workflows/upload.yml
@@ -38,7 +38,8 @@ jobs:
         id: updateSecrets
         run: |
           echo "Updating Secrets.kt"
-          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt  
+          echo '${{ secrets.SECRETS }}' > app/src/main/java/com/am/stbus/common/Secrets.kt
+          echo '${{ secrets.GRADLE_LOCAL_PROPERTIES }}' > local.properties      
 
       - name: Build Release AAB
         id: buildRelease
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 4b7bd61..2d320d9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.google.services)
     alias(libs.plugins.crashlytics)
+    alias(libs.plugins.google.maps.secrets)
 }
 
 android {
@@ -16,8 +17,8 @@ android {
         applicationId = "com.am.stbus"
         minSdk = 23
         targetSdk = 36
-        versionCode = 84
-        versionName = "4.0.3"
+        versionCode = 85
+        versionName = "4.1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -30,21 +31,26 @@ android {
         }
         release {
             isMinifyEnabled = true
-            firebaseCrashlytics {
-                mappingFileUploadEnabled = true
-            }
+            isShrinkResources = true
             proguardFiles(
+                // Default file with automatically generated optimization rules.
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+
+            firebaseCrashlytics {
+                mappingFileUploadEnabled = true
+            }
         }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = "11"
+    kotlin {
+        compilerOptions {
+            jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
+        }
     }
     buildFeatures {
         buildConfig = true
@@ -53,11 +59,13 @@ android {
 }
 
 dependencies {
+    implementation(libs.gson)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.fonts)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
@@ -75,6 +83,9 @@ dependencies {
     implementation(libs.firebase.crashlytics)
     implementation(libs.firebase.analytics)
 
+    implementation(libs.maps.compose)
+    implementation(libs.microsoft.signal)
+
     implementation(platform(libs.koin.bom))
     implementation(libs.koin.android)
     implementation(libs.koin.compose)
@@ -113,4 +124,4 @@ dependencies {
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
     testImplementation(kotlin("test"))
-}
\ No newline at end of file
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 52134ab..c162694 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -30,4 +30,6 @@
 -keep class **.R$*
 
 -keepattributes SourceFile,LineNumberTable        # Keep file names and line numbers.
--keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
\ No newline at end of file
+-keep public class * extends java.lang.Exception  # Optional: Keep custom exceptions.
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3ecf819..caed757 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,14 +46,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SplitBus"
-        android:usesCleartextTraffic="true"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="m">
+        tools:ignore="GoogleAppIndexingWarning">
 
-        <!--
         <meta-data
             android:name="com.google.android.geo.API_KEY"
-            android:value="@string/api_key" />
+            android:value="${MAPS_API_KEY}" />
+
+        <!--
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" /> &lt;!&ndash; Fixes crash for Android 9+ users &ndash;&gt;
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..1fd2f5a
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
deleted file mode 100644
index abf62cc..0000000
Binary files a/app/src/main/ic_launcher-web.png and /dev/null differ
diff --git a/app/src/main/java/com/am/stbus/common/Constants.kt b/app/src/main/java/com/am/stbus/common/Constants.kt
index 48a35d3..3ca34fb 100644
--- a/app/src/main/java/com/am/stbus/common/Constants.kt
+++ b/app/src/main/java/com/am/stbus/common/Constants.kt
@@ -26,9 +26,9 @@ package com.am.stbus.common
 
 object Constants {
 
-    const val DB_VERSION = 1
+    const val DB_VERSION = 2
 
-    const val PROMET_URL = "http://www.promet-split.hr"
+    const val PROMET_URL = "https://www.promet-split.hr"
     const val PROMET_NOVOSTI_URL = "http://www.promet-split.hr/obavijesti"
     const val PROMET_API_URL = "https://api.promet-split.hr/Fleet/api/v1/"
     const val PROMET_ALL_LINES_URL = "$PROMET_URL/vozni-red/sve-linije/"
@@ -98,4 +98,4 @@ object InformationConstants {
                 "&amp;maponly=1&amp;language=hr&amp;redirect_signup=https://secure.nextbike.net/gt/hr/split/registrirajse/\" " +
                 "width=\"100%\" height=\"400\" frameborder=\"0\"></iframe>"
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/am/stbus/common/di/AppModule.kt b/app/src/main/java/com/am/stbus/common/di/AppModule.kt
index f77e47e..f1001a2 100644
--- a/app/src/main/java/com/am/stbus/common/di/AppModule.kt
+++ b/app/src/main/java/com/am/stbus/common/di/AppModule.kt
@@ -25,9 +25,12 @@
 package com.am.stbus.common.di
 
 import androidx.room.Room
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import com.am.stbus.common.room.AppDatabase
-import com.am.stbus.data.ApiService
-import com.am.stbus.data.room.FavouriteItemDao
+import com.am.stbus.data.services.ApiService
+import com.am.stbus.data.services.room.FavouriteItemDao
+import com.am.stbus.data.services.room.TimetableDetailDataCachedDao
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import retrofit2.Retrofit
@@ -38,16 +41,35 @@ val appModule = module {
         get<Retrofit>().create(ApiService::class.java)
     }
 
+    val MIGRATION_1_2 = object : Migration(1, 2) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            database.execSQL(
+                "CREATE TABLE IF NOT EXISTS `TimetableDetailDataCached` (" +
+                        "`websiteTitle` TEXT NOT NULL, " +
+                        "`timetableDetailData` TEXT NOT NULL, " +
+                        "`storedAt` TEXT NOT NULL, " +
+                        "PRIMARY KEY(`websiteTitle`))"
+            )
+        }
+    }
+
     single<AppDatabase> {
         Room.databaseBuilder(
             androidContext(),
             AppDatabase::class.java, "split-bus-db"
-        ).fallbackToDestructiveMigration(true).build()
+        )
+            .addMigrations(MIGRATION_1_2)
+            .fallbackToDestructiveMigration(dropAllTables = true)
+            .build()
     }
 
     single<FavouriteItemDao> {
         get<AppDatabase>().favouriteItemDao()
     }
 
+    single<TimetableDetailDataCachedDao> {
+        get<AppDatabase>().timetableDetailDataCachedDao()
+    }
+
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/am/stbus/common/di/NetworkModule.kt b/app/src/main/java/com/am/stbus/common/di/NetworkModule.kt
index 34ee6d6..4a6f946 100644
--- a/app/src/main/java/com/am/stbus/common/di/NetworkModule.kt
+++ b/app/src/main/java/com/am/stbus/common/di/NetworkModule.kt
@@ -2,6 +2,8 @@ package com.am.stbus.common.di
 
 import com.am.stbus.common.Constants.PROMET_API_URL
 import com.am.stbus.common.PROMET_KEY
+import com.microsoft.signalr.GsonHubProtocol
+import com.microsoft.signalr.HubConnectionBuilder
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -53,4 +55,17 @@ val networkModule = module {
             .build()
     }
 
+
+    single {
+
+        val gsonProtocol = GsonHubProtocol()
+
+        HubConnectionBuilder
+            .create("https://api.promet-split.hr/Fleet/hub/spatial")
+            .withHubProtocol(gsonProtocol)
+            .shouldSkipNegotiate(false)
+            .build()
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/common/di/RepositoryModule.kt b/app/src/main/java/com/am/stbus/common/di/RepositoryModule.kt
index c6ff46a..1360ea3 100644
--- a/app/src/main/java/com/am/stbus/common/di/RepositoryModule.kt
+++ b/app/src/main/java/com/am/stbus/common/di/RepositoryModule.kt
@@ -37,7 +37,9 @@ val repositoryModule = module {
     }
 
     single {
-        TimetablesRepository()
+        TimetablesRepository(
+            timetableDetailDataCachedDao = get()
+        )
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/common/di/UseCaseModule.kt b/app/src/main/java/com/am/stbus/common/di/UseCaseModule.kt
index e74b72a..f7c00eb 100644
--- a/app/src/main/java/com/am/stbus/common/di/UseCaseModule.kt
+++ b/app/src/main/java/com/am/stbus/common/di/UseCaseModule.kt
@@ -26,11 +26,20 @@ package com.am.stbus.common.di
 
 import com.am.stbus.domain.usecases.FavouritesRoomDbUseCase
 import com.am.stbus.domain.usecases.GetBusStopArrivalsUseCase
-import com.am.stbus.domain.usecases.GetTimetableDetailDataUseCase
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesFromHubConnection
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesUseCase
+import com.am.stbus.domain.usecases.timetables.GetLocalTimetableDetailDataUseCase
+import com.am.stbus.domain.usecases.timetables.GetRemoteTimetableDetailDataUseCase
 import org.koin.dsl.module
 
 val useCaseModule = module {
 
+    single {
+        FavouritesRoomDbUseCase(
+            favouriteItemDao = get()
+        )
+    }
+
     single {
         GetBusStopArrivalsUseCase(
             prometApiRepository = get()
@@ -38,14 +47,26 @@ val useCaseModule = module {
     }
 
     single {
-        GetTimetableDetailDataUseCase(
+        GetLiveVehiclesUseCase(
+            prometApiRepository = get()
+        )
+    }
+
+    single {
+        GetLiveVehiclesFromHubConnection(
+            hubConnection = get()
+        )
+    }
+
+    single {
+        GetLocalTimetableDetailDataUseCase(
             timetablesRepository = get()
         )
     }
 
     single {
-        FavouritesRoomDbUseCase(
-            favouriteItemDao = get()
+        GetRemoteTimetableDetailDataUseCase(
+            timetablesRepository = get()
         )
     }
 
diff --git a/app/src/main/java/com/am/stbus/common/di/ViewModelModule.kt b/app/src/main/java/com/am/stbus/common/di/ViewModelModule.kt
index 40e07c2..0784d91 100644
--- a/app/src/main/java/com/am/stbus/common/di/ViewModelModule.kt
+++ b/app/src/main/java/com/am/stbus/common/di/ViewModelModule.kt
@@ -25,6 +25,8 @@
 package com.am.stbus.common.di
 
 import com.am.stbus.presentation.MainViewModel
+import com.am.stbus.presentation.screens.info.InfoScreenViewModel
+import com.am.stbus.presentation.screens.info.maps.GmapsScreenViewModel
 import com.am.stbus.presentation.screens.stops.detail.BusStopArrivalsDetailViewModel
 import com.am.stbus.presentation.screens.timetables.detail.TimetablesDetailViewModel
 import org.koin.core.module.dsl.viewModel
@@ -46,7 +48,19 @@ val viewModelModule = module {
 
     viewModel {
         TimetablesDetailViewModel(
-            getTimetableDetailDataUseCase = get()
+            getLocalTimetableDetailDataUseCase = get(),
+            getRemoteTimetableDetailDataUseCase = get()
         )
     }
+
+    viewModel {
+        GmapsScreenViewModel(
+            getLiveVehiclesUseCase = get(),
+            getLiveVehiclesFromHubConnection = get()
+        )
+    }
+
+    viewModel {
+        InfoScreenViewModel()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/common/room/AppDatabase.kt b/app/src/main/java/com/am/stbus/common/room/AppDatabase.kt
index fa6b585..5512ed6 100644
--- a/app/src/main/java/com/am/stbus/common/room/AppDatabase.kt
+++ b/app/src/main/java/com/am/stbus/common/room/AppDatabase.kt
@@ -26,11 +26,16 @@ package com.am.stbus.common.room
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import com.am.stbus.common.Constants.DB_VERSION
-import com.am.stbus.data.models.FavouriteItem
-import com.am.stbus.data.room.FavouriteItemDao
+import com.am.stbus.data.models.roomdb.FavouriteItem
+import com.am.stbus.data.models.roomdb.TimetableDetailDataCached
+import com.am.stbus.data.services.room.FavouriteItemDao
+import com.am.stbus.data.services.room.TimetableDetailDataCachedDao
 
-@Database(entities = [FavouriteItem::class], version = DB_VERSION)
+@Database(entities = [FavouriteItem::class, TimetableDetailDataCached::class], version = DB_VERSION)
+@TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun favouriteItemDao(): FavouriteItemDao
+    abstract fun timetableDetailDataCachedDao(): TimetableDetailDataCachedDao
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/common/room/Converters.kt b/app/src/main/java/com/am/stbus/common/room/Converters.kt
new file mode 100644
index 0000000..27e2bab
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/common/room/Converters.kt
@@ -0,0 +1,58 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.common.room
+
+import androidx.room.TypeConverter
+import com.am.stbus.data.models.timetables.TimetableDetailData
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import org.threeten.bp.ZonedDateTime
+import org.threeten.bp.format.DateTimeFormatter
+
+class Converters {
+    private val gson = Gson()
+    private val formatter = DateTimeFormatter.ISO_ZONED_DATE_TIME
+
+    @TypeConverter
+    fun fromTimetableDetailData(value: TimetableDetailData): String {
+        return gson.toJson(value)
+    }
+
+    @TypeConverter
+    fun toTimetableDetailData(value: String): TimetableDetailData {
+        val type = object : TypeToken<TimetableDetailData>() {}.type
+        return gson.fromJson(value, type)
+    }
+
+    @TypeConverter
+    fun fromZonedDateTime(value: ZonedDateTime): String {
+        return value.format(formatter)
+    }
+
+    @TypeConverter
+    fun toZonedDateTime(value: String): ZonedDateTime {
+        return ZonedDateTime.parse(value, formatter)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/data/ApiService.kt b/app/src/main/java/com/am/stbus/data/ApiService.kt
deleted file mode 100644
index eeeb678..0000000
--- a/app/src/main/java/com/am/stbus/data/ApiService.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.am.stbus.data
-
-import com.am.stbus.data.models.BusStopArrival
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Path
-
-interface ApiService {
-
-    @GET("stop/{busStopId}/arrival-times")
-    suspend fun getBusStopArrivals(
-        @Path(value = "busStopId") busStopId: Int
-    ): Response<List<BusStopArrival>>
-
-}
-
diff --git a/app/src/main/java/com/am/stbus/data/models/LiveVehicle.kt b/app/src/main/java/com/am/stbus/data/models/LiveVehicle.kt
new file mode 100644
index 0000000..36d8192
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/data/models/LiveVehicle.kt
@@ -0,0 +1,48 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2025 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.data.models
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LiveVehicle(
+    @SerialName("id")
+    val id: Int?,
+    @SerialName("timestamp")
+    val timestamp: String?,
+    @SerialName("garageNumber")
+    val garageNumber: String?,
+    @SerialName("registrationNumber")
+    val registrationNumber: String?,
+    @SerialName("name")
+    val name: String?,
+    @SerialName("latitude")
+    val latitude: Double?,
+    @SerialName("longitude")
+    val longitude: Double?,
+    @SerialName("vehicleStatus")
+    val vehicleStatus: Int?,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/data/models/FavouriteItem.kt b/app/src/main/java/com/am/stbus/data/models/roomdb/FavouriteItem.kt
similarity index 94%
rename from app/src/main/java/com/am/stbus/data/models/FavouriteItem.kt
rename to app/src/main/java/com/am/stbus/data/models/roomdb/FavouriteItem.kt
index cae70ab..68a28d4 100644
--- a/app/src/main/java/com/am/stbus/data/models/FavouriteItem.kt
+++ b/app/src/main/java/com/am/stbus/data/models/roomdb/FavouriteItem.kt
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2013 - 2025 Antonio Marin
+ * Copyright (c) 2013 - 2026 Antonio Marin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.data.models
+package com.am.stbus.data.models.roomdb
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
diff --git a/app/src/main/java/com/am/stbus/data/models/roomdb/TimetableDetailDataCached.kt b/app/src/main/java/com/am/stbus/data/models/roomdb/TimetableDetailDataCached.kt
new file mode 100644
index 0000000..032ada7
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/data/models/roomdb/TimetableDetailDataCached.kt
@@ -0,0 +1,38 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.data.models.roomdb
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.am.stbus.data.models.timetables.TimetableDetailData
+import org.threeten.bp.ZonedDateTime
+
+@Entity
+data class TimetableDetailDataCached(
+    @PrimaryKey val websiteTitle: String,
+    @ColumnInfo(name = "timetableDetailData") val timetableDetailData: TimetableDetailData,
+    @ColumnInfo(name = "storedAt") val storedAt: ZonedDateTime
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/data/models/timetables/TimetableDetailData.kt b/app/src/main/java/com/am/stbus/data/models/timetables/TimetableDetailData.kt
new file mode 100644
index 0000000..95d6329
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/data/models/timetables/TimetableDetailData.kt
@@ -0,0 +1,38 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.data.models.timetables
+
+data class TimetableDetailData(
+    val validFrom: String,
+    val workdayItems: List<List<String>>,
+    val saturdayItems: List<List<String>>,
+    val sundayList: List<List<String>>,
+    val notes: String
+)
+
+data class TimetableDetailDataWithNeedsRefresh(
+    val timetableDetailData: TimetableDetailData,
+    val needsRefresh: Boolean
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/data/services/ApiService.kt b/app/src/main/java/com/am/stbus/data/services/ApiService.kt
new file mode 100644
index 0000000..93c4447
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/data/services/ApiService.kt
@@ -0,0 +1,43 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.data.services
+
+import com.am.stbus.data.models.BusStopArrival
+import com.am.stbus.data.models.LiveVehicle
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Path
+
+interface ApiService {
+
+    @GET("stop/{busStopId}/arrival-times")
+    suspend fun getBusStopArrivals(
+        @Path(value = "busStopId") busStopId: Int
+    ): Response<List<BusStopArrival>>
+
+    @GET("live/vehicles")
+    suspend fun getLiveVehicles(): Response<List<LiveVehicle>>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/data/room/FavouriteItemDao.kt b/app/src/main/java/com/am/stbus/data/services/room/FavouriteItemDao.kt
similarity index 91%
rename from app/src/main/java/com/am/stbus/data/room/FavouriteItemDao.kt
rename to app/src/main/java/com/am/stbus/data/services/room/FavouriteItemDao.kt
index c3a98b5..3dec148 100644
--- a/app/src/main/java/com/am/stbus/data/room/FavouriteItemDao.kt
+++ b/app/src/main/java/com/am/stbus/data/services/room/FavouriteItemDao.kt
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2013 - 2025 Antonio Marin
+ * Copyright (c) 2013 - 2026 Antonio Marin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -22,12 +22,12 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.data.room
+package com.am.stbus.data.services.room
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import com.am.stbus.data.models.FavouriteItem
+import com.am.stbus.data.models.roomdb.FavouriteItem
 
 @Dao
 interface FavouriteItemDao {
diff --git a/app/src/main/java/com/am/stbus/data/services/room/TimetableDetailDataCachedDao.kt b/app/src/main/java/com/am/stbus/data/services/room/TimetableDetailDataCachedDao.kt
new file mode 100644
index 0000000..65255e4
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/data/services/room/TimetableDetailDataCachedDao.kt
@@ -0,0 +1,41 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.data.services.room
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import com.am.stbus.data.models.roomdb.TimetableDetailDataCached
+
+@Dao
+interface TimetableDetailDataCachedDao {
+
+    @Query("SELECT * FROM TimetableDetailDataCached WHERE websiteTitle = :websiteTitle")
+    suspend fun getTimetableByWebsiteTitle(websiteTitle: String): TimetableDetailDataCached?
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertTimetable(timetable: TimetableDetailDataCached)
+}
diff --git a/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt b/app/src/main/java/com/am/stbus/data/services/static/BusLinesData.kt
similarity index 99%
rename from app/src/main/java/com/am/stbus/data/static/BusLinesData.kt
rename to app/src/main/java/com/am/stbus/data/services/static/BusLinesData.kt
index 8061343..c22a2ca 100644
--- a/app/src/main/java/com/am/stbus/data/static/BusLinesData.kt
+++ b/app/src/main/java/com/am/stbus/data/services/static/BusLinesData.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.data.static
+package com.am.stbus.data.services.static
 
 import com.am.stbus.R
 import com.am.stbus.data.models.BusLine
diff --git a/app/src/main/java/com/am/stbus/data/static/BusStopsData.kt b/app/src/main/java/com/am/stbus/data/services/static/BusStopsData.kt
similarity index 97%
rename from app/src/main/java/com/am/stbus/data/static/BusStopsData.kt
rename to app/src/main/java/com/am/stbus/data/services/static/BusStopsData.kt
index 8088f4b..6075ebc 100644
--- a/app/src/main/java/com/am/stbus/data/static/BusStopsData.kt
+++ b/app/src/main/java/com/am/stbus/data/services/static/BusStopsData.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.data.static
+package com.am.stbus.data.services.static
 
 import com.am.stbus.R
 import com.am.stbus.data.models.BusStop
diff --git a/app/src/main/java/com/am/stbus/domain/repositories/PrometApiRepository.kt b/app/src/main/java/com/am/stbus/domain/repositories/PrometApiRepository.kt
index e1e3712..4603761 100644
--- a/app/src/main/java/com/am/stbus/domain/repositories/PrometApiRepository.kt
+++ b/app/src/main/java/com/am/stbus/domain/repositories/PrometApiRepository.kt
@@ -24,15 +24,20 @@
 
 package com.am.stbus.domain.repositories
 
-import com.am.stbus.data.ApiService
 import com.am.stbus.data.models.BusStopArrival
+import com.am.stbus.data.models.LiveVehicle
+import com.am.stbus.data.services.ApiService
 import retrofit2.Response
 
 class PrometApiRepository(
     private val apiService: ApiService
-) {
-    suspend fun getBusStopArrivals(busStopId: Int): Response<List<BusStopArrival>> {
+) : ApiService {
+    override suspend fun getBusStopArrivals(busStopId: Int): Response<List<BusStopArrival>> {
         return apiService.getBusStopArrivals(busStopId = busStopId)
     }
 
+    override suspend fun getLiveVehicles(): Response<List<LiveVehicle>> {
+        return apiService.getLiveVehicles()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/domain/repositories/TimetablesRepository.kt b/app/src/main/java/com/am/stbus/domain/repositories/TimetablesRepository.kt
index caeb703..eecfe29 100644
--- a/app/src/main/java/com/am/stbus/domain/repositories/TimetablesRepository.kt
+++ b/app/src/main/java/com/am/stbus/domain/repositories/TimetablesRepository.kt
@@ -27,31 +27,123 @@ package com.am.stbus.domain.repositories
 import com.am.stbus.common.Constants.NETWORK_REQUEST_TIMEOUT
 import com.am.stbus.common.Constants.PROMET_ALL_LINES_URL
 import com.am.stbus.common.Constants.PROMET_ALL_LINE_ID_URL
+import com.am.stbus.data.models.roomdb.TimetableDetailDataCached
+import com.am.stbus.data.models.timetables.TimetableDetailData
+import com.am.stbus.data.services.room.TimetableDetailDataCachedDao
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import org.threeten.bp.ZonedDateTime
 
-class TimetablesRepository {
+class TimetablesRepository(
+    private val timetableDetailDataCachedDao: TimetableDetailDataCachedDao
+) {
+    suspend fun getLocalTimetableDataForId(websiteTitle: String): TimetableDetailDataCached? {
+        return timetableDetailDataCachedDao.getTimetableByWebsiteTitle(websiteTitle)
+    }
 
-    fun getTimetableId(websiteTitle: String): Int? {
+    suspend fun getRemoteTimetableDataForId(websiteTitle: String): TimetableDetailData {
 
         val timetablePath =
             Jsoup.connect(PROMET_ALL_LINES_URL).timeout(NETWORK_REQUEST_TIMEOUT).get()
-            .select(
-                ".c-vozni-red__search-select option:contains("
-                        + websiteTitle
-                        + ")"
-            )
-            .attr("value")
+                .select(
+                    ".c-vozni-red__search-select option:contains("
+                            + websiteTitle
+                            + ")"
+                )
+                .attr("value")
 
         val timetableId = timetablePath.split("/").lastOrNull()?.toIntOrNull()
+            ?: throw Exception("Missing timetableId $websiteTitle")
+
+        val timetableDocument = Jsoup.connect(PROMET_ALL_LINE_ID_URL + timetableId)
+            .timeout(NETWORK_REQUEST_TIMEOUT).get()
+
+        val timetableData = generateTimetableDetailDataFromDocument(timetableDocument)
+
+        timetableDetailDataCachedDao.insertTimetable(
+            TimetableDetailDataCached(
+                websiteTitle = websiteTitle,
+                timetableDetailData = timetableData,
+                storedAt = ZonedDateTime.now()
+            )
+        )
 
-        return timetableId
+        return timetableData
     }
 
-    fun getTimetableForId(timetableId: Int): Document {
-        return Jsoup.connect(PROMET_ALL_LINE_ID_URL + timetableId)
-            .timeout(NETWORK_REQUEST_TIMEOUT).get()
+    private fun generateTimetableDetailDataFromDocument(timetableDocument: Document): TimetableDetailData {
+        val workDayList = mutableListOf<List<String>>()
+        val saturdayList = mutableListOf<List<String>>()
+        val sundayList = mutableListOf<List<String>>()
+
+        val table = timetableDocument.select("table.c-vozni-red__table")
+
+        table.select("tbody tr").forEach { row ->
+            val cells = row.select("td")
+
+            // Column 0: Weekday
+            workDayList.add(
+                cells.getOrNull(0)
+                    ?.select("span.c-vozni-red__box--new")?.map {
+                        it.text()
+                    } ?: emptyList()
+            )
+
+            // Column 1: Saturday
+            saturdayList.add(
+                cells.getOrNull(1)
+                    ?.select("span.c-vozni-red__box--new")?.map {
+                        it.text()
+                    } ?: emptyList()
+            )
+
+            // Column 2: Sunday/Holiday
+            sundayList.add(
+                cells.getOrNull(2)
+                    ?.select("span.c-vozni-red__box--new")?.map {
+                        it.text()
+                    } ?: emptyList()
+            )
+        }
+
+        return TimetableDetailData(
+            validFrom = timetableDocument.select("p.c-vozni-red__valid").text(),
+            workdayItems = workDayList.toList(),
+            saturdayItems = saturdayList.toList(),
+            sundayList = sundayList.toList(),
+            notes = timetableDocument.select("div.c-vozni-red-note__items").text()
+        )
     }
 
 
-}
\ No newline at end of file
+    /*    fun getTimetableForWebsiteTitle(timetableId: Int): TimetableDetailData {
+            // Check if there's locally stored TimetableDetailData
+            val cached = runBlocking { timetableDetailDataCachedDao.getTimetableById(timetableId) }
+            if (cached != null) {
+                // Check if it's still valid (e.g., within 24 hours)
+                if (cached.storedAt.plusHours(24).isAfter(ZonedDateTime.now())) {
+                    return cached.timetableDetailData
+                }
+            }
+
+            val timetableDocument = Jsoup.connect(PROMET_ALL_LINE_ID_URL + timetableId)
+                .timeout(NETWORK_REQUEST_TIMEOUT).get()
+
+
+            // Store to database
+            runBlocking {
+                timetableDetailDataCachedDao.insertTimetable(
+                    TimetableDetailDataCached(
+                        id = timetableId,
+                        timetableDetailData = timetableDetailData,
+                        storedAt = ZonedDateTime.now()
+                    )
+                )
+            }
+
+            return timetableDetailData
+
+        }*/
+
+
+}
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/FavouritesRoomDbUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/FavouritesRoomDbUseCase.kt
index e8c0219..65838ca 100644
--- a/app/src/main/java/com/am/stbus/domain/usecases/FavouritesRoomDbUseCase.kt
+++ b/app/src/main/java/com/am/stbus/domain/usecases/FavouritesRoomDbUseCase.kt
@@ -24,8 +24,8 @@
 
 package com.am.stbus.domain.usecases
 
-import com.am.stbus.data.models.FavouriteItem
-import com.am.stbus.data.room.FavouriteItemDao
+import com.am.stbus.data.models.roomdb.FavouriteItem
+import com.am.stbus.data.services.room.FavouriteItemDao
 
 class FavouritesRoomDbUseCase(
     private val favouriteItemDao: FavouriteItemDao
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt
deleted file mode 100644
index c5e7ee9..0000000
--- a/app/src/main/java/com/am/stbus/domain/usecases/GetTimetableDetailDataUseCase.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2013 - 2025 Antonio Marin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.am.stbus.domain.usecases
-
-import com.am.stbus.domain.repositories.TimetablesRepository
-
-class GetTimetableDetailDataUseCase(
-    private val timetablesRepository: TimetablesRepository
-) {
-    fun run(websiteTitle: String): Result<TimetableDetailData> {
-        return try {
-
-            val timetableId = timetablesRepository.getTimetableId(websiteTitle)
-
-            if (timetableId == null) {
-                return Result.failure(Exception("Missing timetableId"))
-            }
-
-            val doc = timetablesRepository.getTimetableForId(timetableId)
-
-            val workDayList = mutableListOf<List<String>>()
-            val saturdayList = mutableListOf<List<String>>()
-            val sundayList = mutableListOf<List<String>>()
-
-            val table = doc.select("table.c-vozni-red__table")
-
-            table.select("tbody tr").forEach { row ->
-                val cells = row.select("td")
-
-                // Column 0: Weekday
-                workDayList.add(
-                    cells.getOrNull(0)
-                        ?.select("span.c-vozni-red__box--new")?.map {
-                            it.text()
-                        } ?: emptyList()
-                )
-
-                // Column 1: Saturday
-                saturdayList.add(
-                    cells.getOrNull(1)
-                        ?.select("span.c-vozni-red__box--new")?.map {
-                            it.text()
-                        } ?: emptyList()
-                )
-
-                // Column 2: Sunday/Holiday
-                sundayList.add(
-                    cells.getOrNull(2)
-                        ?.select("span.c-vozni-red__box--new")?.map {
-                            it.text()
-                        } ?: emptyList()
-                )
-            }
-
-            Result.success(
-                TimetableDetailData(
-                    validFrom = doc.select("p.c-vozni-red__valid").text(),
-                    workdayItems = workDayList.toList(),
-                    saturdayItems = saturdayList.toList(),
-                    sundayList = sundayList.toList(),
-                    notes = doc.select("div.c-vozni-red-note__items").text()
-                )
-            )
-        } catch (exp: Exception) {
-            Result.failure(exp)
-        }
-    }
-
-    data class TimetableDetailData(
-        val validFrom: String,
-        val workdayItems: List<List<String>>,
-        val saturdayItems: List<List<String>>,
-        val sundayList: List<List<String>>,
-        val notes: String
-    )
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesFromHubConnection.kt b/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesFromHubConnection.kt
new file mode 100644
index 0000000..c8ebddc
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesFromHubConnection.kt
@@ -0,0 +1,69 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.domain.usecases.gmaps
+
+import com.microsoft.signalr.HubConnection
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+class GetLiveVehiclesFromHubConnection(
+    private val hubConnection: HubConnection
+) {
+    suspend fun start(onData: (VehicleData) -> Unit) {
+
+        hubConnection.on("ReceiveVehicleData", { vehicle ->
+            onData(vehicle)
+        }, VehicleData::class.java)
+
+        withContext(Dispatchers.IO) {
+            try {
+                hubConnection.start().blockingAwait()
+            } catch (e: Exception) {
+                Timber.wtf("SignalR: Failed to start $e")
+            }
+        }
+    }
+
+    suspend fun stop() {
+        withContext(Dispatchers.IO) {
+            try {
+                hubConnection.stop().blockingAwait()
+            } catch (e: Exception) {
+                Timber.wtf("SignalR: Failed to stop $e")
+            }
+        }
+    }
+}
+
+data class VehicleData(
+    val id: Long,
+    val timestamp: String,
+    val name: String,
+    val garageNumber: String,
+    val vehicleStatus: Int,
+    val latitude: Double,
+    val longitude: Double
+)
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesUseCase.kt
new file mode 100644
index 0000000..ff73db4
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/domain/usecases/gmaps/GetLiveVehiclesUseCase.kt
@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.domain.usecases.gmaps
+
+import com.am.stbus.data.models.LiveVehicle
+import com.am.stbus.domain.repositories.PrometApiRepository
+
+class GetLiveVehiclesUseCase(
+    private val prometApiRepository: PrometApiRepository
+) {
+    suspend fun run(): Result<List<LiveVehicle>> {
+        return try {
+            val response = prometApiRepository.getLiveVehicles()
+
+            if (response.isSuccessful) {
+                Result.success(response.body() ?: emptyList())
+            } else {
+                Result.failure(Exception("error"))
+            }
+        } catch (exp: Exception) {
+            Result.failure(Exception(exp))
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetLocalTimetableDetailDataUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetLocalTimetableDetailDataUseCase.kt
new file mode 100644
index 0000000..9addae5
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetLocalTimetableDetailDataUseCase.kt
@@ -0,0 +1,59 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.domain.usecases.timetables
+
+import com.am.stbus.data.models.timetables.TimetableDetailDataWithNeedsRefresh
+import com.am.stbus.domain.repositories.TimetablesRepository
+import org.threeten.bp.ZonedDateTime
+
+class GetLocalTimetableDetailDataUseCase(
+    private val timetablesRepository: TimetablesRepository
+) {
+    suspend fun run(websiteTitle: String): Result<TimetableDetailDataWithNeedsRefresh> {
+        return try {
+
+            val cachedTimetableDetailData =
+                timetablesRepository.getLocalTimetableDataForId(websiteTitle)
+
+            return if (cachedTimetableDetailData != null) {
+                // Vozni red stariji od 3 dana
+                val oldTimetable =
+                    cachedTimetableDetailData.storedAt.plusDays(3L).isBefore(ZonedDateTime.now())
+
+                Result.success(
+                    TimetableDetailDataWithNeedsRefresh(
+                        timetableDetailData = cachedTimetableDetailData.timetableDetailData,
+                        needsRefresh = oldTimetable
+                    )
+                )
+            } else {
+                Result.failure(Exception("No cached timetable"))
+            }
+        } catch (exp: Exception) {
+            Result.failure(exp)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetRemoteTimetableDetailDataUseCase.kt b/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetRemoteTimetableDetailDataUseCase.kt
new file mode 100644
index 0000000..b438b60
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/domain/usecases/timetables/GetRemoteTimetableDetailDataUseCase.kt
@@ -0,0 +1,46 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.domain.usecases.timetables
+
+import com.am.stbus.data.models.timetables.TimetableDetailData
+import com.am.stbus.domain.repositories.TimetablesRepository
+
+class GetRemoteTimetableDetailDataUseCase(
+    private val timetablesRepository: TimetablesRepository
+) {
+    suspend fun run(websiteTitle: String): Result<TimetableDetailData> {
+        return try {
+
+            val timetableDetailData = timetablesRepository.getRemoteTimetableDataForId(
+                websiteTitle
+            )
+
+            Result.success(timetableDetailData)
+        } catch (exp: Exception) {
+            Result.failure(exp)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/MainActivity.kt b/app/src/main/java/com/am/stbus/presentation/MainActivity.kt
index ae3b2af..f3146e8 100644
--- a/app/src/main/java/com/am/stbus/presentation/MainActivity.kt
+++ b/app/src/main/java/com/am/stbus/presentation/MainActivity.kt
@@ -4,33 +4,47 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.DirectionsBus
 import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.rounded.DepartureBoard
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
+import com.am.stbus.R
 import com.am.stbus.data.models.BusLine
 import com.am.stbus.data.models.BusStop
 import com.am.stbus.presentation.screens.home.HomeScreen
+import com.am.stbus.presentation.screens.info.InfoScreen
+import com.am.stbus.presentation.screens.info.maps.GmapsScreen
+import com.am.stbus.presentation.screens.info.prometweb.PrometWebScreen
+import com.am.stbus.presentation.screens.stops.BusStopArrivalsListScreen
 import com.am.stbus.presentation.screens.stops.detail.BusStopArrivalsDetailScreen
-import com.am.stbus.presentation.screens.stops.list.BusStopArrivalsListScreen
+import com.am.stbus.presentation.screens.timetables.TimetablesScreen
 import com.am.stbus.presentation.screens.timetables.detail.TimetablesDetailScreen
-import com.am.stbus.presentation.screens.timetables.list.TimetablesScreen
 import com.am.stbus.presentation.theme.SplitBusTheme
 import kotlinx.serialization.Serializable
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -49,7 +63,7 @@ class MainActivity : ComponentActivity() {
 
                 val backStack = remember { mutableStateListOf<Any>(HomeScreenKey) }
 
-                val barsVisible = TOP_LEVEL_ROUTES.map { it.navKey }.contains(backStack.last())
+                val bottomBarVisible = TOP_LEVEL_ROUTES.map { it.navKey }.contains(backStack.last())
 
                 val busStopFavourites = viewModel.busStopFavourites
 
@@ -57,34 +71,60 @@ class MainActivity : ComponentActivity() {
 
                 Scaffold(
                     bottomBar = {
-                        if (barsVisible) {
-                            NavigationBar {
-                                TOP_LEVEL_ROUTES.forEach { topLevelRoute ->
-
-                                    val isSelected = topLevelRoute.navKey == backStack.last()
-
-                                    NavigationBarItem(
-                                        selected = isSelected,
-                                        onClick = {
-                                            backStack.add(topLevelRoute.navKey)
-                                            if (backStack.size > 2) {
-                                                backStack.removeAt(1)
+                        if (bottomBarVisible) {
+                            Column {
+                                HorizontalDivider(
+                                    thickness = 0.8.dp,
+                                    color = MaterialTheme.colorScheme.onBackground.copy(alpha = 0.08f)
+                                )
+                                NavigationBar(
+                                    containerColor = Color.Transparent
+                                ) {
+                                    TOP_LEVEL_ROUTES.forEach { topLevelRoute ->
+
+                                        val isSelected = topLevelRoute.navKey == backStack.last()
+
+                                        NavigationBarItem(
+                                            selected = isSelected,
+                                            onClick = {
+                                                backStack.add(topLevelRoute.navKey)
+                                                if (backStack.size > 2) {
+                                                    backStack.removeAt(1)
+                                                }
+                                            },
+                                            icon = {
+                                                Icon(
+                                                    imageVector = topLevelRoute.icon,
+                                                    contentDescription = null
+                                                )
+                                            },
+                                            label = {
+                                                Text(
+                                                    text = stringResource(topLevelRoute.title),
+                                                    textAlign = TextAlign.Center,
+                                                    maxLines = 1,
+                                                    overflow = TextOverflow.Ellipsis
+                                                )
                                             }
-                                        },
-                                        icon = {
-                                            Icon(
-                                                imageVector = topLevelRoute.icon,
-                                                contentDescription = null
-                                            )
-                                        }
-                                    )
+                                        )
+                                    }
                                 }
                             }
                         }
                     }
                 ) { innerPadding ->
+
+                    val bottomPadding = innerPadding.calculateBottomPadding()
+
                     NavDisplay(
-                        modifier = Modifier.padding(bottom = innerPadding.calculateBottomPadding()),
+                        modifier = Modifier.padding(
+                            bottom =
+                                if (bottomBarVisible) {
+                                    bottomPadding
+                                } else {
+                                    0.dp
+                                }
+                        ),
                         entryDecorators = listOf(
                             rememberSaveableStateHolderNavEntryDecorator(),
                             rememberViewModelStoreNavEntryDecorator()
@@ -134,6 +174,7 @@ class MainActivity : ComponentActivity() {
                             entry<TimetableDetailScreenKey> {
                                 val favourite = busLinesFavourites.contains(it.busLine)
                                 TimetablesDetailScreen(
+                                    navBarPadding = bottomPadding,
                                     busLine = it.busLine,
                                     favourite = favourite,
                                     onFavouriteClicked = { busLine ->
@@ -148,6 +189,27 @@ class MainActivity : ComponentActivity() {
                                     }
                                 )
                             }
+                            entry<InfoScreenKey> {
+                                InfoScreen(
+                                    onGmapsClicked = {
+                                        backStack.add(InfoGmapsScreenKey)
+                                    },
+                                    onPrometWebClicked = {
+                                        backStack.add(InfoPrometWebScreenKey)
+                                    }
+                                )
+                            }
+                            entry<InfoGmapsScreenKey> {
+                                GmapsScreen {
+                                    backStack.removeAt(backStack.lastIndex)
+                                }
+                            }
+                            entry<InfoPrometWebScreenKey> {
+                                PrometWebScreen {
+                                    backStack.removeAt(backStack.lastIndex)
+                                }
+                            }
+
                         }
                     )
                 }
@@ -160,25 +222,35 @@ class MainActivity : ComponentActivity() {
 private sealed interface BottomBarRoutes {
     val icon: ImageVector
     val navKey: NavKey
+    val title: Int
 }
 
 private data object Home : BottomBarRoutes {
     override val icon = Icons.Default.Home
     override val navKey: NavKey = HomeScreenKey
+    override val title: Int = R.string.nav_favourites
 }
 
 private data object BusStops : BottomBarRoutes {
     override val icon = Icons.Rounded.DepartureBoard
     override val navKey: NavKey = BusStopsScreenKey
+    override val title: Int = R.string.nav_bus_stops
 }
 
 private data object TimetablesList : BottomBarRoutes {
     override val icon = Icons.Default.DirectionsBus
     override val navKey: NavKey = TimetablesListScreenKey
+    override val title: Int = R.string.nav_timetables
+}
+
+private data object Info : BottomBarRoutes {
+    override val icon = Icons.Default.Info
+    override val navKey: NavKey = InfoScreenKey
+    override val title: Int = R.string.nav_information
 }
 
 private val TOP_LEVEL_ROUTES: List<BottomBarRoutes> =
-    listOf(Home, BusStops, TimetablesList)
+    listOf(Home, BusStops, TimetablesList, Info)
 
 
 @Serializable
@@ -190,6 +262,17 @@ data object BusStopsScreenKey : NavKey
 @Serializable
 data object TimetablesListScreenKey : NavKey
 
+@Serializable
+data object InfoScreenKey : NavKey
+
+@Serializable
+data object InfoGmapsScreenKey : NavKey {
+}
+
+data object InfoPrometWebScreenKey : NavKey {
+}
+
+
 @Serializable
 data class TimetableDetailScreenKey(val busLine: BusLine) : NavKey
 
diff --git a/app/src/main/java/com/am/stbus/presentation/MainViewModel.kt b/app/src/main/java/com/am/stbus/presentation/MainViewModel.kt
index 0951bf1..8a9f546 100644
--- a/app/src/main/java/com/am/stbus/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/am/stbus/presentation/MainViewModel.kt
@@ -29,8 +29,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.am.stbus.data.models.BusLine
 import com.am.stbus.data.models.BusStop
-import com.am.stbus.data.static.findBusLinePerId
-import com.am.stbus.data.static.findBusStopArrivalPerId
+import com.am.stbus.data.services.static.findBusLinePerId
+import com.am.stbus.data.services.static.findBusStopArrivalPerId
 import com.am.stbus.domain.usecases.FavouritesRoomDbUseCase
 import kotlinx.coroutines.launch
 
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/common/AppBarScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/common/AppBarScreen.kt
index 90346ef..4ebea1d 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/common/AppBarScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/common/AppBarScreen.kt
@@ -37,11 +37,12 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
+import com.am.stbus.presentation.theme.AppTypography
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -49,29 +50,31 @@ fun AppBarScreen(
     modifier: Modifier = Modifier,
     title: String,
     titleColour: Color,
-    showBackButton: Boolean = false,
-    onBackClicked: () -> Unit = {},
+    onBackClicked: (() -> Unit)? = null,
     actions: @Composable RowScope.() -> Unit = {},
     content: @Composable ColumnScope.() -> Unit = {}
 ) {
+    val backgroundColour = MaterialTheme.colorScheme.background
+
     Column(
         modifier = modifier
             .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
+            .background(backgroundColour)
     ) {
         TopAppBar(
             title = {
                 Text(
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    fontWeight = FontWeight.Bold,
+                    style = AppTypography.titleLarge,
                     color = titleColour,
                     text = title
                 )
             },
+            colors = TopAppBarDefaults.topAppBarColors().copy(containerColor = backgroundColour),
             actions = actions,
             navigationIcon = {
-                if (showBackButton) {
+                if (onBackClicked != null) {
                     IconButton(onClick = { onBackClicked() }) {
                         Icon(
                             imageVector = Icons.AutoMirrored.Filled.ArrowBack,
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/common/LoadingScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/common/LoadingScreen.kt
index 89725b6..857c545 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/common/LoadingScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/common/LoadingScreen.kt
@@ -24,7 +24,6 @@
 
 package com.am.stbus.presentation.screens.common
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -49,7 +48,6 @@ fun LoadingScreen() {
     Box(
         modifier = Modifier
             .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
     ) {
         LoadingIndicator(
             modifier = Modifier
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/home/HomeScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/home/HomeScreen.kt
index d592bd0..c59545b 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/home/HomeScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/home/HomeScreen.kt
@@ -27,8 +27,8 @@ import com.am.stbus.R
 import com.am.stbus.data.models.BusLine
 import com.am.stbus.data.models.BusStop
 import com.am.stbus.presentation.screens.common.AppBarScreen
-import com.am.stbus.presentation.screens.stops.list.BusStopItemView
-import com.am.stbus.presentation.screens.timetables.list.BusLineItemView
+import com.am.stbus.presentation.screens.stops.BusStopItemView
+import com.am.stbus.presentation.screens.timetables.BusLineItemView
 import com.am.stbus.presentation.theme.SplitBusTheme
 
 @Composable
@@ -43,7 +43,7 @@ fun HomeScreen(
 
     AppBarScreen(
         title = stringResource(R.string.nav_favourites),
-        titleColour = MaterialTheme.colorScheme.primary
+        titleColour = MaterialTheme.colorScheme.onBackground
     ) {
         if (emptyScreen) {
             Column(
@@ -82,6 +82,7 @@ fun HomeScreen(
                     text = stringResource(R.string.nav_bus_stops),
                     fontSize = 18.sp,
                     fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.headlineSmall,
                     color = MaterialTheme.colorScheme.tertiary
                 )
                 busStopFavourites.forEach { busStop ->
@@ -100,6 +101,7 @@ fun HomeScreen(
                     text = stringResource(R.string.nav_timetables),
                     fontSize = 18.sp,
                     fontWeight = FontWeight.SemiBold,
+                    style = MaterialTheme.typography.headlineSmall,
                     color = MaterialTheme.colorScheme.secondary
                 )
                 busLinesFavourites.forEach {
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreen.kt
new file mode 100644
index 0000000..f127cf3
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreen.kt
@@ -0,0 +1,117 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.am.stbus.R
+import com.am.stbus.presentation.screens.common.AppBarScreen
+import com.am.stbus.presentation.theme.AppTypography
+import com.am.stbus.presentation.theme.SplitBusTheme
+
+@Composable
+fun InfoScreen(
+    onGmapsClicked: () -> Unit,
+    onPrometWebClicked: () -> Unit
+) {
+    AppBarScreen(
+        title = stringResource(R.string.nav_information),
+        titleColour = MaterialTheme.colorScheme.onBackground
+    ) {
+        InfoScreenRowItem(
+            title = R.string.information_gmaps_title,
+            description = R.string.information_gmaps_desc,
+            showDivider = true
+        ) {
+            onGmapsClicked()
+        }
+        InfoScreenRowItem(
+            title = R.string.information_promet_web,
+            description = R.string.information_promet_desc,
+            showDivider = false
+        ) {
+            onPrometWebClicked()
+        }
+    }
+}
+
+@Composable
+fun InfoScreenRowItem(
+    title: Int,
+    description: Int,
+    showDivider: Boolean,
+    onClicked: () -> Unit
+) {
+    Column(
+        modifier = Modifier
+            .clickable {
+                onClicked()
+            }
+            .padding(horizontal = 16.dp)
+
+    ) {
+        Text(
+            modifier = Modifier.padding(top = 10.dp),
+            style = AppTypography.titleMedium,
+            text = stringResource(title)
+        )
+        Text(
+            modifier = Modifier.padding(top = 4.dp, bottom = 8.dp),
+            text = stringResource(description)
+        )
+        if (showDivider) {
+            HorizontalDivider(thickness = 0.4.dp)
+        }
+    }
+}
+
+
+@Preview
+@Composable
+fun InfoScreenPreview() {
+    SplitBusTheme {
+        Column(
+            modifier = Modifier
+                .background(MaterialTheme.colorScheme.background)
+                .fillMaxSize()
+        ) {
+            InfoScreen(
+                onGmapsClicked = {},
+                onPrometWebClicked = {}
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreenViewModel.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreenViewModel.kt
new file mode 100644
index 0000000..705d888
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/InfoScreenViewModel.kt
@@ -0,0 +1,33 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info
+
+import androidx.lifecycle.ViewModel
+
+class InfoScreenViewModel() : ViewModel() {
+
+    // Todo
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreen.kt
new file mode 100644
index 0000000..1a6beb4
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreen.kt
@@ -0,0 +1,210 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info.maps
+
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.MyLocation
+import androidx.compose.material3.ContainedLoadingIndicator
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
+import com.am.stbus.R
+import com.am.stbus.presentation.screens.common.AppBarScreen
+import com.google.android.gms.maps.model.CameraPosition
+import com.google.android.gms.maps.model.LatLng
+import com.google.maps.android.compose.GoogleMap
+import com.google.maps.android.compose.MapProperties
+import com.google.maps.android.compose.MapUiSettings
+import com.google.maps.android.compose.rememberCameraPositionState
+import com.google.maps.android.compose.rememberUpdatedMarkerState
+import org.koin.androidx.compose.koinViewModel
+import timber.log.Timber
+
+@OptIn(ExperimentalMaterial3ExpressiveApi::class)
+@Composable
+fun GmapsScreen(
+    viewModel: GmapsScreenViewModel = koinViewModel(),
+    onBackClicked: () -> Unit
+) {
+
+    val context = LocalContext.current
+
+    val lifecycleOwner = LocalLifecycleOwner.current
+
+    // Helper to check if any location permission is granted
+    fun hasAnyLocationPermission() = ContextCompat.checkSelfPermission(
+        context, Manifest.permission.ACCESS_FINE_LOCATION
+    ) == PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(
+        context, Manifest.permission.ACCESS_COARSE_LOCATION
+    ) == PackageManager.PERMISSION_GRANTED
+
+    var hasLocationPermission by remember { mutableStateOf(hasAnyLocationPermission()) }
+
+    val launcher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.RequestMultiplePermissions(),
+        onResult = { permissions ->
+            hasLocationPermission = permissions.values.any { it }
+            Timber.d("GmapsScreen: Permission result: $hasLocationPermission")
+        }
+    )
+
+    // Sync permission state when returning to the app (e.g., from settings)
+    DisposableEffect(lifecycleOwner) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                val current = hasAnyLocationPermission()
+                if (current != hasLocationPermission) {
+                    hasLocationPermission = current
+                }
+            }
+        }
+        lifecycleOwner.lifecycle.addObserver(observer)
+        onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }
+    }
+
+    // Auto-request if missing
+    LaunchedEffect(Unit) {
+        if (!hasLocationPermission) {
+            launcher.launch(
+                arrayOf(
+                    Manifest.permission.ACCESS_FINE_LOCATION,
+                    Manifest.permission.ACCESS_COARSE_LOCATION
+                )
+            )
+        }
+    }
+
+    val pullToRefreshLoading = viewModel.vehiclesLoading
+
+    DisposableEffect(Unit) {
+        onDispose {
+            viewModel.stopReceivingData()
+        }
+    }
+
+    val vehicles = viewModel.vehicleData
+
+    val cameraPositionState = rememberCameraPositionState {
+        position = CameraPosition.fromLatLngZoom(
+            LatLng(43.50891, 16.43915),
+            12f
+        )
+    }
+
+    val uiSettings = remember(hasLocationPermission) {
+        MapUiSettings(myLocationButtonEnabled = hasLocationPermission)
+    }
+
+    val properties = remember(hasLocationPermission) {
+        MapProperties(isMyLocationEnabled = hasLocationPermission)
+    }
+
+    AppBarScreen(
+        title = stringResource(R.string.information_gmaps_title),
+        titleColour = MaterialTheme.colorScheme.onBackground,
+        onBackClicked = onBackClicked,
+        actions = {
+            if (!hasLocationPermission) {
+                IconButton(onClick = {
+                    launcher.launch(
+                        arrayOf(
+                            Manifest.permission.ACCESS_FINE_LOCATION,
+                            Manifest.permission.ACCESS_COARSE_LOCATION
+                        )
+                    )
+                }) {
+                    Icon(
+                        imageVector = Icons.Default.MyLocation,
+                        contentDescription = "Enable Location",
+                        tint = MaterialTheme.colorScheme.primary
+                    )
+                }
+            }
+        }
+    ) {
+        Box(modifier = Modifier.fillMaxSize()) {
+            GoogleMap(
+                modifier = Modifier.fillMaxSize(),
+                cameraPositionState = cameraPositionState,
+                uiSettings = uiSettings,
+                properties = properties
+            ) {
+                vehicles.forEach { vehicle ->
+                    key(vehicle.id) {
+                        val markerState = rememberUpdatedMarkerState(
+                            position = LatLng(vehicle.latitude, vehicle.longitude)
+                        )
+
+                        BusMarker(
+                            state = markerState,
+                            busNumber = vehicle.busLine
+                        )
+                    }
+                }
+            }
+
+            if (pullToRefreshLoading) {
+                ContainedLoadingIndicator(
+                    modifier =
+                        Modifier
+                            .padding(top = 16.dp)
+                            .requiredSize(
+                                width = 48.dp,
+                                height = 48.dp,
+                            )
+                            .align(Alignment.TopCenter),
+                    containerColor = MaterialTheme.colorScheme.primaryContainer,
+                    indicatorColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                )
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreenViewModel.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreenViewModel.kt
new file mode 100644
index 0000000..f7cf089
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/GmapsScreenViewModel.kt
@@ -0,0 +1,125 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info.maps
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.am.stbus.data.models.LiveVehicle
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesFromHubConnection
+import com.am.stbus.domain.usecases.gmaps.GetLiveVehiclesUseCase
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class GmapsScreenViewModel(
+    private val getLiveVehiclesUseCase: GetLiveVehiclesUseCase,
+    private val getLiveVehiclesFromHubConnection: GetLiveVehiclesFromHubConnection
+) : ViewModel() {
+
+    var vehicleData = mutableStateListOf<GmapsLiveBus>()
+
+    var vehiclesLoading by mutableStateOf(true)
+
+    override fun onCleared() {
+        viewModelScope.launch {
+            getLiveVehiclesFromHubConnection.stop()
+        }
+        super.onCleared()
+    }
+
+    init {
+        getLiveVehiclesAndStartSocketHub()
+    }
+
+    private fun getLiveVehiclesAndStartSocketHub() {
+        viewModelScope.launch {
+            getLiveVehiclesUseCase.run()
+                .onSuccess {
+                    startSocketHub(it)
+                }
+                .onFailure {
+                    vehiclesLoading = false
+                    // todo: error
+                    Timber.wtf("Error - $it")
+                }
+        }
+    }
+
+    private fun startSocketHub(listOfLiveVehicles: List<LiveVehicle>) {
+        viewModelScope.launch {
+            getLiveVehiclesFromHubConnection.start { socketVehicle ->
+
+                val garageNumber = socketVehicle.garageNumber
+
+                val busLine =
+                    listOfLiveVehicles.firstOrNull { it.garageNumber == garageNumber }?.name ?: ""
+
+                if (busLine.isNotBlank()) {
+                    if (vehiclesLoading) {
+                        vehiclesLoading = false
+                    }
+
+                    val gmapsLiveBus = GmapsLiveBus(
+                        id = socketVehicle.id,
+                        busLine = busLine,
+                        latitude = socketVehicle.latitude,
+                        longitude = socketVehicle.longitude
+                    )
+
+                    updateVehicle(gmapsLiveBus)
+                }
+            }
+        }
+    }
+
+
+    private fun updateVehicle(gmapsLiveBus: GmapsLiveBus) {
+        val index = vehicleData.indexOfFirst { it.id == gmapsLiveBus.id }
+
+        if (index >= 0) {
+            // Update existing item — triggers recomposition
+            vehicleData[index] = gmapsLiveBus
+        } else {
+            // Add new vehicle
+            vehicleData.add(gmapsLiveBus)
+        }
+    }
+
+    fun stopReceivingData() {
+        viewModelScope.launch {
+            getLiveVehiclesFromHubConnection.stop()
+        }
+    }
+
+    data class GmapsLiveBus(
+        val id: Long,
+        val busLine: String,
+        val latitude: Double,
+        val longitude: Double
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/maps/MapMarker.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/MapMarker.kt
new file mode 100644
index 0000000..15a4094
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/maps/MapMarker.kt
@@ -0,0 +1,105 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info.maps
+
+import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentSize
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.am.stbus.presentation.theme.SplitBusTheme
+import com.google.maps.android.compose.MarkerComposable
+import com.google.maps.android.compose.MarkerState
+
+@Composable
+fun BusMarker(
+    state: MarkerState,
+    busNumber: String
+) {
+    MarkerComposable(
+        state = state,
+        anchor = Offset(0.5f, 1f)
+    ) {
+        BusMarkerContent(busNumber = busNumber)
+    }
+}
+
+@Composable
+fun BusMarkerContent(
+    busNumber: String
+) {
+    val pinColour = MaterialTheme.colorScheme.primaryContainer
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = busNumber,
+            modifier = Modifier
+                .size(42.dp)
+                .background(pinColour, CircleShape)
+                .wrapContentSize(Alignment.Center),
+            color = MaterialTheme.colorScheme.onPrimaryContainer,
+            fontWeight = FontWeight.Bold,
+            textAlign = TextAlign.Center
+        )
+
+        // Bottom pin triangle
+        Canvas(
+            modifier = Modifier
+                .offset(y = (-2).dp)
+                .size(width = 16.dp, height = 14.dp)
+        ) {
+            val path = Path().apply {
+                moveTo(size.width / 2f, size.height)
+                lineTo(0f, 0f)
+                lineTo(size.width, 0f)
+                close()
+            }
+            drawPath(path, color = pinColour)
+        }
+    }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun BusMarkerPreview() {
+    SplitBusTheme {
+        BusMarkerContent(busNumber = "37")
+    }
+}
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/info/prometweb/PrometWebScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/info/prometweb/PrometWebScreen.kt
new file mode 100644
index 0000000..ab22fcb
--- /dev/null
+++ b/app/src/main/java/com/am/stbus/presentation/screens/info/prometweb/PrometWebScreen.kt
@@ -0,0 +1,69 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2013 - 2026 Antonio Marin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.am.stbus.presentation.screens.info.prometweb
+
+import android.view.ViewGroup
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.viewinterop.AndroidView
+import com.am.stbus.R
+import com.am.stbus.common.Constants.PROMET_URL
+import com.am.stbus.presentation.screens.common.AppBarScreen
+
+@Composable
+fun PrometWebScreen(
+    onBackClicked: () -> Unit
+) {
+    AppBarScreen(
+        title = stringResource(R.string.information_promet_web),
+        titleColour = MaterialTheme.colorScheme.onBackground,
+        onBackClicked = onBackClicked
+    ) {
+        val url = PROMET_URL
+
+        AndroidView(
+            modifier = Modifier.fillMaxSize(),
+            factory = { context ->
+                WebView(context).apply {
+                    layoutParams = ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT
+                    )
+                    // Standard WebView settings
+                    webViewClient = WebViewClient() // Prevents opening in external browser
+                    settings.javaScriptEnabled = true
+                    settings.domStorageEnabled = true
+
+                    loadUrl(url)
+                }
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/stops/list/BusStopArrivalsListScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/stops/BusStopArrivalsScreen.kt
similarity index 96%
rename from app/src/main/java/com/am/stbus/presentation/screens/stops/list/BusStopArrivalsListScreen.kt
rename to app/src/main/java/com/am/stbus/presentation/screens/stops/BusStopArrivalsScreen.kt
index b25a0ed..73ec9a0 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/stops/list/BusStopArrivalsListScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/stops/BusStopArrivalsScreen.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.presentation.screens.stops.list
+package com.am.stbus.presentation.screens.stops
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -38,7 +38,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.am.stbus.R
 import com.am.stbus.data.models.BusStop
-import com.am.stbus.data.static.BUS_ARRIVALS_STOPS
+import com.am.stbus.data.services.static.BUS_ARRIVALS_STOPS
 import com.am.stbus.presentation.screens.common.AppBarScreen
 import com.am.stbus.presentation.theme.SplitBusTheme
 
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/stops/detail/BusStopArrivalsDetailScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/stops/detail/BusStopArrivalsDetailScreen.kt
index b03b324..7de4cac 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/stops/detail/BusStopArrivalsDetailScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/stops/detail/BusStopArrivalsDetailScreen.kt
@@ -113,7 +113,6 @@ fun BusStopArrivalsDetailScreen(
     AppBarScreen(
         title = stringResource(title),
         titleColour = MaterialTheme.colorScheme.tertiary,
-        showBackButton = true,
         onBackClicked = onBackClicked,
         actions = {
             IconButton(onClick = {
@@ -144,7 +143,8 @@ fun BusStopArrivalsDetailScreen(
                     PullToRefreshDefaults.LoadingIndicator(
                         modifier = Modifier.align(Alignment.TopCenter),
                         state = pullToRefreshState,
-                        isRefreshing = pullToRefreshLoading
+                        isRefreshing = pullToRefreshLoading,
+                        color = MaterialTheme.colorScheme.tertiary
                     )
                 }
             ) {
@@ -172,7 +172,7 @@ fun BusStopArrivalsDetailScreen(
                             ) {
                                 Text(
                                     text = it.lineNumber,
-                                    color = MaterialTheme.colorScheme.secondary,
+                                    color = MaterialTheme.colorScheme.tertiary,
                                     fontWeight = FontWeight.SemiBold,
                                     fontSize = 18.sp,
                                 )
@@ -186,7 +186,7 @@ fun BusStopArrivalsDetailScreen(
                                 ) {
                                     Text(
                                         text = "$minutesUntil",
-                                        color = MaterialTheme.colorScheme.primary,
+                                        color = MaterialTheme.colorScheme.tertiary,
                                         fontWeight = FontWeight.Bold,
                                         fontSize = 18.sp,
                                     )
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/timetables/list/TimetablesScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/timetables/TimetablesScreen.kt
similarity index 92%
rename from app/src/main/java/com/am/stbus/presentation/screens/timetables/list/TimetablesScreen.kt
rename to app/src/main/java/com/am/stbus/presentation/screens/timetables/TimetablesScreen.kt
index e4bf5a7..bcf1593 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/timetables/list/TimetablesScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/timetables/TimetablesScreen.kt
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-package com.am.stbus.presentation.screens.timetables.list
+package com.am.stbus.presentation.screens.timetables
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -46,6 +46,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight.Companion.W600
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -54,9 +55,9 @@ import com.am.stbus.R
 import com.am.stbus.data.models.BusLine
 import com.am.stbus.data.models.BusLineArea
 import com.am.stbus.data.models.BusLineArea.Companion.getPagerTitle
-import com.am.stbus.data.static.CITY_BUS_LINES
-import com.am.stbus.data.static.SUBURBAN_AREA_BUS_LINES
-import com.am.stbus.data.static.URBAN_AREA_BUS_LINES
+import com.am.stbus.data.services.static.CITY_BUS_LINES
+import com.am.stbus.data.services.static.SUBURBAN_AREA_BUS_LINES
+import com.am.stbus.data.services.static.URBAN_AREA_BUS_LINES
 import com.am.stbus.presentation.screens.common.AppBarScreen
 import com.am.stbus.presentation.theme.SplitBusTheme
 import kotlinx.coroutines.launch
@@ -80,6 +81,7 @@ fun TimetablesScreen(
     ) {
         PrimaryTabRow(
             selectedTabIndex = currentPage,
+            containerColor = MaterialTheme.colorScheme.background,
             divider = {}
         ) {
             timetableAreas.forEachIndexed { index, timetableArea ->
@@ -93,7 +95,8 @@ fun TimetablesScreen(
                     },
                     text = {
                         Text(
-                            text = stringResource(timetableArea.busLineArea.getPagerTitle())
+                            text = stringResource(timetableArea.busLineArea.getPagerTitle()),
+                            fontWeight = W600
                         )
                     }
                 )
@@ -141,6 +144,7 @@ fun BusLineItemView(
             color = MaterialTheme.colorScheme.secondary,
             textAlign = TextAlign.End,
             fontSize = 18.sp,
+            fontWeight = W600
         )
         Text(
             modifier = Modifier.padding(end = 16.dp, top = 12.dp, bottom = 12.dp),
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt
index 13b276a..36ea8eb 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailScreen.kt
@@ -43,19 +43,26 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Favorite
 import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PrimaryTabRow
 import androidx.compose.material3.Tab
 import androidx.compose.material3.Text
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import com.am.stbus.R
 import com.am.stbus.data.models.BusLine
 import com.am.stbus.presentation.screens.common.AppBarScreen
 import com.am.stbus.presentation.screens.common.ErrorScreen
@@ -63,11 +70,13 @@ import com.am.stbus.presentation.screens.common.LoadingScreen
 import com.am.stbus.presentation.theme.SplitBusTheme
 import kotlinx.coroutines.launch
 import org.koin.androidx.compose.koinViewModel
+import timber.log.Timber
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun TimetablesDetailScreen(
     viewModel: TimetablesDetailViewModel = koinViewModel(),
+    navBarPadding: Dp,
     busLine: BusLine,
     favourite: Boolean,
     onFavouriteClicked: (BusLine) -> Unit,
@@ -82,25 +91,30 @@ fun TimetablesDetailScreen(
 
     val currentPage = pagerState.currentPage
 
-    val loading = viewModel.loading
+    val loading = viewModel.fullScreenLoading
 
     val timetableData = viewModel.timetableData
 
     val title = "${busLine.number} ${stringResource(id = busLine.title)}"
 
+    val pullToRefreshLoading = viewModel.pullToRefreshLoading
+
+    val pullToRefreshState = rememberPullToRefreshState()
+
     LaunchedEffect(Unit) {
-        viewModel.getTimetableData(busLine.websiteTitle)
+        viewModel.getLocalTimetableData(busLine.websiteTitle)
     }
 
     AppBarScreen(
         title = title,
         titleColour = MaterialTheme.colorScheme.secondary,
-        showBackButton = true,
         onBackClicked = onBackClicked,
         actions = {
-            IconButton(onClick = {
-                onFavouriteClicked(busLine)
-            }) {
+            IconButton(
+                onClick = {
+                    onFavouriteClicked(busLine)
+                }
+            ) {
                 Icon(
                     imageVector = if (favourite) {
                         Icons.Outlined.Favorite
@@ -117,15 +131,18 @@ fun TimetablesDetailScreen(
             LoadingScreen()
         } else {
             if (timetableData == null) {
+                Timber.wtf("Error screen se pojavio, loading: $loading i $timetableData")
                 ErrorScreen(title)
             } else {
                 PrimaryTabRow(
                     selectedTabIndex = currentPage,
+                    containerColor = MaterialTheme.colorScheme.background,
                     divider = {}
                 ) {
                     listOfDays.forEachIndexed { index, day ->
                         Tab(
                             selected = currentPage == index,
+                            selectedContentColor = MaterialTheme.colorScheme.secondary,
                             onClick = {
                                 scope.launch {
                                     pagerState.animateScrollToPage(index)
@@ -133,7 +150,7 @@ fun TimetablesDetailScreen(
                             },
                             text = {
                                 Text(
-                                    text = day.toString()
+                                    text = day.toStringLocalised()
                                 )
                             }
                         )
@@ -148,46 +165,67 @@ fun TimetablesDetailScreen(
                         else -> emptyList()
                     }
 
-                    Column(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(horizontal = 16.dp)
-                            .verticalScroll(rememberScrollState())
+                    PullToRefreshBox(
+                        isRefreshing = pullToRefreshLoading,
+                        state = pullToRefreshState,
+                        onRefresh = {
+                            viewModel.geRemoteTimetableData(
+                                websiteTitle = busLine.websiteTitle,
+                                pullToRefresh = true
+                            )
+                        },
+                        indicator = {
+                            PullToRefreshDefaults.LoadingIndicator(
+                                modifier = Modifier.align(Alignment.TopCenter),
+                                state = pullToRefreshState,
+                                isRefreshing = pullToRefreshLoading,
+                                color = MaterialTheme.colorScheme.secondary
+                            )
+                        }
                     ) {
-                        Text(
-                            modifier = Modifier.padding(top = 12.dp),
-                            text = timetableData.validFrom
-                        )
+                        Column(
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(horizontal = 16.dp)
+                                .verticalScroll(rememberScrollState())
+                        ) {
+                            Text(
+                                modifier = Modifier.padding(top = 12.dp),
+                                text = timetableData.validFrom
+                            )
+
+                            Spacer(modifier = Modifier.height(12.dp))
 
-                        Spacer(modifier = Modifier.height(12.dp))
-
-                        departureTimes.forEach { timetableRow ->
-                            Row(
-                                modifier = Modifier.fillMaxWidth(),
-                                horizontalArrangement = Arrangement.Center
-                            ) {
-                                timetableRow.forEach { time ->
-                                    Text(
-                                        modifier = Modifier
-                                            .background(
-                                                color = MaterialTheme.colorScheme.secondaryContainer,
-                                                shape = RoundedCornerShape(6.dp)
-                                            )
-                                            .padding(horizontal = 6.dp, vertical = 4.dp),
-                                        text = time,
-                                        color = MaterialTheme.colorScheme.secondary
-                                    )
-                                    Spacer(Modifier.width(14.dp))
+                            departureTimes.forEach { timetableRow ->
+                                Row(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.Center
+                                ) {
+                                    timetableRow.forEach { time ->
+                                        Text(
+                                            modifier = Modifier
+                                                .background(
+                                                    color = MaterialTheme.colorScheme.secondaryContainer,
+                                                    shape = RoundedCornerShape(6.dp)
+                                                )
+                                                .padding(horizontal = 6.dp, vertical = 4.dp),
+                                            text = time,
+                                            color = MaterialTheme.colorScheme.secondary
+                                        )
+                                        Spacer(Modifier.width(14.dp))
+                                    }
                                 }
+
+                                Spacer(modifier = Modifier.height(12.dp))
                             }
 
-                            Spacer(modifier = Modifier.height(12.dp))
-                        }
+                            Text(
+                                modifier = Modifier.padding(top = 12.dp),
+                                text = timetableData.notes
+                            )
 
-                        Text(
-                            modifier = Modifier.padding(top = 12.dp),
-                            text = timetableData.notes
-                        )
+                            Spacer(modifier = Modifier.height(navBarPadding))
+                        }
                     }
                 }
             }
@@ -197,6 +235,16 @@ fun TimetablesDetailScreen(
 
 
 sealed class TimetableDetailScreenDay {
+
+    @Composable
+    fun toStringLocalised(): String {
+        return when (this) {
+            is Workday -> stringResource(id = R.string.timetable_detail_work_day)
+            is Saturday -> stringResource(id = R.string.timetable_detail_saturday)
+            is Sunday -> stringResource(id = R.string.timetable_detail_sunday)
+        }
+    }
+
     data object Workday : TimetableDetailScreenDay()
     data object Saturday : TimetableDetailScreenDay()
     data object Sunday : TimetableDetailScreenDay()
diff --git a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailViewModel.kt b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailViewModel.kt
index c24d07b..7dbce28 100644
--- a/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailViewModel.kt
+++ b/app/src/main/java/com/am/stbus/presentation/screens/timetables/detail/TimetablesDetailViewModel.kt
@@ -29,34 +29,67 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.am.stbus.domain.usecases.GetTimetableDetailDataUseCase
+import com.am.stbus.data.models.timetables.TimetableDetailData
+import com.am.stbus.domain.usecases.timetables.GetLocalTimetableDetailDataUseCase
+import com.am.stbus.domain.usecases.timetables.GetRemoteTimetableDetailDataUseCase
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
 class TimetablesDetailViewModel(
-    private val getTimetableDetailDataUseCase: GetTimetableDetailDataUseCase
+    private val getLocalTimetableDetailDataUseCase: GetLocalTimetableDetailDataUseCase,
+    private val getRemoteTimetableDetailDataUseCase: GetRemoteTimetableDetailDataUseCase
 ) : ViewModel() {
 
-    var loading by mutableStateOf(true)
+    var fullScreenLoading by mutableStateOf(true)
 
-    var timetableData: GetTimetableDetailDataUseCase.TimetableDetailData? = null
+    var pullToRefreshLoading by mutableStateOf(false)
 
-    fun getTimetableData(websiteTitle: String) {
-        loading = true
+    var timetableData: TimetableDetailData? = null
+
+    fun getLocalTimetableData(websiteTitle: String) {
         viewModelScope.launch(Dispatchers.IO) {
-            val result = getTimetableDetailDataUseCase.run(websiteTitle)
+            val result = getLocalTimetableDetailDataUseCase.run(websiteTitle)
 
             result.onSuccess {
-                timetableData = it
-                loading = false
+                timetableData = it.timetableDetailData
+                fullScreenLoading = false
+                if (it.needsRefresh) {
+                    geRemoteTimetableData(
+                        websiteTitle, true
+                    )
+                }
             }.onFailure {
                 Timber.wtf("onFailure $websiteTitle $it")
                 Timber.wtf(it)
-                timetableData = null
-                loading = false
+                geRemoteTimetableData(websiteTitle, false)
             }
         }
     }
 
+    fun geRemoteTimetableData(
+        websiteTitle: String,
+        pullToRefresh: Boolean
+    ) {
+        if (pullToRefresh) {
+            pullToRefreshLoading = true
+        } else {
+            fullScreenLoading = true
+        }
+        viewModelScope.launch(Dispatchers.IO) {
+            val result = getRemoteTimetableDetailDataUseCase.run(websiteTitle)
+
+            result.onSuccess {
+                timetableData = it
+                fullScreenLoading = false
+                pullToRefreshLoading = false
+            }.onFailure {
+                Timber.wtf("onFailure $websiteTitle $it")
+                Timber.wtf(it)
+                //timetableData = null
+                fullScreenLoading = false
+                pullToRefreshLoading = false
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/theme/Color.kt b/app/src/main/java/com/am/stbus/presentation/theme/Color.kt
index 3cfc403..11c2412 100644
--- a/app/src/main/java/com/am/stbus/presentation/theme/Color.kt
+++ b/app/src/main/java/com/am/stbus/presentation/theme/Color.kt
@@ -1,32 +1,235 @@
-package com.am.breweyexplorer.presentation.theme
+package com.am.stbus.presentation.theme
 
 import androidx.compose.ui.graphics.Color
 
-val Purple80 = Color(0xFFD0BCFF)
-val PurpleGrey80 = Color(0xFFCCC2DC)
-val Pink80 = Color(0xFFEFB8C8)
-
-val Purple40 = Color(0xFF6650a4)
-val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
-
-val PastelRed = Color(0xFFFFADAD)
-val PastelOrange = Color(0xFFFFD6A5)
-val PastelYellow = Color(0xFFFDFFB6)
-val PastelGreen = Color(0xFFCAFFBF)
-val PastelBlue = Color(0xFF9BF6FF)
-val PastelMauve = Color(0xFFA0C4FF)
-val PastelPurple = Color(0xFFBDB2FF)
-val PastelPurpleBg = Color(0xFFDFD6FD)
-val PastelPink = Color(0xFFFFC6FF)
-
-val colors = listOf(
-    PastelRed,
-    PastelOrange,
-    //PastelYellow,
-    PastelGreen,
-    PastelBlue,
-    PastelMauve,
-    PastelPurple,
-    PastelPink
-)
+
+val primaryLight = Color(0xFF686013)
+val onPrimaryLight = Color(0xFFFFFFFF)
+val primaryContainerLight = Color(0xFFF0E58B)
+val onPrimaryContainerLight = Color(0xFF4F4800)
+val secondaryLight = Color(0xFF635F41)
+val onSecondaryLight = Color(0xFFFFFFFF)
+val secondaryContainerLight = Color(0xFFEAE3BD)
+val onSecondaryContainerLight = Color(0xFF4B472B)
+val tertiaryLight = Color(0xFF33618D)
+val onTertiaryLight = Color(0xFFFFFFFF)
+val tertiaryContainerLight = Color(0xFFD0E4FF)
+val onTertiaryContainerLight = Color(0xFF154974)
+val errorLight = Color(0xFFBA1A1A)
+val onErrorLight = Color(0xFFFFFFFF)
+val errorContainerLight = Color(0xFFFFDAD6)
+val onErrorContainerLight = Color(0xFF93000A)
+val backgroundLight = Color(0xFFFCF9F9)
+val onBackgroundLight = Color(0xFF1D1C14)
+val surfaceLight = Color(0xFFE8E8E8)
+val onSurfaceLight = Color(0xFF1D1C14)
+val surfaceVariantLight = Color(0xFFE8E2D0)
+val onSurfaceVariantLight = Color(0xFF49473A)
+val outlineLight = Color(0xFF7B7768)
+val outlineVariantLight = Color(0xFFCBC6B5)
+val scrimLight = Color(0xFF000000)
+val inverseSurfaceLight = Color(0xFF323127)
+val inverseOnSurfaceLight = Color(0xFFF6F0E3)
+val inversePrimaryLight = Color(0xFFD4C972)
+val surfaceDimLight = Color(0xFFDFDACC)
+val surfaceBrightLight = Color(0xFFFEF9EB)
+val surfaceContainerLowestLight = Color(0xFFFFFFFF)
+val surfaceContainerLowLight = Color(0xFFF9F3E5)
+val surfaceContainerLight = Color(0xFFF3EEE0)
+val surfaceContainerHighLight = Color(0xFFEDE8DA)
+val surfaceContainerHighestLight = Color(0xFFE7E2D5)
+
+val primaryLightMediumContrast = Color(0xFF3C3700)
+val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
+val primaryContainerLightMediumContrast = Color(0xFF776E21)
+val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val secondaryLightMediumContrast = Color(0xFF3A371C)
+val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
+val secondaryContainerLightMediumContrast = Color(0xFF726E4F)
+val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val tertiaryLightMediumContrast = Color(0xFF00385F)
+val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
+val tertiaryContainerLightMediumContrast = Color(0xFF43709D)
+val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
+val errorLightMediumContrast = Color(0xFF740006)
+val onErrorLightMediumContrast = Color(0xFFFFFFFF)
+val errorContainerLightMediumContrast = Color(0xFFCF2C27)
+val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
+val backgroundLightMediumContrast = Color(0xFFFEF9EB)
+val onBackgroundLightMediumContrast = Color(0xFF1D1C14)
+val surfaceLightMediumContrast = Color(0xFFFEF9EB)
+val onSurfaceLightMediumContrast = Color(0xFF12110A)
+val surfaceVariantLightMediumContrast = Color(0xFFE8E2D0)
+val onSurfaceVariantLightMediumContrast = Color(0xFF39362A)
+val outlineLightMediumContrast = Color(0xFF555345)
+val outlineVariantLightMediumContrast = Color(0xFF706D5E)
+val scrimLightMediumContrast = Color(0xFF000000)
+val inverseSurfaceLightMediumContrast = Color(0xFF323127)
+val inverseOnSurfaceLightMediumContrast = Color(0xFFF6F0E3)
+val inversePrimaryLightMediumContrast = Color(0xFFD4C972)
+val surfaceDimLightMediumContrast = Color(0xFFCBC6B9)
+val surfaceBrightLightMediumContrast = Color(0xFFFEF9EB)
+val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
+val surfaceContainerLowLightMediumContrast = Color(0xFFF9F3E5)
+val surfaceContainerLightMediumContrast = Color(0xFFEDE8DA)
+val surfaceContainerHighLightMediumContrast = Color(0xFFE1DDCF)
+val surfaceContainerHighestLightMediumContrast = Color(0xFFD6D1C4)
+
+val primaryLightHighContrast = Color(0xFF312D00)
+val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
+val primaryContainerLightHighContrast = Color(0xFF514A00)
+val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val secondaryLightHighContrast = Color(0xFF302D13)
+val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
+val secondaryContainerLightHighContrast = Color(0xFF4E4A2E)
+val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val tertiaryLightHighContrast = Color(0xFF002E4F)
+val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
+val tertiaryContainerLightHighContrast = Color(0xFF194C76)
+val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
+val errorLightHighContrast = Color(0xFF600004)
+val onErrorLightHighContrast = Color(0xFFFFFFFF)
+val errorContainerLightHighContrast = Color(0xFF98000A)
+val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
+val backgroundLightHighContrast = Color(0xFFFEF9EB)
+val onBackgroundLightHighContrast = Color(0xFF1D1C14)
+val surfaceLightHighContrast = Color(0xFFFEF9EB)
+val onSurfaceLightHighContrast = Color(0xFF000000)
+val surfaceVariantLightHighContrast = Color(0xFFE8E2D0)
+val onSurfaceVariantLightHighContrast = Color(0xFF000000)
+val outlineLightHighContrast = Color(0xFF2E2C20)
+val outlineVariantLightHighContrast = Color(0xFF4C493C)
+val scrimLightHighContrast = Color(0xFF000000)
+val inverseSurfaceLightHighContrast = Color(0xFF323127)
+val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
+val inversePrimaryLightHighContrast = Color(0xFFD4C972)
+val surfaceDimLightHighContrast = Color(0xFFBDB9AC)
+val surfaceBrightLightHighContrast = Color(0xFFFEF9EB)
+val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
+val surfaceContainerLowLightHighContrast = Color(0xFFF6F0E3)
+val surfaceContainerLightHighContrast = Color(0xFFE7E2D5)
+val surfaceContainerHighLightHighContrast = Color(0xFFD9D4C7)
+val surfaceContainerHighestLightHighContrast = Color(0xFFCBC6B9)
+
+val primaryDark = Color(0xFFD4C972)
+val onPrimaryDark = Color(0xFF363100)
+val primaryContainerDark = Color(0xFF4F4800)
+val onPrimaryContainerDark = Color(0xFFF0E58B)
+val secondaryDark = Color(0xFFCEC7A3)
+val onSecondaryDark = Color(0xFF343117)
+val secondaryContainerDark = Color(0xFF4B472B)
+val onSecondaryContainerDark = Color(0xFFEAE3BD)
+val tertiaryDark = Color(0xFF9ECAFC)
+val onTertiaryDark = Color(0xFF003256)
+val tertiaryContainerDark = Color(0xFF154974)
+val onTertiaryContainerDark = Color(0xFFD0E4FF)
+val errorDark = Color(0xFFFFB4AB)
+val onErrorDark = Color(0xFF690005)
+val errorContainerDark = Color(0xFF93000A)
+val onErrorContainerDark = Color(0xFFFFDAD6)
+val backgroundDark = Color(0xFF15140C)
+val onBackgroundDark = Color(0xFFE7E2D5)
+val surfaceDark = Color(0xFF15140C)
+val onSurfaceDark = Color(0xFFE7E2D5)
+val surfaceVariantDark = Color(0xFF49473A)
+val onSurfaceVariantDark = Color(0xFFCBC6B5)
+val outlineDark = Color(0xFF959181)
+val outlineVariantDark = Color(0xFF49473A)
+val scrimDark = Color(0xFF000000)
+val inverseSurfaceDark = Color(0xFFE7E2D5)
+val inverseOnSurfaceDark = Color(0xFF323127)
+val inversePrimaryDark = Color(0xFF686013)
+val surfaceDimDark = Color(0xFF15140C)
+val surfaceBrightDark = Color(0xFF3B3930)
+val surfaceContainerLowestDark = Color(0xFF0F0E07)
+val surfaceContainerLowDark = Color(0xFF1D1C14)
+val surfaceContainerDark = Color(0xFF212017)
+val surfaceContainerHighDark = Color(0xFF2C2A21)
+val surfaceContainerHighestDark = Color(0xFF37352C)
+
+val primaryDarkMediumContrast = Color(0xFFEADE85)
+val onPrimaryDarkMediumContrast = Color(0xFF2A2600)
+val primaryContainerDarkMediumContrast = Color(0xFF9C9242)
+val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
+val secondaryDarkMediumContrast = Color(0xFFE4DDB7)
+val onSecondaryDarkMediumContrast = Color(0xFF29260D)
+val secondaryContainerDarkMediumContrast = Color(0xFF979170)
+val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
+val tertiaryDarkMediumContrast = Color(0xFFC5DFFF)
+val onTertiaryDarkMediumContrast = Color(0xFF002745)
+val tertiaryContainerDarkMediumContrast = Color(0xFF6894C3)
+val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
+val errorDarkMediumContrast = Color(0xFFFFD2CC)
+val onErrorDarkMediumContrast = Color(0xFF540003)
+val errorContainerDarkMediumContrast = Color(0xFFFF5449)
+val onErrorContainerDarkMediumContrast = Color(0xFF000000)
+val backgroundDarkMediumContrast = Color(0xFF15140C)
+val onBackgroundDarkMediumContrast = Color(0xFFE7E2D5)
+val surfaceDarkMediumContrast = Color(0xFF15140C)
+val onSurfaceDarkMediumContrast = Color(0xFFFFFFFF)
+val surfaceVariantDarkMediumContrast = Color(0xFF49473A)
+val onSurfaceVariantDarkMediumContrast = Color(0xFFE2DCCA)
+val outlineDarkMediumContrast = Color(0xFFB6B2A1)
+val outlineVariantDarkMediumContrast = Color(0xFF949080)
+val scrimDarkMediumContrast = Color(0xFF000000)
+val inverseSurfaceDarkMediumContrast = Color(0xFFE7E2D5)
+val inverseOnSurfaceDarkMediumContrast = Color(0xFF2C2A21)
+val inversePrimaryDarkMediumContrast = Color(0xFF504900)
+val surfaceDimDarkMediumContrast = Color(0xFF15140C)
+val surfaceBrightDarkMediumContrast = Color(0xFF47453B)
+val surfaceContainerLowestDarkMediumContrast = Color(0xFF080703)
+val surfaceContainerLowDarkMediumContrast = Color(0xFF1F1E15)
+val surfaceContainerDarkMediumContrast = Color(0xFF2A281F)
+val surfaceContainerHighDarkMediumContrast = Color(0xFF34332A)
+val surfaceContainerHighestDarkMediumContrast = Color(0xFF403E34)
+
+val primaryDarkHighContrast = Color(0xFFFEF297)
+val onPrimaryDarkHighContrast = Color(0xFF000000)
+val primaryContainerDarkHighContrast = Color(0xFFD0C56E)
+val onPrimaryContainerDarkHighContrast = Color(0xFF0E0B00)
+val secondaryDarkHighContrast = Color(0xFFF8F1CA)
+val onSecondaryDarkHighContrast = Color(0xFF000000)
+val secondaryContainerDarkHighContrast = Color(0xFFCAC39F)
+val onSecondaryContainerDarkHighContrast = Color(0xFF0E0B00)
+val tertiaryDarkHighContrast = Color(0xFFE8F1FF)
+val onTertiaryDarkHighContrast = Color(0xFF000000)
+val tertiaryContainerDarkHighContrast = Color(0xFF9AC6F8)
+val onTertiaryContainerDarkHighContrast = Color(0xFF000C1A)
+val errorDarkHighContrast = Color(0xFFFFECE9)
+val onErrorDarkHighContrast = Color(0xFF000000)
+val errorContainerDarkHighContrast = Color(0xFFFFAEA4)
+val onErrorContainerDarkHighContrast = Color(0xFF220001)
+val backgroundDarkHighContrast = Color(0xFF15140C)
+val onBackgroundDarkHighContrast = Color(0xFFE7E2D5)
+val surfaceDarkHighContrast = Color(0xFF15140C)
+val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
+val surfaceVariantDarkHighContrast = Color(0xFF49473A)
+val onSurfaceVariantDarkHighContrast = Color(0xFFFFFFFF)
+val outlineDarkHighContrast = Color(0xFFF6F0DD)
+val outlineVariantDarkHighContrast = Color(0xFFC7C3B1)
+val scrimDarkHighContrast = Color(0xFF000000)
+val inverseSurfaceDarkHighContrast = Color(0xFFE7E2D5)
+val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
+val inversePrimaryDarkHighContrast = Color(0xFF504900)
+val surfaceDimDarkHighContrast = Color(0xFF15140C)
+val surfaceBrightDarkHighContrast = Color(0xFF525046)
+val surfaceContainerLowestDarkHighContrast = Color(0xFF000000)
+val surfaceContainerLowDarkHighContrast = Color(0xFF212017)
+val surfaceContainerDarkHighContrast = Color(0xFF323127)
+val surfaceContainerHighDarkHighContrast = Color(0xFF3D3B32)
+val surfaceContainerHighestDarkHighContrast = Color(0xFF49473D)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/com/am/stbus/presentation/theme/Theme.kt b/app/src/main/java/com/am/stbus/presentation/theme/Theme.kt
index 7f91890..e0d32ee 100644
--- a/app/src/main/java/com/am/stbus/presentation/theme/Theme.kt
+++ b/app/src/main/java/com/am/stbus/presentation/theme/Theme.kt
@@ -1,44 +1,88 @@
 package com.am.stbus.presentation.theme
 
-import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import com.am.breweyexplorer.presentation.theme.Pink40
-import com.am.breweyexplorer.presentation.theme.Pink80
-import com.am.breweyexplorer.presentation.theme.Purple40
-import com.am.breweyexplorer.presentation.theme.Purple80
-import com.am.breweyexplorer.presentation.theme.PurpleGrey40
-import com.am.breweyexplorer.presentation.theme.PurpleGrey80
-import com.am.breweyexplorer.presentation.theme.Typography
 
-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
+private val lightScheme = lightColorScheme(
+    primary = primaryLight,
+    onPrimary = onPrimaryLight,
+    primaryContainer = primaryContainerLight,
+    onPrimaryContainer = onPrimaryContainerLight,
+    secondary = secondaryLight,
+    onSecondary = onSecondaryLight,
+    secondaryContainer = secondaryContainerLight,
+    onSecondaryContainer = onSecondaryContainerLight,
+    tertiary = tertiaryLight,
+    onTertiary = onTertiaryLight,
+    tertiaryContainer = tertiaryContainerLight,
+    onTertiaryContainer = onTertiaryContainerLight,
+    error = errorLight,
+    onError = onErrorLight,
+    errorContainer = errorContainerLight,
+    onErrorContainer = onErrorContainerLight,
+    background = backgroundLight,
+    onBackground = onBackgroundLight,
+    surface = surfaceLight,
+    onSurface = onSurfaceLight,
+    surfaceVariant = surfaceVariantLight,
+    onSurfaceVariant = onSurfaceVariantLight,
+    outline = outlineLight,
+    outlineVariant = outlineVariantLight,
+    scrim = scrimLight,
+    inverseSurface = inverseSurfaceLight,
+    inverseOnSurface = inverseOnSurfaceLight,
+    inversePrimary = inversePrimaryLight,
+    surfaceDim = surfaceDimLight,
+    surfaceBright = surfaceBrightLight,
+    surfaceContainerLowest = surfaceContainerLowestLight,
+    surfaceContainerLow = surfaceContainerLowLight,
+    surfaceContainer = surfaceContainerLight,
+    surfaceContainerHigh = surfaceContainerHighLight,
+    surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
-private val DarkColorScheme = darkColorScheme(
-    primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+private val darkScheme = darkColorScheme(
+    primary = primaryDark,
+    onPrimary = onPrimaryDark,
+    primaryContainer = primaryContainerDark,
+    onPrimaryContainer = onPrimaryContainerDark,
+    secondary = secondaryDark,
+    onSecondary = onSecondaryDark,
+    secondaryContainer = secondaryContainerDark,
+    onSecondaryContainer = onSecondaryContainerDark,
+    tertiary = tertiaryDark,
+    onTertiary = onTertiaryDark,
+    tertiaryContainer = tertiaryContainerDark,
+    onTertiaryContainer = onTertiaryContainerDark,
+    error = errorDark,
+    onError = onErrorDark,
+    errorContainer = errorContainerDark,
+    onErrorContainer = onErrorContainerDark,
+    background = backgroundDark,
+    onBackground = onBackgroundDark,
+    surface = surfaceDark,
+    onSurface = onSurfaceDark,
+    surfaceVariant = surfaceVariantDark,
+    onSurfaceVariant = onSurfaceVariantDark,
+    outline = outlineDark,
+    outlineVariant = outlineVariantDark,
+    scrim = scrimDark,
+    inverseSurface = inverseSurfaceDark,
+    inverseOnSurface = inverseOnSurfaceDark,
+    inversePrimary = inversePrimaryDark,
+    surfaceDim = surfaceDimDark,
+    surfaceBright = surfaceBrightDark,
+    surfaceContainerLowest = surfaceContainerLowestDark,
+    surfaceContainerLow = surfaceContainerLowDark,
+    surfaceContainer = surfaceContainerDark,
+    surfaceContainerHigh = surfaceContainerHighDark,
+    surfaceContainerHighest = surfaceContainerHighestDark,
 )
 
+
 // Dynamic color is available on Android 12+
 
 
@@ -48,17 +92,17 @@ fun SplitBusTheme(
     content: @Composable () -> Unit
 ) {
 
-    val dynamicColor = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+    val dynamicColor = false //Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
     val colors = when {
-        dynamicColor && darkTheme -> dynamicDarkColorScheme(LocalContext.current)
-        dynamicColor && !darkTheme -> dynamicLightColorScheme(LocalContext.current)
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
+        //dynamicColor && darkTheme -> dynamicDarkColorScheme(LocalContext.current)
+        //dynamicColor && !darkTheme -> dynamicLightColorScheme(LocalContext.current)
+        darkTheme -> darkScheme
+        else -> lightScheme
     }
 
     MaterialTheme(
         colorScheme = colors,
-        typography = Typography,
+        typography = AppTypography,
         content = content
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/am/stbus/presentation/theme/Type.kt b/app/src/main/java/com/am/stbus/presentation/theme/Type.kt
index 0166bae..c8ef833 100644
--- a/app/src/main/java/com/am/stbus/presentation/theme/Type.kt
+++ b/app/src/main/java/com/am/stbus/presentation/theme/Type.kt
@@ -1,34 +1,59 @@
-package com.am.breweyexplorer.presentation.theme
+package com.am.stbus.presentation.theme
 
 import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.font.FontWeight.Companion.W600
+import androidx.compose.ui.text.googlefonts.Font
+import androidx.compose.ui.text.googlefonts.GoogleFont
+import androidx.compose.ui.text.googlefonts.GoogleFont.Provider
 import androidx.compose.ui.unit.sp
+import com.am.stbus.R
 
 // Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
+val provider = Provider(
+    providerAuthority = "com.google.android.gms.fonts",
+    providerPackage = "com.google.android.gms",
+    certificates = R.array.com_google_android_gms_fonts_certs
+)
+val displayFontFamily = FontFamily(
+    Font(
+        googleFont = GoogleFont("Merriweather"),
+        fontProvider = provider,
     )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
+)
+
+// Default Material 3 typography values
+val baseline = Typography()
+
+val AppTypography = Typography(
+    displayLarge = baseline.displayLarge.copy(fontFamily = displayFontFamily),
+    displayMedium = baseline.displayMedium.copy(fontFamily = displayFontFamily),
+    displaySmall = baseline.displaySmall.copy(fontFamily = displayFontFamily),
+
+    headlineLarge = baseline.headlineLarge.copy(fontFamily = displayFontFamily),
+    headlineMedium = baseline.headlineMedium.copy(fontFamily = displayFontFamily),
+    headlineSmall = baseline.headlineSmall.copy(fontFamily = displayFontFamily),
+
+    titleLarge = baseline.titleLarge.copy(
+        fontFamily = displayFontFamily,
+        fontWeight = W600
     ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)
\ No newline at end of file
+    titleMedium = baseline.titleMedium.copy(
+        fontFamily = displayFontFamily,
+        fontWeight = W600
+    ),
+    titleSmall = baseline.titleSmall.copy(
+        fontFamily = displayFontFamily,
+        fontWeight = W600,
+        fontSize = 14.sp
+    ),
+
+    // Body & labels use system default (Roboto on most Android devices)
+    bodyLarge = baseline.bodyLarge.copy(fontFamily = FontFamily.Default),
+    bodyMedium = baseline.bodyMedium.copy(fontFamily = FontFamily.Default),
+    bodySmall = baseline.bodySmall.copy(fontFamily = FontFamily.Default),
+
+    labelLarge = baseline.labelLarge.copy(fontFamily = FontFamily.Default),
+    labelMedium = baseline.labelMedium.copy(fontFamily = FontFamily.Default),
+    labelSmall = baseline.labelSmall.copy(fontFamily = FontFamily.Default),
+)
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 0ae43ca..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2013 - 2021 Antonio Marin
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..00b06be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,72 @@
+<!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2013 - 2026 Antonio Marin
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="105.04"
+    android:viewportHeight="105.04">
+    <group
+        android:scaleX="0.61"
+        android:scaleY="0.61"
+        android:translateX="20.4828"
+        android:translateY="20.4828">
+        <path
+            android:fillColor="#000000"
+            android:pathData="M27.49,79.78L34.96,79.78A1.04,1.04 0,0 1,36 80.82L36,91.18A1.04,1.04 0,0 1,34.96 92.22L27.49,92.22A1.04,1.04 0,0 1,26.46 91.18L26.46,80.82A1.04,1.04 0,0 1,27.49 79.78z"
+            android:strokeWidth="0.264583" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M70.04,79.78L77.51,79.78A1.04,1.04 0,0 1,78.54 80.82L78.54,91.18A1.04,1.04 0,0 1,77.51 92.22L70.04,92.22A1.04,1.04 0,0 1,69 91.18L69,80.82A1.04,1.04 0,0 1,70.04 79.78z"
+            android:strokeWidth="0.264583" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M27.93,14.06C23.39,14.06 19.73,18 19.73,22.89L19.73,77.11C19.73,82 23.39,85.94 27.93,85.94L77.11,85.94C81.65,85.94 85.31,82 85.31,77.11L85.31,22.89C85.31,18 81.65,14.06 77.11,14.06L27.93,14.06zM32.94,17.34L73.8,17.34C74.18,17.34 74.48,17.66 74.48,18.07L74.48,23.25C74.48,23.65 74.18,23.98 73.8,23.98L32.94,23.98C32.57,23.98 32.26,23.65 32.26,23.25L32.26,18.07C32.26,17.66 32.57,17.34 32.94,17.34zM24.58,27.78L80.46,27.78C81.01,27.78 81.45,28.26 81.45,28.84L81.45,61.44C81.45,62.03 81.01,62.51 80.46,62.51L24.58,62.51C24.03,62.51 23.59,62.03 23.59,61.44L23.59,28.84C23.59,28.26 24.03,27.78 24.58,27.78zM32,67A6,6 0,0 1,38 73A6,6 0,0 1,32 79A6,6 0,0 1,26 73A6,6 0,0 1,32 67zM73,67A6,6 0,0 1,79 73A6,6 0,0 1,73 79A6,6 0,0 1,67 73A6,6 0,0 1,73 67z"
+            android:strokeWidth="0.263761" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M89,20.49L91,20.49A2,2 0,0 1,93 22.49L93,39.51A2,2 0,0 1,91 41.51L89,41.51A2,2 0,0 1,87 39.51L87,22.49A2,2 0,0 1,89 20.49z"
+            android:strokeWidth="0.221227" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M84.92,44L90.35,44A0.31,0.31 0,0 1,90.66 44.31L90.66,44.69A0.31,0.31 0,0 1,90.35 45L84.92,45A0.31,0.31 0,0 1,84.61 44.69L84.61,44.31A0.31,0.31 0,0 1,84.92 44z"
+            android:strokeWidth="0.230321" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M89.65,39L90.35,39A0.31,0.31 0,0 1,90.66 39.31L90.66,44.69A0.31,0.31 0,0 1,90.35 45L89.65,45A0.31,0.31 0,0 1,89.34 44.69L89.34,39.31A0.31,0.31 0,0 1,89.65 39z"
+            android:strokeWidth="0.264583" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M16.21,20.49L14.21,20.49A2,2 0,0 0,12.21 22.49L12.21,39.51A2,2 0,0 0,14.21 41.51L16.21,41.51A2,2 0,0 0,18.21 39.51L18.21,22.49A2,2 0,0 0,16.21 20.49z"
+            android:strokeWidth="0.221227" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M20.29,44L14.86,44A0.31,0.31 0,0 0,14.55 44.31L14.55,44.69A0.31,0.31 0,0 0,14.86 45L20.29,45A0.31,0.31 0,0 0,20.6 44.69L20.6,44.31A0.31,0.31 0,0 0,20.29 44z"
+            android:strokeWidth="0.230321" />
+        <path
+            android:fillColor="#000000"
+            android:pathData="M15.57,39L14.86,39A0.31,0.31 0,0 0,14.55 39.31L14.55,44.69A0.31,0.31 0,0 0,14.86 45L15.57,45A0.31,0.31 0,0 0,15.87 44.69L15.87,39.31A0.31,0.31 0,0 0,15.57 39z"
+            android:strokeWidth="0.264583" />
+    </group>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 0066bd1..954756a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2013 - 2021 Antonio Marin
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 0066bd1..954756a 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,29 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2013 - 2021 Antonio Marin
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 8a144ee..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000..2190c39
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 5dd8e44..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..e14b877
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index b3cd7a5..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000..030e6ea
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 6b62772..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..db7d8fa
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index f54a112..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000..bca5c5b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 0256a1a..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..cba20e9
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 78c2aed..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..6971b9e
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 08034b2..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..23edf2a
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 16dfc9c..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000..d2603e0
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index cc4775d..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 0000000..533b9cb
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..0d388ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2013 - 2026 Antonio Marin
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  -->
+
+<resources>
+    <array name="com_google_android_gms_fonts_certs">
+        <item>@array/com_google_android_gms_fonts_certs_dev</item>
+        <item>@array/com_google_android_gms_fonts_certs_prod</item>
+    </array>
+    <string-array name="com_google_android_gms_fonts_certs_dev">
+        <item>
+            MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+        </item>
+    </string-array>
+    <string-array name="com_google_android_gms_fonts_certs_prod">
+        <item>
+            MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+        </item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index e798b8e..da3d16d 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,28 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ MIT License
-  ~
-  ~ Copyright (c) 2013 - 2021 Antonio Marin
-  ~
-  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
-  ~ of this software and associated documentation files (the "Software"), to deal
-  ~ in the Software without restriction, including without limitation the rights
-  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  ~ copies of the Software, and to permit persons to whom the Software is
-  ~ furnished to do so, subject to the following conditions:
-  ~
-  ~ The above copyright notice and this permission notice shall be included in all
-  ~ copies or substantial portions of the Software.
-  ~
-  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  ~ SOFTWARE.
-  -->
-
 <resources>
     <color name="ic_launcher_background">#FFEE58</color>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 74aa0af..898cf71 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,4 +6,5 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.crashlytics) apply false
+    alias(libs.plugins.google.maps.secrets) apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6f286f1..98eb6d9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,9 +1,11 @@
 [versions]
 agp = "8.13.0"
+gson = "2.13.2"
 kotlin = "2.2.20"
 ksp = "2.2.20-2.0.4"
 googleServices = "4.4.4"
 crashlytics = "3.0.6"
+secrets = "2.0.1"
 
 coreKtx = "1.17.0"
 junit = "4.13.2"
@@ -29,6 +31,9 @@ room = "2.8.3"
 
 firebaseBom = "34.6.0"
 
+composeMaps = "6.12.0"
+microsoftSignal = "10.0.0"
+
 koinBom = "4.1.1"
 retrofit = "3.0.0"
 navigationFragmentKtx = "2.9.4"
@@ -38,6 +43,7 @@ jsoup = "1.21.2"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
@@ -45,12 +51,14 @@ androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecyc
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { group = "androidx.compose", name = "compose-bom-alpha", version.ref = "composeBom" }
 androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts" }
 androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 
+
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 
@@ -83,6 +91,9 @@ firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.r
 firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
 firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
 
+maps-compose = { group = "com.google.maps.android", name = "maps-compose", version.ref = "composeMaps" }
+microsoft-signal = { group = "com.microsoft.signalr", name = "signalr", version.ref = "microsoftSignal" }
+
 koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koinBom" }
 koin-android = { module = "io.insert-koin:koin-android" }
 koin-compose = { module = "io.insert-koin:koin-androidx-compose" }
@@ -107,4 +118,4 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinSerialization"}
 google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "crashlytics" }
-
+google-maps-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 6d31a2f..c9a9a6e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,6 +11,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 }
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {