diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index e1ca574ef..7bb2df6ba 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 536165d35..b9e43bd37 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
 }
 
 include ":app"
diff --git a/lib/app/app_model.dart b/lib/app/app_model.dart
index 9f8856b1b..58988c9a5 100644
--- a/lib/app/app_model.dart
+++ b/lib/app/app_model.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:github/github.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../constants.dart';
@@ -8,7 +9,7 @@ import '../settings/settings_service.dart';
 
 class AppModel extends SafeChangeNotifier {
   AppModel({
-    required String appVersion,
+    required PackageInfo packageInfo,
     required SettingsService settingsService,
     required GitHub gitHub,
     required bool allowManualUpdates,
@@ -19,7 +20,7 @@ class AppModel extends SafeChangeNotifier {
         _gitHub = gitHub,
         _allowManualUpdates = allowManualUpdates,
         _settingsService = settingsService,
-        _version = appVersion,
+        _packageInfo = packageInfo,
         _exposeService = exposeService;
 
   final ExposeService _exposeService;
@@ -64,14 +65,14 @@ class AppModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
-  final String _version;
-  String? get version => _version;
+  final PackageInfo _packageInfo;
+  String get version => _packageInfo.version;
 
   Future<void> disposePatchNotes() async =>
-      _settingsService.disposePatchNotes(_version);
+      _settingsService.disposePatchNotes(version);
 
   bool recentPatchNotesDisposed() =>
-      _settingsService.recentPatchNotesDisposed(_version);
+      _settingsService.recentPatchNotesDisposed(version);
   bool? _updateAvailable;
   bool? get updateAvailable => _updateAvailable;
   String? _onlineVersion;
diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
index 2eb912e69..2a44be3ed 100644
--- a/lib/app/view/master_detail_page.dart
+++ b/lib/app/view/master_detail_page.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
+import '../../app_config.dart';
 import '../../common/data/audio.dart';
 import '../../common/view/back_gesture.dart';
 import '../../common/view/global_keys.dart';
@@ -91,7 +92,8 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
 
                 return PageRouteBuilder(
                   settings: settings,
-                  pageBuilder: (_, __, ___) => BackGesture(child: page),
+                  pageBuilder: (_, __, ___) =>
+                      useCustomBackGestures ? page : BackGesture(child: page),
                   transitionsBuilder: (_, a, __, c) =>
                       FadeTransition(opacity: a, child: c),
                 );
diff --git a/lib/app_config.dart b/lib/app_config.dart
index 685185b4c..02c3a98f7 100644
--- a/lib/app_config.dart
+++ b/lib/app_config.dart
@@ -15,3 +15,8 @@ bool get appleStyled => Platform.isMacOS || Platform.isIOS;
 
 // TODO(#1022): fix linux video fullscreen
 bool get allowVideoFullScreen => !Platform.isLinux;
+
+bool get isGtkApp => Platform.isLinux;
+
+bool get useCustomBackGestures =>
+    Platform.isAndroid || Platform.isIOS || Platform.isFuchsia;
diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 3729ddd67..1e52b7b2f 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
+import '../app_config.dart';
 import '../common/data/audio.dart';
 import '../common/logging.dart';
 import '../common/view/back_gesture.dart';
@@ -203,7 +204,9 @@ class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
       await _masterNavigatorKey.currentState?.pushNamed(pageId);
     } else if (builder != null) {
       final materialPageRoute = MaterialPageRoute(
-        builder: (context) => BackGesture(child: builder(context)),
+        builder: (context) => useCustomBackGestures
+            ? builder(context)
+            : BackGesture(child: builder(context)),
         maintainState: maintainState,
         settings: RouteSettings(
           name: pageId,
diff --git a/lib/main.dart b/lib/main.dart
index b1e0f02ac..a92d5930a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,10 +1,6 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:gtk/gtk.dart';
 import 'package:media_kit/media_kit.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:system_theme/system_theme.dart';
 import 'package:window_manager/window_manager.dart';
 import 'package:yaru/yaru.dart';
@@ -24,24 +20,21 @@ Future<void> main(List<String> args) async {
     WindowManager.instance
       ..setMinimumSize(const Size(500, 700))
       ..setSize(const Size(950, 820));
-    if (!Platform.isLinux) {
-      SystemTheme.fallbackColor = kMusicPodFallBackColor;
-      await SystemTheme.accentColor.load();
-    }
+  }
+  if (!yaruStyled) {
+    SystemTheme.fallbackColor = kMusicPodFallBackColor;
+    await SystemTheme.accentColor.load();
   }
 
   MediaKit.ensureInitialized();
 
-  await registerServicesAndViewModels(
+  await registerDependencies(
     args: args,
-    sharedPreferences: await SharedPreferences.getInstance(),
-    version: (await PackageInfo.fromPlatform()).version,
-    allowDiscordRPC: allowDiscordRPC,
     downloadsDefaultDir: await getDownloadsDefaultDir(),
   );
 
   runApp(
-    Platform.isLinux
+    isGtkApp
         ? const GtkApplication(child: YaruMusicPodApp())
         : const MaterialMusicPodApp(),
   );
diff --git a/lib/player/player_model.dart b/lib/player/player_model.dart
index eb0894870..37561d2f5 100644
--- a/lib/player/player_model.dart
+++ b/lib/player/player_model.dart
@@ -150,7 +150,7 @@ class PlayerModel extends SafeChangeNotifier {
         .replaceAll(')', '');
   }
 
-  void setTimer(Duration duration) => _playerService.setTimer(duration);
+  void setTimer(Duration duration) => _playerService.setPauseTimer(duration);
 
   @override
   Future<void> dispose() async {
diff --git a/lib/player/player_service.dart b/lib/player/player_service.dart
index 2a39fb626..4540ae747 100644
--- a/lib/player/player_service.dart
+++ b/lib/player/player_service.dart
@@ -20,6 +20,7 @@ import '../extensions/string_x.dart';
 import '../local_audio/local_cover_service.dart';
 import '../persistence_utils.dart';
 import '../radio/online_art_service.dart';
+import 'player_service_audio_handler.dart';
 
 typedef Queue = ({String name, List<Audio> audios});
 
@@ -34,15 +35,21 @@ class PlayerService {
         _exposeService = exposeService,
         _localCoverService = localCoverService;
 
+  // External dependencies
   final OnlineArtService _onlineArtService;
   final ExposeService _exposeService;
   final LocalCoverService _localCoverService;
   final VideoController _controller;
+
+  // MediaKit getters
   VideoController get controller => _controller;
+  Player get _player => _controller.player;
 
+  // Native media trays
   SMTCWindows? _smtc;
-  _AudioHandler? _audioService;
+  PlayerServiceAudioHandler? _audioHandler;
 
+  // Helper stream subscriptions
   StreamSubscription<PressedButton>? _smtcSub;
   StreamSubscription<bool>? _isPlayingSub;
   StreamSubscription<Duration>? _durationSub;
@@ -53,11 +60,84 @@ class PlayerService {
   StreamSubscription<Tracks>? _tracksSub;
   StreamSubscription<double>? _rateSub;
 
-  Player get _player => _controller.player;
-
+  // Used to notify whoever is listening
   final _propertiesChangedController = StreamController<bool>.broadcast();
   Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
 
+  /// All stream subscriptions and the initial [PlayerState] are set here
+  Future<void> init() async {
+    await _initMediaControl();
+
+    _isPlayingSub ??= _player.stream.playing.listen((value) {
+      setIsPlaying(value);
+    });
+
+    _durationSub ??= _player.stream.duration.listen((newDuration) {
+      if (newDuration.inSeconds != 0) {
+        setDuration(newDuration);
+      }
+    });
+
+    _positionSub ??= _player.stream.position.listen((newPosition) {
+      setPosition(newPosition);
+    });
+
+    _bufferSub ??= _player.stream.buffer.listen((event) {
+      setBuffer(event);
+    });
+
+    _isCompletedSub ??= _player.stream.completed.listen((value) async {
+      if (value) {
+        await playNext();
+      }
+    });
+
+    await (_player.platform as NativePlayer).observeProperty(
+      'metadata',
+      _onMpvMetadata,
+    );
+
+    _volumeSub ??= _player.stream.volume.listen((value) {
+      _volume = value;
+      _propertiesChangedController.add(true);
+    });
+
+    _rateSub ??= _player.stream.rate.listen((value) {
+      _rate = value;
+      _propertiesChangedController.add(true);
+    });
+
+    _tracksSub ??= _player.stream.tracks.listen((tracks) {
+      _setIsVideo(false);
+      for (var track in tracks.video) {
+        if (track.fps != null && track.fps! > 1) {
+          _setIsVideo(true);
+          break;
+        }
+      }
+    });
+
+    await _setPlayerState();
+  }
+
+  /// All subscriptions, native media trays and the pause timer need to be closed and disposed
+  Future<void> dispose() async {
+    await _propertiesChangedController.close();
+    await _smtcSub?.cancel();
+    await _smtc?.disableSmtc();
+    await _smtc?.dispose();
+    await _isPlayingSub?.cancel();
+    await _positionSub?.cancel();
+    await _durationSub?.cancel();
+    await _isCompletedSub?.cancel();
+    await _volumeSub?.cancel();
+    await _tracksSub?.cancel();
+    await _rateSub?.cancel();
+    await _bufferSub?.cancel();
+    _timer?.cancel();
+    await _player.dispose();
+  }
+
   Queue _queue = (name: '', audios: []);
   Queue get queue => _queue;
   void setQueue(Queue value) {
@@ -66,35 +146,6 @@ class PlayerService {
     _propertiesChangedController.add(true);
   }
 
-  MpvMetaData? _mpvMetaData;
-  MpvMetaData? get mpvMetaData => _mpvMetaData;
-  Future<void> _setMpvMetaData(MpvMetaData? value) async {
-    _mpvMetaData = value;
-
-    var validHistoryElement = _mpvMetaData?.icyTitle.isNotEmpty == true;
-
-    if (validHistoryElement &&
-        _mpvMetaData?.icyDescription.isNotEmpty == true &&
-        (_mpvMetaData!.icyTitle.contains(_mpvMetaData!.icyDescription) ||
-            _mpvMetaData!.icyTitle.contains(
-              _mpvMetaData!.icyDescription
-                  .replaceAll(RegExp(r'[^a-zA-Z0-9]'), ''),
-            ))) {
-      validHistoryElement = false;
-    }
-    if (validHistoryElement) {
-      _addRadioHistoryElement(
-        icyTitle: mpvMetaData!.icyTitle,
-        mpvMetaData: mpvMetaData!.copyWith(
-          icyName: audio?.title?.trim() ?? _mpvMetaData?.icyName ?? '',
-        ),
-      );
-
-      await _processParsedIcyTitle(mpvMetaData!.icyTitle);
-    }
-    _propertiesChangedController.add(true);
-  }
-
   Audio? _audio;
   Audio? get audio => _audio;
   void _setAudio(Audio value) async {
@@ -211,14 +262,7 @@ class PlayerService {
       Media? media = audio!.path != null
           ? Media('file://${audio!.path!}')
           : (audio!.url != null)
-              ? Media(
-                  audio!.url!,
-                  httpHeaders: {
-                    'Accept': '*',
-                    'User-Agent': '$kAppTitle ($kRepoUrl)',
-                    'Content-Language': 'de-DE',
-                  },
-                )
+              ? Media(audio!.url!)
               : null;
       if (media == null) return;
       _player.open(media).then((_) {
@@ -257,6 +301,11 @@ class PlayerService {
     await _player.pause();
   }
 
+  Timer? _timer;
+  void setPauseTimer(Duration duration) {
+    _timer = Timer(duration, () => pause());
+  }
+
   Future<void> seek() async {
     if (position == null) return;
     await _player.seek(position!);
@@ -267,96 +316,6 @@ class PlayerService {
     await playOrPause();
   }
 
-  Future<void> init() async {
-    await _initMediaControl();
-
-    _isPlayingSub ??= _player.stream.playing.listen((value) {
-      setIsPlaying(value);
-    });
-
-    _durationSub ??= _player.stream.duration.listen((newDuration) {
-      if (newDuration.inSeconds != 0) {
-        setDuration(newDuration);
-      }
-    });
-
-    _positionSub ??= _player.stream.position.listen((newPosition) {
-      setPosition(newPosition);
-    });
-
-    _bufferSub ??= _player.stream.buffer.listen((event) {
-      setBuffer(event);
-    });
-
-    _isCompletedSub ??= _player.stream.completed.listen((value) async {
-      if (value) {
-        await playNext();
-      }
-    });
-
-    await (_player.platform as NativePlayer).observeProperty(
-      'metadata',
-      (data) async {
-        if (audio?.audioType != AudioType.radio ||
-            !data.contains('icy-title')) {
-          return;
-        }
-        final newData = MpvMetaData.fromJson(data);
-        final parsedIcyTitle =
-            HtmlParser(newData.icyTitle).parseFragment().text;
-        if (parsedIcyTitle == null ||
-            parsedIcyTitle == _mpvMetaData?.icyTitle) {
-          return;
-        }
-
-        _setMpvMetaData(newData.copyWith(icyTitle: parsedIcyTitle));
-      },
-    );
-
-    _volumeSub ??= _player.stream.volume.listen((value) {
-      _volume = value;
-      _propertiesChangedController.add(true);
-    });
-
-    _rateSub ??= _player.stream.rate.listen((value) {
-      _rate = value;
-      _propertiesChangedController.add(true);
-    });
-
-    _tracksSub ??= _player.stream.tracks.listen((tracks) {
-      _setIsVideo(false);
-      for (var track in tracks.video) {
-        if (track.fps != null && track.fps! > 1) {
-          _setIsVideo(true);
-          break;
-        }
-      }
-    });
-
-    await _setPlayerState();
-  }
-
-  Future<void> _processParsedIcyTitle(String parsedIcyTitle) async {
-    final songInfo = parsedIcyTitle.splitByDash;
-    final albumArt = await _onlineArtService.fetchAlbumArt(parsedIcyTitle);
-
-    final mergedAudio =
-        (_audio ?? const Audio(audioType: AudioType.radio)).copyWith(
-      imageUrl: albumArt,
-      title: songInfo.songName,
-      artist: songInfo.artist,
-    );
-    await _setMediaControlsMetaData(audio: mergedAudio);
-    _setRemoteImageUrl(albumArt ?? _audio?.imageUrl ?? _audio?.albumArtUrl);
-
-    await _exposeService.exposeTitleOnline(
-      title: songInfo.songName ?? '',
-      artist: songInfo.artist ?? '',
-      additionalInfo: _audio?.title ?? 'Internet Radio',
-      imageUrl: albumArt,
-    );
-  }
-
   Future<void> playNext() async {
     await safeLastPosition();
     if (!repeatSingle && nextAudio != null) {
@@ -512,7 +471,7 @@ class PlayerService {
   }
 
   //
-  // last positions
+  // Last Positions used when the app re-opens and for podcasts
   //
 
   // TODO: migrate to shared preferences but add a migration routine from the old file so users do not
@@ -566,6 +525,10 @@ class PlayerService {
     }
   }
 
+  //
+  // Native media trays
+  //
+
   Future<void> _initSmtc() async {
     await SMTCWindows.initialize();
     _smtc = SMTCWindows(
@@ -606,13 +569,13 @@ class PlayerService {
   }
 
   Future<void> _initAudioService() async {
-    _audioService = await AudioService.init(
+    _audioHandler = await AudioService.init(
       config: const AudioServiceConfig(
         androidNotificationOngoing: true,
         androidNotificationChannelName: kAppName,
       ),
       builder: () {
-        return _AudioHandler(
+        return PlayerServiceAudioHandler(
           onPlay: playOrPause,
           onNext: playNext,
           onPause: pause,
@@ -627,9 +590,9 @@ class PlayerService {
   }
 
   void _setMediaControlPosition(Duration? position) {
-    if (_audioService != null) {
-      _audioService!.playbackState.add(
-        _audioService!.playbackState.value.copyWith(
+    if (_audioHandler != null) {
+      _audioHandler!.playbackState.add(
+        _audioHandler!.playbackState.value.copyWith(
           updatePosition: position ?? Duration.zero,
         ),
       );
@@ -639,9 +602,9 @@ class PlayerService {
   }
 
   void _setMediaControlDuration(Duration? duration) {
-    if (_audioService == null || _audioService!.mediaItem.value == null) return;
-    _audioService!.mediaItem
-        .add(_audioService!.mediaItem.value!.copyWith(duration: duration));
+    if (_audioHandler == null || _audioHandler!.mediaItem.value == null) return;
+    _audioHandler!.mediaItem
+        .add(_audioHandler!.mediaItem.value!.copyWith(duration: duration));
   }
 
   Future<void> _setMediaControlsMetaData({required Audio audio}) async {
@@ -694,9 +657,9 @@ class PlayerService {
   }
 
   Future<void> _setMediaControlsIsPlaying(bool playing) async {
-    if (_audioService != null) {
-      _audioService!.playbackState.add(
-        _audioService!.playbackState.value.copyWith(
+    if (_audioHandler != null) {
+      _audioHandler!.playbackState.add(
+        _audioHandler!.playbackState.value.copyWith(
           playing: playing,
           controls: _determineMediaControls(playing),
         ),
@@ -729,8 +692,8 @@ class PlayerService {
   }
 
   void _setAudioServiceMetaData({required Audio audio, required Uri? artUri}) {
-    if (_audioService == null) return;
-    _audioService!.mediaItem.add(
+    if (_audioHandler == null) return;
+    _audioHandler!.mediaItem.add(
       MediaItem(
         id: audio.toString(),
         title: audio.title ?? kAppTitle,
@@ -760,6 +723,76 @@ class PlayerService {
     );
   }
 
+  //
+  // Everything related to radio stream icy-title information observed from MPV and digested here
+  //
+
+  MpvMetaData? _mpvMetaData;
+  MpvMetaData? get mpvMetaData => _mpvMetaData;
+  Future<void> _setMpvMetaData(MpvMetaData? value) async {
+    _mpvMetaData = value;
+
+    if (_isValidHistoryElement(_mpvMetaData)) {
+      _addRadioHistoryElement(
+        icyTitle: mpvMetaData!.icyTitle,
+        mpvMetaData: mpvMetaData!.copyWith(
+          icyName: audio?.title?.trim() ?? _mpvMetaData?.icyName ?? '',
+        ),
+      );
+
+      await _processParsedIcyTitle(mpvMetaData!.icyTitle);
+    }
+    _propertiesChangedController.add(true);
+  }
+
+  Future<void> _onMpvMetadata(data) async {
+    if (_audio?.audioType != AudioType.radio || !data.contains('icy-title')) {
+      return;
+    }
+    final newData = MpvMetaData.fromJson(data);
+    final parsedIcyTitle = HtmlParser(newData.icyTitle).parseFragment().text;
+    if (parsedIcyTitle == null || parsedIcyTitle == _mpvMetaData?.icyTitle) {
+      return;
+    }
+
+    _setMpvMetaData(newData.copyWith(icyTitle: parsedIcyTitle));
+  }
+
+  bool _isValidHistoryElement(MpvMetaData? data) {
+    var validHistoryElement = data?.icyTitle.isNotEmpty == true;
+
+    if (validHistoryElement &&
+        data?.icyDescription.isNotEmpty == true &&
+        (data!.icyTitle.contains(data.icyDescription) ||
+            data.icyTitle.contains(
+              data.icyDescription.replaceAll(RegExp(r'[^a-zA-Z0-9]'), ''),
+            ))) {
+      validHistoryElement = false;
+    }
+    return validHistoryElement;
+  }
+
+  Future<void> _processParsedIcyTitle(String parsedIcyTitle) async {
+    final songInfo = parsedIcyTitle.splitByDash;
+    final albumArt = await _onlineArtService.fetchAlbumArt(parsedIcyTitle);
+
+    final mergedAudio =
+        (_audio ?? const Audio(audioType: AudioType.radio)).copyWith(
+      imageUrl: albumArt,
+      title: songInfo.songName,
+      artist: songInfo.artist,
+    );
+    await _setMediaControlsMetaData(audio: mergedAudio);
+    _setRemoteImageUrl(albumArt ?? _audio?.imageUrl ?? _audio?.albumArtUrl);
+
+    await _exposeService.exposeTitleOnline(
+      title: songInfo.songName ?? '',
+      artist: songInfo.artist ?? '',
+      additionalInfo: _audio?.title ?? 'Internet Radio',
+      imageUrl: albumArt,
+    );
+  }
+
   final Map<String, MpvMetaData> _radioHistory = {};
   Map<String, MpvMetaData> get radioHistory => _radioHistory;
   void _addRadioHistoryElement({
@@ -772,28 +805,6 @@ class PlayerService {
     );
   }
 
-  Timer? _timer;
-  void setTimer(Duration duration) {
-    _timer = Timer(duration, () => pause());
-  }
-
-  Future<void> dispose() async {
-    await _propertiesChangedController.close();
-    await _smtcSub?.cancel();
-    await _smtc?.disableSmtc();
-    await _smtc?.dispose();
-    await _isPlayingSub?.cancel();
-    await _positionSub?.cancel();
-    await _durationSub?.cancel();
-    await _isCompletedSub?.cancel();
-    await _volumeSub?.cancel();
-    await _tracksSub?.cancel();
-    await _rateSub?.cancel();
-    await _bufferSub?.cancel();
-    _timer?.cancel();
-    await _player.dispose();
-  }
-
   Future<void> _writePlayerState() async {
     final playerState = PlayerState(
       audio: _audio,
@@ -826,63 +837,3 @@ class PlayerService {
     }
   }
 }
-
-class _AudioHandler extends BaseAudioHandler with SeekHandler {
-  final Future<void> Function() onPlay;
-  final Future<void> Function() onPause;
-  final Future<void> Function() onNext;
-  final Future<void> Function() onPrevious;
-  final Future<void> Function(Duration position) onSeek;
-
-  @override
-  _AudioHandler({
-    required this.onPlay,
-    required this.onPause,
-    required this.onNext,
-    required this.onPrevious,
-    required this.onSeek,
-  }) {
-    playbackState.add(
-      PlaybackState(
-        playing: false,
-        systemActions: {
-          MediaAction.seek,
-          MediaAction.seekBackward,
-          MediaAction.seekForward,
-        },
-        controls: [
-          MediaControl.skipToPrevious,
-          MediaControl.rewind,
-          MediaControl.play,
-          MediaControl.fastForward,
-          MediaControl.skipToNext,
-        ],
-      ),
-    );
-  }
-
-  @override
-  Future<void> play() async {
-    await onPlay();
-  }
-
-  @override
-  Future<void> pause() async {
-    await onPause();
-  }
-
-  @override
-  Future<void> skipToNext() async {
-    await onNext();
-  }
-
-  @override
-  Future<void> skipToPrevious() async {
-    await onPrevious();
-  }
-
-  @override
-  Future<void> seek(Duration position) async {
-    await onSeek(position);
-  }
-}
diff --git a/lib/player/player_service_audio_handler.dart b/lib/player/player_service_audio_handler.dart
new file mode 100644
index 000000000..efd2d7d3f
--- /dev/null
+++ b/lib/player/player_service_audio_handler.dart
@@ -0,0 +1,62 @@
+import 'dart:async';
+import 'package:audio_service/audio_service.dart';
+
+class PlayerServiceAudioHandler extends BaseAudioHandler with SeekHandler {
+  final Future<void> Function() onPlay;
+  final Future<void> Function() onPause;
+  final Future<void> Function() onNext;
+  final Future<void> Function() onPrevious;
+  final Future<void> Function(Duration position) onSeek;
+
+  @override
+  PlayerServiceAudioHandler({
+    required this.onPlay,
+    required this.onPause,
+    required this.onNext,
+    required this.onPrevious,
+    required this.onSeek,
+  }) {
+    playbackState.add(
+      PlaybackState(
+        playing: false,
+        systemActions: {
+          MediaAction.seek,
+          MediaAction.seekBackward,
+          MediaAction.seekForward,
+        },
+        controls: [
+          MediaControl.skipToPrevious,
+          MediaControl.rewind,
+          MediaControl.play,
+          MediaControl.fastForward,
+          MediaControl.skipToNext,
+        ],
+      ),
+    );
+  }
+
+  @override
+  Future<void> play() async {
+    await onPlay();
+  }
+
+  @override
+  Future<void> pause() async {
+    await onPause();
+  }
+
+  @override
+  Future<void> skipToNext() async {
+    await onNext();
+  }
+
+  @override
+  Future<void> skipToPrevious() async {
+    await onPrevious();
+  }
+
+  @override
+  Future<void> seek(Duration position) async {
+    await onSeek(position);
+  }
+}
diff --git a/lib/register.dart b/lib/register.dart
index 4ffbe4e50..a329a5ece 100644
--- a/lib/register.dart
+++ b/lib/register.dart
@@ -1,5 +1,8 @@
+import 'package:package_info_plus/package_info_plus.dart';
+
 import 'app/app_model.dart';
 import 'app/connectivity_model.dart';
+import 'app_config.dart';
 import 'constants.dart';
 import 'dart:io';
 import 'expose/expose_service.dart';
@@ -35,20 +38,17 @@ import 'search/search_model.dart';
 import 'settings/settings_model.dart';
 import 'settings/settings_service.dart';
 
-/// Registers all Services, ViewModels or other non-UI objects
+/// Registers all Services, ViewModels and external dependencies
 /// Note: we want lazy registration whenever possible, preferable without any async calls above.
 /// Sometimes this is not possible and we need to await a Future before we can register.
-Future<void> registerServicesAndViewModels({
-  required String? downloadsDefaultDir,
-  required SharedPreferences sharedPreferences,
+Future<void> registerDependencies({
   required List<String> args,
-  required String version,
-  required bool allowDiscordRPC,
+  required String? downloadsDefaultDir,
 }) async {
   if (allowDiscordRPC) {
     await FlutterDiscordRPC.initialize(kDiscordApplicationId);
-    di.registerLazySingleton<FlutterDiscordRPC>(
-      () => FlutterDiscordRPC.instance,
+    di.registerSingleton<FlutterDiscordRPC>(
+      FlutterDiscordRPC.instance,
       dispose: (s) {
         s.disconnect();
         s.dispose();
@@ -56,8 +56,12 @@ Future<void> registerServicesAndViewModels({
     );
   }
 
+  final sharedPreferences = await SharedPreferences.getInstance();
+  final packageInfo = await PackageInfo.fromPlatform();
+
   di
-    ..registerLazySingleton<SharedPreferences>(() => sharedPreferences)
+    ..registerSingleton<SharedPreferences>(sharedPreferences)
+    ..registerSingleton<PackageInfo>(packageInfo)
     ..registerLazySingleton<Dio>(
       () => Dio(),
       dispose: (s) => s.close(),
@@ -170,7 +174,7 @@ Future<void> registerServicesAndViewModels({
     )
     ..registerLazySingleton<AppModel>(
       () => AppModel(
-        appVersion: version,
+        packageInfo: di<PackageInfo>(),
         gitHub: di<GitHub>(),
         settingsService: di<SettingsService>(),
         exposeService: di<ExposeService>(),
diff --git a/lib/settings/view/about_section.dart b/lib/settings/view/about_section.dart
index 87c71779a..164553a7d 100644
--- a/lib/settings/view/about_section.dart
+++ b/lib/settings/view/about_section.dart
@@ -65,7 +65,7 @@ class _AboutTileState extends State<_AboutTile> {
     return YaruTile(
       title: !di<ConnectivityModel>().isOnline == true ||
               !appModel.allowManualUpdate
-          ? Text(di<AppModel>().version ?? '')
+          ? Text(di<AppModel>().version)
           : updateAvailable == null
               ? Center(
                   child: SizedBox.square(
@@ -78,7 +78,7 @@ class _AboutTileState extends State<_AboutTile> {
               : TapAbleText(
                   text: updateAvailable == true
                       ? '${context.l10n.updateAvailable}: $onlineVersion'
-                      : currentVersion ?? context.l10n.unknown,
+                      : currentVersion,
                   style: updateAvailable == true
                       ? TextStyle(
                           color: context.theme.colorScheme.success