Merge branch 'main' into plan-local-image-display

2026-05-18 03:10:24 +03:00 · 2026-05-09 07:49:21 -05:00
parent 13446022d9 8b3c9bf9c3
commit 34777a811b
572 changed files with 23085 additions and 5352 deletions
@@ -2,9 +2,6 @@ import 'package:flutter/material.dart';

 enum ImmichColorPreset { indigo, deepPurple, pink, red, orange, yellow, lime, green, cyan, slateGray }

-const ImmichColorPreset defaultColorPreset = ImmichColorPreset.indigo;
-const String defaultColorPresetName = "indigo";
-
 const Color immichBrandColorLight = Color(0xFF4150AF);
 const Color immichBrandColorDark = Color(0xFFACCBFA);
 const Color whiteOpacity75 = Color.fromRGBO(255, 255, 255, 0.75);
@@ -0,0 +1,22 @@
+import 'package:immich_mobile/domain/models/config/cleanup_config.dart';
+import 'package:immich_mobile/domain/models/config/theme_config.dart';
+
+class AppConfig {
+  final ThemeConfig theme;
+  final CleanupConfig cleanup;
+
+  const AppConfig({this.theme = const .new(), this.cleanup = const .new()});
+
+  AppConfig copyWith({ThemeConfig? theme, CleanupConfig? cleanup}) =>
+      .new(theme: theme ?? this.theme, cleanup: cleanup ?? this.cleanup);
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) || (other is AppConfig && other.theme == theme && other.cleanup == cleanup);
+
+  @override
+  int get hashCode => Object.hash(theme, cleanup);
+
+  @override
+  String toString() => 'AppConfig(theme: $theme, cleanup: $cleanup)';
+}
@@ -0,0 +1,48 @@
+import 'package:immich_mobile/constants/enums.dart';
+
+class CleanupConfig {
+  final bool keepFavorites;
+  final AssetKeepType keepMediaType;
+  final List<String> keepAlbumIds;
+  final int cutoffDaysAgo;
+  final bool defaultsInitialized;
+
+  const CleanupConfig({
+    this.keepFavorites = true,
+    this.keepMediaType = AssetKeepType.none,
+    this.keepAlbumIds = const [],
+    this.cutoffDaysAgo = -1,
+    this.defaultsInitialized = false,
+  });
+
+  CleanupConfig copyWith({
+    bool? keepFavorites,
+    AssetKeepType? keepMediaType,
+    List<String>? keepAlbumIds,
+    int? cutoffDaysAgo,
+    bool? defaultsInitialized,
+  }) => .new(
+    keepFavorites: keepFavorites ?? this.keepFavorites,
+    keepMediaType: keepMediaType ?? this.keepMediaType,
+    keepAlbumIds: keepAlbumIds ?? this.keepAlbumIds,
+    cutoffDaysAgo: cutoffDaysAgo ?? this.cutoffDaysAgo,
+    defaultsInitialized: defaultsInitialized ?? this.defaultsInitialized,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is CleanupConfig &&
+          other.keepFavorites == keepFavorites &&
+          other.keepMediaType == keepMediaType &&
+          other.keepAlbumIds == keepAlbumIds &&
+          other.cutoffDaysAgo == cutoffDaysAgo &&
+          other.defaultsInitialized == defaultsInitialized);
+
+  @override
+  int get hashCode => Object.hash(keepFavorites, keepMediaType, keepAlbumIds, cutoffDaysAgo, defaultsInitialized);
+
+  @override
+  String toString() =>
+      'CleanupConfig(keepFavorites: $keepFavorites, keepMediaType: $keepMediaType, keepAlbumIds: $keepAlbumIds, cutoffDaysAgo: $cutoffDaysAgo, defaultsInitialized: $defaultsInitialized)';
+}
@@ -0,0 +1,18 @@
+import 'package:immich_mobile/domain/models/log.model.dart';
+
+class SystemConfig {
+  final LogLevel logLevel;
+
+  const SystemConfig({this.logLevel = .info});
+
+  SystemConfig copyWith({LogLevel? logLevel}) => SystemConfig(logLevel: logLevel ?? this.logLevel);
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || (other is SystemConfig && other.logLevel == logLevel);
+
+  @override
+  int get hashCode => logLevel.hashCode;
+
+  @override
+  String toString() => 'SystemConfig(logLevel: $logLevel)';
+}
@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/colors.dart';
+
+class ThemeConfig {
+  final ThemeMode mode;
+  final ImmichColorPreset primaryColor;
+  final bool dynamicTheme;
+  final bool colorfulInterface;
+
+  const ThemeConfig({
+    this.mode = .system,
+    this.primaryColor = .indigo,
+    this.dynamicTheme = false,
+    this.colorfulInterface = true,
+  });
+
+  ThemeConfig copyWith({
+    ThemeMode? mode,
+    ImmichColorPreset? primaryColor,
+    bool? dynamicTheme,
+    bool? colorfulInterface,
+  }) => .new(
+    mode: mode ?? this.mode,
+    primaryColor: primaryColor ?? this.primaryColor,
+    dynamicTheme: dynamicTheme ?? this.dynamicTheme,
+    colorfulInterface: colorfulInterface ?? this.colorfulInterface,
+  );
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is ThemeConfig &&
+          other.mode == mode &&
+          other.primaryColor == primaryColor &&
+          other.dynamicTheme == dynamicTheme &&
+          other.colorfulInterface == colorfulInterface);
+
+  @override
+  int get hashCode => Object.hash(mode, primaryColor, dynamicTheme, colorfulInterface);
+
+  @override
+  String toString() =>
+      'ThemeConfig(mode: $mode, primaryColor: $primaryColor, dynamicTheme: $dynamicTheme, colorfulInterface: $colorfulInterface)';
+}
@@ -0,0 +1,150 @@
+import 'dart:convert';
+
+import 'package:collection/collection.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/colors.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
+import 'package:immich_mobile/domain/models/log.model.dart';
+
+enum MetadataDomain<T extends Object> {
+  appConfig<AppConfig>('config.app'),
+  systemConfig<SystemConfig>('config.system');
+
+  final String prefix;
+  const MetadataDomain(this.prefix);
+}
+
+enum MetadataKey<T extends Object> {
+  // Theme
+  themePrimaryColor<ImmichColorPreset>(.appConfig, 'theme.primaryColor', .indigo, _EnumCodec(ImmichColorPreset.values)),
+  themeMode<ThemeMode>(.appConfig, 'theme.mode', .system, _EnumCodec(ThemeMode.values)),
+  themeDynamic<bool>(.appConfig, 'theme.dynamic', false),
+  themeColorfulInterface<bool>(.appConfig, 'theme.colorfulInterface', true),
+
+  // Log
+  logLevel<LogLevel>(.systemConfig, 'log.level', .info, _EnumCodec(LogLevel.values)),
+
+  // Cleanup
+  cleanupKeepFavorites<bool>(.appConfig, 'cleanup.keepFavorites', true),
+  cleanupKeepMediaType<AssetKeepType>(
+    .appConfig,
+    'cleanup.keepMediaType',
+    AssetKeepType.none,
+    _EnumCodec(AssetKeepType.values),
+  ),
+  cleanupKeepAlbumIds<List<String>>(.appConfig, 'cleanup.keepAlbumIds', [], _ListCodec(_PrimitiveCodec.string)),
+  cleanupCutoffDaysAgo<int>(.appConfig, 'cleanup.cutoffDaysAgo', -1),
+  cleanupDefaultsInitialized<bool>(.appConfig, 'cleanup.defaultsInitialized', false);
+
+  final MetadataDomain domain;
+  final String name;
+  final T defaultValue;
+  final _MetadataCodec<T>? _codecOverride;
+
+  const MetadataKey(this.domain, this.name, this.defaultValue, [this._codecOverride]);
+
+  String get key => '${domain.prefix}.$name';
+
+  _MetadataCodec<T> get _codec => _codecOverride ?? _MetadataCodec.forPrimitive(defaultValue);
+
+  String encode(T value) => _codec.encode(value);
+
+  T decode(String raw) => _codec.decode(raw) ?? defaultValue;
+
+  static Map<String, MetadataKey<Object>> asKeyMap() => {for (var value in MetadataKey.values) value.key: value};
+}
+
+sealed class _MetadataCodec<T extends Object> {
+  const _MetadataCodec();
+
+  String encode(T value);
+  T? decode(String raw);
+
+  static const Map<Type, _MetadataCodec<Object>> _primitives = {
+    int: _PrimitiveCodec.integer,
+    double: _PrimitiveCodec.real,
+    bool: _PrimitiveCodec.boolean,
+    String: _PrimitiveCodec.string,
+    DateTime: _DateTimeCodec(),
+  };
+
+  static _MetadataCodec<T> forPrimitive<T extends Object>(T sample) {
+    final codec = _primitives[sample.runtimeType];
+    if (codec == null) {
+      throw StateError(
+        'No primitive codec for ${sample.runtimeType}. Provide an explicit codec when defining the MetadataKey.',
+      );
+    }
+    return codec as _MetadataCodec<T>;
+  }
+}
+
+final class _EnumCodec<T extends Enum> extends _MetadataCodec<T> {
+  final List<T> values;
+
+  const _EnumCodec(this.values);
+
+  @override
+  String encode(T value) => value.name;
+
+  @override
+  T? decode(String raw) => values.firstWhereOrNull((v) => v.name == raw);
+}
+
+final class _DateTimeCodec extends _MetadataCodec<DateTime> {
+  const _DateTimeCodec();
+
+  @override
+  String encode(DateTime value) => value.toIso8601String();
+
+  @override
+  DateTime? decode(String raw) => DateTime.tryParse(raw);
+}
+
+final class _ListCodec<T extends Object> extends _MetadataCodec<List<T>> {
+  final _MetadataCodec<T> _elementCodec;
+
+  const _ListCodec(this._elementCodec);
+
+  @override
+  String encode(List<T> value) => jsonEncode(value.map(_elementCodec.encode).toList());
+
+  @override
+  List<T>? decode(String raw) {
+    try {
+      final decoded = jsonDecode(raw);
+      if (decoded is! List) return null;
+      final result = <T>[];
+      for (final item in decoded) {
+        if (item is! String) return null;
+        final element = _elementCodec.decode(item);
+        if (element == null) return null;
+        result.add(element);
+      }
+      return result;
+    } on FormatException {
+      return null;
+    }
+  }
+}
+
+final class _PrimitiveCodec<T extends Object> extends _MetadataCodec<T> {
+  final T? Function(String) _parse;
+
+  const _PrimitiveCodec._(this._parse);
+
+  @override
+  String encode(T value) => value.toString();
+
+  @override
+  T? decode(String raw) => _parse(raw);
+
+  static const integer = _PrimitiveCodec<int>._(int.tryParse);
+  static const real = _PrimitiveCodec<double>._(double.tryParse);
+  static const boolean = _PrimitiveCodec<bool>._(bool.tryParse);
+  static const string = _PrimitiveCodec<String>._(_identity);
+
+  static String? _identity(String s) => s;
+}
@@ -22,7 +22,6 @@ enum StoreKey<T> {
  // user settings from [AppSettingsEnum] below:
  loadPreview<bool>._(100),
  loadOriginal<bool>._(101),
-  themeMode<String>._(102),
  tilesPerRow<int>._(103),
  dynamicLayout<bool>._(104),
  groupAssetsBy<int>._(105),
@@ -35,7 +34,6 @@ enum StoreKey<T> {
  albumThumbnailCacheSize<int>._(112),
  selectedAlbumSortOrder<int>._(113),
  advancedTroubleshooting<bool>._(114),
-  logLevel<int>._(115),
  preferRemoteImage<bool>._(116),
  loopVideo<bool>._(117),
  // map related settings
@@ -50,11 +48,6 @@ enum StoreKey<T> {
  enableHapticFeedback<bool>._(126),
  customHeaders<String>._(127),

-  // theme settings
-  primaryColor<String>._(128),
-  dynamicTheme<bool>._(129),
-  colorfulInterface<bool>._(130),
-
  syncAlbums<bool>._(131),

  // Auto endpoint switching
@@ -88,13 +81,19 @@ enum StoreKey<T> {
  shouldResetSync<bool>._(1007),

  // Free up space
-  cleanupKeepFavorites<bool>._(1008),
-  cleanupKeepMediaType<int>._(1009),
-  cleanupKeepAlbumIds<String>._(1010),
-  cleanupCutoffDaysAgo<int>._(1011),
-  cleanupDefaultsInitialized<bool>._(1012),
+  syncMigrationStatus<String>._(1013),

-  syncMigrationStatus<String>._(1013);
+  // Legacy keys that have been migrated to the new metadata store
+  legacyPrimaryColor<String>._(128),
+  legacyDynamicTheme<bool>._(129),
+  legacyColorfulInterface<bool>._(130),
+  legacyThemeMode<String>._(102),
+  legacyCleanupKeepFavorites<bool>._(1008),
+  legacyCleanupKeepMediaType<int>._(1009),
+  legacyCleanupKeepAlbumIds<String>._(1010),
+  legacyCleanupCutoffDaysAgo<int>._(1011),
+  legacyCleanupDefaultsInitialized<bool>._(1012),
+  legacyLogLevel<int>._(115);

  const StoreKey._(this.id);
  final int id;
@@ -176,15 +176,8 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
      final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
      final nativeSyncApi = _ref?.read(nativeSyncApiProvider);

-      await _drift.close();
-      await _driftLogger.close();
-
-      _ref?.dispose();
-      _ref = null;
-
-      _cancellationToken.complete();
      _logger.info("Cleaning up background worker");
-
+      _cancellationToken.complete();
      final cleanupFutures = [
        nativeSyncApi?.cancelHashing(),
        workerManagerPatch.dispose().catchError((_) async {
@@ -195,10 +188,15 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
        Store.dispose(),

        backgroundSyncManager?.cancel(),
+        _drift.optimize(allTables: true),
      ];

      await Future.wait(cleanupFutures.nonNulls);
-      _logger.info("Background worker resources cleaned up");
+      await _drift.close();
+      await _driftLogger.close();
+
+      _ref?.dispose();
+      _ref = null;
    } catch (error, stack) {
      dPrint(() => 'Failed to cleanup background worker: $error with stack: $stack');
    }
@@ -2,20 +2,20 @@ import 'dart:async';

 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/log.model.dart';
-import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:logging/logging.dart';

 /// Service responsible for handling application logging.
 ///
 /// It listens to Dart's [Logger.root], buffers logs in memory (optionally),
-/// writes them to a persistent [ILogRepository], and manages log levels
-/// via [IStoreRepository]
+/// writes them to a persistent [LogRepository], and manages log levels via
+/// [MetadataRepository].
 class LogService {
  final LogRepository _logRepository;
-  final DriftStoreRepository _storeRepository;
+  final MetadataRepository _metadataRepository;

  final List<LogMessage> _msgBuffer = [];

@@ -38,12 +38,12 @@ class LogService {

  static Future<LogService> init({
    required LogRepository logRepository,
-    required DriftStoreRepository storeRepository,
+    required MetadataRepository metadataRepository,
    bool shouldBuffer = true,
  }) async {
    _instance ??= await create(
      logRepository: logRepository,
-      storeRepository: storeRepository,
+      metadataRepository: metadataRepository,
      shouldBuffer: shouldBuffer,
    );
    return _instance!;
@@ -51,17 +51,17 @@ class LogService {

  static Future<LogService> create({
    required LogRepository logRepository,
-    required DriftStoreRepository storeRepository,
+    required MetadataRepository metadataRepository,
    bool shouldBuffer = true,
  }) async {
-    final instance = LogService._(logRepository, storeRepository, shouldBuffer);
+    final instance = LogService._(logRepository, metadataRepository, shouldBuffer);
    await logRepository.truncate(limit: kLogTruncateLimit);
-    final level = await instance._storeRepository.tryGet(StoreKey.logLevel) ?? LogLevel.info.index;
-    Logger.root.level = Level.LEVELS.elementAtOrNull(level) ?? Level.INFO;
+    final level = instance._metadataRepository.systemConfig.logLevel;
+    Logger.root.level = Level.LEVELS.elementAtOrNull(level.index) ?? Level.INFO;
    return instance;
  }

-  LogService._(this._logRepository, this._storeRepository, this._shouldBuffer) {
+  LogService._(this._logRepository, this._metadataRepository, this._shouldBuffer) {
    _logSubscription = Logger.root.onRecord.listen(_handleLogRecord);
  }

@@ -91,7 +91,7 @@ class LogService {
  }

  Future<void> setLogLevel(LogLevel level) async {
-    await _storeRepository.upsert(StoreKey.logLevel, level.index);
+    await _metadataRepository.write(MetadataKey.logLevel, level);
    Logger.root.level = level.toLevel();
  }

@@ -3,6 +3,7 @@
 import 'dart:async';
 import 'dart:convert';

+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
@@ -192,17 +193,22 @@ class SyncStreamService {
        final remoteSyncAssets = data.cast<SyncAssetV1>();
        await _syncStreamRepository.updateAssetsV1(remoteSyncAssets);
        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
-          final hasPermission = await _localFilesManager.hasManageMediaPermission();
-          if (hasPermission) {
-            await _handleRemoteTrashed(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.checksum));
-            await _applyRemoteRestoreToLocal();
-          } else {
-            _logger.warning("sync Trashed Assets cannot proceed because MANAGE_MEDIA permission is missing");
-          }
+          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
+        }
+        return;
+      case SyncEntityType.assetV2:
+        final remoteSyncAssets = data.cast<SyncAssetV2>();
+        await _syncStreamRepository.updateAssetsV2(remoteSyncAssets);
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          await _syncAssetTrashStatus(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.id).toList());
        }
        return;
      case SyncEntityType.assetDeleteV1:
-        return _syncStreamRepository.deleteAssetsV1(data.cast());
+        final remoteSyncAssets = data.cast<SyncAssetDeleteV1>();
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          await _syncAssetDeletion(remoteSyncAssets.map((e) => e.assetId).toList());
+        }
+        return _syncStreamRepository.deleteAssetsV1(remoteSyncAssets);
      case SyncEntityType.assetExifV1:
        return _syncStreamRepository.updateAssetsExifV1(data.cast());
      case SyncEntityType.assetEditV1:
@@ -215,8 +221,12 @@ class SyncStreamService {
        return _syncStreamRepository.deleteAssetsMetadataV1(data.cast());
      case SyncEntityType.partnerAssetV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner');
+      case SyncEntityType.partnerAssetV2:
+        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'partner');
      case SyncEntityType.partnerAssetBackfillV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'partner backfill');
+      case SyncEntityType.partnerAssetBackfillV2:
+        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'partner backfill');
      case SyncEntityType.partnerAssetDeleteV1:
        return _syncStreamRepository.deleteAssetsV1(data.cast(), debugLabel: "partner");
      case SyncEntityType.partnerAssetExifV1:
@@ -237,10 +247,16 @@ class SyncStreamService {
        return _syncStreamRepository.deleteAlbumUsersV1(data.cast());
      case SyncEntityType.albumAssetCreateV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset create');
+      case SyncEntityType.albumAssetCreateV2:
+        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset create');
      case SyncEntityType.albumAssetUpdateV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset update');
+      case SyncEntityType.albumAssetUpdateV2:
+        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset update');
      case SyncEntityType.albumAssetBackfillV1:
        return _syncStreamRepository.updateAssetsV1(data.cast(), debugLabel: 'album asset backfill');
+      case SyncEntityType.albumAssetBackfillV2:
+        return _syncStreamRepository.updateAssetsV2(data.cast(), debugLabel: 'album asset backfill');
      case SyncEntityType.albumAssetExifCreateV1:
        return _syncStreamRepository.updateAssetsExifV1(data.cast(), debugLabel: 'album asset exif create');
      case SyncEntityType.albumAssetExifUpdateV1:
@@ -342,6 +358,47 @@ class SyncStreamService {
    }
  }

+  Future<void> handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) async {
+    if (batchData.isEmpty) return;
+
+    _logger.info('Processing batch of ${batchData.length} AssetUploadReadyV2 events');
+
+    final List<SyncAssetV2> assets = [];
+    final List<SyncAssetExifV1> exifs = [];
+
+    try {
+      for (final data in batchData) {
+        if (data is! Map<String, dynamic>) {
+          continue;
+        }
+
+        final payload = data;
+        final assetData = payload['asset'];
+        final exifData = payload['exif'];
+
+        if (assetData == null || exifData == null) {
+          continue;
+        }
+
+        final asset = SyncAssetV2.fromJson(assetData);
+        final exif = SyncAssetExifV1.fromJson(exifData);
+
+        if (asset != null && exif != null) {
+          assets.add(asset);
+          exifs.add(exif);
+        }
+      }
+
+      if (assets.isNotEmpty && exifs.isNotEmpty) {
+        await _syncStreamRepository.updateAssetsV2(assets, debugLabel: 'websocket-batch');
+        await _syncStreamRepository.updateAssetsExifV1(exifs, debugLabel: 'websocket-batch');
+        _logger.info('Successfully processed ${assets.length} assets in batch');
+      }
+    } catch (error, stackTrace) {
+      _logger.severe("Error processing AssetUploadReadyV2 websocket batch events", error, stackTrace);
+    }
+  }
+
  Future<void> handleWsAssetEditReadyV1(dynamic data) async {
    _logger.info('Processing AssetEditReadyV1 event');

@@ -382,28 +439,67 @@ class SyncStreamService {
    }
  }

-  Future<void> _handleRemoteTrashed(Iterable<String> checksums) async {
-    if (checksums.isEmpty) {
+  Future<void> handleWsAssetEditReadyV2(dynamic data) async {
+    _logger.info('Processing AssetEditReadyV2 event');
+
+    try {
+      if (data is! Map<String, dynamic>) {
+        throw ArgumentError("Invalid data format for AssetEditReadyV2 event");
+      }
+
+      final payload = data;
+
+      if (payload['asset'] == null) {
+        throw ArgumentError("Missing 'asset' field in AssetEditReadyV2 event data");
+      }
+
+      final asset = SyncAssetV2.fromJson(payload['asset']);
+      if (asset == null) {
+        throw ArgumentError("Failed to parse 'asset' field in AssetEditReadyV2 event data");
+      }
+
+      final assetEdits = (payload['edit'] as List<dynamic>)
+          .map((e) => SyncAssetEditV1.fromJson(e))
+          .whereType<SyncAssetEditV1>()
+          .toList();
+
+      await _syncStreamRepository.updateAssetsV2([asset], debugLabel: 'websocket-edit');
+      await _syncStreamRepository.replaceAssetEditsV1(asset.id, assetEdits, debugLabel: 'websocket-edit');
+
+      _logger.info(
+        'Successfully processed AssetEditReadyV2 event for asset ${asset.id} with ${assetEdits.length} edits',
+      );
+    } catch (error, stackTrace) {
+      _logger.severe("Error processing AssetEditReadyV2 websocket event", error, stackTrace);
+    }
+  }
+
+  Future<void> _handleRemoteDeleted(Iterable<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
      return Future.value();
    } else {
-      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(checksums);
+      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(remoteIds);
      if (localAssetsToTrash.isNotEmpty) {
-        final mediaUrls = await Future.wait(
-          localAssetsToTrash.values
-              .expand((e) => e)
-              .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
-        );
-        _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
-        final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
-        if (result) {
-          await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
-        }
+        await _trashLocalAssets(localAssetsToTrash);
      } else {
-        _logger.info("No assets found in backup-enabled albums for assets: $checksums");
+        _logger.info("No assets found in backup-enabled albums for remote assets: $remoteIds");
      }
    }
  }

+  Future<void> _trashLocalAssets(Map<String, List<LocalAsset>> localAssetsToTrash) async {
+    final mediaUrls = await Future.wait(
+      localAssetsToTrash.values
+          .expand((e) => e)
+          .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+    );
+    _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
+    final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+    if (result) {
+      await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+    }
+  }
+
  Future<void> _applyRemoteRestoreToLocal() async {
    final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
    if (assetsToRestore.isNotEmpty) {
@@ -413,4 +509,23 @@ class SyncStreamService {
      _logger.info("No remote assets found for restoration");
    }
  }
+
+  Future<void> _syncAssetTrashStatus(List<String> remoteIds) async {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
+      _logger.warning("Syncing asset trash status cannot proceed because MANAGE_MEDIA permission is missing");
+      return;
+    }
+
+    await _handleRemoteDeleted(remoteIds);
+    await _applyRemoteRestoreToLocal();
+  }
+
+  Future<void> _syncAssetDeletion(List<String> remoteIds) async {
+    if (!(await _localFilesManager.hasManageMediaPermission())) {
+      _logger.warning("Syncing asset deletion cannot proceed because MANAGE_MEDIA permission is missing");
+      return;
+    }
+
+    await _handleRemoteDeleted(remoteIds);
+  }
 }
@@ -186,7 +186,7 @@ class BackgroundSyncManager {
        });
  }

-  Future<void> syncWebsocketBatch(List<dynamic> batchData) {
+  Future<void> syncWebsocketBatchV1(List<dynamic> batchData) {
    if (_syncWebsocketTask != null) {
      return _syncWebsocketTask!.future;
    }
@@ -196,7 +196,17 @@ class BackgroundSyncManager {
    });
  }

-  Future<void> syncWebsocketEdit(dynamic data) {
+  Future<void> syncWebsocketBatchV2(List<dynamic> batchData) {
+    if (_syncWebsocketTask != null) {
+      return _syncWebsocketTask!.future;
+    }
+    _syncWebsocketTask = _handleWsAssetUploadReadyV2Batch(batchData);
+    return _syncWebsocketTask!.whenComplete(() {
+      _syncWebsocketTask = null;
+    });
+  }
+
+  Future<void> syncWebsocketEditV1(dynamic data) {
    if (_syncWebsocketTask != null) {
      return _syncWebsocketTask!.future;
    }
@@ -206,6 +216,16 @@ class BackgroundSyncManager {
    });
  }

+  Future<void> syncWebsocketEditV2(dynamic data) {
+    if (_syncWebsocketTask != null) {
+      return _syncWebsocketTask!.future;
+    }
+    _syncWebsocketTask = _handleWsAssetEditReadyV2(data);
+    return _syncWebsocketTask!.whenComplete(() {
+      _syncWebsocketTask = null;
+    });
+  }
+
  Future<void> syncLinkedAlbum() {
    if (_linkedAlbumSyncTask != null) {
      return _linkedAlbumSyncTask!.future;
@@ -242,7 +262,17 @@ Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => ru
  debugLabel: 'websocket-batch',
 );

+Cancelable<void> _handleWsAssetUploadReadyV2Batch(List<dynamic> batchData) => runInIsolateGentle(
+  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV2Batch(batchData),
+  debugLabel: 'websocket-batch',
+);
+
 Cancelable<void> _handleWsAssetEditReadyV1(dynamic data) => runInIsolateGentle(
  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV1(data),
  debugLabel: 'websocket-edit',
 );
+
+Cancelable<void> _handleWsAssetEditReadyV2(dynamic data) => runInIsolateGentle(
+  computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV2(data),
+  debugLabel: 'websocket-edit',
+);
@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/exif.model.dart';
-import 'package:immich_mobile/extensions/string_extensions.dart';
 import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';
 import 'package:openapi/api.dart' as api;

@@ -14,7 +13,7 @@ extension DTOToAsset on api.AssetResponseDto {
      updatedAt: updatedAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
-      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
+      durationMs: duration,
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
@@ -36,7 +35,7 @@ extension DTOToAsset on api.AssetResponseDto {
      updatedAt: updatedAt,
      ownerId: ownerId,
      visibility: visibility.toAssetVisibility(),
-      durationMs: duration?.toDuration()?.inMilliseconds ?? 0,
+      durationMs: duration,
      height: height?.toInt(),
      width: width?.toInt(),
      isFavorite: isFavorite,
@@ -0,0 +1,18 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+class MetadataEntity extends Table with DriftDefaultsMixin {
+  const MetadataEntity();
+
+  TextColumn get key => text()();
+
+  TextColumn get value => text()();
+
+  DateTimeColumn get updatedAt => dateTime().withDefault(currentDateAndTime)();
+
+  @override
+  Set<Column> get primaryKey => {key};
+
+  @override
+  String get tableName => "metadata";
+}
@@ -0,0 +1,429 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart'
+    as i2;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i3;
+
+typedef $$MetadataEntityTableCreateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
+      required String key,
+      required String value,
+      i0.Value<DateTime> updatedAt,
+    });
+typedef $$MetadataEntityTableUpdateCompanionBuilder =
+    i1.MetadataEntityCompanion Function({
+      i0.Value<String> key,
+      i0.Value<String> value,
+      i0.Value<DateTime> updatedAt,
+    });
+
+class $$MetadataEntityTableFilterComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+}
+
+class $$MetadataEntityTableOrderingComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get key => $composableBuilder(
+    column: $table.key,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get value => $composableBuilder(
+    column: $table.value,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+}
+
+class $$MetadataEntityTableAnnotationComposer
+    extends i0.Composer<i0.GeneratedDatabase, i1.$MetadataEntityTable> {
+  $$MetadataEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get key =>
+      $composableBuilder(column: $table.key, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get value =>
+      $composableBuilder(column: $table.value, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+}
+
+class $$MetadataEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData,
+          i1.$$MetadataEntityTableFilterComposer,
+          i1.$$MetadataEntityTableOrderingComposer,
+          i1.$$MetadataEntityTableAnnotationComposer,
+          $$MetadataEntityTableCreateCompanionBuilder,
+          $$MetadataEntityTableUpdateCompanionBuilder,
+          (
+            i1.MetadataEntityData,
+            i0.BaseReferences<
+              i0.GeneratedDatabase,
+              i1.$MetadataEntityTable,
+              i1.MetadataEntityData
+            >,
+          ),
+          i1.MetadataEntityData,
+          i0.PrefetchHooks Function()
+        > {
+  $$MetadataEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$MetadataEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$MetadataEntityTableFilterComposer($db: db, $table: table),
+          createOrderingComposer: () =>
+              i1.$$MetadataEntityTableOrderingComposer($db: db, $table: table),
+          createComputedFieldComposer: () => i1
+              .$$MetadataEntityTableAnnotationComposer($db: db, $table: table),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> key = const i0.Value.absent(),
+                i0.Value<String> value = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.MetadataEntityCompanion(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          createCompanionCallback:
+              ({
+                required String key,
+                required String value,
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+              }) => i1.MetadataEntityCompanion.insert(
+                key: key,
+                value: value,
+                updatedAt: updatedAt,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$MetadataEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$MetadataEntityTable,
+      i1.MetadataEntityData,
+      i1.$$MetadataEntityTableFilterComposer,
+      i1.$$MetadataEntityTableOrderingComposer,
+      i1.$$MetadataEntityTableAnnotationComposer,
+      $$MetadataEntityTableCreateCompanionBuilder,
+      $$MetadataEntityTableUpdateCompanionBuilder,
+      (
+        i1.MetadataEntityData,
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$MetadataEntityTable,
+          i1.MetadataEntityData
+        >,
+      ),
+      i1.MetadataEntityData,
+      i0.PrefetchHooks Function()
+    >;
+
+class $MetadataEntityTable extends i2.MetadataEntity
+    with i0.TableInfo<$MetadataEntityTable, i1.MetadataEntityData> {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $MetadataEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _keyMeta = const i0.VerificationMeta('key');
+  @override
+  late final i0.GeneratedColumn<String> key = i0.GeneratedColumn<String>(
+    'key',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _valueMeta = const i0.VerificationMeta(
+    'value',
+  );
+  @override
+  late final i0.GeneratedColumn<String> value = i0.GeneratedColumn<String>(
+    'value',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
+    'updatedAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> updatedAt =
+      i0.GeneratedColumn<DateTime>(
+        'updated_at',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: i3.currentDateAndTime,
+      );
+  @override
+  List<i0.GeneratedColumn> get $columns => [key, value, updatedAt];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'metadata';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.MetadataEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('key')) {
+      context.handle(
+        _keyMeta,
+        key.isAcceptableOrUnknown(data['key']!, _keyMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_keyMeta);
+    }
+    if (data.containsKey('value')) {
+      context.handle(
+        _valueMeta,
+        value.isAcceptableOrUnknown(data['value']!, _valueMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_valueMeta);
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {key};
+  @override
+  i1.MetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.MetadataEntityData(
+      key: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}key'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}value'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+    );
+  }
+
+  @override
+  $MetadataEntityTable createAlias(String alias) {
+    return $MetadataEntityTable(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MetadataEntityData extends i0.DataClass
+    implements i0.Insertable<i1.MetadataEntityData> {
+  final String key;
+  final String value;
+  final DateTime updatedAt;
+  const MetadataEntityData({
+    required this.key,
+    required this.value,
+    required this.updatedAt,
+  });
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['key'] = i0.Variable<String>(key);
+    map['value'] = i0.Variable<String>(value);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    return map;
+  }
+
+  factory MetadataEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return MetadataEntityData(
+      key: serializer.fromJson<String>(json['key']),
+      value: serializer.fromJson<String>(json['value']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'key': serializer.toJson<String>(key),
+      'value': serializer.toJson<String>(value),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+    };
+  }
+
+  i1.MetadataEntityData copyWith({
+    String? key,
+    String? value,
+    DateTime? updatedAt,
+  }) => i1.MetadataEntityData(
+    key: key ?? this.key,
+    value: value ?? this.value,
+    updatedAt: updatedAt ?? this.updatedAt,
+  );
+  MetadataEntityData copyWithCompanion(i1.MetadataEntityCompanion data) {
+    return MetadataEntityData(
+      key: data.key.present ? data.key.value : this.key,
+      value: data.value.present ? data.value.value : this.value,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MetadataEntityData(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(key, value, updatedAt);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.MetadataEntityData &&
+          other.key == this.key &&
+          other.value == this.value &&
+          other.updatedAt == this.updatedAt);
+}
+
+class MetadataEntityCompanion
+    extends i0.UpdateCompanion<i1.MetadataEntityData> {
+  final i0.Value<String> key;
+  final i0.Value<String> value;
+  final i0.Value<DateTime> updatedAt;
+  const MetadataEntityCompanion({
+    this.key = const i0.Value.absent(),
+    this.value = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+  });
+  MetadataEntityCompanion.insert({
+    required String key,
+    required String value,
+    this.updatedAt = const i0.Value.absent(),
+  }) : key = i0.Value(key),
+       value = i0.Value(value);
+  static i0.Insertable<i1.MetadataEntityData> custom({
+    i0.Expression<String>? key,
+    i0.Expression<String>? value,
+    i0.Expression<DateTime>? updatedAt,
+  }) {
+    return i0.RawValuesInsertable({
+      if (key != null) 'key': key,
+      if (value != null) 'value': value,
+      if (updatedAt != null) 'updated_at': updatedAt,
+    });
+  }
+
+  i1.MetadataEntityCompanion copyWith({
+    i0.Value<String>? key,
+    i0.Value<String>? value,
+    i0.Value<DateTime>? updatedAt,
+  }) {
+    return i1.MetadataEntityCompanion(
+      key: key ?? this.key,
+      value: value ?? this.value,
+      updatedAt: updatedAt ?? this.updatedAt,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (key.present) {
+      map['key'] = i0.Variable<String>(key.value);
+    }
+    if (value.present) {
+      map['value'] = i0.Variable<String>(value.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MetadataEntityCompanion(')
+          ..write('key: $key, ')
+          ..write('value: $value, ')
+          ..write('updatedAt: $updatedAt')
+          ..write(')'))
+        .toString();
+  }
+}
@@ -13,6 +13,7 @@ import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/person.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_album.entity.dart';
@@ -29,6 +30,7 @@ import 'package:immich_mobile/infrastructure/entities/user.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/user_metadata.entity.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.dart';
+import 'package:logging/logging.dart';

@DriftDatabase(
  tables: [
@@ -53,6 +55,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.steps.da
    StoreEntity,
    TrashedLocalAssetEntity,
    AssetEditEntity,
+    MetadataEntity,
  ],
  include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -83,8 +86,19 @@ class Drift extends $Drift {
    });
  }

+  Future<void> optimize({bool allTables = false}) async {
+    try {
+      if (allTables) {
+        await customStatement('PRAGMA optimize=0x10002');
+      }
+      await customStatement('PRAGMA optimize');
+    } catch (error) {
+      Logger('Drift').fine('Failed to optimize database', error);
+    }
+  }
+
  @override
-  int get schemaVersion => 24;
+  int get schemaVersion => 25;

  @override
  MigrationStrategy get migration => MigrationStrategy(
@@ -250,6 +264,9 @@ class Drift extends $Drift {
            await customStatement('DROP INDEX IF EXISTS idx_remote_album_owner_id');
            await m.alterTable(TableMigration(v24.remoteAlbumEntity));
          },
+          from24To25: (m, v25) async {
+            await m.createTable(v25.metadata);
+          },
        ),
      );

@@ -260,6 +277,7 @@ class Drift extends $Drift {
      }

      await customStatement('PRAGMA foreign_keys = ON;');
+      await optimize();
    },
    beforeOpen: (details) async {
      await customStatement('PRAGMA foreign_keys = ON');
@@ -43,9 +43,11 @@ import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity
    as i20;
 import 'package:immich_mobile/infrastructure/entities/asset_edit.entity.drift.dart'
    as i21;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart'
    as i22;
-import 'package:drift/internal/modular.dart' as i23;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i23;
+import 'package:drift/internal/modular.dart' as i24;

 abstract class $Drift extends i0.GeneratedDatabase {
  $Drift(i0.QueryExecutor e) : super(e);
@@ -89,9 +91,12 @@ abstract class $Drift extends i0.GeneratedDatabase {
      .$TrashedLocalAssetEntityTable(this);
  late final i21.$AssetEditEntityTable assetEditEntity = i21
      .$AssetEditEntityTable(this);
-  i22.MergedAssetDrift get mergedAssetDrift => i23.ReadDatabaseContainer(
+  late final i22.$MetadataEntityTable metadataEntity = i22.$MetadataEntityTable(
    this,
-  ).accessor<i22.MergedAssetDrift>(i22.MergedAssetDrift.new);
+  );
+  i23.MergedAssetDrift get mergedAssetDrift => i24.ReadDatabaseContainer(
+    this,
+  ).accessor<i23.MergedAssetDrift>(i23.MergedAssetDrift.new);
  @override
  Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
      allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -129,6 +134,7 @@ abstract class $Drift extends i0.GeneratedDatabase {
    storeEntity,
    trashedLocalAssetEntity,
    assetEditEntity,
+    metadataEntity,
    i10.idxPartnerSharedWithId,
    i11.idxLatLng,
    i12.idxRemoteAlbumAssetAlbumAsset,
@@ -389,4 +395,6 @@ class $DriftManager {
      );
  i21.$$AssetEditEntityTableTableManager get assetEditEntity =>
      i21.$$AssetEditEntityTableTableManager(_db, _db.assetEditEntity);
+  i22.$$MetadataEntityTableTableManager get metadataEntity =>
+      i22.$$MetadataEntityTableTableManager(_db, _db.metadataEntity);
 }
@@ -12375,6 +12375,574 @@ class Shape48 extends i0.VersionedTable {
      columnsByName['order']! as i1.GeneratedColumn<int>;
 }

+final class Schema25 extends i0.VersionedSchema {
+  Schema25({required super.database}) : super(version: 25);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAlbumAssetAlbumAsset,
+    idxLocalAssetChecksum,
+    idxLocalAssetCloudId,
+    idxStackPrimaryAssetId,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    idxRemoteAssetStackId,
+    idxRemoteAssetLocalDateTimeDay,
+    idxRemoteAssetLocalDateTimeMonth,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    remoteAssetCloudIdEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    assetEditEntity,
+    metadata,
+    idxPartnerSharedWithId,
+    idxLatLng,
+    idxRemoteAlbumAssetAlbumAsset,
+    idxRemoteAssetCloudId,
+    idxPersonOwnerId,
+    idxAssetFacePersonId,
+    idxAssetFaceAssetId,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+    idxAssetEditAssetId,
+  ];
+  late final Shape33 userEntity = Shape33(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_110,
+        _column_111,
+        _column_112,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape34 remoteAssetEntity = Shape34(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_119,
+        _column_120,
+        _column_121,
+        _column_122,
+        _column_123,
+        _column_124,
+        _column_125,
+        _column_126,
+        _column_127,
+        _column_128,
+        _column_129,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape35 stackEntity = Shape35(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_130,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape36 localAssetEntity = Shape36(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_133,
+        _column_134,
+        _column_135,
+        _column_136,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape48 remoteAlbumEntity = Shape48(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_138,
+        _column_114,
+        _column_115,
+        _column_139,
+        _column_140,
+        _column_141,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape38 localAlbumEntity = Shape38(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_115,
+        _column_142,
+        _column_143,
+        _column_144,
+        _column_145,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape39 localAlbumAssetEntity = Shape39(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_146, _column_147, _column_145],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAlbumAssetAlbumAsset = i1.Index(
+    'idx_local_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_local_album_asset_album_asset ON local_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxLocalAssetCloudId = i1.Index(
+    'idx_local_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_cloud_id ON local_asset_entity (i_cloud_id)',
+  );
+  final i1.Index idxStackPrimaryAssetId = i1.Index(
+    'idx_stack_primary_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_stack_primary_asset_id ON stack_entity (primary_asset_id)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetStackId = i1.Index(
+    'idx_remote_asset_stack_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_stack_id ON remote_asset_entity (stack_id)',
+  );
+  final i1.Index idxRemoteAssetLocalDateTimeDay = i1.Index(
+    'idx_remote_asset_local_date_time_day',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_day ON remote_asset_entity (STRFTIME(\'%Y-%m-%d\', local_date_time))',
+  );
+  final i1.Index idxRemoteAssetLocalDateTimeMonth = i1.Index(
+    'idx_remote_asset_local_date_time_month',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_local_date_time_month ON remote_asset_entity (STRFTIME(\'%Y-%m\', local_date_time))',
+  );
+  late final Shape40 authUserEntity = Shape40(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_108,
+        _column_109,
+        _column_148,
+        _column_110,
+        _column_111,
+        _column_149,
+        _column_150,
+        _column_151,
+        _column_152,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_153, _column_154, _column_155],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape41 partnerEntity = Shape41(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_156, _column_157, _column_158],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape42 remoteExifEntity = Shape42(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_160,
+        _column_161,
+        _column_162,
+        _column_163,
+        _column_164,
+        _column_117,
+        _column_116,
+        _column_165,
+        _column_166,
+        _column_167,
+        _column_168,
+        _column_135,
+        _column_136,
+        _column_169,
+        _column_170,
+        _column_171,
+        _column_172,
+        _column_173,
+        _column_174,
+        _column_175,
+        _column_176,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_159, _column_177],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_177, _column_153, _column_178],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape43 remoteAssetCloudIdEntity = Shape43(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_cloud_id_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_159,
+        _column_179,
+        _column_180,
+        _column_134,
+        _column_135,
+        _column_136,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape44 memoryEntity = Shape44(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_124,
+        _column_121,
+        _column_113,
+        _column_181,
+        _column_182,
+        _column_183,
+        _column_184,
+        _column_185,
+        _column_186,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_159, _column_187],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape45 personEntity = Shape45(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_114,
+        _column_115,
+        _column_121,
+        _column_108,
+        _column_188,
+        _column_189,
+        _column_190,
+        _column_191,
+        _column_192,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape46 assetFaceEntity = Shape46(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_193,
+        _column_194,
+        _column_195,
+        _column_196,
+        _column_197,
+        _column_198,
+        _column_199,
+        _column_200,
+        _column_201,
+        _column_124,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_202, _column_203, _column_204],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape47 trashedLocalAssetEntity = Shape47(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_108,
+        _column_113,
+        _column_114,
+        _column_115,
+        _column_116,
+        _column_117,
+        _column_118,
+        _column_107,
+        _column_205,
+        _column_131,
+        _column_120,
+        _column_132,
+        _column_206,
+        _column_137,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape32 assetEditEntity = Shape32(
+    source: i0.VersionedTable(
+      entityName: 'asset_edit_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_107,
+        _column_159,
+        _column_207,
+        _column_208,
+        _column_209,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape49 metadata = Shape49(
+    source: i0.VersionedTable(
+      entityName: 'metadata',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY("key")'],
+      columns: [_column_210, _column_211, _column_115],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxPartnerSharedWithId = i1.Index(
+    'idx_partner_shared_with_id',
+    'CREATE INDEX IF NOT EXISTS idx_partner_shared_with_id ON partner_entity (shared_with_id)',
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxRemoteAlbumAssetAlbumAsset = i1.Index(
+    'idx_remote_album_asset_album_asset',
+    'CREATE INDEX IF NOT EXISTS idx_remote_album_asset_album_asset ON remote_album_asset_entity (album_id, asset_id)',
+  );
+  final i1.Index idxRemoteAssetCloudId = i1.Index(
+    'idx_remote_asset_cloud_id',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_cloud_id ON remote_asset_cloud_id_entity (cloud_id)',
+  );
+  final i1.Index idxPersonOwnerId = i1.Index(
+    'idx_person_owner_id',
+    'CREATE INDEX IF NOT EXISTS idx_person_owner_id ON person_entity (owner_id)',
+  );
+  final i1.Index idxAssetFacePersonId = i1.Index(
+    'idx_asset_face_person_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_person_id ON asset_face_entity (person_id)',
+  );
+  final i1.Index idxAssetFaceAssetId = i1.Index(
+    'idx_asset_face_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_face_asset_id ON asset_face_entity (asset_id)',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  final i1.Index idxAssetEditAssetId = i1.Index(
+    'idx_asset_edit_asset_id',
+    'CREATE INDEX IF NOT EXISTS idx_asset_edit_asset_id ON asset_edit_entity (asset_id)',
+  );
+}
+
+class Shape49 extends i0.VersionedTable {
+  Shape49({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get key =>
+      columnsByName['key']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get value =>
+      columnsByName['value']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<String>;
+}
+
+i1.GeneratedColumn<String> _column_210(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'key',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NOT NULL',
+    );
+i1.GeneratedColumn<String> _column_211(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'value',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.string,
+      $customConstraints: 'NOT NULL',
+    );
 i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
  required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -12399,6 +12967,7 @@ i0.MigrationStepWithVersion migrationSteps({
  required Future<void> Function(i1.Migrator m, Schema22 schema) from21To22,
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
+  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
 }) {
  return (currentVersion, database) async {
    switch (currentVersion) {
@@ -12517,6 +13086,11 @@ i0.MigrationStepWithVersion migrationSteps({
        final migrator = i1.Migrator(database, schema);
        await from23To24(migrator, schema);
        return 24;
+      case 24:
+        final schema = Schema25(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from24To25(migrator, schema);
+        return 25;
      default:
        throw ArgumentError.value('Unknown migration from $currentVersion');
    }
@@ -12547,6 +13121,7 @@ i1.OnUpgrade stepByStep({
  required Future<void> Function(i1.Migrator m, Schema22 schema) from21To22,
  required Future<void> Function(i1.Migrator m, Schema23 schema) from22To23,
  required Future<void> Function(i1.Migrator m, Schema24 schema) from23To24,
+  required Future<void> Function(i1.Migrator m, Schema25 schema) from24To25,
 }) => i0.VersionedSchema.stepByStepHelper(
  step: migrationSteps(
    from1To2: from1To2,
@@ -12572,5 +13147,6 @@ i1.OnUpgrade stepByStep({
    from21To22: from21To22,
    from22To23: from22To23,
    from23To24: from23To24,
+    from24To25: from24To25,
  ),
 );
@@ -109,31 +109,40 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
    return query.map((localAlbum) => localAlbum.toDto()).get();
  }

-  Future<Map<String, List<LocalAsset>>> getAssetsFromBackupAlbums(Iterable<String> checksums) async {
-    if (checksums.isEmpty) {
+  Future<Map<String, List<LocalAsset>>> getAssetsFromBackupAlbums(Iterable<String> remoteIds) async {
+    if (remoteIds.isEmpty) {
      return {};
    }

    final result = <String, List<LocalAsset>>{};

-    for (final slice in checksums.toSet().slices(kDriftMaxChunk)) {
+    for (final slice in remoteIds.toSet().slices(kDriftMaxChunk)) {
      final rows =
          await (_db.select(_db.localAlbumAssetEntity).join([
-                innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id)),
+                innerJoin(
+                  _db.localAlbumEntity,
+                  _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id),
+                  useColumns: false,
+                ),
                innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+                innerJoin(
+                  _db.remoteAssetEntity,
+                  _db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum),
+                  useColumns: false,
+                ),
              ])..where(
                _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
-                    _db.localAssetEntity.checksum.isIn(slice),
+                    _db.remoteAssetEntity.id.isIn(slice),
              ))
              .get();

      for (final row in rows) {
        final albumId = row.readTable(_db.localAlbumAssetEntity).albumId;
-        final assetData = row.readTable(_db.localAssetEntity);
-        final asset = assetData.toDto();
+        final asset = row.readTable(_db.localAssetEntity).toDto();
        (result[albumId] ??= <LocalAsset>[]).add(asset);
      }
    }
+
    return result;
  }

@@ -0,0 +1,122 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+class MetadataRepository extends DriftDatabaseRepository {
+  final Drift _db;
+  final Map<MetadataKey, Object> _cache = {};
+
+  MetadataRepository._(this._db) : super(_db);
+
+  static MetadataRepository? _instance;
+
+  static MetadataRepository get instance {
+    final instance = _instance;
+    if (instance == null) {
+      throw StateError('MetadataRepository not initialized. Call ensureInitialized() first');
+    }
+    return instance;
+  }
+
+  AppConfig _appConfig = const .new();
+  AppConfig get appConfig => _appConfig;
+
+  SystemConfig _systemConfig = const .new();
+  SystemConfig get systemConfig => _systemConfig;
+
+  static Future<MetadataRepository> ensureInitialized(Drift db) async {
+    if (_instance == null) {
+      final instance = MetadataRepository._(db);
+      await instance._hydrate();
+      _instance = instance;
+    }
+    return _instance!;
+  }
+
+  static Future<void> refresh() async {
+    instance._cache.clear();
+    instance._appConfig = const .new();
+    instance._systemConfig = const .new();
+    await instance._hydrate();
+  }
+
+  Future<void> _hydrate() async => _hydrateCache(await _db.select(_db.metadataEntity).get());
+
+  T _read<T extends Object>(MetadataKey<T> key) => (_cache[key] as T?) ?? key.defaultValue;
+
+  Future<void> write<T extends Object, U extends T>(MetadataKey<T> key, U value) async {
+    if (_read(key) == value) return;
+
+    await _db
+        .into(_db.metadataEntity)
+        .insertOnConflictUpdate(
+          MetadataEntityCompanion.insert(key: key.key, value: key.encode(value), updatedAt: Value(DateTime.now())),
+        );
+    _updateCache(key, value);
+  }
+
+  Future<void> delete<T extends Object>(MetadataKey<T> key) async {
+    await (_db.delete(_db.metadataEntity)..where((t) => t.key.equals(key.key))).go();
+    _updateCache(key, key.defaultValue);
+  }
+
+  Stream<AppConfig> watchAppConfig() => _watchDomain(.appConfig).distinct();
+
+  Stream<SystemConfig> watchSystemConfig() => _watchDomain(.systemConfig).distinct();
+
+  Stream<T> _watchDomain<T extends Object>(MetadataDomain<T> domain) {
+    final query = _db.select(_db.metadataEntity)..where((t) => t.key.like('${domain.prefix}.%'));
+    return query.watch().map((rows) {
+      _hydrateCache(rows);
+      return domain.config(this);
+    });
+  }
+
+  void _hydrateCache(List<MetadataEntityData> rows) {
+    final keyMap = MetadataKey.asKeyMap();
+    for (final row in rows) {
+      final key = keyMap[row.key];
+      if (key == null) continue;
+      _updateCache(key, key.decode(row.value));
+    }
+  }
+
+  void _updateCache<T extends Object>(MetadataKey<T> key, T value) {
+    if (_cache[key] == value) return;
+    _cache[key] = value;
+    key.domain.rebuild(this);
+  }
+}
+
+extension<T extends Object> on MetadataDomain<T> {
+  T config(MetadataRepository repo) => switch (this) {
+    .appConfig => repo._appConfig as T,
+    .systemConfig => repo._systemConfig as T,
+  };
+
+  void rebuild(MetadataRepository repo) {
+    switch (this) {
+      case .appConfig:
+        repo._appConfig = .new(
+          theme: .new(
+            mode: repo._read(.themeMode),
+            primaryColor: repo._read(.themePrimaryColor),
+            dynamicTheme: repo._read(.themeDynamic),
+            colorfulInterface: repo._read(.themeColorfulInterface),
+          ),
+          cleanup: .new(
+            keepFavorites: repo._read(.cleanupKeepFavorites),
+            keepMediaType: repo._read(.cleanupKeepMediaType),
+            keepAlbumIds: repo._read(.cleanupKeepAlbumIds),
+            cutoffDaysAgo: repo._read(.cleanupCutoffDaysAgo),
+            defaultsInitialized: repo._read(.cleanupDefaultsInitialized),
+          ),
+        );
+      case .systemConfig:
+        repo._systemConfig = .new(logLevel: repo._read(.logLevel));
+    }
+  }
+}
@@ -46,19 +46,25 @@ class SyncApiRepository {
        types: [
          SyncRequestType.authUsersV1,
          SyncRequestType.usersV1,
-          SyncRequestType.assetsV1,
+          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
+              ? SyncRequestType.assetsV2
+              : SyncRequestType.assetsV1,
          SyncRequestType.assetExifsV1,
          if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetEditsV1,
          SyncRequestType.assetMetadataV1,
          SyncRequestType.partnersV1,
-          SyncRequestType.partnerAssetsV1,
+          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
+              ? SyncRequestType.partnerAssetsV2
+              : SyncRequestType.partnerAssetsV1,
          SyncRequestType.partnerAssetExifsV1,
          if (serverVersion < const SemVer(major: 3, minor: 0, patch: 0))
            SyncRequestType.albumsV1
          else
            SyncRequestType.albumsV2,
          SyncRequestType.albumUsersV1,
-          SyncRequestType.albumAssetsV1,
+          serverVersion >= const SemVer(major: 3, minor: 0, patch: 0)
+              ? SyncRequestType.albumAssetsV2
+              : SyncRequestType.albumAssetsV1,
          SyncRequestType.albumAssetExifsV1,
          SyncRequestType.albumToAssetsV1,
          SyncRequestType.memoriesV1,
@@ -67,8 +73,9 @@ class SyncApiRepository {
          SyncRequestType.partnerStacksV1,
          SyncRequestType.userMetadataV1,
          SyncRequestType.peopleV1,
-          if (serverVersion < const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV1,
-          if (serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)) SyncRequestType.assetFacesV2,
+          serverVersion >= const SemVer(major: 2, minor: 6, patch: 0)
+              ? SyncRequestType.assetFacesV2
+              : SyncRequestType.assetFacesV1,
        ],
        reset: shouldReset,
      ).toJson(),
@@ -153,6 +160,7 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.partnerV1: SyncPartnerV1.fromJson,
  SyncEntityType.partnerDeleteV1: SyncPartnerDeleteV1.fromJson,
  SyncEntityType.assetV1: SyncAssetV1.fromJson,
+  SyncEntityType.assetV2: SyncAssetV2.fromJson,
  SyncEntityType.assetDeleteV1: SyncAssetDeleteV1.fromJson,
  SyncEntityType.assetExifV1: SyncAssetExifV1.fromJson,
  SyncEntityType.assetEditV1: SyncAssetEditV1.fromJson,
@@ -160,7 +168,9 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.assetMetadataV1: SyncAssetMetadataV1.fromJson,
  SyncEntityType.assetMetadataDeleteV1: SyncAssetMetadataDeleteV1.fromJson,
  SyncEntityType.partnerAssetV1: SyncAssetV1.fromJson,
+  SyncEntityType.partnerAssetV2: SyncAssetV2.fromJson,
  SyncEntityType.partnerAssetBackfillV1: SyncAssetV1.fromJson,
+  SyncEntityType.partnerAssetBackfillV2: SyncAssetV2.fromJson,
  SyncEntityType.partnerAssetDeleteV1: SyncAssetDeleteV1.fromJson,
  SyncEntityType.partnerAssetExifV1: SyncAssetExifV1.fromJson,
  SyncEntityType.partnerAssetExifBackfillV1: SyncAssetExifV1.fromJson,
@@ -171,8 +181,11 @@ const _kResponseMap = <SyncEntityType, Function(Object)>{
  SyncEntityType.albumUserBackfillV1: SyncAlbumUserV1.fromJson,
  SyncEntityType.albumUserDeleteV1: SyncAlbumUserDeleteV1.fromJson,
  SyncEntityType.albumAssetCreateV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetCreateV2: SyncAssetV2.fromJson,
  SyncEntityType.albumAssetUpdateV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetUpdateV2: SyncAssetV2.fromJson,
  SyncEntityType.albumAssetBackfillV1: SyncAssetV1.fromJson,
+  SyncEntityType.albumAssetBackfillV2: SyncAssetV2.fromJson,
  SyncEntityType.albumAssetExifCreateV1: SyncAssetExifV1.fromJson,
  SyncEntityType.albumAssetExifUpdateV1: SyncAssetExifV1.fromJson,
  SyncEntityType.albumAssetExifBackfillV1: SyncAssetExifV1.fromJson,
@@ -220,6 +220,44 @@ class SyncStreamRepository extends DriftDatabaseRepository {
    }
  }

+  Future<void> updateAssetsV2(Iterable<SyncAssetV2> data, {String debugLabel = 'user'}) async {
+    try {
+      await _db.batch((batch) {
+        for (final asset in data) {
+          final companion = RemoteAssetEntityCompanion(
+            name: Value(asset.originalFileName),
+            type: Value(asset.type.toAssetType()),
+            createdAt: Value.absentIfNull(asset.fileCreatedAt),
+            updatedAt: Value.absentIfNull(asset.fileModifiedAt),
+            durationMs: Value(asset.duration),
+            checksum: Value(asset.checksum),
+            isFavorite: Value(asset.isFavorite),
+            ownerId: Value(asset.ownerId),
+            localDateTime: Value(asset.localDateTime),
+            thumbHash: Value(asset.thumbhash),
+            deletedAt: Value(asset.deletedAt),
+            visibility: Value(asset.visibility.toAssetVisibility()),
+            livePhotoVideoId: Value(asset.livePhotoVideoId),
+            stackId: Value(asset.stackId),
+            libraryId: Value(asset.libraryId),
+            width: Value(asset.width),
+            height: Value(asset.height),
+            isEdited: Value(asset.isEdited),
+          );
+
+          batch.insert(
+            _db.remoteAssetEntity,
+            companion.copyWith(id: Value(asset.id)),
+            onConflict: DoUpdate((_) => companion),
+          );
+        }
+      });
+    } catch (error, stack) {
+      _logger.severe('Error: updateAssetsV2 - $debugLabel', error, stack);
+      rethrow;
+    }
+  }
+
  Future<void> updateAssetsExifV1(Iterable<SyncAssetExifV1> data, {String debugLabel = 'user'}) async {
    try {
      await _db.batch((batch) {
@@ -278,17 +278,21 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    final isAscending = albumData.order == AlbumAssetOrder.asc;

-    final query = _db.remoteAssetEntity.select().addColumns([_db.localAssetEntity.id]).join([
+    // Correlated subquery picks the first matching local asset by checksum,
+    // avoiding fan-out when the same photo exists in multiple device albums (#23273).
+    final localId = subqueryExpression<String>(
+      _db.localAssetEntity.selectOnly()
+        ..addColumns([_db.localAssetEntity.id])
+        ..where(_db.localAssetEntity.checksum.equalsExp(_db.remoteAssetEntity.checksum))
+        ..limit(1),
+    );
+
+    final query = _db.remoteAssetEntity.select().addColumns([localId]).join([
      innerJoin(
        _db.remoteAlbumAssetEntity,
        _db.remoteAlbumAssetEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
        useColumns: false,
      ),
-      leftOuterJoin(
-        _db.localAssetEntity,
-        _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
-        useColumns: false,
-      ),
    ])..where(_db.remoteAssetEntity.deletedAt.isNull() & _db.remoteAlbumAssetEntity.albumId.equals(albumId));

    if (isAscending) {
@@ -299,9 +303,7 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    query.limit(count, offset: offset);

-    return query
-        .map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(_db.localAssetEntity.id)))
-        .get();
+    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto(localId: row.read(localId))).get();
  }

  TimelineQuery fromAssets(List<BaseAsset> assets, TimelineOrigin origin) => (
@@ -456,23 +458,22 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
  }

  Stream<List<Bucket>> _watchPersonBucket(String userId, String personId, {GroupAssetsBy groupBy = GroupAssetsBy.day}) {
+    final idQuery = _db.assetFaceEntity.selectOnly()
+      ..addColumns([_db.assetFaceEntity.assetId])
+      ..where(
+        _db.assetFaceEntity.personId.equals(personId) &
+            _db.assetFaceEntity.isVisible.equals(true) &
+            _db.assetFaceEntity.deletedAt.isNull(),
+      );
+
    if (groupBy == GroupAssetsBy.none) {
      final query = _db.remoteAssetEntity.selectOnly()
        ..addColumns([_db.remoteAssetEntity.id.count()])
-        ..join([
-          innerJoin(
-            _db.assetFaceEntity,
-            _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-            useColumns: false,
-          ),
-        ])
        ..where(
-          _db.remoteAssetEntity.deletedAt.isNull() &
+          _db.remoteAssetEntity.id.isInQuery(idQuery) &
+              _db.remoteAssetEntity.deletedAt.isNull() &
              _db.remoteAssetEntity.ownerId.equals(userId) &
-              _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-              _db.assetFaceEntity.personId.equals(personId) &
-              _db.assetFaceEntity.isVisible.equals(true) &
-              _db.assetFaceEntity.deletedAt.isNull(),
+              _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline),
        );

      return query.map((row) {
@@ -486,20 +487,11 @@ class DriftTimelineRepository extends DriftDatabaseRepository {

    final query = _db.remoteAssetEntity.selectOnly()
      ..addColumns([assetCountExp, dateExp])
-      ..join([
-        innerJoin(
-          _db.assetFaceEntity,
-          _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-          useColumns: false,
-        ),
-      ])
      ..where(
-        _db.remoteAssetEntity.deletedAt.isNull() &
+        _db.remoteAssetEntity.id.isInQuery(idQuery) &
            _db.remoteAssetEntity.ownerId.equals(userId) &
            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-            _db.assetFaceEntity.personId.equals(personId) &
-            _db.assetFaceEntity.isVisible.equals(true) &
-            _db.assetFaceEntity.deletedAt.isNull(),
+            _db.remoteAssetEntity.deletedAt.isNull(),
      )
      ..groupBy([dateExp])
      ..orderBy([OrderingTerm.desc(dateExp)]);
@@ -517,26 +509,26 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
    required int offset,
    required int count,
  }) {
-    final query =
-        _db.remoteAssetEntity.select().join([
-            innerJoin(
-              _db.assetFaceEntity,
-              _db.assetFaceEntity.assetId.equalsExp(_db.remoteAssetEntity.id),
-              useColumns: false,
-            ),
-          ])
-          ..where(
-            _db.remoteAssetEntity.deletedAt.isNull() &
-                _db.remoteAssetEntity.ownerId.equals(userId) &
-                _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
-                _db.assetFaceEntity.personId.equals(personId) &
-                _db.assetFaceEntity.isVisible.equals(true) &
-                _db.assetFaceEntity.deletedAt.isNull(),
-          )
-          ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
-          ..limit(count, offset: offset);
+    final idQuery = _db.assetFaceEntity.selectOnly()
+      ..addColumns([_db.assetFaceEntity.assetId])
+      ..where(
+        _db.assetFaceEntity.personId.equals(personId) &
+            _db.assetFaceEntity.isVisible.equals(true) &
+            _db.assetFaceEntity.deletedAt.isNull(),
+      );

-    return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
+    final query = _db.remoteAssetEntity.select()
+      ..where(
+        (row) =>
+            row.id.isInQuery(idQuery) &
+            row.deletedAt.isNull() &
+            row.ownerId.equals(userId) &
+            row.visibility.equalsValue(AssetVisibility.timeline),
+      )
+      ..orderBy([(row) => OrderingTerm.desc(row.createdAt)])
+      ..limit(count, offset: offset);
+
+    return query.map((row) => row.toDto()).get();
  }

  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
@@ -10,6 +10,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_displaymode/flutter_displaymode.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/constants/locales.dart';
@@ -24,6 +25,7 @@ import 'package:immich_mobile/platform/background_worker_lock_api.g.dart';
 import 'package:immich_mobile/providers/app_life_cycle.provider.dart';
 import 'package:immich_mobile/providers/asset_viewer/share_intent_upload.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/locale_provider.dart';
 import 'package:immich_mobile/providers/routes.provider.dart';
@@ -53,7 +55,7 @@ void main() async {
    await initApp();
    // Warm-up isolate pool for worker manager
    await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
-    await migrateDatabaseIfNeeded();
+    await migrateDatabaseIfNeeded(drift);

    runApp(ProviderScope(overrides: [driftProvider.overrideWith(driftOverride(drift))], child: const MainWidget()));
  } catch (error, stack) {
@@ -162,6 +164,13 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
      }
    }
    SystemChrome.setSystemUIOverlayStyle(overlayStyle);
+
+    await FlutterLocalNotificationsPlugin().initialize(
+      const InitializationSettings(
+        android: AndroidInitializationSettings('@drawable/notification_icon'),
+        iOS: DarwinInitializationSettings(),
+      ),
+    );
  }

  Future<DeepLink> _deepLinkBuilder(PlatformDeepLink deepLink) async {
@@ -241,7 +250,7 @@ class ImmichAppState extends ConsumerState<ImmichApp> with WidgetsBindingObserve
        localizationsDelegates: context.localizationDelegates,
        supportedLocales: context.supportedLocales,
        locale: context.locale,
-        themeMode: ref.watch(immichThemeModeProvider),
+        themeMode: ref.watch(appConfigProvider.select((config) => config.theme.mode)),
        darkTheme: getThemeData(colorScheme: immichTheme.dark, locale: context.locale),
        theme: getThemeData(colorScheme: immichTheme.light, locale: context.locale),
        builder: (context, child) => ImmichTranslationProvider(
@@ -6,8 +6,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/constants/locales.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/generated/codegen_loader.g.dart';
@@ -35,7 +35,7 @@ class BootstrapErrorWidget extends StatelessWidget {

  @override
  Widget build(BuildContext _) {
-    final immichTheme = defaultColorPreset.themeOfPreset;
+    final immichTheme = MetadataKey.themePrimaryColor.defaultValue.themeOfPreset;

    return EasyLocalization(
      supportedLocales: locales.values.toList(),
@@ -160,12 +160,25 @@ class DriftMemoryPage extends HookConsumerWidget {
      currentAssetPage.value = otherIndex;
      updateProgressText();

+      final activeMemory = currentMemory.value;
+
      // Wait for page change animation to finish
      await Future.delayed(const Duration(milliseconds: 400));
+
+      // check if memory is still the same and if context is still mounted
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
      // And then precache the next asset
      await precacheAsset(otherIndex + 1);

-      final asset = currentMemory.value.assets[otherIndex];
+      // check again as precache involves async operations
+      if (currentMemory.value != activeMemory || !context.mounted) {
+        return;
+      }
+
+      final asset = activeMemory.assets[otherIndex];
      currentAsset.value = asset;
      ref.read(assetViewerProvider.notifier).setAsset(asset);
    }
@@ -106,10 +106,17 @@ class DriftSearchPage extends HookConsumerWidget {

      Future.microtask(() {
        textSearchController.clear();
+        peopleCurrentFilterWidget.value = null;
+        dateRangeCurrentFilterWidget.value = null;
+        cameraCurrentFilterWidget.value = null;
+        tagCurrentFilterWidget.value = null;
+        mediaTypeCurrentFilterWidget.value = null;
+        ratingCurrentFilterWidget.value = null;
+        displayOptionCurrentFilterWidget.value = null;
+        locationCurrentFilterWidget.value = preFilter.location.city != null
+            ? Text(preFilter.location.city!, style: context.textTheme.labelLarge)
+            : null;
        search(preFilter);
-        if (preFilter.location.city != null) {
-          locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
-        }
      });

      return null;
@@ -37,7 +37,7 @@ class SimilarPhotosActionButton extends ConsumerWidget {
          date: SearchDateFilter(),
          display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
          rating: SearchRatingFilter(),
-          mediaType: AssetType.image,
+          mediaType: AssetType.other,
        ),
      );

@@ -26,6 +26,14 @@ class AssetDetails extends ConsumerWidget {
      decoration: BoxDecoration(
        color: context.colorScheme.surface,
        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: 0.2),
+            offset: const Offset(0, -3),
+            blurRadius: 10,
+            spreadRadius: 2,
+          ),
+        ],
      ),
      child: SafeArea(
        top: false,
@@ -22,6 +22,7 @@ class TechnicalDetails extends ConsumerWidget {
    final exifInfo = this.exifInfo;
    final cameraTitle = _getCameraInfoTitle(exifInfo);
    final lensTitle = exifInfo?.lens != null && exifInfo!.lens!.isNotEmpty ? exifInfo.lens : null;
+    final lensSubtitle = _getLensInfoSubtitle(exifInfo);

    return Column(
      children: [
@@ -46,9 +47,16 @@ class TechnicalDetails extends ConsumerWidget {
            title: lensTitle,
            titleStyle: context.textTheme.labelLarge,
            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
-            subtitle: _getLensInfoSubtitle(exifInfo),
+            subtitle: lensSubtitle,
            subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
          ),
+        ] else if (lensSubtitle != null) ...[
+          const SizedBox(height: 16),
+          SheetTile(
+            title: lensSubtitle,
+            titleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
+            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
+          ),
        ],
      ],
    );
@@ -123,6 +131,7 @@ class TechnicalDetails extends ConsumerWidget {
    if (exifInfo == null) return null;
    final fNumber = exifInfo.fNumber.isNotEmpty ? 'ƒ/${exifInfo.fNumber}' : null;
    final focalLength = exifInfo.focalLength.isNotEmpty ? '${exifInfo.focalLength} mm' : null;
+    if (fNumber == null && focalLength == null) return null;
    return [fNumber, focalLength].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
  }
 }
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/domain/models/events.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/scroll_extensions.dart';
@@ -363,7 +364,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
    }

    BaseAsset displayAsset = asset;
-    final stackChildren = ref.watch(stackChildrenNotifier(asset)).valueOrNull;
+    final showAssetStack = ref.watch(timelineServiceProvider.select((s) => s.origin != TimelineOrigin.trash));
+    final stackChildren = showAssetStack ? ref.watch(stackChildrenNotifier(asset)).valueOrNull : null;
    if (stackChildren != null && stackChildren.isNotEmpty) {
      displayAsset = stackChildren.elementAt(stackIndex);
    }
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/services/timeline.service.dart';
 import 'package:immich_mobile/providers/asset_viewer/asset_viewer.provider.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';

 class AssetStackRow extends ConsumerWidget {
  final List<RemoteAsset> stack;
@@ -15,6 +17,11 @@ class AssetStackRow extends ConsumerWidget {
      return const SizedBox.shrink();
    }

+    final hideAssetStack = ref.read(timelineServiceProvider).origin == TimelineOrigin.trash;
+    if (hideAssetStack) {
+      return const SizedBox.shrink();
+    }
+
    final showingControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
    double opacity = ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity)) * (showingControls ? 1 : 0);

@@ -65,26 +65,37 @@ class ViewerBottomBar extends ConsumerWidget {
                  labelLarge: context.themeData.textTheme.labelLarge?.copyWith(color: Colors.white),
                ),
              ),
-              child: Container(
-                decoration: const BoxDecoration(
-                  gradient: LinearGradient(
-                    begin: Alignment.bottomCenter,
-                    end: Alignment.topCenter,
-                    colors: [Colors.black45, Colors.black12, Colors.transparent],
-                    stops: [0.0, 0.7, 1.0],
+              child: Stack(
+                children: [
+                  const Positioned.fill(
+                    child: IgnorePointer(
+                      child: DecoratedBox(
+                        decoration: BoxDecoration(
+                          gradient: LinearGradient(
+                            begin: Alignment.bottomCenter,
+                            end: Alignment.topCenter,
+                            colors: [Colors.black45, Colors.black12, Colors.transparent],
+                            stops: [0.0, 0.7, 1.0],
+                          ),
+                        ),
+                      ),
+                    ),
                  ),
-                ),
-                child: SafeArea(
-                  top: false,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
-                      if (!isReadonlyModeEnabled)
-                        Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
-                    ],
+                  SafeArea(
+                    top: false,
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 16),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (asset.isVideo) VideoControls(videoPlayerName: asset.heroTag),
+                          if (!isReadonlyModeEnabled)
+                            Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),
+                        ],
+                      ),
+                    ),
                  ),
-                ),
+                ],
              ),
            ),
    );
@@ -75,29 +75,41 @@ class ViewerTopAppBar extends ConsumerWidget implements PreferredSizeWidget {
      child: AnimatedOpacity(
        opacity: opacity,
        duration: Durations.short2,
-        child: DecoratedBox(
-          decoration: BoxDecoration(
-            gradient: showingDetails
-                ? null
-                : const LinearGradient(
-                    begin: Alignment.topCenter,
-                    end: Alignment.bottomCenter,
-                    colors: [Colors.black45, Colors.black12, Colors.transparent],
-                    stops: [0.0, 0.7, 1.0],
+        child: Stack(
+          children: [
+            Positioned.fill(
+              child: IgnorePointer(
+                child: DecoratedBox(
+                  decoration: BoxDecoration(
+                    gradient: showingDetails
+                        ? null
+                        : const LinearGradient(
+                            begin: Alignment.topCenter,
+                            end: Alignment.bottomCenter,
+                            colors: [Colors.black45, Colors.black12, Colors.transparent],
+                            stops: [0.0, 0.7, 1.0],
+                          ),
                  ),
-          ),
-          child: AppBar(
-            backgroundColor: Colors.transparent,
-            leading: const _AppBarBackButton(),
-            iconTheme: const IconThemeData(size: 22, color: Colors.white),
-            actionsIconTheme: const IconThemeData(size: 22, color: Colors.white),
-            shape: const Border(),
-            actions: showingDetails || isReadonlyModeEnabled
-                ? null
-                : isInLockedView
-                ? lockedViewActions
-                : actions,
-          ),
+                ),
+              ),
+            ),
+            SafeArea(
+              bottom: false,
+              child: SizedBox.square(
+                child: Theme(
+                  data: context.themeData.copyWith(iconTheme: const IconThemeData(size: 22, color: Colors.white)),
+                  child: Row(
+                    children: [
+                      const _AppBarBackButton(),
+                      const Spacer(),
+                      if (!showingDetails && !isReadonlyModeEnabled)
+                        if (isInLockedView) ...lockedViewActions else ...actions,
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ],
        ),
      ),
    );
@@ -113,20 +125,17 @@ class _AppBarBackButton extends ConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final showingDetails = ref.watch(assetViewerProvider.select((state) => state.showingDetails));
-    return Padding(
-      padding: const EdgeInsets.only(left: 12.0),
-      child: ElevatedButton(
-        style: ElevatedButton.styleFrom(
-          backgroundColor: showingDetails ? context.colorScheme.surface : Colors.transparent,
-          shape: const CircleBorder(),
-          iconSize: 22,
-          iconColor: showingDetails ? context.colorScheme.onSurface : Colors.white,
-          padding: EdgeInsets.zero,
-          elevation: showingDetails ? 4 : 0,
-        ),
-        onPressed: context.maybePop,
-        child: const Icon(Icons.arrow_back_rounded),
+    return ElevatedButton(
+      style: ElevatedButton.styleFrom(
+        backgroundColor: showingDetails ? context.colorScheme.surface : Colors.transparent,
+        shape: const CircleBorder(),
+        iconSize: 22,
+        iconColor: showingDetails ? context.colorScheme.onSurface : Colors.white,
+        padding: const EdgeInsets.all(10.0),
+        elevation: showingDetails ? 4 : 0,
      ),
+      onPressed: context.maybePop,
+      child: const Icon(Icons.arrow_back_rounded),
    );
  }
 }
@@ -21,6 +21,7 @@ class ThumbnailTile extends ConsumerStatefulWidget {
    this.showStorageIndicator = false,
    this.lockSelection = false,
    this.heroOffset,
+    this.showStackIndicator = false,
    super.key,
  });

@@ -30,6 +31,7 @@ class ThumbnailTile extends ConsumerStatefulWidget {
  final bool showStorageIndicator;
  final bool lockSelection;
  final int? heroOffset;
+  final bool showStackIndicator;

  @override
  ConsumerState<ThumbnailTile> createState() => _ThumbnailTileState();
@@ -139,7 +141,14 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
                    duration: Durations.short4,
                    child: Align(
                      alignment: Alignment.topRight,
-                      child: _AssetTypeIcons(asset: asset),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          _AssetTypeIcons(asset: asset),
+                          if (widget.showStackIndicator) _StackIndicator(asset: asset),
+                        ],
+                      ),
                    ),
                  ),
                if (storageIndicator && asset != null)
@@ -286,8 +295,8 @@ class _AssetTypeIcons extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    final hasStack = asset is RemoteAsset && (asset as RemoteAsset).stackId != null;
-    final isLivePhoto = asset is RemoteAsset && asset.livePhotoVideoId != null;
+    final remoteAsset = asset is RemoteAsset ? asset as RemoteAsset : null;
+    final isLivePhoto = remoteAsset?.livePhotoVideoId != null;

    return Column(
      mainAxisSize: MainAxisSize.min,
@@ -295,11 +304,6 @@ class _AssetTypeIcons extends StatelessWidget {
      children: [
        if (asset.isVideo)
          Padding(padding: const EdgeInsets.only(right: 10.0, top: 6.0), child: _VideoIndicator(asset.duration)),
-        if (hasStack)
-          const Padding(
-            padding: EdgeInsets.only(right: 10.0, top: 6.0),
-            child: _TileOverlayIcon(Icons.burst_mode_rounded),
-          ),
        if (isLivePhoto)
          const Padding(
            padding: EdgeInsets.only(right: 10.0, top: 6.0),
@@ -312,6 +316,24 @@ class _AssetTypeIcons extends StatelessWidget {
  }
 }

+class _StackIndicator extends StatelessWidget {
+  final BaseAsset asset;
+
+  const _StackIndicator({required this.asset});
+
+  @override
+  Widget build(BuildContext context) {
+    if (asset is! RemoteAsset || (asset as RemoteAsset).stackId == null) {
+      return const SizedBox.shrink();
+    }
+
+    return const Padding(
+      padding: EdgeInsets.only(right: 10.0, top: 6.0),
+      child: _TileOverlayIcon(Icons.burst_mode_rounded),
+    );
+  }
+}
+
 class _UploadProgressOverlay extends StatelessWidget {
  final double progress;

@@ -244,6 +244,7 @@ class _AssetTileWidget extends ConsumerWidget {
    final lockSelection = _getLockSelectionStatus(ref);
    final showStorageIndicator = ref.watch(timelineArgsProvider.select((args) => args.showStorageIndicator));
    final isReadonlyModeEnabled = ref.watch(readonlyModeProvider);
+    final showStackIndicator = ref.read(timelineServiceProvider).origin != TimelineOrigin.trash;

    return RepaintBoundary(
      child: GestureDetector(
@@ -253,6 +254,7 @@ class _AssetTileWidget extends ConsumerWidget {
          asset,
          lockSelection: lockSelection,
          showStorageIndicator: showStorageIndicator,
+          showStackIndicator: showStackIndicator,
          heroOffset: heroOffset,
        ),
      ),
@@ -1,9 +1,9 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/enums.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/cleanup.service.dart';

 class CleanupState {
@@ -54,27 +54,25 @@ final cleanupProvider = StateNotifierProvider<CleanupNotifier, CleanupState>((re
  return CleanupNotifier(
    ref.watch(cleanupServiceProvider),
    ref.watch(currentUserProvider)?.id,
-    ref.watch(appSettingsServiceProvider),
+    ref.watch(metadataProvider),
  );
 });

 class CleanupNotifier extends StateNotifier<CleanupState> {
  final CleanupService _cleanupService;
  final String? _userId;
-  final AppSettingsService _appSettingsService;
+  final MetadataRepository _metadataRepository;

-  CleanupNotifier(this._cleanupService, this._userId, this._appSettingsService) : super(const CleanupState()) {
+  CleanupNotifier(this._cleanupService, this._userId, this._metadataRepository) : super(const CleanupState()) {
    _loadPersistedSettings();
  }

  void _loadPersistedSettings() {
-    final keepFavorites = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepFavorites);
-    final keepMediaTypeIndex = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepMediaType);
-    final keepAlbumIdsString = _appSettingsService.getSetting(AppSettingsEnum.cleanupKeepAlbumIds);
-    final cutoffDaysAgo = _appSettingsService.getSetting(AppSettingsEnum.cleanupCutoffDaysAgo);
-
-    final keepMediaType = AssetKeepType.values[keepMediaTypeIndex.clamp(0, AssetKeepType.values.length - 1)];
-    final keepAlbumIds = keepAlbumIdsString.isEmpty ? <String>{} : keepAlbumIdsString.split(',').toSet();
+    final cleanup = _metadataRepository.appConfig.cleanup;
+    final keepFavorites = cleanup.keepFavorites;
+    final keepMediaType = cleanup.keepMediaType;
+    final keepAlbumIds = cleanup.keepAlbumIds.toSet();
+    final cutoffDaysAgo = cleanup.cutoffDaysAgo;
    final selectedDate = cutoffDaysAgo >= 0 ? DateTime.now().subtract(Duration(days: cutoffDaysAgo)) : null;

    state = state.copyWith(
@@ -89,18 +87,18 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
    state = state.copyWith(selectedDate: date, assetsToDelete: []);
    if (date != null) {
      final daysAgo = DateTime.now().difference(date).inDays;
-      _appSettingsService.setSetting(AppSettingsEnum.cleanupCutoffDaysAgo, daysAgo);
+      _metadataRepository.write(.cleanupCutoffDaysAgo, daysAgo);
    }
  }

  void setKeepMediaType(AssetKeepType keepMediaType) {
    state = state.copyWith(keepMediaType: keepMediaType, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepMediaType, keepMediaType.index);
+    _metadataRepository.write(.cleanupKeepMediaType, keepMediaType);
  }

  void setKeepFavorites(bool keepFavorites) {
    state = state.copyWith(keepFavorites: keepFavorites, assetsToDelete: []);
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepFavorites, keepFavorites);
+    _metadataRepository.write(.cleanupKeepFavorites, keepFavorites);
  }

  void toggleKeepAlbum(String albumId) {
@@ -120,7 +118,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
  }

  void _persistExcludedAlbumIds(Set<String> albumIds) {
-    _appSettingsService.setSetting(AppSettingsEnum.cleanupKeepAlbumIds, albumIds.join(','));
+    _metadataRepository.write(.cleanupKeepAlbumIds, albumIds.toList());
  }

  void cleanupStaleAlbumIds(Set<String> existingAlbumIds) {
@@ -133,7 +131,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
  }

  void applyDefaultAlbumSelections(List<(String id, String name)> albums) {
-    final isInitialized = _appSettingsService.getSetting(AppSettingsEnum.cleanupDefaultsInitialized);
+    final isInitialized = _metadataRepository.appConfig.cleanup.defaultsInitialized;
    if (isInitialized) return;

    final toKeep = _cleanupService.getDefaultKeepAlbumIds(albums);
@@ -144,7 +142,7 @@ class CleanupNotifier extends StateNotifier<CleanupState> {
      _persistExcludedAlbumIds(keepAlbumIds);
    }

-    _appSettingsService.setSetting(AppSettingsEnum.cleanupDefaultsInitialized, true);
+    _metadataRepository.write(.cleanupDefaultsInitialized, true);
  }

  Future<void> scanAssets() async {
@@ -0,0 +1,20 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/config/app_config.dart';
+import 'package:immich_mobile/domain/models/config/system_config.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
+
+final metadataProvider = Provider.autoDispose<MetadataRepository>((_) => MetadataRepository.instance);
+
+final appConfigProvider = Provider.autoDispose<AppConfig>((ref) {
+  final repo = ref.watch(metadataProvider);
+  final subscription = repo.watchAppConfig().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.appConfig;
+});
+
+final systemConfigProvider = Provider.autoDispose<SystemConfig>((ref) {
+  final repo = ref.watch(metadataProvider);
+  final subscription = repo.watchSystemConfig().listen((event) => ref.state = event);
+  ref.onDispose(subscription.cancel);
+  return repo.systemConfig;
+});
@@ -1,58 +1,17 @@
-import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-
-import 'package:immich_mobile/constants/colors.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
-import 'package:immich_mobile/theme/theme_data.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
-import 'package:immich_mobile/utils/debug_print.dart';
-
-final immichThemeModeProvider = StateProvider<ThemeMode>((ref) {
-  final themeMode = ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.themeMode);
-
-  dPrint(() => "Current themeMode $themeMode");
-
-  if (themeMode == ThemeMode.light.name) {
-    return ThemeMode.light;
-  } else if (themeMode == ThemeMode.dark.name) {
-    return ThemeMode.dark;
-  } else {
-    return ThemeMode.system;
-  }
-});
-
-final immichThemePresetProvider = StateProvider<ImmichColorPreset>((ref) {
-  final appSettingsProvider = ref.watch(appSettingsServiceProvider);
-  final primaryColorPreset = appSettingsProvider.getSetting(AppSettingsEnum.primaryColor);
-
-  dPrint(() => "Current theme preset $primaryColorPreset");
-
-  try {
-    return ImmichColorPreset.values.firstWhere((e) => e.name == primaryColorPreset);
-  } catch (e) {
-    dPrint(() => "Theme preset $primaryColorPreset not found. Applying default preset.");
-    appSettingsProvider.setSetting(AppSettingsEnum.primaryColor, defaultColorPresetName);
-    return defaultColorPreset;
-  }
-});
-
-final dynamicThemeSettingProvider = StateProvider<bool>((ref) {
-  return ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.dynamicTheme);
-});
-
-final colorfulInterfaceSettingProvider = StateProvider<bool>((ref) {
-  return ref.watch(appSettingsServiceProvider).getSetting(AppSettingsEnum.colorfulInterface);
-});
+import 'package:immich_mobile/theme/theme_data.dart';

 // Provider for current selected theme
 final immichThemeProvider = StateProvider<ImmichTheme>((ref) {
-  final primaryColorPreset = ref.read(immichThemePresetProvider);
-  final useSystemColor = ref.watch(dynamicThemeSettingProvider);
-  final useColorfulInterface = ref.watch(colorfulInterfaceSettingProvider);
-  final ImmichTheme? dynamicTheme = DynamicTheme.theme;
-  final currentTheme = (useSystemColor && dynamicTheme != null) ? dynamicTheme : primaryColorPreset.themeOfPreset;
+  final themeConfig = ref.watch(appConfigProvider.select((config) => config.theme));

-  return useColorfulInterface ? currentTheme : decolorizeSurfaces(theme: currentTheme);
+  final ImmichTheme? dynamicTheme = DynamicTheme.theme;
+  final currentTheme = (themeConfig.dynamicTheme && dynamicTheme != null)
+      ? dynamicTheme
+      : themeConfig.primaryColor.themeOfPreset;
+
+  return themeConfig.colorfulInterface ? currentTheme : decolorizeSurfaces(theme: currentTheme);
 });
@@ -94,8 +94,10 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
          state = const WebsocketState(isConnected: false, socket: null);
        });

-        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReady);
-        socket.on('AssetEditReadyV1', _handleSyncAssetEditReady);
+        socket.on('AssetUploadReadyV1', _handleSyncAssetUploadReadyV1);
+        socket.on('AssetUploadReadyV2', _handleSyncAssetUploadReadyV2);
+        socket.on('AssetEditReadyV1', _handleSyncAssetEditReadyV1);
+        socket.on('AssetEditReadyV2', _handleSyncAssetEditReadyV2);
        socket.on('on_config_update', _handleOnConfigUpdate);
        socket.on('on_new_release', _handleReleaseUpdates);
      } catch (e) {
@@ -163,16 +165,25 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
    _ref.read(serverInfoProvider.notifier).handleReleaseInfo(serverVersion, releaseVersion);
  }

-  void _handleSyncAssetUploadReady(dynamic data) {
+  void _handleSyncAssetUploadReadyV1(dynamic data) {
    _batchedAssetUploadReady.add(data);
-    _batchDebouncer.run(_processBatchedAssetUploadReady);
+    _batchDebouncer.run(_processBatchedAssetUploadReadyV1);
  }

-  void _handleSyncAssetEditReady(dynamic data) {
-    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEdit(data));
+  void _handleSyncAssetUploadReadyV2(dynamic data) {
+    _batchedAssetUploadReady.add(data);
+    _batchDebouncer.run(_processBatchedAssetUploadReadyV2);
  }

-  void _processBatchedAssetUploadReady() {
+  void _handleSyncAssetEditReadyV1(dynamic data) {
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV1(data));
+  }
+
+  void _handleSyncAssetEditReadyV2(dynamic data) {
+    unawaited(_ref.read(backgroundSyncProvider).syncWebsocketEditV2(data));
+  }
+
+  void _processBatchedAssetUploadReadyV1() {
    if (_batchedAssetUploadReady.isEmpty) {
      return;
    }
@@ -180,7 +191,7 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {
    final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
    try {
      unawaited(
-        _ref.read(backgroundSyncProvider).syncWebsocketBatch(_batchedAssetUploadReady.toList()).then((_) {
+        _ref.read(backgroundSyncProvider).syncWebsocketBatchV1(_batchedAssetUploadReady.toList()).then((_) {
          if (isSyncAlbumEnabled) {
            _ref.read(backgroundSyncProvider).syncLinkedAlbum();
          }
@@ -192,6 +203,27 @@ class WebsocketNotifier extends StateNotifier<WebsocketState> {

    _batchedAssetUploadReady.clear();
  }
+
+  void _processBatchedAssetUploadReadyV2() {
+    if (_batchedAssetUploadReady.isEmpty) {
+      return;
+    }
+
+    final isSyncAlbumEnabled = Store.get(StoreKey.syncAlbums, false);
+    try {
+      unawaited(
+        _ref.read(backgroundSyncProvider).syncWebsocketBatchV2(_batchedAssetUploadReady.toList()).then((_) {
+          if (isSyncAlbumEnabled) {
+            _ref.read(backgroundSyncProvider).syncLinkedAlbum();
+          }
+        }),
+      );
+    } catch (error) {
+      _log.severe("Error processing batched AssetUploadReadyV2 events: $error");
+    }
+
+    _batchedAssetUploadReady.clear();
+  }
 }

 final websocketProvider = StateNotifierProvider<WebsocketNotifier, WebsocketState>((ref) {
@@ -1,14 +1,9 @@
-import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';

 enum AppSettingsEnum<T> {
  loadPreview<bool>(StoreKey.loadPreview, "loadPreview", true),
  loadOriginal<bool>(StoreKey.loadOriginal, "loadOriginal", false),
-  themeMode<String>(StoreKey.themeMode, "themeMode", "system"), // "light","dark","system"
-  primaryColor<String>(StoreKey.primaryColor, "primaryColor", defaultColorPresetName),
-  dynamicTheme<bool>(StoreKey.dynamicTheme, "dynamicTheme", false),
-  colorfulInterface<bool>(StoreKey.colorfulInterface, "colorfulInterface", true),
  tilesPerRow<int>(StoreKey.tilesPerRow, "tilesPerRow", 4),
  dynamicLayout<bool>(StoreKey.dynamicLayout, "dynamicLayout", false),
  groupAssetsBy<int>(StoreKey.groupAssetsBy, "groupBy", 0),
@@ -30,7 +25,6 @@ enum AppSettingsEnum<T> {
  selectedAlbumSortOrder<int>(StoreKey.selectedAlbumSortOrder, "selectedAlbumSortOrder", 2),
  advancedTroubleshooting<bool>(StoreKey.advancedTroubleshooting, null, false),
  manageLocalMediaAndroid<bool>(StoreKey.manageLocalMediaAndroid, null, false),
-  logLevel<int>(StoreKey.logLevel, null, 5), // Level.INFO = 5
  preferRemoteImage<bool>(StoreKey.preferRemoteImage, null, false),
  loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),
  loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),
@@ -55,12 +49,7 @@ enum AppSettingsEnum<T> {
  readonlyModeEnabled<bool>(StoreKey.readonlyModeEnabled, "readonlyModeEnabled", false),
  albumGridView<bool>(StoreKey.albumGridView, "albumGridView", false),
  backupRequireCharging<bool>(StoreKey.backupRequireCharging, null, false),
-  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30),
-  cleanupKeepFavorites<bool>(StoreKey.cleanupKeepFavorites, null, true),
-  cleanupKeepMediaType<int>(StoreKey.cleanupKeepMediaType, null, 0),
-  cleanupKeepAlbumIds<String>(StoreKey.cleanupKeepAlbumIds, null, ""),
-  cleanupCutoffDaysAgo<int>(StoreKey.cleanupCutoffDaysAgo, null, -1),
-  cleanupDefaultsInitialized<bool>(StoreKey.cleanupDefaultsInitialized, null, false);
+  backupTriggerDelay<int>(StoreKey.backupTriggerDelay, null, 30);

  const AppSettingsEnum(this.storeKey, this.hiveKey, this.defaultValue);

@@ -148,6 +148,7 @@ enum ActionButtonType {
            context.selectedCount == 1,
      ActionButtonType.unstack =>
        context.isOwner && //
+            context.timelineOrigin != TimelineOrigin.trash &&
            !context.isInLockedView && //
            context.isStacked,
      ActionButtonType.openInBrowser => context.asset.hasRemote && !context.isInLockedView,
@@ -6,6 +6,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/log.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/metadata.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:photo_manager/photo_manager.dart';
@@ -48,9 +49,11 @@ abstract final class Bootstrap {

    await StoreService.init(storeRepository: storeRepo, listenUpdates: listenStoreUpdates);

+    final metadataRepo = await MetadataRepository.ensureInitialized(drift);
+
    await LogService.init(
      logRepository: LogRepository(logDb),
-      storeRepository: storeRepo,
+      metadataRepository: metadataRepo,
      shouldBuffer: shouldBufferLogs,
    );

@@ -1,7 +1,7 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';

 ValueNotifier<T> useAppSettingsState<T>(AppSettingsEnum<T> key) {
  final notifier = useState<T>(Store.get(key.storeKey, key.defaultValue));
@@ -1,25 +1,146 @@
 import 'dart:async';

+import 'package:drift/drift.dart';
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/constants/colors.dart';
+import 'package:immich_mobile/constants/enums.dart';
+import 'package:immich_mobile/domain/models/log.model.dart';
+import 'package:immich_mobile/domain/models/metadata_key.dart';
 import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/metadata.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/network.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';

-const int targetVersion = 25;
+const int targetVersion = 26;

-Future<void> migrateDatabaseIfNeeded() async {
+Future<void> migrateDatabaseIfNeeded(Drift drift) async {
  final int version = Store.get(StoreKey.version, targetVersion);

  if (version < 25) {
-    final accessToken = Store.tryGet(StoreKey.accessToken);
-    if (accessToken != null && accessToken.isNotEmpty) {
-      final serverUrls = ApiService.getServerUrls();
-      if (serverUrls.isNotEmpty) {
-        await NetworkRepository.setHeaders(ApiService.getRequestHeaders(), serverUrls, token: accessToken);
-      }
-    }
+    await _migrateTo25();
+  }
+
+  if (version < 26) {
+    await _migrateTo26(drift);
  }

  await Store.put(StoreKey.version, targetVersion);
  return;
 }
+
+Future<void> _migrateTo25() async {
+  final accessToken = Store.tryGet(StoreKey.accessToken);
+  if (accessToken == null || accessToken.isEmpty) return;
+
+  final serverUrls = ApiService.getServerUrls();
+  if (serverUrls.isEmpty) return;
+
+  await NetworkRepository.setHeaders(ApiService.getRequestHeaders(), serverUrls, token: accessToken);
+}
+
+Future<void> _migrateTo26(Drift drift) async {
+  final migrator = _StoreMigrator(drift);
+  await migrator.migrateEnumName(StoreKey.legacyThemeMode, MetadataKey.themeMode, ThemeMode.values);
+  await migrator.migrateEnumIndex(StoreKey.legacyLogLevel, MetadataKey.logLevel, LogLevel.values);
+  await migrator.migrateEnumName(StoreKey.legacyPrimaryColor, MetadataKey.themePrimaryColor, ImmichColorPreset.values);
+  await migrator.migrateBool(StoreKey.legacyDynamicTheme, MetadataKey.themeDynamic);
+  await migrator.migrateBool(StoreKey.legacyColorfulInterface, MetadataKey.themeColorfulInterface);
+  final cleanupKeepAlbumIds = await migrator.readLegacyStoreString(StoreKey.legacyCleanupKeepAlbumIds.id);
+  if (cleanupKeepAlbumIds != null) {
+    final ids = cleanupKeepAlbumIds.split(',').where((id) => id.isNotEmpty).toList();
+    await drift.metadataEntity.insertOnConflictUpdate(
+      MetadataEntityCompanion.insert(
+        key: MetadataKey.cleanupKeepAlbumIds.key,
+        value: MetadataKey.cleanupKeepAlbumIds.encode(ids),
+        updatedAt: Value(DateTime.now()),
+      ),
+    );
+    await migrator.deleteLegacyStoreRows([StoreKey.legacyCleanupKeepAlbumIds.id]);
+  }
+  await migrator.migrateBool(StoreKey.legacyCleanupKeepFavorites, MetadataKey.cleanupKeepFavorites);
+  await migrator.migrateEnumIndex(
+    StoreKey.legacyCleanupKeepMediaType,
+    MetadataKey.cleanupKeepMediaType,
+    AssetKeepType.values,
+  );
+  await migrator.migrateInt(StoreKey.legacyCleanupCutoffDaysAgo, MetadataKey.cleanupCutoffDaysAgo);
+  await migrator.migrateBool(StoreKey.legacyCleanupDefaultsInitialized, MetadataKey.cleanupDefaultsInitialized);
+  await migrator.complete();
+}
+
+class _StoreMigrator {
+  final Drift _db;
+  final Map<MetadataKey<Object>, Object> _cache = {};
+  final List<int> _migratedStoreIds = [];
+
+  _StoreMigrator(this._db);
+
+  Future<void> migrateEnumIndex<T extends Enum>(StoreKey<int> legacyKey, MetadataKey<T> newKey, List<T> values) async {
+    final index = await readLegacyStoreInt(legacyKey.id);
+    if (index == null) return;
+
+    final enumValue = values.elementAtOrNull(index) ?? newKey.defaultValue;
+    _cache[newKey] = enumValue;
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  Future<void> migrateEnumName<T extends Enum>(
+    StoreKey<String> legacyKey,
+    MetadataKey<T> newKey,
+    List<T> values,
+  ) async {
+    final name = await readLegacyStoreString(legacyKey.id);
+    if (name == null) return;
+
+    final enumValue = values.firstWhere((e) => e.name == name, orElse: () => newKey.defaultValue);
+    _cache[newKey] = enumValue;
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  Future<void> migrateBool(StoreKey<bool> legacyKey, MetadataKey<bool> newKey) async {
+    final intValue = await readLegacyStoreInt(legacyKey.id);
+    if (intValue == null) return;
+
+    final boolValue = intValue != 0;
+    _cache[newKey] = boolValue;
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  Future<void> migrateInt(StoreKey<int> legacyKey, MetadataKey<int> newKey) async {
+    final intValue = await readLegacyStoreInt(legacyKey.id);
+    if (intValue == null) return;
+
+    _cache[newKey] = intValue;
+    _migratedStoreIds.add(legacyKey.id);
+  }
+
+  Future<void> complete() async {
+    await _db.batch((batch) {
+      for (final entry in _cache.entries) {
+        batch.insert(
+          _db.metadataEntity,
+          MetadataEntityCompanion(key: Value(entry.key.key), value: Value(entry.key.encode(entry.value))),
+          mode: InsertMode.insertOrReplace,
+        );
+      }
+    });
+    await deleteLegacyStoreRows(_migratedStoreIds);
+  }
+
+  Future<String?> readLegacyStoreString(int id) async {
+    final row = await (_db.storeEntity.select()..where((t) => t.id.equals(id))).getSingleOrNull();
+    return row?.stringValue;
+  }
+
+  Future<int?> readLegacyStoreInt(int id) async {
+    final row = await (_db.storeEntity.select()..where((t) => t.id.equals(id))).getSingleOrNull();
+    return row?.intValue;
+  }
+
+  Future<void> deleteLegacyStoreRows(List<int> ids) async {
+    if (ids.isEmpty) return;
+    await (_db.storeEntity.delete()..where((t) => t.id.isIn(ids))).go();
+  }
+}
@@ -119,13 +119,15 @@ class _VideoControlsState extends ConsumerState<VideoControls> {
                onPressed: () => _toggle(isCasting),
              ),
              const Spacer(),
-              Text(
-                "${position.format()} / ${duration.format()}",
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontWeight: FontWeight.w500,
-                  fontFeatures: [FontFeature.tabularFigures()],
-                  shadows: VideoControls._controlShadows,
+              IgnorePointer(
+                child: Text(
+                  "${position.format()} / ${duration.format()}",
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontWeight: FontWeight.w500,
+                    fontFeatures: [FontFeature.tabularFigures()],
+                    shadows: VideoControls._controlShadows,
+                  ),
                ),
              ),
              const SizedBox(width: 12),
@@ -7,6 +7,7 @@ import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
@@ -30,7 +31,7 @@ class AdvancedSettings extends HookConsumerWidget {
    final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
    final isManageMediaSupported = useState(false);
    final manageMediaAndroidPermission = useState(false);
-    final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
+    final levelId = useState<int>(ref.read(systemConfigProvider).logLevel.index);
    final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
    final readonlyModeEnabled = useAppSettingsState(AppSettingsEnum.readonlyModeEnabled);

@@ -74,6 +74,7 @@ class _AlbumSyncActionButtonState extends ConsumerState<_AlbumSyncActionButton>
    } catch (_) {
    } finally {
      Future.delayed(const Duration(seconds: 1), () {
+        if (!mounted) return;
        setState(() {
          isAlbumSyncInProgress = false;
        });
@@ -1,15 +1,13 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/colors.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/providers/theme.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/theme/color_scheme.dart';
 import 'package:immich_mobile/theme/dynamic_theme.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';

 class PrimaryColorSetting extends HookConsumerWidget {
  const PrimaryColorSetting({super.key});
@@ -17,18 +15,10 @@ class PrimaryColorSetting extends HookConsumerWidget {
  @override
  Widget build(BuildContext context, WidgetRef ref) {
    final themeProvider = ref.read(immichThemeProvider);
+    final themeConfig = ref.watch(appConfigProvider.select((config) => config.theme));

-    final primaryColorSetting = useAppSettingsState(AppSettingsEnum.primaryColor);
-    final systemPrimaryColorSetting = useAppSettingsState(AppSettingsEnum.dynamicTheme);
-
-    final currentPreset = useValueNotifier(ref.read(immichThemePresetProvider));
    const tileSize = 55.0;

-    useValueChanged(
-      primaryColorSetting.value,
-      (_, __) => currentPreset.value = ImmichColorPreset.values.firstWhere((e) => e.name == primaryColorSetting.value),
-    );
-
    void popBottomSheet() {
      Future.delayed(const Duration(milliseconds: 200), () {
        Navigator.pop(context);
@@ -36,23 +26,18 @@ class PrimaryColorSetting extends HookConsumerWidget {
    }

    onUseSystemColorChange(bool newValue) {
-      systemPrimaryColorSetting.value = newValue;
-      ref.watch(dynamicThemeSettingProvider.notifier).state = newValue;
-      ref.invalidate(immichThemeProvider);
+      ref.read(metadataProvider).write(.themeDynamic, newValue);
      popBottomSheet();
    }

    onPrimaryColorChange(ImmichColorPreset colorPreset) {
-      primaryColorSetting.value = colorPreset.name;
-      ref.watch(immichThemePresetProvider.notifier).state = colorPreset;
-      ref.invalidate(immichThemeProvider);
+      ref.read(metadataProvider).write(.themePrimaryColor, colorPreset);

      //turn off system color setting
-      if (systemPrimaryColorSetting.value) {
-        onUseSystemColorChange(false);
-      } else {
-        popBottomSheet();
+      if (themeConfig.dynamicTheme) {
+        ref.read(metadataProvider).write(.themeDynamic, false);
      }
+      popBottomSheet();
    }

    buildPrimaryColorTile({
@@ -122,7 +107,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
                  'theme_setting_system_primary_color_title'.tr(),
                  style: context.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500, height: 1.5),
                ),
-                value: systemPrimaryColorSetting.value,
+                value: themeConfig.dynamicTheme,
                onChanged: onUseSystemColorChange,
              ),
            ),
@@ -140,7 +125,7 @@ class PrimaryColorSetting extends HookConsumerWidget {
                    topColor: theme.light.primary,
                    bottomColor: theme.dark.primary,
                    tileSize: tileSize,
-                    showSelector: currentPreset.value == preset && !systemPrimaryColorSetting.value,
+                    showSelector: themeConfig.primaryColor == preset && !themeConfig.dynamicTheme,
                  ),
                );
              }).toList(),
@@ -3,72 +3,48 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/providers/theme.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/providers/infrastructure/metadata.provider.dart';
 import 'package:immich_mobile/widgets/settings/preference_settings/primary_color_setting.dart';
 import 'package:immich_mobile/widgets/settings/setting_group_title.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
-import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';

 class ThemeSetting extends HookConsumerWidget {
  const ThemeSetting({super.key});

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final currentThemeString = useAppSettingsState(AppSettingsEnum.themeMode);
-    final currentTheme = useValueNotifier(ref.read(immichThemeModeProvider));
+    final currentTheme = useState(ref.read(appConfigProvider.select((config) => config.theme.mode)));
    final isDarkTheme = useValueNotifier(currentTheme.value == ThemeMode.dark);
    final isSystemTheme = useValueNotifier(currentTheme.value == ThemeMode.system);
-
-    final applyThemeToBackgroundSetting = useAppSettingsState(AppSettingsEnum.colorfulInterface);
-    final applyThemeToBackgroundProvider = useValueNotifier(ref.read(colorfulInterfaceSettingProvider));
-
-    useValueChanged(
-      currentThemeString.value,
-      (_, __) => currentTheme.value = switch (currentThemeString.value) {
-        "light" => ThemeMode.light,
-        "dark" => ThemeMode.dark,
-        _ => ThemeMode.system,
-      },
-    );
-
-    useValueChanged(
-      applyThemeToBackgroundSetting.value,
-      (_, __) => applyThemeToBackgroundProvider.value = applyThemeToBackgroundSetting.value,
+    final colorfulInterface = useValueNotifier(
+      ref.watch(appConfigProvider.select((config) => config.theme.colorfulInterface)),
    );

    void onThemeChange(bool isDark) {
-      if (isDark) {
-        ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.dark;
-        currentThemeString.value = "dark";
-      } else {
-        ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.light;
-        currentThemeString.value = "light";
-      }
+      currentTheme.value = isDark ? ThemeMode.dark : ThemeMode.light;
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
    }

    void onSystemThemeChange(bool isSystem) {
      if (isSystem) {
-        currentThemeString.value = "system";
+        currentTheme.value = ThemeMode.system;
        isSystemTheme.value = true;
-        ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.system;
      } else {
        final currentSystemBrightness = context.platformBrightness;
        isSystemTheme.value = false;
        isDarkTheme.value = currentSystemBrightness == Brightness.dark;
        if (currentSystemBrightness == Brightness.light) {
-          currentThemeString.value = "light";
-          ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.light;
+          currentTheme.value = ThemeMode.light;
        } else if (currentSystemBrightness == Brightness.dark) {
-          currentThemeString.value = "dark";
-          ref.watch(immichThemeModeProvider.notifier).state = ThemeMode.dark;
+          currentTheme.value = ThemeMode.dark;
        }
      }
+      ref.read(metadataProvider).write(.themeMode, currentTheme.value);
    }

    void onSurfaceColorSettingChange(bool useColorfulInterface) {
-      applyThemeToBackgroundSetting.value = useColorfulInterface;
-      ref.watch(colorfulInterfaceSettingProvider.notifier).state = useColorfulInterface;
+      ref.read(metadataProvider).write(.themeColorfulInterface, useColorfulInterface);
+      colorfulInterface.value = useColorfulInterface;
    }

    return Column(
@@ -91,7 +67,7 @@ class ThemeSetting extends HookConsumerWidget {
          ),
        const PrimaryColorSetting(),
        SettingsSwitchListTile(
-          valueNotifier: applyThemeToBackgroundProvider,
+          valueNotifier: colorfulInterface,
          title: "theme_setting_colorful_interface_title".t(context: context),
          subtitle: 'theme_setting_colorful_interface_subtitle'.t(context: context),
          onChanged: onSurfaceColorSettingChange,