diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies
index 4f9a79d..4060fc1 100644
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"geolocator","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.6/","dependencies":[]},{"name":"shared_preferences","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"geolocator","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.6/","dependencies":[]},{"name":"shared_preferences","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.1+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"geolocator","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2020-11-29 12:54:29.441319","version":"1.22.0"}
\ No newline at end of file
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"geolocator","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.6/","dependencies":[]},{"name":"shared_preferences","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"android":[{"name":"geolocator","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator-6.1.6/","dependencies":[]},{"name":"shared_preferences","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.12+4/","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-0.0.1+11/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-0.0.2+4/","dependencies":["path_provider_linux"]}],"windows":[{"name":"path_provider_windows","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/","dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-0.0.1+3/","dependencies":["path_provider_windows"]}],"web":[{"name":"shared_preferences_web","path":"/Users/kekland/sdk/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-0.1.2+7/","dependencies":[]}]},"dependencyGraph":[{"name":"geolocator","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2021-03-04 10:23:20.355440","version":"2.0.0"}
\ No newline at end of file
diff --git a/android/app/src/main/kotlin/com/kekland/almetro_app/MainActivity.kt b/android/app/src/main/kotlin/com/kekland/almetro_app/MainActivity.kt
new file mode 100644
index 0000000..e749de2
--- /dev/null
+++ b/android/app/src/main/kotlin/com/kekland/almetro_app/MainActivity.kt
@@ -0,0 +1,6 @@
+package com.kekland.almetro_app
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
new file mode 100644
index 0000000..449a9f9
--- /dev/null
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/assets/icon-raster.png b/assets/icon-raster.png
new file mode 100644
index 0000000..3c0b8f5
Binary files /dev/null and b/assets/icon-raster.png differ
diff --git a/assets/l10n/de.json b/assets/l10n/de.json
new file mode 100644
index 0000000..5e13f5d
--- /dev/null
+++ b/assets/l10n/de.json
@@ -0,0 +1,30 @@
+{
+  "featureDiscoveryGpsDescription": "Tippen Sie, um mit GPS die nächstliegende Station zu finden",
+  "featureDiscoveryGpsTitle": "Nächstliegende Station",
+  "featureDiscoveryStationInfoDescription": "Hier können Sie die Zeit sehen, bevor die nächste Bahn ankommt",
+  "featureDiscoveryStationInfoTitle": "Bahnfahrplan",
+  "featureDiscoveryStationPickerDescription": "Tippen Sie, um alle Stationen anzuzeigen",
+  "featureDiscoveryStationPickerTitle": "Wählen Sie eine Station",
+  "labelAppVersion": "Almetro Version",
+  "labelAutoupdate": "Automatisch aktualisieren",
+  "labelChangeBrightness": "Thema wechseln",
+  "labelChangeSettings": "Sie können den Fahrplan in Einstellungen wechseln",
+  "labelDateTimeIn": "in",
+  "labelDateTimeNow": "jetzt",
+  "labelLastCacheRefresh": "Wurde aktualisiert",
+  "labelLoadingError": "Ein Fehler ist aufgetreten",
+  "labelLoadingErrorTooltip": "Wenn Sie die App zum ersten Mal benutzen, prüfen Sie bitte Ihre Internetverbindung über",
+  "labelRefreshCache": "Cache aktualisieren",
+  "labelShortHour": "St.",
+  "labelShortMinute": "Min.",
+  "labelShortSecond": "Sek.",
+  "labelShowHolidaySchedule": "Wochenendefahrplan anzeigen",
+  "labelShowingHolidaySchedule": "Wochenendefahrplan wird angezeigt",
+  "labelStation": "Station",
+  "labelToday": "Heute",
+  "labelToStation": "Zu Station",
+  "labelTryAgain": "Versuchen Sie nochmal",
+  "snackbarCacheRefreshResultFailure": "Fehler beim Aktualisieren des Fahrplans",
+  "snackbarCacheRefreshResultSuccess": "Der Fahrplan wurde erfolgreich aktualisiert",
+  "snackbarGpsResultSuccess": "Die nächstliegende Station wird gewählt"
+}
\ No newline at end of file
diff --git a/lib/api/api.dart b/lib/api/api.dart
index ed9d5a3..a41c1f9 100644
--- a/lib/api/api.dart
+++ b/lib/api/api.dart
@@ -24,6 +24,102 @@ abstract class Api {
 }
 
 class AlmetroApi implements Api {
+  @override
+  Future<Map<String, dynamic>> downloadSubwayData() async {
+    final response = await http.get('http://209.182.216.197:5134/data/');
+    return jsonDecode(response.body);
+  }
+
+  Time _parseTime(String line) {
+    final data = line.split(':');
+    return Time(
+      hour: int.parse(data[0]),
+      minute: int.parse(data[1]),
+      second: int.parse(data[2]),
+    );
+  }
+
+  SubwayData _getSubwayDataFromResponse(
+    Map<String, dynamic> response,
+    ScheduleType type,
+  ) {
+    final scheduleData = response['schedules']
+        [type == ScheduleType.normal ? 'normal' : 'holiday'];
+
+    final stations = response['stations']
+        .map(
+          (v) => SubwayStation(
+            id: int.parse(v['id']),
+            order: v['order'],
+            latitude: v['position']['latitude'],
+            longitude: v['position']['longitude'],
+            name: SubwayStationName(
+              en: v['name']['name_en'],
+              ru: v['name']['name_ru'],
+              kk: v['name']['name_kz'],
+            ),
+            connections: {},
+            schedule: {},
+          ),
+        )
+        .cast<SubwayStation>()
+        .toList();
+
+    for (final station in stations) {
+      for (final connection in scheduleData[station.id.toString()]) {
+        if (connection['to'].isEmpty) continue;
+
+        final to = int.parse(connection['to']);
+        final schedule = (connection['schedule'])
+            .cast<String>()
+            .map(_parseTime)
+            .cast<Time>()
+            .toList();
+        station.populateSchedule(stationId: to, schedule: schedule);
+      }
+    }
+
+    final line = SubwayLine(
+      id: 0,
+      stations: stations,
+      segments: [],
+    );
+
+    line.stations.sort((a, b) => b.order - a.order);
+
+    return SubwayData(
+      lines: [line],
+      lineConnections: {},
+    );
+  }
+
+  @override
+  Subway getSubwayFromResponse(Map<String, dynamic> response) {
+    return Subway(
+      holidays: response['holidays']
+          .map(
+            (holiday) => Tuple2(
+              DateTime.parse(holiday['date']),
+              holiday['name'] as String,
+            ),
+          )
+          .cast<Tuple2<DateTime, String>>()
+          .toList(),
+      schedules: {
+        ScheduleType.normal: _getSubwayDataFromResponse(
+          response,
+          ScheduleType.normal,
+        ),
+        ScheduleType.holiday: _getSubwayDataFromResponse(
+          response,
+          ScheduleType.holiday,
+        ),
+      },
+    );
+  }
+}
+
+class MetroWithArtsApi implements Api {
   Future<Map<String, dynamic>> downloadSubwayData() async {
     final response = await http.get(
       'http://metro.witharts.kz/metro/api/0/all',
diff --git a/lib/api/model/station.dart b/lib/api/model/station.dart
index ea35449..28e5ab5 100644
--- a/lib/api/model/station.dart
+++ b/lib/api/model/station.dart
@@ -28,6 +28,8 @@ class SubwayStationName {
         return kk;
       case 'en':
         return en;
+      case 'de':
+        return en;
       default:
         return resolveFromLocale(fallbackLocale);
     }
diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart
new file mode 100644
index 0000000..d045f9a
--- /dev/null
+++ b/lib/generated_plugin_registrant.dart
@@ -0,0 +1,15 @@
+//
+// Generated file. Do not edit.
+//
+
+// ignore_for_file: lines_longer_than_80_chars
+
+import 'package:shared_preferences_web/shared_preferences_web.dart';
+
+import 'package:flutter_web_plugins/flutter_web_plugins.dart';
+
+// ignore: public_member_api_docs
+void registerPlugins(Registrar registrar) {
+  SharedPreferencesPlugin.registerWith(registrar);
+  registrar.registerMessageHandler();
+}
diff --git a/lib/home_page.dart b/lib/home_page.dart
index 99f886a..444fba4 100644
--- a/lib/home_page.dart
+++ b/lib/home_page.dart
@@ -1,6 +1,7 @@
 import 'package:almaty_metro/api/api.dart';
 import 'package:almaty_metro/l10n/localization.dart';
 import 'package:almaty_metro/utils/snackbar.dart';
+import 'package:almaty_metro/widgets/app_logo.dart';
 import 'package:almaty_metro/widgets/feature_discovery/feature.dart';
 import 'package:almaty_metro/widgets/feature_discovery/feature_discovery_manager.dart';
 import 'package:almaty_metro/widgets/holiday_card.dart';
@@ -11,7 +12,6 @@ import 'package:almaty_metro/widgets/station_info.dart';
 import 'package:almaty_metro/widgets/station_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
 
 class HomePage extends StatefulWidget {
@@ -66,8 +66,7 @@ class _HomePageBody extends StatelessWidget {
             alignment: Alignment.center,
             child: Hero(
               tag: 'app_logo',
-              child: SvgPicture.asset(
-                'assets/icon.svg',
+              child: AppLogo(
                 height: 24.0,
               ),
             ),
diff --git a/lib/l10n/delegate.dart b/lib/l10n/delegate.dart
index 77f9461..8210717 100644
--- a/lib/l10n/delegate.dart
+++ b/lib/l10n/delegate.dart
@@ -10,6 +10,7 @@ class AlmetroLocalizationsDelegate
     Locale('ru'),
     Locale('en'),
     Locale('kk'),
+    Locale('de'),
   ];
 
   @override
diff --git a/lib/loading_page.dart b/lib/loading_page.dart
index 9d2b6d3..73e9c6e 100644
--- a/lib/loading_page.dart
+++ b/lib/loading_page.dart
@@ -1,9 +1,9 @@
 import 'package:almaty_metro/home_page.dart';
 import 'package:almaty_metro/l10n/localization.dart';
 import 'package:almaty_metro/model/app_model.dart';
+import 'package:almaty_metro/widgets/app_logo.dart';
 import 'package:almaty_metro/widgets/transitions/circular_reveal_page_route.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';
 
 class LoadingPage extends StatefulWidget {
@@ -61,8 +61,7 @@ class _LoadingPageState extends State<LoadingPage> {
             ),
             Hero(
               tag: 'app_logo',
-              child: SvgPicture.asset(
-                'assets/icon.svg',
+              child: AppLogo(
                 height: 80.0,
               ),
             ),
diff --git a/lib/main.dart b/lib/main.dart
index 38d4d25..b36082b 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -47,6 +47,7 @@ class MyApp extends StatelessWidget {
             if (list.contains(locale)) return locale;
             return Locale('ru');
           },
+          locale: Locale('ru'),
           theme: ThemeData(
             primaryColor: accentRed,
             accentColor: accentRed,
diff --git a/lib/model/app_model.dart b/lib/model/app_model.dart
index 2ebe140..15d15e0 100644
--- a/lib/model/app_model.dart
+++ b/lib/model/app_model.dart
@@ -78,6 +78,7 @@ class AppModel extends ChangeNotifier {
 
   Future<void> loadFromCache([bool notify = true]) async {
     final cache = settings.cachedData;
+    
     if (cache == null) {
       return;
     }
diff --git a/lib/widgets/app_logo.dart b/lib/widgets/app_logo.dart
new file mode 100644
index 0000000..a9bb265
--- /dev/null
+++ b/lib/widgets/app_logo.dart
@@ -0,0 +1,17 @@
+import 'package:flutter/widgets.dart';
+
+class AppLogo extends StatelessWidget {
+  final double height;
+
+  const AppLogo({
+    Key key,
+    @required this.height,
+  }) : super(key: key);
+  @override
+  Widget build(BuildContext context) {
+    return Image.asset(
+      'assets/icon-raster.png',
+      height: 24.0,
+    );
+  }
+}
diff --git a/pubspec.lock b/pubspec.lock
index 84652f3..bedc23b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -35,28 +35,28 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.5.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.3"
+    version: "1.1.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   circular_reveal_animation:
     dependency: "direct main"
     description:
@@ -77,14 +77,14 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.15.0"
   convert:
     dependency: transitive
     description:
@@ -126,7 +126,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   feature_discovery:
     dependency: "direct main"
     description:
@@ -147,7 +147,7 @@ packages:
       name: file
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.1"
+    version: "6.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -179,13 +179,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
-  flutter_svg:
-    dependency: "direct main"
-    description:
-      name: flutter_svg
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.19.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -265,7 +258,7 @@ packages:
       name: intl
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.16.1"
+    version: "0.17.0"
   io:
     dependency: transitive
     description:
@@ -279,7 +272,7 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3-nullsafety.2"
+    version: "0.6.3"
   logging:
     dependency: transitive
     description:
@@ -293,14 +286,14 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.10"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   mime:
     dependency: transitive
     description:
@@ -349,21 +342,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.1"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.4.1+1"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.4"
+    version: "1.8.0"
   path_provider_linux:
     dependency: transitive
     description:
@@ -391,7 +370,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.11.0"
   petitparser:
     dependency: transitive
     description:
@@ -405,7 +384,7 @@ packages:
       name: platform
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.1"
+    version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -419,14 +398,14 @@ packages:
       name: pool
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.0-nullsafety.2"
+    version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.13"
+    version: "4.1.0"
   provider:
     dependency: "direct main"
     description:
@@ -529,42 +508,42 @@ packages:
       name: source_map_stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.10-nullsafety.2"
+    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.8.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.0"
   swipedetector:
     dependency: "direct main"
     description:
@@ -578,28 +557,28 @@ packages:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.0"
   test:
     dependency: "direct dev"
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.0-nullsafety.5"
+    version: "1.16.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19-nullsafety.2"
+    version: "0.2.19"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.12-nullsafety.5"
+    version: "0.3.15"
   tuple:
     dependency: "direct main"
     description:
@@ -613,14 +592,14 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.0"
   vm_service:
     dependency: transitive
     description:
@@ -678,5 +657,5 @@ packages:
     source: hosted
     version: "2.1.15"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.18.0-6.0.pre <2.0.0"
+  dart: ">=2.12.0-0.0 <3.0.0"
+  flutter: ">=1.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index aff83db..5862b8d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -28,7 +28,6 @@ dependencies:
   http:
   provider:
   shared_preferences:
-  flutter_svg: ^0.19.1
   circular_reveal_animation:
   feature_discovery:
   geolocator:
@@ -66,6 +65,7 @@ flutter:
 
   assets:
     - assets/icon.svg
+    - assets/icon-raster.png
     - assets/l10n/
 
   # To add assets to your application, add an assets section, like this:
diff --git a/web/favicon.png b/web/favicon.png
new file mode 100644
index 0000000..8aaa46a
Binary files /dev/null and b/web/favicon.png differ
diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png
new file mode 100644
index 0000000..b749bfe
Binary files /dev/null and b/web/icons/Icon-192.png differ
diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png
new file mode 100644
index 0000000..88cfd48
Binary files /dev/null and b/web/icons/Icon-512.png differ
diff --git a/web/index.html b/web/index.html
new file mode 100644
index 0000000..d3994d8
--- /dev/null
+++ b/web/index.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    Fore more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+  -->
+  <base href="/">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="almetro_app">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>almetro_app</title>
+  <link rel="manifest" href="manifest.json">
+</head>
+<body>
+  <!-- This script installs service_worker.js to provide PWA functionality to
+       application. For more information, see:
+       https://developers.google.com/web/fundamentals/primers/service-workers -->
+  <script>
+    if ('serviceWorker' in navigator) {
+      window.addEventListener('flutter-first-frame', function () {
+        navigator.serviceWorker.register('flutter_service_worker.js');
+      });
+    }
+  </script>
+  <script src="main.dart.js" type="application/javascript"></script>
+</body>
+</html>
diff --git a/web/manifest.json b/web/manifest.json
new file mode 100644
index 0000000..9576467
--- /dev/null
+++ b/web/manifest.json
@@ -0,0 +1,23 @@
+{
+    "name": "almetro_app",
+    "short_name": "almetro_app",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}