diff --git a/lib/src/core/moderation/moderated_content.dart b/lib/src/core/moderation/moderated_content.dart
index e0f399c4..e02c7f8a 100644
--- a/lib/src/core/moderation/moderated_content.dart
+++ b/lib/src/core/moderation/moderated_content.dart
@@ -1,45 +1,29 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:get_it/get_it.dart';
-import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/com/atproto/admin/defs.dart';
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/com/atproto/moderation/create_report.dart';
-import 'package:poptart_lex/com/atproto/moderation/defs.dart';
-import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
-import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/moderation/moderation.dart';
+import 'package:spark/src/core/moderation/moderation_details_sheet.dart';
+import 'package:spark/src/core/moderation/moderation_engine.dart';
+import 'package:spark/src/core/moderation/moderation_models.dart';
+import 'package:spark/src/core/moderation/moderation_presentation.dart';
 import 'package:spark/src/core/moderation/moderation_provider.dart';
-import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:spark/src/core/moderation/moderation_subject.dart';
 
 /// Applies the same moderation decision and reveal rules to every surface.
 class ModeratedContent extends ConsumerStatefulWidget {
   const ModeratedContent({
-    required this.labels,
-    required this.target,
+    required this.subject,
     required this.context,
     required this.child,
     super.key,
-    this.subjectDid,
-    this.authorLabels = const [],
-    this.compact = false,
-    this.blurredChild,
-    this.onConcealedTap,
+    this.presentation = const ModerationPresentation.standard(),
     this.filterReplacement = const SizedBox.shrink(),
     this.onConcealChanged,
   });
 
-  final List<Label> labels;
-  final ModerationTarget target;
+  final ModerationSubject subject;
   final ModerationContext context;
-  final String? subjectDid;
-  final List<Label> authorLabels;
   final Widget child;
-  final bool compact;
-  final Widget? blurredChild;
-  final VoidCallback? onConcealedTap;
+  final ModerationPresentation presentation;
   final Widget filterReplacement;
   final ValueChanged<bool>? onConcealChanged;
 
@@ -63,11 +47,12 @@ class ModeratedProfileAvatar extends StatelessWidget {
   Widget build(BuildContext context) {
     return ClipOval(
       child: ModeratedContent(
-        labels: labels,
-        target: ModerationTarget.account,
+        subject: ModerationSubject.profile(
+          labels: labels,
+          subjectDid: subjectDid,
+        ),
         context: ModerationContext.avatar,
-        subjectDid: subjectDid,
-        compact: true,
+        presentation: const ModerationPresentation.compact(),
         child: child,
       ),
     );
@@ -80,7 +65,7 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
 
   @override
   Widget build(BuildContext context) {
-    if (widget.labels.isEmpty && widget.authorLabels.isEmpty) {
+    if (!widget.subject.hasLabels) {
       _notifyConcealed(false);
       return widget.child;
     }
@@ -89,7 +74,7 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
     final engine = engineState.asData?.value;
     if (engine == null) {
       _notifyConcealed(true);
-      return _ModerationPending(
+      return ModerationPending(
         hasError: engineState.hasError,
         onRetry: () => ref.invalidate(moderationEngineProvider),
         child: widget.child,
@@ -97,27 +82,10 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
     }
 
     final locale = Localizations.localeOf(context).toLanguageTag();
-    final decision = ModerationDecision.merge([
-      if (widget.target == ModerationTarget.account)
-        engine.evaluateProfileLabels(
-          widget.labels,
-          subjectDid: widget.subjectDid,
-          preferredLocales: [locale],
-        )
-      else
-        engine.evaluate(
-          widget.labels,
-          target: widget.target,
-          subjectDid: widget.subjectDid,
-          preferredLocales: [locale],
-        ),
-      if (widget.authorLabels.isNotEmpty)
-        engine.evaluateProfileLabels(
-          widget.authorLabels,
-          subjectDid: widget.subjectDid,
-          preferredLocales: [locale],
-        ),
-    ]);
+    final decision = widget.subject.evaluate(
+      engine,
+      preferredLocales: [locale],
+    );
     final ui = decision.forContext(widget.context);
     if (ui.filter) {
       _notifyConcealed(true);
@@ -133,93 +101,18 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
       ...ui.alerts,
       ...ui.informs,
     }.toList();
-    final disclosureKey = [
-      widget.subjectDid,
-      widget.context.name,
-      _signature([...widget.labels, ...widget.authorLabels]),
-    ].join('|');
-    final shouldConceal =
+    final disclosureKey = widget.subject.disclosureKey(widget.context);
+    final concealed =
         ui.blur && (ui.noOverride || _revealedKey != disclosureKey);
-    _notifyConcealed(shouldConceal);
-
-    if (widget.compact) {
-      return Stack(
-        fit: StackFit.passthrough,
-        children: [
-          if (shouldConceal)
-            widget.blurredChild ??
-                ImageFiltered(
-                  imageFilter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
-                  child: widget.child,
-                )
-          else
-            widget.child,
-          if (shouldConceal)
-            Positioned.fill(
-              child: Material(
-                color: Colors.black.withValues(alpha: 0.38),
-                child: InkWell(
-                  onTap:
-                      widget.onConcealedTap ??
-                      (ui.noOverride
-                          ? () => _showDetails(decision, causes)
-                          : () => setState(() => _revealedKey = disclosureKey)),
-                  child: const Center(
-                    child: Icon(
-                      Icons.visibility_off_outlined,
-                      color: Colors.white,
-                    ),
-                  ),
-                ),
-              ),
-            )
-          else if (ui.alert || ui.inform)
-            Positioned(
-              left: 4,
-              top: 4,
-              child: _CompactModerationNotice(
-                onTap: () => _showDetails(decision, causes),
-              ),
-            ),
-        ],
-      );
-    }
-
-    return Stack(
-      fit: StackFit.passthrough,
-      children: [
-        if (shouldConceal)
-          IgnorePointer(
-            child:
-                widget.blurredChild ??
-                ImageFiltered(
-                  imageFilter: ImageFilter.blur(sigmaX: 40, sigmaY: 40),
-                  child: widget.child,
-                ),
-          )
-        else
-          widget.child,
-        if (shouldConceal)
-          Positioned.fill(
-            child: _ModerationCover(
-              causes: causes,
-              noOverride: ui.noOverride,
-              onReveal: ui.noOverride
-                  ? null
-                  : () => setState(() => _revealedKey = disclosureKey),
-              onDetails: () => _showDetails(decision, causes),
-            ),
-          )
-        else if (ui.alert || ui.inform)
-          Positioned(
-            left: 12,
-            top: 12,
-            child: _ModerationNotice(
-              causes: causes,
-              onTap: () => _showDetails(decision, causes),
-            ),
-          ),
-      ],
+    _notifyConcealed(concealed);
+
+    return widget.presentation.render(
+      child: widget.child,
+      concealed: concealed,
+      ui: ui,
+      causes: causes,
+      reveal: () => setState(() => _revealedKey = disclosureKey),
+      showDetails: () => _showDetails(decision, causes),
     );
   }
 
@@ -231,7 +124,7 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
       context: context,
       showDragHandle: true,
       isScrollControlled: true,
-      builder: (context) => _ModerationDetails(
+      builder: (context) => ModerationDetailsSheet(
         causes: causes,
         mayAppeal: decision.isSubjectCurrentUser,
       ),
@@ -246,322 +139,3 @@ class _ModeratedContentState extends ConsumerState<ModeratedContent> {
     });
   }
 }
-
-class _ModerationPending extends StatelessWidget {
-  const _ModerationPending({
-    required this.hasError,
-    required this.onRetry,
-    required this.child,
-  });
-
-  final bool hasError;
-  final VoidCallback onRetry;
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      fit: StackFit.passthrough,
-      children: [
-        IgnorePointer(
-          child: ExcludeSemantics(child: Opacity(opacity: 0, child: child)),
-        ),
-        Positioned.fill(
-          child: Material(
-            color: Colors.black87,
-            child: hasError
-                ? Semantics(
-                    button: true,
-                    label: AppLocalizations.of(context).buttonRetry,
-                    child: InkWell(
-                      onTap: onRetry,
-                      child: const Center(child: Icon(Icons.refresh)),
-                    ),
-                  )
-                : const Center(
-                    child: SizedBox.square(
-                      dimension: 24,
-                      child: CircularProgressIndicator(strokeWidth: 2),
-                    ),
-                  ),
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class _CompactModerationNotice extends StatelessWidget {
-  const _CompactModerationNotice({required this.onTap});
-
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    return Semantics(
-      button: true,
-      label: AppLocalizations.of(context).buttonModerationDetails,
-      child: Material(
-        color: Theme.of(context).colorScheme.surfaceContainerHighest,
-        shape: const CircleBorder(),
-        child: InkResponse(
-          onTap: onTap,
-          radius: 16,
-          child: const Padding(
-            padding: EdgeInsets.all(5),
-            child: Icon(Icons.info_outline, size: 16),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _ModerationCover extends StatelessWidget {
-  const _ModerationCover({
-    required this.causes,
-    required this.noOverride,
-    required this.onReveal,
-    required this.onDetails,
-  });
-
-  final List<ModerationCause> causes;
-  final bool noOverride;
-  final VoidCallback? onReveal;
-  final VoidCallback onDetails;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context);
-    final names = causes
-        .map((cause) => cause.localizedStrings(l10n)?.name)
-        .nonNulls
-        .toList();
-    return ColoredBox(
-      color: Colors.black.withValues(alpha: 0.7),
-      child: Center(
-        child: SingleChildScrollView(
-          padding: const EdgeInsets.all(24),
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const Icon(
-                Icons.warning_amber_rounded,
-                color: Colors.white,
-                size: 44,
-              ),
-              const SizedBox(height: 12),
-              Text(
-                l10n.moderationContentWarning,
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 22,
-                  fontWeight: FontWeight.bold,
-                ),
-                textAlign: TextAlign.center,
-              ),
-              if (names.isNotEmpty) ...[
-                const SizedBox(height: 8),
-                Text(
-                  names.join(', '),
-                  style: const TextStyle(color: Colors.white, fontSize: 15),
-                  textAlign: TextAlign.center,
-                ),
-              ],
-              const SizedBox(height: 18),
-              if (onReveal != null)
-                FilledButton(
-                  onPressed: onReveal,
-                  child: Text(l10n.buttonViewContent),
-                )
-              else if (noOverride)
-                Text(
-                  l10n.moderationCannotOverride,
-                  style: const TextStyle(color: Colors.white70),
-                  textAlign: TextAlign.center,
-                ),
-              TextButton(
-                onPressed: onDetails,
-                child: Text(l10n.buttonModerationDetails),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _ModerationNotice extends StatelessWidget {
-  const _ModerationNotice({required this.causes, required this.onTap});
-
-  final List<ModerationCause> causes;
-  final VoidCallback onTap;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context);
-    final name = causes
-        .map((cause) => cause.localizedStrings(l10n)?.name)
-        .nonNulls
-        .firstOrNull;
-    return ActionChip(
-      avatar: const Icon(Icons.info_outline, size: 18),
-      label: Text(name ?? l10n.moderationContentNotice),
-      onPressed: onTap,
-    );
-  }
-}
-
-class _ModerationDetails extends StatefulWidget {
-  const _ModerationDetails({required this.causes, required this.mayAppeal});
-
-  final List<ModerationCause> causes;
-  final bool mayAppeal;
-
-  @override
-  State<_ModerationDetails> createState() => _ModerationDetailsState();
-}
-
-class _ModerationDetailsState extends State<_ModerationDetails> {
-  bool _submitting = false;
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = AppLocalizations.of(context);
-    return SafeArea(
-      child: ListView(
-        shrinkWrap: true,
-        padding: const EdgeInsets.fromLTRB(20, 0, 20, 24),
-        children: [
-          Text(
-            l10n.moderationDetailsTitle,
-            style: Theme.of(context).textTheme.titleLarge,
-          ),
-          const SizedBox(height: 12),
-          for (final cause in widget.causes)
-            Builder(
-              builder: (context) {
-                final strings = cause.localizedStrings(l10n);
-                final source = switch (cause.sourceHandle) {
-                  final handle? => '@$handle',
-                  null => cause.sourceDid,
-                };
-                return Card(
-                  child: Padding(
-                    padding: const EdgeInsets.all(16),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          strings?.name ?? l10n.moderationContentNotice,
-                          style: Theme.of(context).textTheme.titleMedium,
-                        ),
-                        if (strings?.description case final description?) ...[
-                          const SizedBox(height: 6),
-                          Text(description),
-                        ],
-                        const SizedBox(height: 8),
-                        SelectableText('${l10n.moderationAppliedBy}: $source'),
-                        if (cause.label.exp case final expires?)
-                          Text(
-                            '${l10n.moderationExpires}: ${expires.toLocal()}',
-                          ),
-                        if (cause.noOverride) ...[
-                          const SizedBox(height: 6),
-                          Text(l10n.moderationCannotOverride),
-                        ],
-                        if (widget.mayAppeal &&
-                            cause.sourceDid != _labelSubjectDid(cause.label) &&
-                            cause.sourceDid.startsWith('did:') &&
-                            _reportSubject(cause.label) != null) ...[
-                          const SizedBox(height: 10),
-                          OutlinedButton(
-                            onPressed: _submitting
-                                ? null
-                                : () => _appeal(cause),
-                            child: Text(l10n.buttonAppealLabel),
-                          ),
-                        ],
-                      ],
-                    ),
-                  ),
-                );
-              },
-            ),
-        ],
-      ),
-    );
-  }
-
-  Future<void> _appeal(ModerationCause cause) async {
-    final subject = _reportSubject(cause.label);
-    if (subject == null) return;
-
-    setState(() => _submitting = true);
-    final l10n = AppLocalizations.of(context);
-    try {
-      await GetIt.I<SprkRepository>().repo.createReport(
-        input: ModerationCreateReportInput(
-          subject: subject,
-          reasonType: const ReasonType.knownValue(
-            data: KnownReasonType.comAtprotoModerationDefsReasonAppeal,
-          ),
-          reason: l10n.moderationAppealReason,
-        ),
-        serviceDid: cause.sourceDid,
-      );
-      if (mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text(l10n.moderationAppealSent)));
-      }
-    } catch (_) {
-      if (mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text(l10n.moderationAppealFailed)));
-      }
-    } finally {
-      if (mounted) setState(() => _submitting = false);
-    }
-  }
-}
-
-UModerationCreateReportSubject? _reportSubject(Label label) {
-  AtUri? uri;
-  try {
-    uri = AtUri.parse(label.uri);
-  } catch (_) {
-    uri = null;
-  }
-  if (uri != null) {
-    if (uri.pathname.isEmpty) {
-      return UModerationCreateReportSubject.repoRef(
-        data: RepoRef(did: uri.hostname),
-      );
-    }
-    if (label.cid != null && label.cid!.isNotEmpty) {
-      return UModerationCreateReportSubject.repoStrongRef(
-        data: RepoStrongRef(uri: uri, cid: label.cid!),
-      );
-    }
-  }
-  return null;
-}
-
-String _labelSubjectDid(Label label) {
-  try {
-    return AtUri.parse(label.uri).hostname;
-  } catch (_) {
-    return label.uri;
-  }
-}
-
-String _signature(List<Label> labels) => labels
-    .map(
-      (label) =>
-          '${label.src}|${label.uri}|${label.cid}|${label.val}|${label.neg}|'
-          '${label.cts.toUtc().toIso8601String()}|${label.exp}',
-    )
-    .join(';;');
diff --git a/lib/src/core/moderation/moderation.dart b/lib/src/core/moderation/moderation.dart
index d87b0773..a2fbf895 100644
--- a/lib/src/core/moderation/moderation.dart
+++ b/lib/src/core/moderation/moderation.dart
@@ -2,3 +2,5 @@ export 'moderation_definitions.dart';
 export 'moderation_engine.dart';
 export 'moderation_label_localizations.dart';
 export 'moderation_models.dart';
+export 'moderation_presentation.dart';
+export 'moderation_subject.dart';
diff --git a/lib/src/core/moderation/moderation_appeal_service.dart b/lib/src/core/moderation/moderation_appeal_service.dart
new file mode 100644
index 00000000..8f058afe
--- /dev/null
+++ b/lib/src/core/moderation/moderation_appeal_service.dart
@@ -0,0 +1,69 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
+import 'package:poptart/poptart.dart';
+import 'package:poptart_lex/com/atproto/admin/defs.dart';
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:poptart_lex/com/atproto/moderation/create_report.dart';
+import 'package:poptart_lex/com/atproto/moderation/defs.dart';
+import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
+
+final moderationAppealServiceProvider = Provider<ModerationAppealService>(
+  (ref) => ModerationAppealService(GetIt.I<SprkRepository>()),
+);
+
+final class ModerationAppealService {
+  const ModerationAppealService(this._repository);
+
+  final SprkRepository _repository;
+
+  static bool canAppeal(Label label) {
+    return label.src != _subjectDid(label) &&
+        label.src.startsWith('did:') &&
+        _reportSubject(label) != null;
+  }
+
+  Future<void> appeal(Label label, {required String reason}) async {
+    final subject = _reportSubject(label);
+    if (subject == null) return;
+
+    await _repository.repo.createReport(
+      input: ModerationCreateReportInput(
+        subject: subject,
+        reasonType: const ReasonType.knownValue(
+          data: KnownReasonType.comAtprotoModerationDefsReasonAppeal,
+        ),
+        reason: reason,
+      ),
+      serviceDid: label.src,
+    );
+  }
+}
+
+UModerationCreateReportSubject? _reportSubject(Label label) {
+  AtUri? uri;
+  try {
+    uri = AtUri.parse(label.uri);
+  } catch (_) {
+    return null;
+  }
+  if (uri.pathname.isEmpty) {
+    return UModerationCreateReportSubject.repoRef(
+      data: RepoRef(did: uri.hostname),
+    );
+  }
+  if (label.cid?.isNotEmpty ?? false) {
+    return UModerationCreateReportSubject.repoStrongRef(
+      data: RepoStrongRef(uri: uri, cid: label.cid!),
+    );
+  }
+  return null;
+}
+
+String _subjectDid(Label label) {
+  try {
+    return AtUri.parse(label.uri).hostname;
+  } catch (_) {
+    return label.uri;
+  }
+}
diff --git a/lib/src/core/moderation/moderation_details_sheet.dart b/lib/src/core/moderation/moderation_details_sheet.dart
new file mode 100644
index 00000000..80db9cc9
--- /dev/null
+++ b/lib/src/core/moderation/moderation_details_sheet.dart
@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:spark/src/core/l10n/app_localizations.dart';
+import 'package:spark/src/core/moderation/moderation_appeal_service.dart';
+import 'package:spark/src/core/moderation/moderation_label_localizations.dart';
+import 'package:spark/src/core/moderation/moderation_models.dart';
+
+class ModerationDetailsSheet extends ConsumerStatefulWidget {
+  const ModerationDetailsSheet({
+    required this.causes,
+    required this.mayAppeal,
+    super.key,
+  });
+
+  final List<ModerationCause> causes;
+  final bool mayAppeal;
+
+  @override
+  ConsumerState<ModerationDetailsSheet> createState() =>
+      _ModerationDetailsSheetState();
+}
+
+class _ModerationDetailsSheetState
+    extends ConsumerState<ModerationDetailsSheet> {
+  bool _submitting = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    return SafeArea(
+      child: ListView(
+        shrinkWrap: true,
+        padding: const EdgeInsets.fromLTRB(20, 0, 20, 24),
+        children: [
+          Text(
+            l10n.moderationDetailsTitle,
+            style: Theme.of(context).textTheme.titleLarge,
+          ),
+          const SizedBox(height: 12),
+          for (final cause in widget.causes)
+            Card(
+              child: Padding(
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(
+                      cause.localizedStrings(l10n)?.name ??
+                          l10n.moderationContentNotice,
+                      style: Theme.of(context).textTheme.titleMedium,
+                    ),
+                    if (cause.localizedStrings(l10n)?.description
+                        case final description?) ...[
+                      const SizedBox(height: 6),
+                      Text(description),
+                    ],
+                    const SizedBox(height: 8),
+                    SelectableText(
+                      '${l10n.moderationAppliedBy}: '
+                      '${cause.sourceHandle == null ? cause.sourceDid : '@${cause.sourceHandle}'}',
+                    ),
+                    if (cause.label.exp case final expires?)
+                      Text('${l10n.moderationExpires}: ${expires.toLocal()}'),
+                    if (cause.noOverride) ...[
+                      const SizedBox(height: 6),
+                      Text(l10n.moderationCannotOverride),
+                    ],
+                    if (widget.mayAppeal &&
+                        ModerationAppealService.canAppeal(cause.label)) ...[
+                      const SizedBox(height: 10),
+                      OutlinedButton(
+                        onPressed: _submitting ? null : () => _appeal(cause),
+                        child: Text(l10n.buttonAppealLabel),
+                      ),
+                    ],
+                  ],
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _appeal(ModerationCause cause) async {
+    setState(() => _submitting = true);
+    final l10n = AppLocalizations.of(context);
+    try {
+      await ref
+          .read(moderationAppealServiceProvider)
+          .appeal(cause.label, reason: l10n.moderationAppealReason);
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(l10n.moderationAppealSent)));
+      }
+    } catch (_) {
+      if (mounted) {
+        ScaffoldMessenger.of(
+          context,
+        ).showSnackBar(SnackBar(content: Text(l10n.moderationAppealFailed)));
+      }
+    } finally {
+      if (mounted) setState(() => _submitting = false);
+    }
+  }
+}
diff --git a/lib/src/core/moderation/moderation_presentation.dart b/lib/src/core/moderation/moderation_presentation.dart
new file mode 100644
index 00000000..7cea0448
--- /dev/null
+++ b/lib/src/core/moderation/moderation_presentation.dart
@@ -0,0 +1,294 @@
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+import 'package:spark/src/core/l10n/app_localizations.dart';
+import 'package:spark/src/core/moderation/moderation_label_localizations.dart';
+import 'package:spark/src/core/moderation/moderation_models.dart';
+
+sealed class ModerationPresentation {
+  const ModerationPresentation();
+
+  const factory ModerationPresentation.standard({Widget? blurredChild}) =
+      StandardModerationPresentation;
+
+  const factory ModerationPresentation.compact({
+    Widget? blurredChild,
+    VoidCallback? onConcealedTap,
+  }) = CompactModerationPresentation;
+
+  Widget render({
+    required Widget child,
+    required bool concealed,
+    required ModerationUI ui,
+    required List<ModerationCause> causes,
+    required VoidCallback reveal,
+    required VoidCallback showDetails,
+  });
+}
+
+final class StandardModerationPresentation extends ModerationPresentation {
+  const StandardModerationPresentation({this.blurredChild});
+
+  final Widget? blurredChild;
+
+  @override
+  Widget render({
+    required Widget child,
+    required bool concealed,
+    required ModerationUI ui,
+    required List<ModerationCause> causes,
+    required VoidCallback reveal,
+    required VoidCallback showDetails,
+  }) {
+    return Stack(
+      fit: StackFit.passthrough,
+      children: [
+        if (concealed)
+          IgnorePointer(
+            child:
+                blurredChild ??
+                ImageFiltered(
+                  imageFilter: ImageFilter.blur(sigmaX: 40, sigmaY: 40),
+                  child: child,
+                ),
+          )
+        else
+          child,
+        if (concealed)
+          Positioned.fill(
+            child: _ModerationCover(
+              causes: causes,
+              noOverride: ui.noOverride,
+              onReveal: ui.noOverride ? null : reveal,
+              onDetails: showDetails,
+            ),
+          )
+        else if (ui.alert || ui.inform)
+          Positioned(
+            left: 12,
+            top: 12,
+            child: _ModerationNotice(causes: causes, onTap: showDetails),
+          ),
+      ],
+    );
+  }
+}
+
+final class CompactModerationPresentation extends ModerationPresentation {
+  const CompactModerationPresentation({this.blurredChild, this.onConcealedTap});
+
+  final Widget? blurredChild;
+  final VoidCallback? onConcealedTap;
+
+  @override
+  Widget render({
+    required Widget child,
+    required bool concealed,
+    required ModerationUI ui,
+    required List<ModerationCause> causes,
+    required VoidCallback reveal,
+    required VoidCallback showDetails,
+  }) {
+    return Stack(
+      fit: StackFit.passthrough,
+      children: [
+        if (concealed)
+          blurredChild ??
+              ImageFiltered(
+                imageFilter: ImageFilter.blur(sigmaX: 18, sigmaY: 18),
+                child: child,
+              )
+        else
+          child,
+        if (concealed)
+          Positioned.fill(
+            child: Material(
+              color: Colors.black.withValues(alpha: 0.38),
+              child: InkWell(
+                onTap: onConcealedTap ?? (ui.noOverride ? showDetails : reveal),
+                child: const Center(
+                  child: Icon(
+                    Icons.visibility_off_outlined,
+                    color: Colors.white,
+                  ),
+                ),
+              ),
+            ),
+          )
+        else if (ui.alert || ui.inform)
+          Positioned(
+            left: 4,
+            top: 4,
+            child: _CompactModerationNotice(onTap: showDetails),
+          ),
+      ],
+    );
+  }
+}
+
+class ModerationPending extends StatelessWidget {
+  const ModerationPending({
+    required this.hasError,
+    required this.onRetry,
+    required this.child,
+    super.key,
+  });
+
+  final bool hasError;
+  final VoidCallback onRetry;
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      fit: StackFit.passthrough,
+      children: [
+        IgnorePointer(
+          child: ExcludeSemantics(child: Opacity(opacity: 0, child: child)),
+        ),
+        Positioned.fill(
+          child: Material(
+            color: Colors.black87,
+            child: hasError
+                ? Semantics(
+                    button: true,
+                    label: AppLocalizations.of(context).buttonRetry,
+                    child: InkWell(
+                      onTap: onRetry,
+                      child: const Center(child: Icon(Icons.refresh)),
+                    ),
+                  )
+                : const Center(
+                    child: SizedBox.square(
+                      dimension: 24,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    ),
+                  ),
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+class _CompactModerationNotice extends StatelessWidget {
+  const _CompactModerationNotice({required this.onTap});
+
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return Semantics(
+      button: true,
+      label: AppLocalizations.of(context).buttonModerationDetails,
+      child: Material(
+        color: Theme.of(context).colorScheme.surfaceContainerHighest,
+        shape: const CircleBorder(),
+        child: InkResponse(
+          onTap: onTap,
+          radius: 16,
+          child: const Padding(
+            padding: EdgeInsets.all(5),
+            child: Icon(Icons.info_outline, size: 16),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ModerationCover extends StatelessWidget {
+  const _ModerationCover({
+    required this.causes,
+    required this.noOverride,
+    required this.onReveal,
+    required this.onDetails,
+  });
+
+  final List<ModerationCause> causes;
+  final bool noOverride;
+  final VoidCallback? onReveal;
+  final VoidCallback onDetails;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    final names = causes
+        .map((cause) => cause.localizedStrings(l10n)?.name)
+        .nonNulls
+        .toList();
+    return ColoredBox(
+      color: Colors.black.withValues(alpha: 0.7),
+      child: Center(
+        child: SingleChildScrollView(
+          padding: const EdgeInsets.all(24),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Icon(
+                Icons.warning_amber_rounded,
+                color: Colors.white,
+                size: 44,
+              ),
+              const SizedBox(height: 12),
+              Text(
+                l10n.moderationContentWarning,
+                style: const TextStyle(
+                  color: Colors.white,
+                  fontSize: 22,
+                  fontWeight: FontWeight.bold,
+                ),
+                textAlign: TextAlign.center,
+              ),
+              if (names.isNotEmpty) ...[
+                const SizedBox(height: 8),
+                Text(
+                  names.join(', '),
+                  style: const TextStyle(color: Colors.white, fontSize: 15),
+                  textAlign: TextAlign.center,
+                ),
+              ],
+              const SizedBox(height: 18),
+              if (onReveal != null)
+                FilledButton(
+                  onPressed: onReveal,
+                  child: Text(l10n.buttonViewContent),
+                )
+              else if (noOverride)
+                Text(
+                  l10n.moderationCannotOverride,
+                  style: const TextStyle(color: Colors.white70),
+                  textAlign: TextAlign.center,
+                ),
+              TextButton(
+                onPressed: onDetails,
+                child: Text(l10n.buttonModerationDetails),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _ModerationNotice extends StatelessWidget {
+  const _ModerationNotice({required this.causes, required this.onTap});
+
+  final List<ModerationCause> causes;
+  final VoidCallback onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    final name = causes
+        .map((cause) => cause.localizedStrings(l10n)?.name)
+        .nonNulls
+        .firstOrNull;
+    return ActionChip(
+      avatar: const Icon(Icons.info_outline, size: 18),
+      label: Text(name ?? l10n.moderationContentNotice),
+      onPressed: onTap,
+    );
+  }
+}
diff --git a/lib/src/core/moderation/moderation_provider.dart b/lib/src/core/moderation/moderation_provider.dart
index 2c0aac35..de9d0fcc 100644
--- a/lib/src/core/moderation/moderation_provider.dart
+++ b/lib/src/core/moderation/moderation_provider.dart
@@ -5,7 +5,7 @@ import 'package:spark/src/core/moderation/moderation.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
 
 /// The moderation engine for the current preference snapshot.
 ///
diff --git a/lib/src/core/moderation/moderation_subject.dart b/lib/src/core/moderation/moderation_subject.dart
new file mode 100644
index 00000000..c48224c7
--- /dev/null
+++ b/lib/src/core/moderation/moderation_subject.dart
@@ -0,0 +1,90 @@
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:spark/src/core/moderation/moderation_engine.dart';
+import 'package:spark/src/core/moderation/moderation_models.dart';
+
+enum _ModerationSubjectKind { content, profile }
+
+/// A typed moderation input that owns how protocol labels are evaluated.
+final class ModerationSubject {
+  ModerationSubject._(
+    this._kind, {
+    required this.subjectDid,
+    required Iterable<Label> labels,
+    required Iterable<Label> authorLabels,
+  }) : labels = List.unmodifiable(labels),
+       authorLabels = List.unmodifiable(authorLabels);
+
+  factory ModerationSubject.content({
+    required String? subjectDid,
+    required Iterable<Label> labels,
+    Iterable<Label> authorLabels = const [],
+  }) {
+    return ModerationSubject._(
+      _ModerationSubjectKind.content,
+      subjectDid: subjectDid,
+      labels: labels,
+      authorLabels: authorLabels,
+    );
+  }
+
+  factory ModerationSubject.profile({
+    required String? subjectDid,
+    required Iterable<Label> labels,
+  }) {
+    return ModerationSubject._(
+      _ModerationSubjectKind.profile,
+      subjectDid: subjectDid,
+      labels: labels,
+      authorLabels: const [],
+    );
+  }
+
+  final _ModerationSubjectKind _kind;
+  final String? subjectDid;
+  final List<Label> labels;
+  final List<Label> authorLabels;
+
+  bool get hasLabels => labels.isNotEmpty || authorLabels.isNotEmpty;
+
+  ModerationDecision evaluate(
+    ModerationEngine engine, {
+    Iterable<String> preferredLocales = const [],
+  }) {
+    return switch (_kind) {
+      _ModerationSubjectKind.profile => engine.evaluateProfileLabels(
+        labels,
+        subjectDid: subjectDid,
+        preferredLocales: preferredLocales,
+      ),
+      _ModerationSubjectKind.content => ModerationDecision.merge([
+        engine.evaluate(
+          labels,
+          target: ModerationTarget.content,
+          subjectDid: subjectDid,
+          preferredLocales: preferredLocales,
+        ),
+        if (authorLabels.isNotEmpty)
+          engine.evaluateProfileLabels(
+            authorLabels,
+            subjectDid: subjectDid,
+            preferredLocales: preferredLocales,
+          ),
+      ]),
+    };
+  }
+
+  String disclosureKey(ModerationContext context) {
+    return <String?>[
+      subjectDid,
+      _kind.name,
+      context.name,
+      ...labels.map(_labelSignature),
+      ...authorLabels.map(_labelSignature),
+    ].join('|');
+  }
+}
+
+String _labelSignature(Label label) {
+  return '${label.src}|${label.uri}|${label.cid}|${label.val}|${label.neg}|'
+      '${label.cts.toUtc().toIso8601String()}|${label.exp}';
+}
diff --git a/lib/src/core/network/atproto/data/models/feed_models.dart b/lib/src/core/network/atproto/data/models/feed_models.dart
index b64b5eb3..ee71c6aa 100644
--- a/lib/src/core/network/atproto/data/models/feed_models.dart
+++ b/lib/src/core/network/atproto/data/models/feed_models.dart
@@ -192,26 +192,6 @@ extension ReplyViewConvenience on ReplyView {
 }
 
 extension StoryViewConvenience on StoryView {
-  static const _moderationLabelsKey = 'sparkModerationLabels';
-
-  List<Label> get moderationLabels {
-    final values = $unknown?[_moderationLabelsKey];
-    if (values is! List) return const [];
-    return values
-        .whereType<Map<String, Object?>>()
-        .map((value) => Label.fromJson(Map<String, Object?>.from(value)))
-        .toList();
-  }
-
-  StoryView withModerationLabels(Iterable<Label> labels) {
-    return copyWith(
-      $unknown: {
-        ...?$unknown,
-        _moderationLabelsKey: [for (final label in labels) label.toJson()],
-      },
-    );
-  }
-
   StoryRecord? get localRecord {
     try {
       return StoryRecord.fromJson(record);
diff --git a/lib/src/core/network/atproto/data/models/moderated_story_view.dart b/lib/src/core/network/atproto/data/models/moderated_story_view.dart
new file mode 100644
index 00000000..f276e7eb
--- /dev/null
+++ b/lib/src/core/network/atproto/data/models/moderated_story_view.dart
@@ -0,0 +1,29 @@
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:poptart/poptart.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/record_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+
+/// App-owned story data layered around the generated protocol view.
+final class ModeratedStoryView {
+  ModeratedStoryView({
+    required this.story,
+    Iterable<Label> moderationLabels = const [],
+  }) : moderationLabels = List.unmodifiable(moderationLabels);
+
+  final StoryView story;
+  final List<Label> moderationLabels;
+
+  AtUri get uri => story.uri;
+  String get cid => story.cid;
+  ProfileViewBasic get author => story.author;
+  DateTime get indexedAt => story.indexedAt;
+  Map<String, dynamic> get record => story.record;
+  StoryRecord? get localRecord => story.localRecord;
+  List<StoryEmbedView>? get localEmbeds => story.localEmbeds;
+  bool get isVideoStory => story.isVideoStory;
+  String get videoUrl => story.videoUrl;
+  String get imageUrl => story.imageUrl;
+  String get thumbnailUrl => story.thumbnailUrl;
+}
diff --git a/lib/src/core/network/atproto/data/repositories/labeler_repository.dart b/lib/src/core/network/atproto/data/repositories/labeler_repository.dart
index e446d94c..2f567a3a 100644
--- a/lib/src/core/network/atproto/data/repositories/labeler_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/labeler_repository.dart
@@ -9,6 +9,32 @@ class LabelerServiceUnavailableException implements Exception {
   String toString() => message;
 }
 
+final class ModerationServiceQuery {
+  const ModerationServiceQuery({
+    required this.fallbackDid,
+    required this.subjectType,
+    required this.reasonType,
+    this.subjectCollection,
+  });
+
+  final String fallbackDid;
+  final String subjectType;
+  final String reasonType;
+  final String? subjectCollection;
+}
+
+final class CompatibleModerationService {
+  const CompatibleModerationService({
+    required this.did,
+    required this.displayName,
+    required this.isDefault,
+  });
+
+  final String did;
+  final String displayName;
+  final bool isDefault;
+}
+
 /// Interface for Feed-related API endpoints
 abstract class LabelerRepository {
   /// Resolves a DID or handle to the canonical service DID.
@@ -19,4 +45,9 @@ abstract class LabelerRepository {
 
   Future<LabelerView> getServices(List<String> dids);
   Future<LabelerViewDetailed> getServicesDetailed(List<String> dids);
+
+  Future<List<CompatibleModerationService>> getCompatibleModerationServices(
+    Iterable<String> dids,
+    ModerationServiceQuery query,
+  );
 }
diff --git a/lib/src/core/network/atproto/data/repositories/labeler_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/labeler_repository_impl.dart
index 9dc84e41..70742b14 100644
--- a/lib/src/core/network/atproto/data/repositories/labeler_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/labeler_repository_impl.dart
@@ -18,6 +18,7 @@ class LabelerRepositoryImpl extends LabelerRepository {
   }
   final SprkRepository _client;
   final SparkLogger _logger;
+  final Map<String, Future<LabelerViewDetailed>> _detailedServiceCache = {};
 
   @override
   Future<String> resolveIdentifier(String identifier) async {
@@ -107,6 +108,23 @@ class LabelerRepositoryImpl extends LabelerRepository {
 
   @override
   Future<LabelerViewDetailed> getServicesDetailed(List<String> dids) async {
+    if (dids.length != 1) return _fetchServicesDetailed(dids);
+
+    final did = dids.single;
+    final request = _detailedServiceCache.putIfAbsent(
+      did,
+      () => _fetchServicesDetailed(dids),
+    );
+    try {
+      return await request;
+    } finally {
+      if (identical(_detailedServiceCache[did], request)) {
+        _detailedServiceCache.remove(did);
+      }
+    }
+  }
+
+  Future<LabelerViewDetailed> _fetchServicesDetailed(List<String> dids) async {
     _logger.d('Getting detailed labeler services for DIDs: $dids');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -147,4 +165,67 @@ class LabelerRepositoryImpl extends LabelerRepository {
       return view;
     });
   }
+
+  @override
+  Future<List<CompatibleModerationService>> getCompatibleModerationServices(
+    Iterable<String> dids,
+    ModerationServiceQuery query,
+  ) async {
+    final fallbackDid = query.fallbackDid.split('#').first;
+    final candidates = <String>{fallbackDid, ...dids};
+    final services = await Future.wait([
+      for (final did in candidates)
+        _compatibleService(did, fallbackDid: fallbackDid, query: query),
+    ]);
+    final compatible = services.nonNulls.toList()
+      ..sort((left, right) {
+        if (left.isDefault != right.isDefault) {
+          return left.isDefault ? -1 : 1;
+        }
+        return left.displayName.compareTo(right.displayName);
+      });
+    return compatible;
+  }
+
+  Future<CompatibleModerationService?> _compatibleService(
+    String did, {
+    required String fallbackDid,
+    required ModerationServiceQuery query,
+  }) async {
+    try {
+      final service = await getServicesDetailed([did]);
+      final subjectTypes = service.subjectTypes?.map((type) => type.toJson());
+      if (subjectTypes != null && !subjectTypes.contains(query.subjectType)) {
+        return null;
+      }
+      if (query.subjectCollection != null &&
+          service.subjectCollections != null &&
+          !service.subjectCollections!.contains(query.subjectCollection)) {
+        return null;
+      }
+      final reasonTypes = service.reasonTypes?.map((type) => type.toJson());
+      if (reasonTypes != null && !reasonTypes.contains(query.reasonType)) {
+        return null;
+      }
+      return CompatibleModerationService(
+        did: did,
+        displayName: service.creator.displayName ?? service.creator.handle,
+        isDefault: did == fallbackDid,
+      );
+    } catch (error, stackTrace) {
+      _logger.w(
+        'Unable to inspect moderation service capabilities for $did',
+        error: error,
+        stackTrace: stackTrace,
+      );
+      if (did == fallbackDid) {
+        return CompatibleModerationService(
+          did: did,
+          displayName: did,
+          isDefault: true,
+        );
+      }
+      return null;
+    }
+  }
 }
diff --git a/lib/src/core/network/atproto/data/repositories/repo_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/repo_repository_impl.dart
index c9e9c9f8..72e09213 100644
--- a/lib/src/core/network/atproto/data/repositories/repo_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/repo_repository_impl.dart
@@ -17,6 +17,7 @@ import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/network/atproto/data/adapters/bsky/repo_adapter.dart';
 import 'package:spark/src/core/network/atproto/data/models/record_models.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/repo_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
@@ -306,9 +307,7 @@ class RepoRepositoryImpl implements RepoRepository {
             );
         _logger.d('Routing report to moderation service: $modServiceDid');
 
-        final headers = {
-          'atproto-proxy': _moderationProxyDid(modServiceDid),
-        };
+        final headers = {'atproto-proxy': _moderationProxyDid(modServiceDid)};
 
         try {
           final response = await atproto.call(
@@ -345,38 +344,16 @@ class RepoRepositoryImpl implements RepoRepository {
         ? subject.uri.collection.toString()
         : null;
     final reasonType = input.reasonType.toJson();
-    final candidates = <String>{
-      fallbackDid.split('#').first,
-      ..._client.labelerDids,
-    };
-
-    for (final did in candidates) {
-      try {
-        final service = await _client.labeler.getServicesDetailed([did]);
-        final subjectTypes = service.subjectTypes?.map((type) => type.toJson());
-        if (subjectTypes != null && !subjectTypes.contains(subjectType)) {
-          continue;
-        }
-        final collections = service.subjectCollections;
-        if (collection != null &&
-            collections != null &&
-            !collections.contains(collection)) {
-          continue;
-        }
-        final reasons = service.reasonTypes?.map((reason) => reason.toJson());
-        if (reasons != null && !reasons.contains(reasonType)) {
-          continue;
-        }
-        return did;
-      } catch (error, stackTrace) {
-        _logger.w(
-          'Could not inspect moderation service $did',
-          error: error,
-          stackTrace: stackTrace,
-        );
-      }
-    }
-    return fallbackDid;
+    final compatible = await _client.labeler.getCompatibleModerationServices(
+      _client.labelerDids,
+      ModerationServiceQuery(
+        fallbackDid: fallbackDid,
+        subjectType: subjectType,
+        subjectCollection: collection,
+        reasonType: reasonType,
+      ),
+    );
+    return compatible.firstOrNull?.did ?? fallbackDid;
   }
 
   String _moderationProxyDid(String did) {
diff --git a/lib/src/core/network/atproto/data/repositories/story_repository.dart b/lib/src/core/network/atproto/data/repositories/story_repository.dart
index 860f1c1c..f2d3dc8a 100644
--- a/lib/src/core/network/atproto/data/repositories/story_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/story_repository.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart/poptart.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
@@ -39,14 +39,17 @@ abstract class StoryRepository {
   /// [limit] The number of items to return (default 30)
   /// [cursor] Pagination cursor for the next set of results
   Future<
-    ({String? cursor, Map<ProfileViewBasic, List<StoryView>> storiesByAuthor})
+    ({
+      String? cursor,
+      Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor,
+    })
   >
   getStoriesTimeline({int limit = 30, String? cursor});
 
   /// Gets story views for a specified list of stories (by AT-URI).
   ///
   /// [storyUris] List of story URIs to fetch
-  Future<List<StoryView>> getStoryViews(List<AtUri> storyUris);
+  Future<List<ModeratedStoryView>> getStoryViews(List<AtUri> storyUris);
 
   Future<StoryRecordPage> listStoryRecords({
     required String did,
diff --git a/lib/src/core/network/atproto/data/repositories/story_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/story_repository_impl.dart
index ffff5ed0..a551ab24 100644
--- a/lib/src/core/network/atproto/data/repositories/story_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/story_repository_impl.dart
@@ -5,6 +5,7 @@ import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart/poptart.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/network/atproto/data/models/record_write_adapters.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/story_repository.dart';
@@ -77,7 +78,10 @@ class StoryRepositoryImpl implements StoryRepository {
 
   @override
   Future<
-    ({String? cursor, Map<ProfileViewBasic, List<StoryView>> storiesByAuthor})
+    ({
+      String? cursor,
+      Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor,
+    })
   >
   getStoriesTimeline({int limit = 30, String? cursor}) {
     return _client.executeWithRetry(() async {
@@ -163,7 +167,10 @@ class StoryRepositoryImpl implements StoryRepository {
           for (final entry in response.storiesByAuthor.entries)
             entry.key: [
               for (final story in entry.value)
-                story.withModerationLabels(_labelsForStory(labelsByUri, story)),
+                ModeratedStoryView(
+                  story: story,
+                  moderationLabels: _labelsForStory(labelsByUri, story),
+                ),
             ],
         },
         cursor: response.cursor,
@@ -172,7 +179,7 @@ class StoryRepositoryImpl implements StoryRepository {
   }
 
   @override
-  Future<List<StoryView>> getStoryViews(List<AtUri> storyUris) {
+  Future<List<ModeratedStoryView>> getStoryViews(List<AtUri> storyUris) {
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
         throw Exception('Not authenticated');
@@ -216,7 +223,10 @@ class StoryRepositoryImpl implements StoryRepository {
       final labelsByUri = await _getModerationLabels(response);
       return [
         for (final story in response)
-          story.withModerationLabels(_labelsForStory(labelsByUri, story)),
+          ModeratedStoryView(
+            story: story,
+            moderationLabels: _labelsForStory(labelsByUri, story),
+          ),
       ];
     });
   }
diff --git a/lib/src/features/settings/providers/preferences_provider.dart b/lib/src/core/providers/preferences_provider.dart
similarity index 100%
rename from lib/src/features/settings/providers/preferences_provider.dart
rename to lib/src/core/providers/preferences_provider.dart
diff --git a/lib/src/core/routing/app_router.dart b/lib/src/core/routing/app_router.dart
index 373c1350..b081eb74 100644
--- a/lib/src/core/routing/app_router.dart
+++ b/lib/src/core/routing/app_router.dart
@@ -8,6 +8,7 @@ import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:spark/src/core/auth/data/repositories/onboarding_repository.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/routing/pages.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
diff --git a/lib/src/core/ui/widgets/report_dialog.dart b/lib/src/core/ui/widgets/report_dialog.dart
index 6d6ccdd9..377e1320 100644
--- a/lib/src/core/ui/widgets/report_dialog.dart
+++ b/lib/src/core/ui/widgets/report_dialog.dart
@@ -11,6 +11,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_button.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
@@ -86,7 +87,7 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
       TextEditingController();
   bool _isSubmitting = false;
   String? _errorMessage;
-  Future<List<_ModerationServiceOption>>? _compatibleServicesFuture;
+  Future<List<CompatibleModerationService>>? _compatibleServicesFuture;
   String? _selectedServiceDid;
 
   // Map categories to their reasons
@@ -372,14 +373,26 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
       _compatibleServicesFuture = servicesFuture;
       _selectedServiceDid = null;
     });
-    unawaited(
-      servicesFuture.then((services) {
-        if (!mounted || _selectedReason != reason || services.isEmpty) return;
-        setState(() {
-          _selectedServiceDid = services.first.did;
-        });
-      }),
-    );
+    unawaited(_selectDefaultService(servicesFuture, reason));
+  }
+
+  Future<void> _selectDefaultService(
+    Future<List<CompatibleModerationService>> servicesFuture,
+    ReportReason reason,
+  ) async {
+    try {
+      final services = await servicesFuture;
+      if (!mounted || _selectedReason != reason || services.isEmpty) return;
+      setState(() {
+        _selectedServiceDid = services.first.did;
+      });
+    } catch (error, stackTrace) {
+      _logger.w(
+        'Could not select a default moderation service',
+        error: error,
+        stackTrace: stackTrace,
+      );
+    }
   }
 
   void _goBack() {
@@ -412,7 +425,7 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
         : ReasonType.unknown(data: reason.value);
   }
 
-  Future<List<_ModerationServiceOption>> _loadCompatibleServices(
+  Future<List<CompatibleModerationService>> _loadCompatibleServices(
     ReportReason reason,
   ) async {
     final repository = GetIt.instance<SprkRepository>();
@@ -425,62 +438,22 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
             ? repository.bskyModDid
             : repository.modDid);
     final fallbackDid = fallbackProxyDid.split('#').first;
-    final candidates = <String>{fallbackDid, ...repository.labelerDids};
     final reasonType = _reasonTypeFor(reason).toJson();
-    final services = <_ModerationServiceOption>[];
-
-    for (final did in candidates) {
-      try {
-        final service = await repository.labeler.getServicesDetailed([did]);
-        final subjectTypes = service.subjectTypes?.map((type) => type.toJson());
-        if (subjectTypes != null &&
-            !subjectTypes.contains(isRecord ? 'record' : 'account')) {
-          continue;
-        }
-        if (collection != null &&
-            service.subjectCollections != null &&
-            !service.subjectCollections!.contains(collection)) {
-          continue;
-        }
-        final reasonTypes = service.reasonTypes?.map((type) => type.toJson());
-        if (reasonTypes != null && !reasonTypes.contains(reasonType)) {
-          continue;
-        }
-        services.add(
-          _ModerationServiceOption(
-            did: did,
-            displayName: service.creator.displayName ?? service.creator.handle,
-            isDefault: did == fallbackDid,
-          ),
-        );
-      } catch (error, stackTrace) {
-        _logger.w(
-          'Unable to inspect report capabilities for $did',
-          error: error,
-          stackTrace: stackTrace,
-        );
-        if (did == fallbackDid) {
-          services.add(
-            _ModerationServiceOption(
-              did: did,
-              displayName: did,
-              isDefault: true,
-            ),
-          );
-        }
-      }
-    }
-
-    services.sort((left, right) {
-      if (left.isDefault != right.isDefault) return left.isDefault ? -1 : 1;
-      return left.displayName.compareTo(right.displayName);
-    });
-    return services;
+    return repository.labeler.getCompatibleModerationServices(
+      repository.labelerDids,
+      ModerationServiceQuery(
+        fallbackDid: fallbackDid,
+        subjectType: isRecord ? 'record' : 'account',
+        subjectCollection: collection,
+        reasonType: reasonType,
+      ),
+    );
   }
 
   Future<void> _submitReport() async {
     if (_selectedReason == null || _selectedServiceDid == null) return;
 
+    final l10n = AppLocalizations.of(context);
     final subject = _buildSubject();
     final reason = _additionalInfoController.text.isNotEmpty
         ? _additionalInfoController.text
@@ -528,7 +501,7 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
       _logger.e('Error creating report', error: e);
       if (mounted) {
         setState(() {
-          _errorMessage = 'Error: $e';
+          _errorMessage = l10n.errorGeneric;
         });
       }
     } finally {
@@ -618,7 +591,7 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
 
               if (isStep2 && _selectedReason != null) ...[
                 const SizedBox(height: 8),
-                FutureBuilder<List<_ModerationServiceOption>>(
+                FutureBuilder<List<CompatibleModerationService>>(
                   future: _compatibleServicesFuture,
                   builder: (context, snapshot) {
                     if (snapshot.connectionState != ConnectionState.done) {
@@ -727,18 +700,6 @@ class _ReportDialogState extends ConsumerState<ReportDialog> {
   }
 }
 
-class _ModerationServiceOption {
-  const _ModerationServiceOption({
-    required this.did,
-    required this.displayName,
-    required this.isDefault,
-  });
-
-  final String did;
-  final String displayName;
-  final bool isDefault;
-}
-
 class _CategoryTile extends StatelessWidget {
   const _CategoryTile({
     required this.category,
diff --git a/lib/src/features/comments/ui/widgets/comment_item.dart b/lib/src/features/comments/ui/widgets/comment_item.dart
index c920dd00..a2d83c59 100644
--- a/lib/src/features/comments/ui/widgets/comment_item.dart
+++ b/lib/src/features/comments/ui/widgets/comment_item.dart
@@ -41,11 +41,12 @@ class CommentItem extends ConsumerWidget {
 
     final post = commentState.thread.post;
     return ModeratedContent(
-      labels: post.labels ?? const [],
-      authorLabels: post.author.labels ?? const [],
-      target: ModerationTarget.content,
+      subject: ModerationSubject.content(
+        labels: post.labels ?? const [],
+        authorLabels: post.author.labels ?? const [],
+        subjectDid: post.author.did,
+      ),
       context: ModerationContext.contentList,
-      subjectDid: post.author.did,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
diff --git a/lib/src/features/feed/providers/feed_provider.dart b/lib/src/features/feed/providers/feed_provider.dart
index 17b2e922..19954af4 100644
--- a/lib/src/features/feed/providers/feed_provider.dart
+++ b/lib/src/features/feed/providers/feed_provider.dart
@@ -14,6 +14,7 @@ import 'package:spark/src/core/storage/cache/download_manager_interface.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 import 'package:spark/src/features/feed/providers/feed_state.dart';
+import 'package:spark/src/features/settings/providers/labeler_settings_controller.dart';
 import 'package:spark/src/features/settings/providers/settings_provider.dart';
 
 part 'feed_provider.g.dart';
@@ -32,7 +33,7 @@ class _RiverpodFeedSettingsGateway implements FeedSettingsGateway {
   Future<List<String>> getLabelers() async {
     try {
       return await ref
-          .read(settingsProvider.notifier)
+          .read(labelerSettingsControllerProvider)
           .getLabelers()
           .timeout(const Duration(seconds: 5), onTimeout: _fallbackLabelers);
     } catch (_) {
@@ -552,56 +553,32 @@ class FeedNotifier extends _$FeedNotifier {
     );
   }
 
-  /// Checks if a post should be hidden based on its labels and user preferences
-  Future<bool> _shouldHidePost(PostView post, List<Label> postLabels) async {
+  /// Filters based on label preferences, removing posts that should be hidden
+  Future<List<PostView>> _filterHiddenPosts(
+    List<PostView> posts,
+    LinkedHashMap<AtUri, ({List<Label> postLabels})> extraInfo,
+  ) async {
     try {
       final engine = await ref.read(moderationEngineProvider.future);
-      final decision = ModerationDecision.merge([
-        engine.evaluate(
-          postLabels,
-          target: ModerationTarget.content,
+      return posts.where((post) {
+        final labels = extraInfo[post.uri]?.postLabels;
+        if (labels == null) return true;
+        final decision = ModerationSubject.content(
+          labels: labels,
+          authorLabels: post.author.labels ?? const [],
           subjectDid: post.author.did,
-        ),
-        engine.evaluateProfileLabels(
-          post.author.labels ?? const [],
-          subjectDid: post.author.did,
-        ),
-      ]);
-      return decision.forContext(ModerationContext.contentList).filter;
+        ).evaluate(engine);
+        return !decision.forContext(ModerationContext.contentList).filter;
+      }).toList();
     } catch (error, stackTrace) {
       _logger.w(
-        'Could not evaluate moderation for ${post.uri}',
+        'Could not moderate feed page',
         error: error,
         stackTrace: stackTrace,
       );
-      return false;
+      return posts;
     }
   }
-
-  /// Filters based on label preferences, removing posts that should be hidden
-  Future<List<PostView>> _filterHiddenPosts(
-    List<PostView> posts,
-    LinkedHashMap<AtUri, ({List<Label> postLabels})> extraInfo,
-  ) async {
-    final filteredPosts = <PostView>[];
-
-    for (final post in posts) {
-      final postExtraInfo = extraInfo[post.uri];
-      if (postExtraInfo != null) {
-        final shouldHide = await _shouldHidePost(
-          post,
-          postExtraInfo.postLabels,
-        );
-        if (!shouldHide) {
-          filteredPosts.add(post);
-        }
-      } else {
-        filteredPosts.add(post);
-      }
-    }
-
-    return filteredPosts;
-  }
 }
 
 bool _labelShouldReplace(Label candidate, Label existing, DateTime now) {
diff --git a/lib/src/features/feed/providers/visible_pinned_feeds_provider.dart b/lib/src/features/feed/providers/visible_pinned_feeds_provider.dart
index 9203ecff..84b5b5af 100644
--- a/lib/src/features/feed/providers/visible_pinned_feeds_provider.dart
+++ b/lib/src/features/feed/providers/visible_pinned_feeds_provider.dart
@@ -63,17 +63,9 @@ ModerationDecision feedGeneratorModerationDecision(
   GeneratorView generator, {
   Iterable<String> preferredLocales = const [],
 }) {
-  return ModerationDecision.merge([
-    engine.evaluate(
-      generator.labels ?? const [],
-      target: ModerationTarget.content,
-      subjectDid: generator.creator.did,
-      preferredLocales: preferredLocales,
-    ),
-    engine.evaluateProfileLabels(
-      generator.creator.labels ?? const [],
-      subjectDid: generator.creator.did,
-      preferredLocales: preferredLocales,
-    ),
-  ]);
+  return ModerationSubject.content(
+    labels: generator.labels ?? const [],
+    authorLabels: generator.creator.labels ?? const [],
+    subjectDid: generator.creator.did,
+  ).evaluate(engine, preferredLocales: preferredLocales);
 }
diff --git a/lib/src/features/feed/ui/pages/standalone_post_page.dart b/lib/src/features/feed/ui/pages/standalone_post_page.dart
index 45357d29..e6b59122 100644
--- a/lib/src/features/feed/ui/pages/standalone_post_page.dart
+++ b/lib/src/features/feed/ui/pages/standalone_post_page.dart
@@ -211,11 +211,12 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
 
           content = ModeratedContent(
             key: ValueKey(postData.uri.toString()),
-            labels: postData.labels ?? const [],
-            authorLabels: postData.author.labels ?? const [],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: postData.labels ?? const [],
+              authorLabels: postData.author.labels ?? const [],
+              subjectDid: postData.author.did,
+            ),
             context: ModerationContext.contentView,
-            subjectDid: postData.author.did,
             onConcealChanged: (concealed) {
               if (mounted && _moderationConcealed != concealed) {
                 setState(() => _moderationConcealed = concealed);
diff --git a/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart b/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
index 607bc283..2e63406f 100644
--- a/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
+++ b/lib/src/features/feed/ui/widgets/post/feed_post_widget.dart
@@ -214,11 +214,12 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
 
           return ModeratedContent(
             key: ValueKey(currentPost.uri.toString()),
-            labels: labels,
-            authorLabels: currentPost.author.labels ?? const [],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: labels,
+              authorLabels: currentPost.author.labels ?? const [],
+              subjectDid: currentPost.author.did,
+            ),
             context: ModerationContext.contentList,
-            subjectDid: currentPost.author.did,
             onConcealChanged: (concealed) {
               if (mounted && _moderationConcealed != concealed) {
                 setState(() => _moderationConcealed = concealed);
diff --git a/lib/src/features/feed/ui/widgets/post_likes_sheet.dart b/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
index 8355d910..dcea3b00 100644
--- a/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
+++ b/lib/src/features/feed/ui/widgets/post_likes_sheet.dart
@@ -118,10 +118,11 @@ class _PostLikesSheetState extends ConsumerState<_PostLikesSheet> {
 
                   final actor = state.likes[index].actor;
                   return ModeratedContent(
-                    labels: actor.labels ?? const [],
-                    target: ModerationTarget.account,
+                    subject: ModerationSubject.profile(
+                      labels: actor.labels ?? const [],
+                      subjectDid: actor.did,
+                    ),
                     context: ModerationContext.profileList,
-                    subjectDid: actor.did,
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
                         horizontal: 16,
diff --git a/lib/src/features/messages/ui/pages/messages_page.dart b/lib/src/features/messages/ui/pages/messages_page.dart
index abe42401..89963324 100644
--- a/lib/src/features/messages/ui/pages/messages_page.dart
+++ b/lib/src/features/messages/ui/pages/messages_page.dart
@@ -94,10 +94,11 @@ class _MessagesPageState extends ConsumerState<MessagesPage> {
           itemWrapper: (context, index, child) {
             final profile = data.conversations[index].$1;
             return ModeratedContent(
-              labels: profile.labels ?? const [],
-              target: ModerationTarget.account,
+              subject: ModerationSubject.profile(
+                labels: profile.labels ?? const [],
+                subjectDid: profile.did,
+              ),
               context: ModerationContext.profileList,
-              subjectDid: profile.did,
               child: child,
             );
           },
diff --git a/lib/src/features/messages/ui/pages/new_chat_search_page.dart b/lib/src/features/messages/ui/pages/new_chat_search_page.dart
index f84b8670..ae82f295 100644
--- a/lib/src/features/messages/ui/pages/new_chat_search_page.dart
+++ b/lib/src/features/messages/ui/pages/new_chat_search_page.dart
@@ -241,10 +241,11 @@ class _UserResultsState extends ConsumerState<_UserResults> {
         final actor = state.searchResults[index];
 
         return ModeratedContent(
-          labels: actor.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: actor.labels ?? const [],
+            subjectDid: actor.did,
+          ),
           context: ModerationContext.profileList,
-          subjectDid: actor.did,
           child: Padding(
             padding: const EdgeInsets.only(bottom: 8),
             child: ProfileCard(
diff --git a/lib/src/features/messages/ui/widgets/messages_list.dart b/lib/src/features/messages/ui/widgets/messages_list.dart
index 7b6f73b9..f7fe94f1 100644
--- a/lib/src/features/messages/ui/widgets/messages_list.dart
+++ b/lib/src/features/messages/ui/widgets/messages_list.dart
@@ -719,12 +719,13 @@ class _PostEmbedPreview extends ConsumerWidget {
         final screenWidth = MediaQuery.of(context).size.width;
         final double targetWidth = math.min(screenWidth * 0.5, 170);
         return ModeratedContent(
-          labels: post.labels ?? const [],
-          authorLabels: post.author.labels ?? const [],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: post.labels ?? const [],
+            authorLabels: post.author.labels ?? const [],
+            subjectDid: post.author.did,
+          ),
           context: ModerationContext.contentList,
-          subjectDid: post.author.did,
-          compact: true,
+          presentation: const ModerationPresentation.compact(),
           child: SizedBox(
             width: targetWidth,
             child: AspectRatio(
diff --git a/lib/src/features/notifications/ui/widgets/notification_item.dart b/lib/src/features/notifications/ui/widgets/notification_item.dart
index d1c7c806..1f094f5f 100644
--- a/lib/src/features/notifications/ui/widgets/notification_item.dart
+++ b/lib/src/features/notifications/ui/widgets/notification_item.dart
@@ -402,11 +402,12 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
       return SizedBox(
         width: 40,
         child: ModeratedContent(
-          labels: author.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: author.labels ?? const [],
+            subjectDid: author.did,
+          ),
           context: ModerationContext.avatar,
-          subjectDid: author.did,
-          compact: true,
+          presentation: const ModerationPresentation.compact(),
           child: UserAvatar(
             imageUrl: avatarUrl,
             username: username,
@@ -439,11 +440,12 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
             return Positioned(
               left: index * overlapStep,
               child: ModeratedContent(
-                labels: author.labels ?? const [],
-                target: ModerationTarget.account,
+                subject: ModerationSubject.profile(
+                  labels: author.labels ?? const [],
+                  subjectDid: author.did,
+                ),
                 context: ModerationContext.avatar,
-                subjectDid: author.did,
-                compact: true,
+                presentation: const ModerationPresentation.compact(),
                 child: UserAvatar(
                   imageUrl: avatarUrl,
                   username: username,
@@ -506,11 +508,12 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
     final username = primaryAuthor.displayName ?? primaryAuthor.handle;
 
     return ModeratedContent(
-      labels: notification.labels ?? const [],
-      authorLabels: notification.author.labels ?? const [],
-      target: ModerationTarget.content,
+      subject: ModerationSubject.content(
+        labels: notification.labels ?? const [],
+        authorLabels: notification.author.labels ?? const [],
+        subjectDid: primaryAuthor.did,
+      ),
       context: ModerationContext.contentList,
-      subjectDid: primaryAuthor.did,
       child: Material(
         color: widget.groupedNotification.isRead
             ? Colors.transparent
diff --git a/lib/src/features/profile/ui/pages/profile_page.dart b/lib/src/features/profile/ui/pages/profile_page.dart
index 39b46d4b..525bf62b 100644
--- a/lib/src/features/profile/ui/pages/profile_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_page.dart
@@ -258,10 +258,11 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
         final uniqueLinks = links.toSet().toList();
 
         return ModeratedContent(
-          labels: profile.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: profile.labels ?? const [],
+            subjectDid: profile.did,
+          ),
           context: ModerationContext.profileView,
-          subjectDid: profile.did,
           child: ProfilePageTemplate(
             displayName: profile.displayName ?? profile.handle,
             handle: profile.handle,
diff --git a/lib/src/features/profile/ui/widgets/blocks_list_view.dart b/lib/src/features/profile/ui/widgets/blocks_list_view.dart
index 2cd6d7fd..b29f3491 100644
--- a/lib/src/features/profile/ui/widgets/blocks_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/blocks_list_view.dart
@@ -44,10 +44,11 @@ class BlocksListView extends ConsumerWidget {
         }
         final user = users[index];
         return ModeratedContent(
-          labels: user.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: user.labels ?? const [],
+            subjectDid: user.did,
+          ),
           context: ModerationContext.profileList,
-          subjectDid: user.did,
           child: Padding(
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
             child: ProfileCard(
diff --git a/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart b/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
index 99f8d26f..a8dfdf11 100644
--- a/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
+++ b/lib/src/features/profile/ui/widgets/profile_feed_post_widget.dart
@@ -203,11 +203,12 @@ class _ProfileFeedPostWidgetState extends ConsumerState<ProfileFeedPostWidget> {
 
         return ModeratedContent(
           key: ValueKey(post.uri.toString()),
-          labels: post.labels ?? const [],
-          authorLabels: post.author.labels ?? const [],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: post.labels ?? const [],
+            authorLabels: post.author.labels ?? const [],
+            subjectDid: post.author.did,
+          ),
           context: ModerationContext.contentList,
-          subjectDid: post.author.did,
           onConcealChanged: (concealed) {
             if (mounted && _moderationConcealed != concealed) {
               setState(() => _moderationConcealed = concealed);
diff --git a/lib/src/features/profile/ui/widgets/profile_grid_widget.dart b/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
index 835283e6..cae1b921 100644
--- a/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
+++ b/lib/src/features/profile/ui/widgets/profile_grid_widget.dart
@@ -168,12 +168,13 @@ class ProfileGridTile extends ConsumerWidget {
 
     if (thumbnailUrl.isEmpty) {
       return ModeratedContent(
-        labels: postView.labels ?? const [],
-        authorLabels: postView.author.labels ?? const [],
-        target: ModerationTarget.content,
+        subject: ModerationSubject.content(
+          labels: postView.labels ?? const [],
+          authorLabels: postView.author.labels ?? const [],
+          subjectDid: postView.author.did,
+        ),
         context: ModerationContext.contentList,
-        subjectDid: postView.author.did,
-        compact: true,
+        presentation: const ModerationPresentation.compact(),
         child: GestureDetector(
           onTap: onTap,
           child: ColoredBox(
@@ -187,19 +188,21 @@ class ProfileGridTile extends ConsumerWidget {
     }
 
     return ModeratedContent(
-      labels: postView.labels ?? const [],
-      authorLabels: postView.author.labels ?? const [],
-      target: ModerationTarget.content,
+      subject: ModerationSubject.content(
+        labels: postView.labels ?? const [],
+        authorLabels: postView.author.labels ?? const [],
+        subjectDid: postView.author.did,
+      ),
       context: ModerationContext.contentList,
-      subjectDid: postView.author.did,
-      compact: true,
-      onConcealedTap: onTap,
-      blurredChild: PostTile(
-        thumbnailUrl: thumbnailUrl,
-        likes: likeCount,
-        seen: false,
-        nsfwBlur: true,
-        onTap: onTap,
+      presentation: ModerationPresentation.compact(
+        onConcealedTap: onTap,
+        blurredChild: PostTile(
+          thumbnailUrl: thumbnailUrl,
+          likes: likeCount,
+          seen: false,
+          nsfwBlur: true,
+          onTap: onTap,
+        ),
       ),
       child: PostTile(
         thumbnailUrl: thumbnailUrl,
diff --git a/lib/src/features/profile/ui/widgets/user_list_view.dart b/lib/src/features/profile/ui/widgets/user_list_view.dart
index a9a9361e..41ed5c5f 100644
--- a/lib/src/features/profile/ui/widgets/user_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/user_list_view.dart
@@ -61,10 +61,11 @@ class UserListView extends ConsumerWidget {
         final user = users[index];
         final hasStories = user.stories?.isNotEmpty ?? false;
         return ModeratedContent(
-          labels: user.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: user.labels ?? const [],
+            subjectDid: user.did,
+          ),
           context: ModerationContext.profileList,
-          subjectDid: user.did,
           child: Padding(
             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
             child: ProfileCard(
diff --git a/lib/src/features/search/providers/post_search_provider.dart b/lib/src/features/search/providers/post_search_provider.dart
index 27f4b352..11aedc6f 100644
--- a/lib/src/features/search/providers/post_search_provider.dart
+++ b/lib/src/features/search/providers/post_search_provider.dart
@@ -101,23 +101,20 @@ class PostSearch extends _$PostSearch {
   /// Search for posts with the given query
   Future<void> _searchPosts(String query, {required int requestToken}) async {
     if (query.isEmpty) return;
-    if (requestToken != _activeSearchToken || state.query != query) {
-      return;
-    }
+    if (!_isCurrentRequest(query, requestToken)) return;
 
     state = state.copyWith(isLoading: true, error: null);
 
     try {
       final response = await _repository.search(query);
 
-      if (!ref.mounted ||
-          requestToken != _activeSearchToken ||
-          state.query != query) {
-        return;
-      }
+      if (!_isCurrentRequest(query, requestToken)) return;
 
       final filteredSprkPosts = await _filterHiddenPosts(response.sprk.posts);
+      if (!_isCurrentRequest(query, requestToken)) return;
+
       final filteredBskyPosts = await _filterHiddenPosts(response.bsky.posts);
+      if (!_isCurrentRequest(query, requestToken)) return;
 
       final combinedPosts = [...filteredSprkPosts, ...filteredBskyPosts];
 
@@ -134,11 +131,7 @@ class PostSearch extends _$PostSearch {
         await _loadMorePostsForToken(requestToken);
       }
     } catch (e) {
-      if (!ref.mounted ||
-          requestToken != _activeSearchToken ||
-          state.query != query) {
-        return;
-      }
+      if (!_isCurrentRequest(query, requestToken)) return;
 
       _logger.e('Error searching posts: $e');
       state = state.copyWith(error: e.toString(), isLoading: false);
@@ -184,13 +177,11 @@ class PostSearch extends _$PostSearch {
     if (sprkCursor != null && sprkCursor.isNotEmpty) {
       final response = await _repository.searchSprk(query, cursor: sprkCursor);
 
-      if (!ref.mounted ||
-          requestToken != _activeSearchToken ||
-          state.query != query) {
-        return;
-      }
+      if (!_isCurrentRequest(query, requestToken)) return;
 
       final filteredPosts = await _filterHiddenPosts(response.posts);
+      if (!_isCurrentRequest(query, requestToken)) return;
+
       state = state.copyWith(
         searchResults: [...state.searchResults, ...filteredPosts],
         sprkNextCursor: response.cursor,
@@ -208,14 +199,12 @@ class PostSearch extends _$PostSearch {
     if (bskyCursor != null && bskyCursor.isNotEmpty) {
       final response = await _repository.searchBsky(query, cursor: bskyCursor);
 
-      if (!ref.mounted ||
-          requestToken != _activeSearchToken ||
-          state.query != query) {
-        return;
-      }
+      if (!_isCurrentRequest(query, requestToken)) return;
 
       final initialCount = state.searchResults.length;
       final filteredBskyPosts = await _filterHiddenPosts(response.posts);
+      if (!_isCurrentRequest(query, requestToken)) return;
+
       state = state.copyWith(
         searchResults: [...state.searchResults, ...filteredBskyPosts],
         bskyNextCursor: response.cursor,
@@ -230,21 +219,21 @@ class PostSearch extends _$PostSearch {
     }
   }
 
+  bool _isCurrentRequest(String query, int requestToken) {
+    return ref.mounted &&
+        requestToken == _activeSearchToken &&
+        state.query == query;
+  }
+
   Future<List<PostView>> _filterHiddenPosts(List<PostView> posts) async {
     try {
       final engine = await ref.read(moderationEngineProvider.future);
       return posts.where((post) {
-        final decision = ModerationDecision.merge([
-          engine.evaluate(
-            post.labels ?? const [],
-            target: ModerationTarget.content,
-            subjectDid: post.author.did,
-          ),
-          engine.evaluateProfileLabels(
-            post.author.labels ?? const [],
-            subjectDid: post.author.did,
-          ),
-        ]);
+        final decision = ModerationSubject.content(
+          labels: post.labels ?? const [],
+          authorLabels: post.author.labels ?? const [],
+          subjectDid: post.author.did,
+        ).evaluate(engine);
         return !decision.forContext(ModerationContext.contentList).filter;
       }).toList();
     } catch (error, stackTrace) {
diff --git a/lib/src/features/search/ui/pages/post_results.dart b/lib/src/features/search/ui/pages/post_results.dart
index 7b035fc6..2e1bed4b 100644
--- a/lib/src/features/search/ui/pages/post_results.dart
+++ b/lib/src/features/search/ui/pages/post_results.dart
@@ -183,12 +183,13 @@ class _PostResultsState extends ConsumerState<PostResults>
 
               final post = state.searchResults[index];
               return ModeratedContent(
-                labels: post.labels ?? const [],
-                authorLabels: post.author.labels ?? const [],
-                target: ModerationTarget.content,
+                subject: ModerationSubject.content(
+                  labels: post.labels ?? const [],
+                  authorLabels: post.author.labels ?? const [],
+                  subjectDid: post.author.did,
+                ),
                 context: ModerationContext.contentList,
-                subjectDid: post.author.did,
-                compact: true,
+                presentation: const ModerationPresentation.compact(),
                 child: PostTile(
                   thumbnailUrl: post.thumbnailUrl,
                   likes: post.likeCount ?? 0,
diff --git a/lib/src/features/search/ui/pages/search_page.dart b/lib/src/features/search/ui/pages/search_page.dart
index 7302c02b..092e61ed 100644
--- a/lib/src/features/search/ui/pages/search_page.dart
+++ b/lib/src/features/search/ui/pages/search_page.dart
@@ -215,10 +215,11 @@ class _ActorTypeaheadSuggestions extends ConsumerWidget {
         final actor = state.results[index];
 
         return ModeratedContent(
-          labels: actor.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: actor.labels ?? const [],
+            subjectDid: actor.did,
+          ),
           context: ModerationContext.profileList,
-          subjectDid: actor.did,
           child: ListTile(
             onTap: () => onSuggestionSelected(actor),
             contentPadding: const EdgeInsets.symmetric(vertical: 4),
diff --git a/lib/src/features/search/ui/pages/user_results.dart b/lib/src/features/search/ui/pages/user_results.dart
index 3bb76789..cf41bb20 100644
--- a/lib/src/features/search/ui/pages/user_results.dart
+++ b/lib/src/features/search/ui/pages/user_results.dart
@@ -190,10 +190,11 @@ class _UserResultsState extends ConsumerState<UserResults>
         final hasStories = actor.stories?.isNotEmpty ?? false;
 
         return ModeratedContent(
-          labels: actor.labels ?? const [],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: actor.labels ?? const [],
+            subjectDid: actor.did,
+          ),
           context: ModerationContext.profileList,
-          subjectDid: actor.did,
           child: Padding(
             padding: const EdgeInsets.only(bottom: 8),
             child: ProfileCard(
diff --git a/lib/src/features/search/ui/widgets/suggested_feeds_list.dart b/lib/src/features/search/ui/widgets/suggested_feeds_list.dart
index b3371d83..cca2d483 100644
--- a/lib/src/features/search/ui/widgets/suggested_feeds_list.dart
+++ b/lib/src/features/search/ui/widgets/suggested_feeds_list.dart
@@ -102,11 +102,12 @@ class SuggestedFeedsList extends ConsumerWidget {
                       );
 
                 return ModeratedContent(
-                  labels: generatorView.labels ?? const [],
-                  authorLabels: generatorView.creator.labels ?? const [],
-                  target: ModerationTarget.content,
+                  subject: ModerationSubject.content(
+                    labels: generatorView.labels ?? const [],
+                    authorLabels: generatorView.creator.labels ?? const [],
+                    subjectDid: generatorView.creator.did,
+                  ),
                   context: ModerationContext.contentList,
-                  subjectDid: generatorView.creator.did,
                   child: Padding(
                     padding: const EdgeInsets.only(bottom: 12),
                     child: FeedCard(
diff --git a/lib/src/features/settings/providers/labeler_policy_preferences.dart b/lib/src/features/settings/providers/labeler_policy_preferences.dart
new file mode 100644
index 00000000..77b578b3
--- /dev/null
+++ b/lib/src/features/settings/providers/labeler_policy_preferences.dart
@@ -0,0 +1,37 @@
+import 'package:spark/src/core/moderation/moderation.dart';
+import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
+
+final class LabelerPreferenceSnapshot {
+  const LabelerPreferenceSnapshot({
+    required this.preferences,
+    required this.definitions,
+  });
+
+  final Map<String, LabelPreference> preferences;
+  final Map<String, ModerationLabelDefinition> definitions;
+}
+
+LabelPreference labelPreferenceFromPolicy({
+  required String value,
+  required Setting? savedSetting,
+  required Setting? globalSetting,
+  required ModerationLabelDefinition? definition,
+}) {
+  final defaultSetting = definition == null
+      ? Setting.warn
+      : Setting.fromValue(definition.defaultSetting.name);
+  return LabelPreference(
+    value: value,
+    blurs: definition == null
+        ? Blurs.media
+        : Blurs.fromValue(definition.blurs.name),
+    severity: definition == null
+        ? Severity.alert
+        : Severity.fromValue(definition.severity.name),
+    defaultSetting: defaultSetting,
+    setting: globalAdultContentLabelValues.contains(value)
+        ? globalSetting ?? savedSetting ?? defaultSetting
+        : savedSetting ?? defaultSetting,
+    adultOnly: definition?.adultOnly ?? false,
+  );
+}
diff --git a/lib/src/features/settings/providers/labeler_settings_controller.dart b/lib/src/features/settings/providers/labeler_settings_controller.dart
new file mode 100644
index 00000000..28ba372c
--- /dev/null
+++ b/lib/src/features/settings/providers/labeler_settings_controller.dart
@@ -0,0 +1,343 @@
+import 'dart:async';
+
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:get_it/get_it.dart';
+import 'package:spark/src/core/moderation/moderation.dart';
+import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:spark/src/core/network/atproto/data/services/appview_labeler_headers.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
+import 'package:spark/src/core/utils/logging/log_service.dart';
+import 'package:spark/src/core/utils/logging/logger.dart';
+import 'package:spark/src/features/settings/providers/labeler_policy_preferences.dart';
+
+final labelerSettingsControllerProvider = Provider<LabelerSettingsController>(
+  (ref) => LabelerSettingsController(
+    ref,
+    GetIt.I<SprkRepository>(),
+    GetIt.I<LogService>().getLogger('LabelerSettings'),
+  ),
+);
+
+final class LabelerSettingsController {
+  LabelerSettingsController(this._ref, this._repository, this._logger);
+
+  final Ref _ref;
+  final SprkRepository _repository;
+  final SparkLogger _logger;
+  final Set<String> _policiesChecked = {};
+  bool _defaultEnsured = false;
+
+  String get _defaultDid => _repository.modDid.split('#').first;
+
+  void resetSessionCache() {
+    _policiesChecked.clear();
+    _defaultEnsured = false;
+  }
+
+  Future<Preferences> _preferences() async {
+    return _ref.read(userPreferencesProvider).asData?.value ??
+        _ref.read(userPreferencesProvider.future);
+  }
+
+  Future<void> _update(Preferences preferences) async {
+    await _ref
+        .read(userPreferencesProvider.notifier)
+        .updatePreferences(preferences);
+    configureHeaders(preferences);
+  }
+
+  void configureHeaders(Preferences preferences) {
+    _repository.configureLabelers(
+      preferences.labelers?.map((labeler) => labeler.did) ?? const [],
+    );
+  }
+
+  Future<List<String>> getLabelers() async {
+    final preferences = await _preferences();
+    var labelers =
+        preferences.labelers?.map((labeler) => labeler.did).toList() ?? [];
+
+    if (!_defaultEnsured) {
+      _defaultEnsured = true;
+      if (!labelers.contains(_defaultDid)) {
+        labelers = [_defaultDid, ...labelers];
+        _repository.configureLabelers(labelers);
+        labelers = _repository.labelerDids;
+        await _update(_withLabelers(preferences, labelers));
+      }
+    } else if (!labelers.contains(_defaultDid)) {
+      labelers = [_defaultDid, ...labelers];
+    }
+
+    _repository.configureLabelers(labelers);
+    labelers = _repository.labelerDids;
+    unawaited(_ensurePolicies(labelers));
+    return labelers;
+  }
+
+  Future<void> addLabeler(String identifier) async {
+    try {
+      final did = await _repository.labeler.resolveIdentifier(identifier);
+      final preferences = await _preferences();
+      final current = preferences.labelers ?? [];
+      if (current.any((labeler) => labeler.did == did)) return;
+      if (current.length >= AppViewLabelerHeaders.maxLabelers) {
+        throw StateError(
+          'Cannot subscribe to more than '
+          '${AppViewLabelerHeaders.maxLabelers} labelers',
+        );
+      }
+      await _repository.labeler.validateService(did);
+      await _update(
+        _withLabelers(preferences, [
+          ...current.map((labeler) => labeler.did),
+          did,
+        ]),
+      );
+      if (await _setMissingPolicyDefaults(did)) _policiesChecked.add(did);
+    } catch (error, stackTrace) {
+      _logger.e(
+        'Could not add labeler $identifier',
+        error: error,
+        stackTrace: stackTrace,
+      );
+      rethrow;
+    }
+  }
+
+  Future<void> removeLabeler(String did) async {
+    if (did == _defaultDid) {
+      throw Exception('Cannot remove the default moderation service');
+    }
+    final preferences = await _preferences();
+    await _update(
+      _withLabelers(
+        preferences,
+        (preferences.labelers ?? const [])
+            .map((labeler) => labeler.did)
+            .where((labelerDid) => labelerDid != did),
+      ),
+    );
+    _policiesChecked.remove(did);
+  }
+
+  Future<void> syncLabelers() async {
+    resetSessionCache();
+    await _ref.read(userPreferencesProvider.notifier).refresh();
+    var preferences = await _preferences();
+    final configured = <String>[
+      _defaultDid,
+      ...(preferences.labelers ?? const [])
+          .map((labeler) => labeler.did)
+          .where((did) => did != _defaultDid),
+    ];
+    _repository.configureLabelers(configured);
+    var labelers = _repository.labelerDids;
+    if (!_sameLabelers(
+      preferences.labelers?.map((labeler) => labeler.did) ?? const [],
+      labelers,
+    )) {
+      preferences = _withLabelers(preferences, labelers);
+      await _update(preferences);
+    }
+
+    final available = <String>[];
+    for (final did in labelers) {
+      if (did == _defaultDid) {
+        available.add(did);
+        continue;
+      }
+      try {
+        await _repository.labeler.validateService(did);
+        available.add(did);
+      } on LabelerServiceUnavailableException catch (error, stackTrace) {
+        _logger.w(
+          'Removing unavailable labeler $did',
+          error: error,
+          stackTrace: stackTrace,
+        );
+      }
+    }
+    if (!_sameLabelers(labelers, available)) {
+      preferences = _withLabelers(preferences, available);
+      await _update(preferences);
+      labelers = available;
+    }
+    await _ensurePolicies(labelers);
+    _repository.configureLabelers(labelers);
+    _defaultEnsured = true;
+  }
+
+  Future<Map<String, Setting>> getLabelSettings(String labelerDid) async {
+    final preferences = await _preferences();
+    return _savedSettings(preferences, labelerDid);
+  }
+
+  Future<LabelerPreferenceSnapshot> getPreferenceSnapshot(
+    String labelerDid,
+  ) async {
+    final service = await _repository.labeler.getServicesDetailed([labelerDid]);
+    final labelValues = service.policies.labelValues
+        .map<String>((value) => value.toJson())
+        .toList(growable: false);
+    if (labelValues.isEmpty) {
+      throw StateError('No label values found for labeler');
+    }
+    final definitions = ModerationLabelDefinitions.fromLabelers({
+      labelerDid: service.policies.labelValueDefinitions ?? const [],
+    });
+    final definitionMap = <String, ModerationLabelDefinition>{
+      for (final value in labelValues)
+        value:
+            ?definitions.bySource[labelerDid]?[value] ??
+            definitions.global[value],
+    };
+    final preferences = await _preferences();
+    final saved = _savedSettings(preferences, labelerDid);
+    final global = _savedSettings(preferences, null);
+    return LabelerPreferenceSnapshot(
+      definitions: definitionMap,
+      preferences: {
+        for (final value in labelValues)
+          value: labelPreferenceFromPolicy(
+            value: value,
+            savedSetting: saved[value],
+            globalSetting: global[value],
+            definition: definitionMap[value],
+          ),
+      },
+    );
+  }
+
+  Future<void> setLabelPreference(
+    String labelerDid,
+    String value,
+    Setting setting,
+  ) async {
+    final preferences = await _preferences();
+    final updated = <Preference>[];
+    var replaced = false;
+    for (final preference in preferences.preferences) {
+      final contentLabel = preference.contentLabelPref;
+      if (contentLabel?.labelerDid == labelerDid &&
+          contentLabel?.label == value) {
+        updated.add(
+          contentLabelPreference(
+            labelerDid: labelerDid,
+            label: value,
+            visibility: setting.name,
+          ),
+        );
+        replaced = true;
+      } else {
+        updated.add(preference);
+      }
+    }
+    if (!replaced) {
+      updated.add(
+        contentLabelPreference(
+          labelerDid: labelerDid,
+          label: value,
+          visibility: setting.name,
+        ),
+      );
+    }
+    await _update(Preferences(preferences: updated));
+  }
+
+  Future<void> _ensurePolicies(Iterable<String> dids) async {
+    for (final did in dids.where((did) => !_policiesChecked.contains(did))) {
+      if (await _setMissingPolicyDefaults(did)) _policiesChecked.add(did);
+    }
+  }
+
+  Future<bool> _setMissingPolicyDefaults(String did) async {
+    try {
+      final service = await _repository.labeler.getServicesDetailed([did]);
+      final labelValues = service.policies.labelValues
+          .map<String>((value) => value.toJson())
+          .where((value) => !globalAdultContentLabelValues.contains(value));
+      final definitions = ModerationLabelDefinitions.fromLabelers({
+        did: service.policies.labelValueDefinitions ?? const [],
+      });
+      final preferences = await _preferences();
+      final existing = _savedSettings(preferences, did);
+      final additions = <Preference>[
+        for (final value in labelValues)
+          if (!existing.containsKey(value))
+            contentLabelPreference(
+              labelerDid: did,
+              label: value,
+              visibility:
+                  (definitions.bySource[did]?[value] ??
+                          definitions.global[value])
+                      ?.defaultSetting
+                      .name ??
+                  Setting.warn.name,
+            ),
+      ];
+      if (additions.isNotEmpty) {
+        await _update(
+          Preferences(preferences: [...preferences.preferences, ...additions]),
+        );
+      }
+      return true;
+    } catch (error, stackTrace) {
+      _logger.w(
+        'Could not set label policy defaults for $did',
+        error: error,
+        stackTrace: stackTrace,
+      );
+      return false;
+    }
+  }
+
+  Map<String, Setting> _savedSettings(
+    Preferences preferences,
+    String? labelerDid,
+  ) {
+    final result = <String, Setting>{};
+    for (final preference
+        in preferences.contentLabelPrefs ?? const <ContentLabelPref>[]) {
+      if (preference.labelerDid == labelerDid) {
+        result[preference.label] = Setting.fromValue(
+          preference.visibility.toJson(),
+        );
+      }
+    }
+    return result;
+  }
+
+  Preferences _withLabelers(
+    Preferences preferences,
+    Iterable<String> labelers,
+  ) {
+    final normalized = labelers.toList(growable: false);
+    final subscribed = normalized.toSet();
+    return Preferences(
+      preferences: [
+        ...preferences.preferences.where((preference) {
+          if (preference.isLabelersPref) return false;
+          final labelerDid = preference.contentLabelPref?.labelerDid;
+          return labelerDid == null || subscribed.contains(labelerDid);
+        }),
+        labelersPreference([
+          for (final did in normalized) LabelerPrefItem(did: did),
+        ]),
+      ],
+    );
+  }
+
+  bool _sameLabelers(Iterable<String> left, Iterable<String> right) {
+    final leftItems = left.toList(growable: false);
+    final rightItems = right.toList(growable: false);
+    if (leftItems.length != rightItems.length) return false;
+    for (var index = 0; index < leftItems.length; index++) {
+      if (leftItems[index] != rightItems[index]) return false;
+    }
+    return true;
+  }
+}
diff --git a/lib/src/features/settings/providers/settings_provider.dart b/lib/src/features/settings/providers/settings_provider.dart
index b1105544..4dfa688e 100644
--- a/lib/src/features/settings/providers/settings_provider.dart
+++ b/lib/src/features/settings/providers/settings_provider.dart
@@ -1,19 +1,16 @@
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/moderation/moderation_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/feed_repository.dart';
-import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/pref_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
-import 'package:spark/src/core/network/atproto/data/services/appview_labeler_headers.dart';
 import 'package:spark/src/core/storage/preferences/default_preferences.dart';
 import 'package:spark/src/core/storage/preferences/storage_manager.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
+import 'package:spark/src/features/settings/providers/labeler_settings_controller.dart';
 import 'package:spark/src/features/settings/providers/settings_state.dart';
 
 part 'settings_provider.g.dart';
@@ -39,13 +36,6 @@ class Settings extends _$Settings {
   SparkLogger? _logger;
   Feed? _defaultFeed;
 
-  /// Tracks labelers whose policies have already been fetched and set.
-  /// This prevents repeated network calls to getServices for the same labelers.
-  final Set<String> _labelerPoliciesChecked = {};
-
-  /// Tracks if the default labeler has been ensured this session
-  bool _defaultLabelerEnsured = false;
-
   /// Tracks if settings have been loaded to prevent resetting state on rebuild
   bool _hasLoadedSettings = false;
 
@@ -96,7 +86,7 @@ class Settings extends _$Settings {
     await ref
         .read(userPreferencesProvider.notifier)
         .updatePreferences(preferences);
-    _configureLabelerHeaders(preferences);
+    ref.read(labelerSettingsControllerProvider).configureHeaders(preferences);
   }
 
   Future<Preferences> _getCurrentPreferencesForFeedUpdate() async {
@@ -247,7 +237,7 @@ class Settings extends _$Settings {
 
       // Get preferences from the provider (waits for it to load if needed)
       final preferences = await _getPreferences();
-      _configureLabelerHeaders(preferences);
+      ref.read(labelerSettingsControllerProvider).configureHeaders(preferences);
       final savedFeeds = _getSavedFeedsFromPreferences(preferences);
 
       // If there are no feeds, set default preferences
@@ -279,7 +269,9 @@ class Settings extends _$Settings {
           // Get updated preferences from provider
           final updatedPreferences =
               ref.read(userPreferencesProvider).asData?.value ?? mergedDefaults;
-          _configureLabelerHeaders(updatedPreferences);
+          ref
+              .read(labelerSettingsControllerProvider)
+              .configureHeaders(updatedPreferences);
           final updatedSavedFeeds = _getSavedFeedsFromPreferences(
             updatedPreferences,
           );
@@ -432,7 +424,7 @@ class Settings extends _$Settings {
       // Reset flags to handle race conditions (e.g., login while loading)
       _hasLoadedSettings = false;
       _isLoadingSettings = false;
-      _defaultLabelerEnsured = false;
+      ref.read(labelerSettingsControllerProvider).resetSessionCache();
       // Refresh preferences from server - use Future to avoid modifying
       // provider during widget build phase
       await Future(() async {
@@ -566,519 +558,10 @@ class Settings extends _$Settings {
     }
   }
 
-  // Public methods for other providers to use
-
-  Future<List<String>> getLabelers() async {
-    final preferences = await _getPreferences();
-    var labelers =
-        preferences.labelers?.map((labeler) => labeler.did).toList() ?? [];
-
-    // Ensure default mod service labeler is always present
-    // Only check once per session to avoid unnecessary putPreferences calls
-    final modServiceDid = _defaultModServiceDid;
-    if (!_defaultLabelerEnsured) {
-      _defaultLabelerEnsured = true;
-      final isMissing = !labelers.contains(modServiceDid);
-      if (isMissing) {
-        logger.d('Default mod service labeler not found, adding it');
-        labelers = [modServiceDid, ...labelers];
-
-        sprkRepository.configureLabelers(labelers);
-        labelers = sprkRepository.labelerDids;
-
-        // Update preferences to include default labeler
-        final updatedLabelers = labelers
-            .map((did) => LabelerPrefItem(did: did))
-            .toList();
-        final updatedPreferencesList =
-            preferences.preferences
-                .where((pref) => !pref.isLabelersPref)
-                .toList()
-              ..add(labelersPreference(updatedLabelers));
-
-        await _updatePreferences(
-          Preferences(preferences: updatedPreferencesList),
-        );
-      }
-    } else if (!labelers.contains(modServiceDid)) {
-      // Already checked this session but still need to include it in return
-      labelers = [modServiceDid, ...labelers];
-    }
-
-    sprkRepository.configureLabelers(labelers);
-    labelers = sprkRepository.labelerDids;
-
-    // Ensure all labelers' label values are set as preferences
-    // Do this asynchronously to avoid blocking
-    Future.microtask(() => _ensureAllLabelersPoliciesSet(labelers));
-
-    return labelers;
-  }
-
-  /// Ensures all label values from all subscribed labelers have prefs set.
-  /// Only fetch policies for labelers that haven't been checked this session.
-  Future<void> _ensureAllLabelersPoliciesSet(List<String> labelerDids) async {
-    final uncheckedLabelers = labelerDids
-        .where((did) => !_labelerPoliciesChecked.contains(did))
-        .toList();
-
-    if (uncheckedLabelers.isEmpty) {
-      return;
-    }
-
-    for (final did in uncheckedLabelers) {
-      try {
-        if (await _fetchLabelerPoliciesAndSetDefaults(did)) {
-          _labelerPoliciesChecked.add(did);
-        }
-      } catch (e) {
-        logger.w('Error ensuring label values for labeler $did: $e');
-      }
-    }
-  }
-
-  /// Adds a labeler to the user's subscribed labelers list
-  Future<void> addLabeler(String identifier) async {
-    try {
-      logger.d('Adding labeler: $identifier');
-      final did = await sprkRepository.labeler.resolveIdentifier(identifier);
-      final preferences = await _getPreferences();
-      final currentLabelers = preferences.labelers ?? [];
-
-      // Check if labeler already exists
-      if (currentLabelers.any((labeler) => labeler.did == did)) {
-        logger.w('Labeler already exists: $did');
-        return;
-      }
-
-      if (currentLabelers.length >= AppViewLabelerHeaders.maxLabelers) {
-        throw StateError(
-          'Cannot subscribe to more than '
-          '${AppViewLabelerHeaders.maxLabelers} labelers',
-        );
-      }
-
-      await sprkRepository.labeler.validateService(did);
-
-      // Create updated preferences with new labeler
-      final updatedLabelers = [...currentLabelers, LabelerPrefItem(did: did)];
-      final updatedPreferencesList =
-          preferences.preferences.where((pref) => !pref.isLabelersPref).toList()
-            ..add(labelersPreference(updatedLabelers));
-
-      await _updatePreferences(
-        Preferences(preferences: updatedPreferencesList),
-      );
-      logger.d('Labeler added successfully: $did');
-
-      // Fetch and set default label preferences for this labeler
-      if (await _fetchLabelerPoliciesAndSetDefaults(did)) {
-        _labelerPoliciesChecked.add(did);
-      }
-    } catch (e) {
-      logger.e('Error adding labeler: $e');
-      rethrow;
-    }
-  }
-
-  /// Removes a labeler from the user's subscribed labelers list
-  Future<void> removeLabeler(String did) async {
-    try {
-      // Prevent removal of default mod service labeler
-      if (did == _defaultModServiceDid) {
-        logger.w(
-          'Attempted to remove default mod service labeler, '
-          'which is not allowed',
-        );
-        throw Exception('Cannot remove the default mod service labeler');
-      }
-
-      logger.d('Removing labeler: $did');
-      final preferences = await _getPreferences();
-      final currentLabelers = preferences.labelers ?? [];
-
-      // Remove the labeler
-      final updatedLabelers = currentLabelers
-          .where((labeler) => labeler.did != did)
-          .toList();
-
-      // Create updated preferences
-      final updatedPreferencesList = preferences.preferences.where((pref) {
-        if (pref.isLabelersPref) return false;
-        final contentLabelPref = pref.contentLabelPref;
-        return contentLabelPref?.labelerDid != did;
-      }).toList()..add(labelersPreference(updatedLabelers));
-
-      await _updatePreferences(
-        Preferences(preferences: updatedPreferencesList),
-      );
-      _labelerPoliciesChecked.remove(did);
-      logger.d('Labeler removed successfully: $did');
-    } catch (e) {
-      logger.e('Error removing labeler: $e');
-      rethrow;
-    }
-  }
-
-  /// Syncs labelers from server (useful for manual refresh)
-  Future<void> syncLabelers() async {
-    try {
-      logger.d('Syncing labelers from server...');
-      // Clear the caches so we re-check everything
-      _labelerPoliciesChecked.clear();
-      _defaultLabelerEnsured = false;
-      // Refresh preferences from server first
-      await ref.read(userPreferencesProvider.notifier).refresh();
-
-      var preferences = await _getPreferences();
-      var labelers =
-          preferences.labelers?.map((labeler) => labeler.did).toList() ?? [];
-
-      // Ensure default mod service labeler is present
-      final modServiceDid = _defaultModServiceDid;
-      _defaultLabelerEnsured = true;
-      if (!labelers.contains(modServiceDid)) {
-        labelers.insert(0, modServiceDid);
-      }
-
-      sprkRepository.configureLabelers(labelers);
-      final normalizedLabelers = sprkRepository.labelerDids;
-      if (!_sameLabelers(labelers, normalizedLabelers) ||
-          !_sameLabelers(
-            preferences.labelers?.map((labeler) => labeler.did) ?? const [],
-            normalizedLabelers,
-          )) {
-        preferences = _withLabelers(preferences, normalizedLabelers);
-        await _updatePreferences(preferences);
-      }
-      labelers = normalizedLabelers.toList();
-
-      final availableLabelers = <String>[];
-      final unavailableLabelers = <String>{};
-      for (final did in labelers) {
-        if (did == modServiceDid) {
-          availableLabelers.add(did);
-          continue;
-        }
-        try {
-          await sprkRepository.labeler.validateService(did);
-          availableLabelers.add(did);
-        } on LabelerServiceUnavailableException catch (e) {
-          logger.w('Removing unavailable labeler $did: $e');
-          unavailableLabelers.add(did);
-        }
-      }
-
-      if (unavailableLabelers.isNotEmpty) {
-        preferences = _withLabelers(preferences, availableLabelers);
-        await _updatePreferences(preferences);
-        labelers
-          ..clear()
-          ..addAll(availableLabelers);
-      }
-
-      logger.d(
-        'Syncing label value preferences for ${labelers.length} labelers',
-      );
-
-      // Ensure all labelers' label values are set as preferences
-      await _ensureAllLabelersPoliciesSet(labelers);
-
-      sprkRepository.configureLabelers(labelers);
-
-      logger.d('Labelers synced successfully');
-    } catch (e) {
-      logger.e('Error syncing labelers: $e');
-      rethrow;
-    }
-  }
-
-  /// Gets label preferences for a specific labeler
-  Future<Map<String, Setting>> getLabelSettingsForLabeler(
-    String labelerDid,
-  ) async {
-    final preferences = await _getPreferences();
-
-    // Get content label preferences from the main preferences list
-    final contentLabelPrefsMap = <String, String>{}; // label -> visibility
-    for (final pref in preferences.preferences) {
-      final contentLabelPref = pref.contentLabelPref;
-      if (contentLabelPref != null &&
-          contentLabelPref.labelerDid == labelerDid) {
-        contentLabelPrefsMap[contentLabelPref.label] = contentLabelPref
-            .visibility
-            .toJson();
-      }
-    }
-
-    // Also check contentLabelPrefs property
-    final contentLabelPrefsFromProperty =
-        preferences.contentLabelPrefs ?? const <ContentLabelPref>[];
-    for (final pref in contentLabelPrefsFromProperty) {
-      final prefLabelerDid = pref.labelerDid;
-      final prefLabel = pref.label;
-      final prefVisibility = pref.visibility.toJson();
-      if (prefLabelerDid == labelerDid &&
-          !contentLabelPrefsMap.containsKey(prefLabel)) {
-        contentLabelPrefsMap[prefLabel] = prefVisibility;
-      }
-    }
-
-    final result = <String, Setting>{};
-    for (final entry in contentLabelPrefsMap.entries) {
-      result[entry.key] = _visibilityToSetting(entry.value);
-    }
-    return result;
-  }
-
-  /// Sets label preference for a specific labeler
-  Future<void> setLabelPreferenceForLabeler(
-    String labelerDid,
-    String value,
-    Setting setting,
-  ) async {
-    final preferences = await _getPreferences();
-
-    // Get all non-content-label preferences
-    final updatedPreferencesList = preferences.preferences
-        .where((pref) => !pref.isContentLabelPref)
-        .toList();
-
-    // Get all existing content label preferences from preferences
-    final existingContentLabelPreferences = preferences.preferences
-        .where((pref) => pref.isContentLabelPref)
-        .toList();
-
-    // Track if we found the preference to update
-    var found = false;
-
-    // Preserve all other content label prefs & update the one we're changing
-    for (final pref in existingContentLabelPreferences) {
-      final contentLabelPref = pref.contentLabelPref;
-      if (contentLabelPref != null) {
-        if (contentLabelPref.labelerDid == labelerDid &&
-            contentLabelPref.label == value) {
-          // Update this specific preference
-          updatedPreferencesList.add(
-            contentLabelPreference(
-              labelerDid: labelerDid,
-              label: value,
-              visibility: _settingToVisibility(setting),
-            ),
-          );
-          found = true;
-        } else {
-          // Keep other preferences as-is
-          updatedPreferencesList.add(pref);
-        }
-      }
-    }
-
-    // If preference doesn't exist, add it
-    if (!found) {
-      updatedPreferencesList.add(
-        contentLabelPreference(
-          labelerDid: labelerDid,
-          label: value,
-          visibility: _settingToVisibility(setting),
-        ),
-      );
-    }
-
-    await _updatePreferences(Preferences(preferences: updatedPreferencesList));
-  }
-
   Future<Feed> getActiveFeed() async {
     final preferences = await _getPreferences();
     final savedFeeds = _getSavedFeedsFromPreferences(preferences);
     final feeds = await _loadFeedsFromSavedFeeds(savedFeeds);
     return _getActiveFeedFromFeeds(feeds, savedFeeds);
   }
-
-  // Helper conversion methods
-
-  String _settingToVisibility(Setting setting) {
-    switch (setting) {
-      case Setting.ignore:
-        return 'ignore';
-      case Setting.warn:
-        return 'warn';
-      case Setting.hide:
-        return 'hide';
-    }
-  }
-
-  Setting _visibilityToSetting(String visibility) {
-    switch (visibility) {
-      case 'ignore':
-        return Setting.ignore;
-      case 'warn':
-        return Setting.warn;
-      case 'hide':
-        return Setting.hide;
-      default:
-        return Setting.ignore;
-    }
-  }
-
-  /// Fetches labeler policies and sets default content label preferences
-  /// for label values that don't already have preferences
-  Future<bool> _fetchLabelerPoliciesAndSetDefaults(String did) async {
-    try {
-      final service = await sprkRepository.labeler.getServicesDetailed([did]);
-      final policiesJson = service.policies.toJson();
-
-      final labelValuesJson = policiesJson['labelValues'] as List<dynamic>?;
-      if (labelValuesJson == null || labelValuesJson.isEmpty) {
-        return true;
-      }
-
-      final labelValues = labelValuesJson.map((v) => v as String).toList();
-
-      final labelValueDefinitionsJson =
-          policiesJson['labelValueDefinitions'] as List<dynamic>?;
-      final labelDefinitionMap = <String, Map<String, dynamic>>{};
-      if (labelValueDefinitionsJson != null) {
-        for (final defJson in labelValueDefinitionsJson) {
-          final def = defJson as Map<String, dynamic>;
-          final identifier = def['identifier'] as String?;
-          if (identifier != null) {
-            labelDefinitionMap[identifier] = def;
-          }
-        }
-      }
-
-      final preferences = await _getPreferences();
-
-      // Get all existing content label preferences from both sources
-      final existingContentLabelPreferences = preferences.preferences
-          .where((pref) => pref.isContentLabelPref)
-          .toList();
-      final existingContentPrefsFromProperty =
-          preferences.contentLabelPrefs ?? const <ContentLabelPref>[];
-
-      // Build a map of existing preferences by labelerDid:label
-      final existingPrefsMap =
-          <String, String>{}; // "labelerDid:label" -> "visibility"
-      for (final pref in existingContentLabelPreferences) {
-        final contentLabelPref = pref.contentLabelPref;
-        if (contentLabelPref != null) {
-          existingPrefsMap['${contentLabelPref.labelerDid}:'
-              '${contentLabelPref.label}'] = contentLabelPref.visibility
-              .toJson();
-        }
-      }
-      for (final pref in existingContentPrefsFromProperty) {
-        final key = '${pref.labelerDid}:${pref.label}';
-        if (!existingPrefsMap.containsKey(key)) {
-          existingPrefsMap[key] = pref.visibility.toJson();
-        }
-      }
-
-      final preferencesToAdd = <Preference>[];
-
-      for (final labelValue in labelValues) {
-        if (globalAdultContentLabelValues.contains(labelValue)) continue;
-        final key = '$did:$labelValue';
-        final hasExistingPref = existingPrefsMap.containsKey(key);
-
-        if (!hasExistingPref) {
-          String defaultVisibility;
-          final definition = labelDefinitionMap[labelValue];
-          if (definition != null) {
-            defaultVisibility =
-                definition['defaultSetting'] as String? ?? 'warn';
-          } else {
-            defaultVisibility = _getDefaultVisibilityForLabel(labelValue);
-          }
-
-          preferencesToAdd.add(
-            contentLabelPreference(
-              labelerDid: did,
-              label: labelValue,
-              visibility: defaultVisibility,
-            ),
-          );
-        }
-      }
-
-      if (preferencesToAdd.isNotEmpty) {
-        // Preserve all existing preferences and add new ones
-        final updatedPreferencesList = [
-          ...preferences.preferences.where((pref) => !pref.isContentLabelPref),
-          ...existingContentLabelPreferences,
-          ...preferencesToAdd,
-        ];
-        await _updatePreferences(
-          Preferences(preferences: updatedPreferencesList),
-        );
-      }
-      return true;
-    } catch (e) {
-      logger.e('Error fetching labeler policies for $did: $e');
-      return false;
-    }
-  }
-
-  void _configureLabelerHeaders(Preferences preferences) {
-    sprkRepository.configureLabelers(
-      preferences.labelers?.map((labeler) => labeler.did) ?? const [],
-    );
-  }
-
-  Preferences _withLabelers(
-    Preferences preferences,
-    Iterable<String> labelers,
-  ) {
-    final normalizedLabelers = labelers.toList(growable: false);
-    final subscribed = normalizedLabelers.toSet();
-    return Preferences(
-      preferences: [
-        ...preferences.preferences.where((preference) {
-          if (preference.isLabelersPref) return false;
-          final labelerDid = preference.contentLabelPref?.labelerDid;
-          return labelerDid == null || subscribed.contains(labelerDid);
-        }),
-        labelersPreference([
-          for (final did in normalizedLabelers) LabelerPrefItem(did: did),
-        ]),
-      ],
-    );
-  }
-
-  bool _sameLabelers(Iterable<String> left, Iterable<String> right) {
-    final leftItems = left.toList(growable: false);
-    final rightItems = right.toList(growable: false);
-    if (leftItems.length != rightItems.length) return false;
-    for (var index = 0; index < leftItems.length; index++) {
-      if (leftItems[index] != rightItems[index]) return false;
-    }
-    return true;
-  }
-
-  /// Determines default visibility setting for a label value
-  String _getDefaultVisibilityForLabel(String labelValue) {
-    // Use similar logic to LabelSettingsPage._createDefaultLabelPreference
-    switch (labelValue) {
-      case '!hide':
-      case 'dmca-violation':
-        return 'hide';
-      case '!no-promote':
-        return 'hide';
-      case '!warn':
-      case 'doxxing':
-      case 'porn':
-      case 'sexual':
-      case 'nsfl':
-      case 'gore':
-        return 'warn';
-      case '!no-unauthenticated':
-        return 'ignore';
-      case 'nudity':
-        return 'ignore';
-      default:
-        // For unknown labels, default to warn
-        return 'warn';
-    }
-  }
 }
diff --git a/lib/src/features/settings/ui/pages/labeler_label_settings_page.dart b/lib/src/features/settings/ui/pages/labeler_label_settings_page.dart
index 11e17b49..cbd817e0 100644
--- a/lib/src/features/settings/ui/pages/labeler_label_settings_page.dart
+++ b/lib/src/features/settings/ui/pages/labeler_label_settings_page.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
-import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_leading_button.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/moderation/moderation.dart';
@@ -12,8 +11,8 @@ import 'package:spark/src/core/network/atproto/data/repositories/actor_repositor
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/design_system/components/atoms/user_avatar.dart';
 import 'package:spark/src/core/utils/logging/logging.dart';
-import 'package:spark/src/features/settings/providers/settings_provider.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
+import 'package:spark/src/features/settings/providers/labeler_settings_controller.dart';
 import 'package:spark/src/features/settings/ui/widgets/widgets.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
@@ -78,76 +77,14 @@ class _LabelerLabelSettingsPageState
       }
       if (!mounted) return;
 
-      final service = await _sprkRepository.labeler.getServicesDetailed([
-        widget.did,
-      ]);
+      final snapshot = await ref
+          .read(labelerSettingsControllerProvider)
+          .getPreferenceSnapshot(widget.did);
       if (!mounted) return;
-      final policiesJson = service.policies.toJson();
-      final labelValuesJson = policiesJson['labelValues'] as List<dynamic>?;
-      if (labelValuesJson == null || labelValuesJson.isEmpty) {
-        throw Exception('No label values found for labeler');
-      }
-
-      final labelValues = labelValuesJson.cast<String>();
-
-      final definitions = ModerationLabelDefinitions.fromLabelers({
-        widget.did:
-            service.policies.labelValueDefinitions ??
-            const <LabelValueDefinition>[],
-      });
-      final labelDefinitionMap = <String, ModerationLabelDefinition>{
-        for (final labelValue in labelValues)
-          labelValue:
-              ?definitions.bySource[widget.did]?[labelValue] ??
-              definitions.global[labelValue],
-      };
-
-      // Get existing preferences for this labeler
-      final settings = ref.read(settingsProvider.notifier);
-      final existingSettings = await settings.getLabelSettingsForLabeler(
-        widget.did,
-      );
-      if (!mounted) return;
-      final userPreferences = await ref.read(userPreferencesProvider.future);
-      if (!mounted) return;
-      final globalSettings = <String, Setting>{
-        for (final preference
-            in userPreferences.contentLabelPrefs ?? const <ContentLabelPref>[])
-          if (preference.labelerDid == null)
-            preference.label: _visibilityToSetting(
-              preference.visibility.toJson(),
-            ),
-      };
-      final preferences = <String, LabelPreference>{};
-
-      // Create preferences for all label values
-      for (final labelValue in labelValues) {
-        final definition = labelDefinitionMap[labelValue];
-        final defaultSetting = definition == null
-            ? _visibilityToSetting(_getDefaultVisibilityForLabel(labelValue))
-            : Setting.fromValue(definition.defaultSetting.name);
-        final savedSetting = globalAdultContentLabelValues.contains(labelValue)
-            ? globalSettings[labelValue] ??
-                  existingSettings[labelValue] ??
-                  defaultSetting
-            : existingSettings[labelValue] ?? defaultSetting;
-        preferences[labelValue] = LabelPreference(
-          value: labelValue,
-          blurs: definition == null
-              ? _visibilityToBlurs(_getDefaultVisibilityForLabel(labelValue))
-              : Blurs.fromValue(definition.blurs.name),
-          severity: definition == null
-              ? _visibilityToSeverity(_getDefaultVisibilityForLabel(labelValue))
-              : Severity.fromValue(definition.severity.name),
-          defaultSetting: defaultSetting,
-          setting: savedSetting,
-          adultOnly: definition?.adultOnly ?? false,
-        );
-      }
 
       setState(() {
-        _labelPreferences = preferences;
-        _labelDefinitions = labelDefinitionMap;
+        _labelPreferences = snapshot.preferences;
+        _labelDefinitions = snapshot.definitions;
         _isLoading = false;
       });
     } catch (e) {
@@ -160,80 +97,15 @@ class _LabelerLabelSettingsPageState
     }
   }
 
-  String _getDefaultVisibilityForLabel(String labelValue) {
-    switch (labelValue) {
-      case '!hide':
-      case 'dmca-violation':
-        return 'hide';
-      case '!no-promote':
-        return 'hide';
-      case '!warn':
-      case 'doxxing':
-      case 'porn':
-      case 'sexual':
-      case 'nsfl':
-      case 'gore':
-        return 'warn';
-      case '!no-unauthenticated':
-        return 'ignore';
-      case 'nudity':
-        return 'ignore';
-      default:
-        return 'warn';
-    }
-  }
-
-  Setting _visibilityToSetting(String visibility) {
-    switch (visibility) {
-      case 'ignore':
-        return Setting.ignore;
-      case 'warn':
-        return Setting.warn;
-      case 'hide':
-        return Setting.hide;
-      default:
-        return Setting.ignore;
-    }
-  }
-
-  Blurs _visibilityToBlurs(String visibility) {
-    switch (visibility) {
-      case 'ignore':
-        return Blurs.none;
-      case 'warn':
-        return Blurs.media;
-      case 'hide':
-        return Blurs.content;
-      default:
-        return Blurs.none;
-    }
-  }
-
-  Severity _visibilityToSeverity(String visibility) {
-    switch (visibility) {
-      case 'ignore':
-        return Severity.none;
-      case 'warn':
-        return Severity.alert;
-      case 'hide':
-        return Severity.alert;
-      default:
-        return Severity.none;
-    }
-  }
-
   Future<void> _updateLabelPreference(String label, {Setting? setting}) async {
     try {
       final currentPref = _labelPreferences[label];
       if (currentPref != null) {
         final newSetting = setting ?? currentPref.setting;
 
-        final settings = ref.read(settingsProvider.notifier);
-        await settings.setLabelPreferenceForLabeler(
-          widget.did,
-          label,
-          newSetting,
-        );
+        await ref
+            .read(labelerSettingsControllerProvider)
+            .setLabelPreference(widget.did, label, newSetting);
 
         setState(() {
           _labelPreferences[label] = currentPref.copyWith(setting: newSetting);
diff --git a/lib/src/features/settings/ui/pages/labeler_management_page.dart b/lib/src/features/settings/ui/pages/labeler_management_page.dart
index e1406589..9b23a1cc 100644
--- a/lib/src/features/settings/ui/pages/labeler_management_page.dart
+++ b/lib/src/features/settings/ui/pages/labeler_management_page.dart
@@ -10,7 +10,7 @@ import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/design_system/components/atoms/user_avatar.dart';
 import 'package:spark/src/core/utils/logging/logging.dart';
-import 'package:spark/src/features/settings/providers/settings_provider.dart';
+import 'package:spark/src/features/settings/providers/labeler_settings_controller.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 @RoutePage()
@@ -50,8 +50,9 @@ class _LabelerManagementPageState extends ConsumerState<LabelerManagementPage>
   Future<void> _loadLabelers() async {
     try {
       setState(() => _isLoading = true);
-      final settings = ref.read(settingsProvider.notifier);
-      final labelerDids = await settings.getLabelers();
+      final labelerDids = await ref
+          .read(labelerSettingsControllerProvider)
+          .getLabelers();
 
       setState(() {
         _labelerDids = labelerDids;
@@ -142,8 +143,9 @@ class _LabelerManagementPageState extends ConsumerState<LabelerManagementPage>
       if (result == null || result.isEmpty) {
         return;
       }
-      final settings = ref.read(settingsProvider.notifier);
-      await settings.addLabeler(result.trim());
+      await ref
+          .read(labelerSettingsControllerProvider)
+          .addLabeler(result.trim());
 
       // Refresh the list
       await _loadLabelers();
@@ -186,8 +188,7 @@ class _LabelerManagementPageState extends ConsumerState<LabelerManagementPage>
     if (confirmed != true) return;
 
     try {
-      final settings = ref.read(settingsProvider.notifier);
-      await settings.removeLabeler(did);
+      await ref.read(labelerSettingsControllerProvider).removeLabeler(did);
 
       // Refresh the list
       await _loadLabelers();
diff --git a/lib/src/features/settings/ui/pages/moderation_page.dart b/lib/src/features/settings/ui/pages/moderation_page.dart
index a3a0a8f9..6b04ea3e 100644
--- a/lib/src/features/settings/ui/pages/moderation_page.dart
+++ b/lib/src/features/settings/ui/pages/moderation_page.dart
@@ -9,7 +9,7 @@ import 'package:spark/src/core/moderation/moderation.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
 import 'package:spark/src/features/settings/ui/widgets/widgets.dart';
 
 @RoutePage()
diff --git a/lib/src/features/settings/ui/widgets/settings_feed_card.dart b/lib/src/features/settings/ui/widgets/settings_feed_card.dart
index 341a8dcc..75bc2853 100644
--- a/lib/src/features/settings/ui/widgets/settings_feed_card.dart
+++ b/lib/src/features/settings/ui/widgets/settings_feed_card.dart
@@ -117,11 +117,12 @@ class SettingsFeedCard extends ConsumerWidget {
     final generator = _generator;
     if (generator == null) return card;
     return ModeratedContent(
-      labels: generator.labels ?? const [],
-      authorLabels: generator.creator.labels ?? const [],
-      target: ModerationTarget.content,
+      subject: ModerationSubject.content(
+        labels: generator.labels ?? const [],
+        authorLabels: generator.creator.labels ?? const [],
+        subjectDid: generator.creator.did,
+      ),
       context: ModerationContext.contentList,
-      subjectDid: generator.creator.did,
       child: card,
     );
   }
diff --git a/lib/src/features/sound/ui/pages/sound_page.dart b/lib/src/features/sound/ui/pages/sound_page.dart
index 8c03c2ca..a7da4f11 100644
--- a/lib/src/features/sound/ui/pages/sound_page.dart
+++ b/lib/src/features/sound/ui/pages/sound_page.dart
@@ -65,12 +65,13 @@ class _SoundPageState extends ConsumerState<SoundPage> {
         actions: [
           soundState.maybeWhen(
             data: (state) => ModeratedContent(
-              labels: state.audio.labels ?? const [],
-              authorLabels: state.audio.author.labels ?? const [],
-              target: ModerationTarget.content,
+              subject: ModerationSubject.content(
+                labels: state.audio.labels ?? const [],
+                authorLabels: state.audio.author.labels ?? const [],
+                subjectDid: state.audio.author.did,
+              ),
               context: ModerationContext.contentView,
-              subjectDid: state.audio.author.did,
-              compact: true,
+              presentation: const ModerationPresentation.compact(),
               child: IconButton(
                 tooltip: l10n.buttonAddSound,
                 onPressed: state.audio.audio == null
@@ -98,11 +99,12 @@ class _SoundPageState extends ConsumerState<SoundPage> {
               // Header Card
               SliverToBoxAdapter(
                 child: ModeratedContent(
-                  labels: state.audio.labels ?? const [],
-                  authorLabels: state.audio.author.labels ?? const [],
-                  target: ModerationTarget.content,
+                  subject: ModerationSubject.content(
+                    labels: state.audio.labels ?? const [],
+                    authorLabels: state.audio.author.labels ?? const [],
+                    subjectDid: state.audio.author.did,
+                  ),
                   context: ModerationContext.contentView,
-                  subjectDid: state.audio.author.did,
                   child: SoundHeaderCard(audio: state.audio),
                 ),
               ),
@@ -160,12 +162,13 @@ class _SoundPageState extends ConsumerState<SoundPage> {
 
                         final post = state.posts[index];
                         return ModeratedContent(
-                          labels: post.labels ?? const [],
-                          authorLabels: post.author.labels ?? const [],
-                          target: ModerationTarget.content,
+                          subject: ModerationSubject.content(
+                            labels: post.labels ?? const [],
+                            authorLabels: post.author.labels ?? const [],
+                            subjectDid: post.author.did,
+                          ),
                           context: ModerationContext.contentList,
-                          subjectDid: post.author.did,
-                          compact: true,
+                          presentation: const ModerationPresentation.compact(),
                           child: _SoundPostTile(
                             post: post,
                             onTap: () => context.router.push(
diff --git a/lib/src/features/sound/ui/widgets/audio_track_list_section.dart b/lib/src/features/sound/ui/widgets/audio_track_list_section.dart
index 520c1a3a..bb995c47 100644
--- a/lib/src/features/sound/ui/widgets/audio_track_list_section.dart
+++ b/lib/src/features/sound/ui/widgets/audio_track_list_section.dart
@@ -176,12 +176,13 @@ class _AudioTrackListSectionState extends ConsumerState<AudioTrackListSection> {
         final audio = item.audio;
         if (audio == null) return tile;
         return ModeratedContent(
-          labels: audio.labels ?? const [],
-          authorLabels: audio.author.labels ?? const [],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: audio.labels ?? const [],
+            authorLabels: audio.author.labels ?? const [],
+            subjectDid: audio.author.did,
+          ),
           context: ModerationContext.contentList,
-          subjectDid: audio.author.did,
-          compact: true,
+          presentation: const ModerationPresentation.compact(),
           child: tile,
         );
       },
diff --git a/lib/src/features/stories/providers/stories_by_author.dart b/lib/src/features/stories/providers/stories_by_author.dart
index 54f66d00..1b5ffd65 100644
--- a/lib/src/features/stories/providers/stories_by_author.dart
+++ b/lib/src/features/stories/providers/stories_by_author.dart
@@ -1,5 +1,5 @@
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/features/stories/providers/story_repository_provider.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
@@ -7,7 +7,10 @@ part 'stories_by_author.g.dart';
 
 @riverpod
 FutureOr<
-  ({Map<ProfileViewBasic, List<StoryView>> storiesByAuthor, String? cursor})
+  ({
+    Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor,
+    String? cursor,
+  })
 >
 storiesByAuthor(Ref ref, {int limit = 30, String? cursor}) async {
   final repository = ref.read(storyRepositoryProvider);
diff --git a/lib/src/features/stories/providers/story_manager_provider.dart b/lib/src/features/stories/providers/story_manager_provider.dart
index 1714db99..876232bb 100644
--- a/lib/src/features/stories/providers/story_manager_provider.dart
+++ b/lib/src/features/stories/providers/story_manager_provider.dart
@@ -2,7 +2,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
 import 'package:poptart/poptart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/story_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
@@ -23,12 +23,12 @@ class StoryManagerState {
     this.isLoading = false,
     this.error,
   });
-  final List<StoryView> stories; // hydrated story views
+  final List<ModeratedStoryView> stories;
   final bool isLoading;
   final String? error;
 
   StoryManagerState copyWith({
-    List<StoryView>? stories,
+    List<ModeratedStoryView>? stories,
     bool? isLoading,
     String? error,
   }) {
@@ -97,12 +97,12 @@ class StoryManager extends _$StoryManager {
     state = await AsyncValue.guard(_loadInitial);
   }
 
-  Future<void> deleteStory(StoryView story) async {
+  Future<void> deleteStory(ModeratedStoryView story) async {
     final current = state.value;
     if (current == null) return;
     try {
       // Optimistic update
-      final updatedList = List<StoryView>.from(current.stories)
+      final updatedList = List<ModeratedStoryView>.from(current.stories)
         ..removeWhere((s) => s.uri == story.uri);
       state = AsyncData(current.copyWith(stories: updatedList));
       await _repository.deleteStoryRecord(story.uri);
diff --git a/lib/src/features/stories/ui/pages/all_stories_page.dart b/lib/src/features/stories/ui/pages/all_stories_page.dart
index be8a289d..346697ef 100644
--- a/lib/src/features/stories/ui/pages/all_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/all_stories_page.dart
@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/features/stories/ui/pages/author_stories_page.dart';
 
 @RoutePage()
@@ -14,7 +14,7 @@ class AllStoriesPage extends StatefulWidget {
     this.initialStoryIndex,
   });
 
-  final Map<ProfileViewBasic, List<StoryView>> storiesByAuthor;
+  final Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor;
   final int initialAuthorIndex;
   final int? initialStoryIndex;
 
@@ -24,7 +24,8 @@ class AllStoriesPage extends StatefulWidget {
 
 class _AllStoriesPageState extends State<AllStoriesPage> {
   late final PageController _pageController;
-  late final List<MapEntry<ProfileViewBasic, List<StoryView>>> _authorsList;
+  late final List<MapEntry<ProfileViewBasic, List<ModeratedStoryView>>>
+  _authorsList;
   int _currentAuthorIndex = 0;
 
   @override
diff --git a/lib/src/features/stories/ui/pages/author_stories_page.dart b/lib/src/features/stories/ui/pages/author_stories_page.dart
index cfb91e57..e083be6f 100644
--- a/lib/src/features/stories/ui/pages/author_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/author_stories_page.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/moderation/moderated_content.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/design_system/components/atoms/user_avatar.dart';
 import 'package:spark/src/features/stories/ui/pages/story_page.dart';
@@ -22,7 +22,7 @@ class AuthorStoriesPage extends ConsumerStatefulWidget {
   });
 
   final ProfileViewBasic author;
-  final List<StoryView> stories;
+  final List<ModeratedStoryView> stories;
   final int initialStoryIndex;
 
   /// Called when the user attempts to go to a previous story but is already at
@@ -253,7 +253,7 @@ class _AuthorStoriesPageState extends ConsumerState<AuthorStoriesPage>
     });
   }
 
-  String _timeAgo(StoryView story) {
+  String _timeAgo(ModeratedStoryView story) {
     final now = DateTime.now();
     final diff = now.difference(story.indexedAt);
     if (diff.inDays > 0) return '${diff.inDays}d';
diff --git a/lib/src/features/stories/ui/pages/story_manager_page.dart b/lib/src/features/stories/ui/pages/story_manager_page.dart
index fc0e1a5d..6a65904d 100644
--- a/lib/src/features/stories/ui/pages/story_manager_page.dart
+++ b/lib/src/features/stories/ui/pages/story_manager_page.dart
@@ -3,7 +3,6 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/stories/providers/story_auto_delete_provider.dart';
 import 'package:spark/src/features/stories/providers/story_manager_provider.dart';
diff --git a/lib/src/features/stories/ui/pages/story_page.dart b/lib/src/features/stories/ui/pages/story_page.dart
index 77cf4557..66bea6cf 100644
--- a/lib/src/features/stories/ui/pages/story_page.dart
+++ b/lib/src/features/stories/ui/pages/story_page.dart
@@ -8,7 +8,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:spark/src/core/moderation/moderated_content.dart';
 import 'package:spark/src/core/moderation/moderation.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/network/atproto/data/models/record_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
 import 'package:spark/src/core/routing/app_router.dart';
@@ -28,7 +28,7 @@ class StoryPage extends ConsumerStatefulWidget {
     this.onNext,
   });
 
-  final StoryView story;
+  final ModeratedStoryView story;
   final bool isActive;
   final ValueChanged<bool>? onLoadingStateChanged;
   final ValueChanged<Duration>? onStoryDurationChanged;
@@ -146,15 +146,15 @@ class _StoryPageState extends ConsumerState<StoryPage>
     }
   }
 
-  bool _isVideoStory(StoryView story) {
+  bool _isVideoStory(ModeratedStoryView story) {
     return story.isVideoStory;
   }
 
-  String _getVideoUrl(StoryView story) {
+  String _getVideoUrl(ModeratedStoryView story) {
     return story.videoUrl;
   }
 
-  String _getImageUrl(StoryView story) {
+  String _getImageUrl(ModeratedStoryView story) {
     final imageUrl = story.imageUrl;
     return imageUrl.isNotEmpty
         ? imageUrl
@@ -275,11 +275,12 @@ class _StoryPageState extends ConsumerState<StoryPage>
     ];
 
     return ModeratedContent(
-      labels: labels,
-      authorLabels: widget.story.author.labels ?? const [],
-      target: ModerationTarget.content,
+      subject: ModerationSubject.content(
+        labels: labels,
+        authorLabels: widget.story.author.labels ?? const [],
+        subjectDid: widget.story.author.did,
+      ),
       context: ModerationContext.contentView,
-      subjectDid: widget.story.author.did,
       onConcealChanged: _onModerationConcealChanged,
       child: ClipRRect(
         borderRadius: borderRadius,
diff --git a/lib/src/features/stories/ui/widgets/stories_list.dart b/lib/src/features/stories/ui/widgets/stories_list.dart
index 2decb18c..b5cc986c 100644
--- a/lib/src/features/stories/ui/widgets/stories_list.dart
+++ b/lib/src/features/stories/ui/widgets/stories_list.dart
@@ -106,11 +106,12 @@ class _StoriesListState extends ConsumerState<StoriesList> {
                   final author = authorEntry.key;
 
                   return ModeratedContent(
-                    labels: author.labels ?? const [],
-                    target: ModerationTarget.account,
+                    subject: ModerationSubject.profile(
+                      labels: author.labels ?? const [],
+                      subjectDid: author.did,
+                    ),
                     context: ModerationContext.profileList,
-                    subjectDid: author.did,
-                    compact: true,
+                    presentation: const ModerationPresentation.compact(),
                     child: GestureDetector(
                       onTap: () {
                         context.router.push(
diff --git a/test/src/core/moderation/moderated_content_test.dart b/test/src/core/moderation/moderated_content_test.dart
index 61dfb083..4e6d4560 100644
--- a/test/src/core/moderation/moderated_content_test.dart
+++ b/test/src/core/moderation/moderated_content_test.dart
@@ -23,8 +23,10 @@ void main() {
         ],
         child: _materialApp(
           ModeratedContent(
-            labels: [_label('sexual')],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: [_label('sexual')],
+              subjectDid: null,
+            ),
             context: ModerationContext.contentView,
             child: GestureDetector(
               key: const Key('pending-child'),
@@ -63,10 +65,12 @@ void main() {
         _engine(),
         Center(
           child: ModeratedContent(
-            labels: [_label('sexual')],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: [_label('sexual')],
+              subjectDid: null,
+            ),
             context: ModerationContext.contentView,
-            compact: true,
+            presentation: const ModerationPresentation.compact(),
             child: GestureDetector(
               key: const Key('compact-child'),
               onTap: () => taps += 1,
@@ -95,13 +99,16 @@ void main() {
         _engine(),
         Center(
           child: ModeratedContent(
-            labels: [_label('sexual')],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: [_label('sexual')],
+              subjectDid: null,
+            ),
             context: ModerationContext.contentView,
-            compact: true,
-            blurredChild: const SizedBox.square(
-              key: Key('internally-blurred-child'),
-              dimension: 100,
+            presentation: const ModerationPresentation.compact(
+              blurredChild: SizedBox.square(
+                key: Key('internally-blurred-child'),
+                dimension: 100,
+              ),
             ),
             child: const SizedBox.square(
               key: Key('clear-child'),
@@ -134,14 +141,17 @@ void main() {
         _engine(),
         Center(
           child: ModeratedContent(
-            labels: [_label('sexual')],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: [_label('sexual')],
+              subjectDid: null,
+            ),
             context: ModerationContext.contentList,
-            compact: true,
-            onConcealedTap: () => forwardedTaps += 1,
-            blurredChild: const SizedBox.square(
-              key: Key('still-blurred-child'),
-              dimension: 100,
+            presentation: ModerationPresentation.compact(
+              onConcealedTap: () => forwardedTaps += 1,
+              blurredChild: const SizedBox.square(
+                key: Key('still-blurred-child'),
+                dimension: 100,
+              ),
             ),
             child: const SizedBox.square(
               key: Key('clear-child'),
@@ -175,10 +185,11 @@ void main() {
             children: [
               Expanded(
                 child: ModeratedContent(
-                  labels: labels,
-                  target: ModerationTarget.content,
+                  subject: ModerationSubject.content(
+                    labels: labels,
+                    subjectDid: 'did:plc:author',
+                  ),
                   context: ModerationContext.contentView,
-                  subjectDid: 'did:plc:author',
                   child: const ColoredBox(
                     color: Colors.pink,
                     child: SizedBox.expand(),
@@ -211,6 +222,7 @@ void main() {
     expect(
       tester
           .widget<ModeratedContent>(find.byType(ModeratedContent))
+          .subject
           .labels
           .single
           .src,
@@ -242,10 +254,11 @@ void main() {
             children: [
               Expanded(
                 child: ModeratedContent(
-                  labels: labels,
-                  target: ModerationTarget.content,
+                  subject: ModerationSubject.content(
+                    labels: labels,
+                    subjectDid: 'did:plc:author',
+                  ),
                   context: ModerationContext.contentView,
-                  subjectDid: 'did:plc:author',
                   child: const SizedBox.expand(),
                 ),
               ),
@@ -320,10 +333,11 @@ void main() {
       _app(
         _engine(),
         ModeratedContent(
-          labels: [_label('gore', source: 'did:plc:labeler')],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: [_label('gore', source: 'did:plc:labeler')],
+            subjectDid: 'did:plc:author',
+          ),
           context: ModerationContext.contentView,
-          subjectDid: 'did:plc:author',
           child: const SizedBox.expand(),
         ),
       ),
@@ -347,10 +361,11 @@ void main() {
       _app(
         _engine(labelerHandles: const {'did:plc:labeler': 'labeler.test'}),
         ModeratedContent(
-          labels: [_label('gore', source: 'did:plc:labeler')],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: [_label('gore', source: 'did:plc:labeler')],
+            subjectDid: 'did:plc:author',
+          ),
           context: ModerationContext.contentView,
-          subjectDid: 'did:plc:author',
           child: const SizedBox.expand(),
         ),
       ),
@@ -371,10 +386,11 @@ void main() {
       _app(
         _engine(currentUserDid: 'did:plc:author'),
         ModeratedContent(
-          labels: [_label('gore', source: 'did:plc:labeler')],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: [_label('gore', source: 'did:plc:labeler')],
+            subjectDid: 'did:plc:author',
+          ),
           context: ModerationContext.contentView,
-          subjectDid: 'did:plc:author',
           child: const SizedBox.expand(),
         ),
       ),
@@ -394,12 +410,13 @@ void main() {
       _app(
         _engine(currentUserDid: 'did:plc:author'),
         ModeratedContent(
-          labels: [
-            _label('gore', source: 'did:plc:labeler', uri: 'did:plc:author'),
-          ],
-          target: ModerationTarget.account,
+          subject: ModerationSubject.profile(
+            labels: [
+              _label('gore', source: 'did:plc:labeler', uri: 'did:plc:author'),
+            ],
+            subjectDid: 'did:plc:author',
+          ),
           context: ModerationContext.contentView,
-          subjectDid: 'did:plc:author',
           child: const SizedBox.expand(),
         ),
       ),
@@ -433,8 +450,10 @@ void main() {
           },
         ),
         ModeratedContent(
-          labels: [_label('context', source: 'did:plc:labeler')],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: [_label('context', source: 'did:plc:labeler')],
+            subjectDid: null,
+          ),
           context: ModerationContext.contentView,
           child: const SizedBox.expand(key: Key('inform-child')),
         ),
@@ -453,10 +472,11 @@ void main() {
       _app(
         _engine(),
         ModeratedContent(
-          labels: [_label('!hide', source: 'did:plc:labeler')],
-          target: ModerationTarget.content,
+          subject: ModerationSubject.content(
+            labels: [_label('!hide', source: 'did:plc:labeler')],
+            subjectDid: 'did:plc:author',
+          ),
           context: ModerationContext.contentView,
-          subjectDid: 'did:plc:author',
           child: const SizedBox.expand(),
         ),
       ),
@@ -481,10 +501,11 @@ void main() {
         container: container,
         child: _materialApp(
           ModeratedContent(
-            labels: [_label('sexual')],
-            target: ModerationTarget.content,
+            subject: ModerationSubject.content(
+              labels: [_label('sexual')],
+              subjectDid: 'did:plc:author',
+            ),
             context: ModerationContext.contentView,
-            subjectDid: 'did:plc:author',
             child: const SizedBox.expand(),
           ),
         ),
diff --git a/test/src/core/network/atproto/data/repositories/labeler_repository_impl_test.dart b/test/src/core/network/atproto/data/repositories/labeler_repository_impl_test.dart
index 9427d87e..51f9cab7 100644
--- a/test/src/core/network/atproto/data/repositories/labeler_repository_impl_test.dart
+++ b/test/src/core/network/atproto/data/repositories/labeler_repository_impl_test.dart
@@ -1,4 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
+import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository_impl.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 
@@ -62,6 +63,84 @@ void main() {
       expect(service.policies.labelValues, isEmpty);
     });
 
+    test('deduplicates concurrent detailed service lookups', () async {
+      final harness = RepositoryHarness();
+      harness.transport.enqueueGet({
+        'views': [_detailedLabeler],
+      });
+      final repository = LabelerRepositoryImpl(
+        harness.sprk,
+        logger: SparkLogger(),
+      );
+
+      final services = await Future.wait([
+        repository.getServicesDetailed(['did:plc:labeler-one']),
+        repository.getServicesDetailed(['did:plc:labeler-one']),
+      ]);
+
+      expect(services, hasLength(2));
+      expect(harness.transport.requests, hasLength(1));
+    });
+
+    test('refreshes completed detailed service lookups', () async {
+      final harness = RepositoryHarness();
+      harness.transport
+        ..enqueueGet({
+          'views': [_detailedLabeler],
+        })
+        ..enqueueGet({
+          'views': [
+            {..._detailedLabeler, 'cid': 'refreshed-labeler-cid'},
+          ],
+        });
+      final repository = LabelerRepositoryImpl(
+        harness.sprk,
+        logger: SparkLogger(),
+      );
+
+      final initial = await repository.getServicesDetailed([
+        'did:plc:labeler-one',
+      ]);
+      final refreshed = await repository.getServicesDetailed([
+        'did:plc:labeler-one',
+      ]);
+
+      expect(initial.cid, 'labeler-cid');
+      expect(refreshed.cid, 'refreshed-labeler-cid');
+      expect(harness.transport.requests, hasLength(2));
+    });
+
+    test('filters moderation services by report capabilities', () async {
+      final harness = RepositoryHarness();
+      harness.transport
+        ..enqueueGet({
+          'views': [
+            _detailedService('did:plc:labeler-one', subjectTypes: ['record']),
+          ],
+        })
+        ..enqueueGet({
+          'views': [
+            _detailedService('did:plc:accounts', subjectTypes: ['account']),
+          ],
+        });
+      final repository = LabelerRepositoryImpl(
+        harness.sprk,
+        logger: SparkLogger(),
+      );
+
+      final services = await repository.getCompatibleModerationServices(
+        ['did:plc:accounts'],
+        const ModerationServiceQuery(
+          fallbackDid: 'did:plc:labeler-one',
+          subjectType: 'record',
+          reasonType: 'com.atproto.moderation.defs#reasonOther',
+        ),
+      );
+
+      expect(services.map((service) => service.did), ['did:plc:labeler-one']);
+      expect(harness.transport.requests, hasLength(2));
+    });
+
     test(
       'resolveIdentifier resolves handles directly through the PDS',
       () async {
@@ -203,3 +282,25 @@ const _detailedLabeler = <String, dynamic>{
   },
   'indexedAt': '2026-07-22T12:00:00.000Z',
 };
+
+Map<String, dynamic> _detailedService(
+  String did, {
+  required List<String> subjectTypes,
+}) {
+  return {
+    r'$type': 'so.sprk.labeler.defs#labelerViewDetailed',
+    'uri': 'at://$did/so.sprk.labeler.service/self',
+    'cid': 'labeler-cid',
+    'creator': {
+      r'$type': 'so.sprk.actor.defs#profileView',
+      'did': did,
+      'handle': '${did.split(':').last}.test',
+    },
+    'policies': {
+      r'$type': 'so.sprk.labeler.defs#labelerPolicies',
+      'labelValues': <dynamic>[],
+    },
+    'subjectTypes': subjectTypes,
+    'indexedAt': '2026-07-22T12:00:00.000Z',
+  };
+}
diff --git a/test/src/features/settings/providers/preferences_provider_test.dart b/test/src/core/providers/preferences_provider_test.dart
similarity index 99%
rename from test/src/features/settings/providers/preferences_provider_test.dart
rename to test/src/core/providers/preferences_provider_test.dart
index 1efd9dee..69b798de 100644
--- a/test/src/features/settings/providers/preferences_provider_test.dart
+++ b/test/src/core/providers/preferences_provider_test.dart
@@ -11,7 +11,7 @@ import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/pref_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
 
 void main() {
   late _FakeAuthRepository authRepository;
diff --git a/test/src/core/ui/widgets/report_dialog_test.dart b/test/src/core/ui/widgets/report_dialog_test.dart
index 43a2f8e6..73e5bd66 100644
--- a/test/src/core/ui/widgets/report_dialog_test.dart
+++ b/test/src/core/ui/widgets/report_dialog_test.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:get_it/get_it.dart';
+import 'package:spark/src/core/design_system/components/atoms/buttons/app_button.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
@@ -102,6 +103,75 @@ void main() {
     expect(find.text('Bluesky moderation'), findsOneWidget);
     expect(find.text('Moderation service'), findsOneWidget);
   });
+
+  testWidgets('renders service discovery failures without an uncaught error', (
+    tester,
+  ) async {
+    await GetIt.I.unregister<SprkRepository>();
+    GetIt.I.registerSingleton<SprkRepository>(
+      _FakeSprkRepository(
+        _FakeLabelerRepository(
+          const {},
+          compatibilityError: StateError('discovery failed'),
+        ),
+      ),
+    );
+    await tester.pumpWidget(
+      const ProviderScope(
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: ReportDialog(
+              postUri: 'at://did:plc:author/so.sprk.feed.post/example',
+              postCid: 'example-cid',
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Violence'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Animal Abuse'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('Could not load moderation services.'), findsOneWidget);
+  });
+
+  testWidgets('does not expose submission exceptions to the user', (
+    tester,
+  ) async {
+    await tester.binding.setSurfaceSize(const Size(800, 900));
+    addTearDown(() => tester.binding.setSurfaceSize(null));
+    await tester.pumpWidget(
+      ProviderScope(
+        child: MaterialApp(
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          home: Scaffold(
+            body: ReportDialog(
+              accountDid: 'did:plc:account',
+              fallbackServiceDid: 'did:plc:bsky#atproto_labeler',
+              onSubmit: (_, _, _, _) async {
+                throw StateError('private transport detail');
+              },
+            ),
+          ),
+        ),
+      ),
+    );
+
+    await tester.tap(find.text('Violence'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.text('Animal Abuse'));
+    await tester.pumpAndSettle();
+    await tester.tap(find.widgetWithText(AppButton, 'Submit'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('An error occurred'), findsOneWidget);
+    expect(find.textContaining('private transport detail'), findsNothing);
+  });
 }
 
 class _FakeSprkRepository implements SprkRepository {
@@ -130,9 +200,38 @@ class _FakeSprkRepository implements SprkRepository {
 }
 
 class _FakeLabelerRepository implements LabelerRepository {
-  const _FakeLabelerRepository(this.services);
+  const _FakeLabelerRepository(this.services, {this.compatibilityError});
 
   final Map<String, LabelerViewDetailed> services;
+  final Object? compatibilityError;
+
+  @override
+  Future<List<CompatibleModerationService>> getCompatibleModerationServices(
+    Iterable<String> dids,
+    ModerationServiceQuery query,
+  ) async {
+    if (compatibilityError case final error?) throw error;
+    final candidates = <String>{query.fallbackDid, ...dids};
+    return [
+      for (final did in candidates)
+        if (services[did] case final service?)
+          if ((service.subjectTypes == null ||
+                  service.subjectTypes!.any(
+                    (type) => type.toJson() == query.subjectType,
+                  )) &&
+              (query.subjectCollection == null ||
+                  service.subjectCollections == null ||
+                  service.subjectCollections!.contains(
+                    query.subjectCollection,
+                  )))
+            CompatibleModerationService(
+              did: did,
+              displayName:
+                  service.creator.displayName ?? service.creator.handle,
+              isDefault: did == query.fallbackDid,
+            ),
+    ]..sort((left, right) => left.isDefault ? -1 : 1);
+  }
 
   @override
   Future<LabelerViewDetailed> getServicesDetailed(List<String> dids) async {
diff --git a/test/src/features/search/providers/post_search_provider_test.dart b/test/src/features/search/providers/post_search_provider_test.dart
index d6dda09c..930d27db 100644
--- a/test/src/features/search/providers/post_search_provider_test.dart
+++ b/test/src/features/search/providers/post_search_provider_test.dart
@@ -141,6 +141,50 @@ void main() {
     );
   });
 
+  test(
+    'query change while moderation resolves cannot publish stale results',
+    () async {
+      final repository = _FakePostSearchRepository();
+      final secondResponse = Completer<InitialPostSearchResult>();
+      repository.initialResponses
+        ..add(() async => _initial([_post('first')]))
+        ..add(() => secondResponse.future);
+      final moderation = Completer<ModerationEngine>();
+      final scope = container(
+        overrides: [
+          postSearchRepositoryProvider.overrideWithValue(repository),
+          moderationEngineProvider.overrideWith((ref) => moderation.future),
+        ],
+      );
+      final subscription = scope.listen(
+        postSearchProvider,
+        (previous, next) {},
+      );
+      addTearDown(subscription.close);
+      final notifier = scope.read(postSearchProvider.notifier);
+
+      final firstRequest = notifier.submitQuery('first');
+      await pumpEventQueue();
+      final secondRequest = notifier.submitQuery('second');
+      await pumpEventQueue();
+
+      moderation.complete(_engine());
+      await firstRequest;
+
+      final pendingSecondState = scope.read(postSearchProvider);
+      expect(pendingSecondState.query, 'second');
+      expect(pendingSecondState.searchResults, isEmpty);
+      expect(pendingSecondState.isLoading, isTrue);
+
+      secondResponse.complete(_initial([_post('second')]));
+      await secondRequest;
+      expect(
+        scope.read(postSearchProvider).searchResults.single.uri.rkey,
+        'second',
+      );
+    },
+  );
+
   test(
     'pagination suppresses duplicates and stops after cursors end',
     () async {
@@ -182,6 +226,62 @@ void main() {
     },
   );
 
+  test(
+    'query change while paginated moderation resolves discards the page',
+    () async {
+      final repository = _FakePostSearchRepository();
+      repository.initialResponses.add(
+        () async => (
+          sprk: (
+            posts: List.generate(10, (i) => _post('initial-$i')),
+            cursor: 'next',
+          ),
+          bsky: (posts: const <PostView>[], cursor: null),
+        ),
+      );
+      final pageReturned = Completer<void>();
+      repository.sprkResponses.add(() {
+        pageReturned.complete();
+        return Future.value((posts: [_post('stale-page')], cursor: null));
+      });
+      final paginationModeration = Completer<ModerationEngine>();
+      var moderationBuilds = 0;
+      final scope = container(
+        overrides: [
+          postSearchRepositoryProvider.overrideWithValue(repository),
+          moderationEngineProvider.overrideWith((ref) {
+            moderationBuilds++;
+            return moderationBuilds == 1
+                ? Future.value(_engine())
+                : paginationModeration.future;
+          }),
+        ],
+      );
+      final subscription = scope.listen(
+        postSearchProvider,
+        (previous, next) {},
+      );
+      addTearDown(subscription.close);
+      final notifier = scope.read(postSearchProvider.notifier);
+      await notifier.submitQuery('first');
+
+      scope.invalidate(moderationEngineProvider);
+      final loadMore = notifier.loadMorePosts();
+      await pageReturned.future;
+      await pumpEventQueue();
+
+      notifier.updateQuery('second');
+      paginationModeration.complete(_engine());
+      await loadMore;
+
+      final state = scope.read(postSearchProvider);
+      expect(state.query, 'second');
+      expect(state.searchResults, isEmpty);
+      expect(state.sprkNextCursor, isNull);
+      expect(state.isLoading, isTrue);
+    },
+  );
+
   test('current errors clear loading and empty query resets state', () async {
     final repository = _FakePostSearchRepository();
     repository.initialResponses.add(() async => throw StateError('offline'));
@@ -263,5 +363,14 @@ Label _authorLabel({bool profileRecord = false}) => Label(
   cts: _indexedAt,
 );
 
+ModerationEngine _engine() => ModerationEngine(
+  definitions: ModerationLabelDefinitions(),
+  preferences: ModerationPreferences(
+    labels: const [],
+    adultContentEnabled: true,
+    authenticated: true,
+  ),
+);
+
 InitialPostSearchResult _initial(List<PostView> posts) =>
     (sprk: (posts: posts, cursor: null), bsky: (posts: const [], cursor: null));
diff --git a/test/src/features/settings/providers/settings_provider_test.dart b/test/src/features/settings/providers/settings_provider_test.dart
index 75be2423..ddcdd1e2 100644
--- a/test/src/features/settings/providers/settings_provider_test.dart
+++ b/test/src/features/settings/providers/settings_provider_test.dart
@@ -15,7 +15,8 @@ import 'package:spark/src/core/network/atproto/data/repositories/labeler_reposit
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/storage/preferences/storage_manager.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
+import 'package:spark/src/features/settings/providers/labeler_settings_controller.dart';
 import 'package:spark/src/features/settings/providers/settings_provider.dart';
 
 void main() {
@@ -347,13 +348,10 @@ void main() {
         ],
       );
       final container = createContainer();
-      final notifier = await loadSettings(container);
+      await loadSettings(container);
+      final labelers = container.read(labelerSettingsControllerProvider);
 
-      await notifier.setLabelPreferenceForLabeler(
-        'did:plc:a',
-        'custom',
-        Setting.hide,
-      );
+      await labelers.setLabelPreference('did:plc:a', 'custom', Setting.hide);
 
       final written = preferencesController.writes.single.contentLabelPrefs!;
       expect(
@@ -387,15 +385,16 @@ void main() {
           ],
         );
         final container = createContainer();
-        final notifier = await loadSettings(container);
+        await loadSettings(container);
+        final labelers = container.read(labelerSettingsControllerProvider);
 
-        await notifier.addLabeler('did:plc:other');
+        await labelers.addLabeler('did:plc:other');
         expect(
           preferencesController.current.labelers?.map((item) => item.did),
           ['did:plc:mod', 'did:plc:other'],
         );
 
-        await notifier.removeLabeler('did:plc:other');
+        await labelers.removeLabeler('did:plc:other');
         expect(
           preferencesController.current.labelers?.map((item) => item.did),
           ['did:plc:mod'],
@@ -408,7 +407,7 @@ void main() {
           isEmpty,
         );
         await expectLater(
-          notifier.removeLabeler('did:plc:mod'),
+          labelers.removeLabeler('did:plc:mod'),
           throwsA(isA<Exception>()),
         );
         expect(preferencesController.writes, hasLength(2));
@@ -423,9 +422,10 @@ void main() {
         ],
       );
       final container = createContainer();
-      final notifier = await loadSettings(container);
+      await loadSettings(container);
+      final labelers = container.read(labelerSettingsControllerProvider);
 
-      await notifier.addLabeler('@labeler.test');
+      await labelers.addLabeler('@labeler.test');
 
       expect(preferencesController.current.labelers?.map((item) => item.did), [
         'did:plc:mod',
@@ -443,10 +443,11 @@ void main() {
       );
       sprkRepository._labelerRepository.invalidDids.add('did:plc:invalid');
       final container = createContainer();
-      final notifier = await loadSettings(container);
+      await loadSettings(container);
+      final labelers = container.read(labelerSettingsControllerProvider);
 
       await expectLater(
-        notifier.addLabeler('did:plc:invalid'),
+        labelers.addLabeler('did:plc:invalid'),
         throwsA(isA<Exception>()),
       );
 
@@ -468,10 +469,11 @@ void main() {
         ],
       );
       final container = createContainer();
-      final notifier = await loadSettings(container);
+      await loadSettings(container);
+      final labelers = container.read(labelerSettingsControllerProvider);
 
       await expectLater(
-        notifier.addLabeler('did:plc:overflow'),
+        labelers.addLabeler('did:plc:overflow'),
         throwsA(isA<StateError>()),
       );
 
@@ -496,9 +498,10 @@ void main() {
       );
       sprkRepository._labelerRepository.invalidDids.add('did:plc:unavailable');
       final container = createContainer();
-      final notifier = await loadSettings(container);
+      await loadSettings(container);
+      final labelers = container.read(labelerSettingsControllerProvider);
 
-      await notifier.syncLabelers();
+      await labelers.syncLabelers();
 
       expect(preferencesController.current.labelers?.map((item) => item.did), [
         'did:plc:mod',
@@ -531,9 +534,10 @@ void main() {
           ],
         );
         final container = createContainer();
-        final notifier = await loadSettings(container);
+        await loadSettings(container);
+        final labelers = container.read(labelerSettingsControllerProvider);
 
-        await notifier.syncLabelers();
+        await labelers.syncLabelers();
 
         final persisted = preferencesController.current;
         expect(persisted.labelers, hasLength(20));
diff --git a/test/src/features/settings/ui/pages/labeler_label_settings_page_test.dart b/test/src/features/settings/ui/pages/labeler_label_settings_page_test.dart
index 9d4beb5c..e1ac2cf3 100644
--- a/test/src/features/settings/ui/pages/labeler_label_settings_page_test.dart
+++ b/test/src/features/settings/ui/pages/labeler_label_settings_page_test.dart
@@ -9,16 +9,13 @@ import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:spark/src/core/design_system/components/molecules/app_choice_group.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/moderation/moderation.dart';
-import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/labeler_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
-import 'package:spark/src/features/settings/providers/settings_provider.dart';
-import 'package:spark/src/features/settings/providers/settings_state.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
 import 'package:spark/src/features/settings/ui/pages/labeler_label_settings_page.dart';
 import 'package:spark/src/features/settings/ui/widgets/label_setting_tile.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
@@ -100,10 +97,7 @@ Future<void> _pumpPage(WidgetTester tester, String labelerDid) async {
 }
 
 Widget _page(String labelerDid) => ProviderScope(
-  overrides: [
-    settingsProvider.overrideWith(_FakeSettings.new),
-    userPreferencesProvider.overrideWith(_FakePreferences.new),
-  ],
+  overrides: [userPreferencesProvider.overrideWith(_FakePreferences.new)],
   child: MaterialApp(
     localizationsDelegates: AppLocalizations.localizationsDelegates,
     supportedLocales: AppLocalizations.supportedLocales,
@@ -197,26 +191,6 @@ class _FakeLabelerRepository implements LabelerRepository {
       throw UnsupportedError('${invocation.memberName} is not used');
 }
 
-class _FakeSettings extends Settings {
-  @override
-  SettingsState build() => SettingsState(
-    activeFeed: Feed(
-      type: 'timeline',
-      config: makeSavedFeed(
-        id: 'following',
-        type: 'timeline',
-        value: 'following',
-        pinned: true,
-      ),
-    ),
-  );
-
-  @override
-  Future<Map<String, Setting>> getLabelSettingsForLabeler(
-    String labelerDid,
-  ) async => const {};
-}
-
 class _FakePreferences extends UserPreferences {
   @override
   Future<Preferences> build() async => Preferences(preferences: []);
diff --git a/test/src/features/settings/ui/pages/moderation_page_test.dart b/test/src/features/settings/ui/pages/moderation_page_test.dart
index 51a3baf3..0c47a32f 100644
--- a/test/src/features/settings/ui/pages/moderation_page_test.dart
+++ b/test/src/features/settings/ui/pages/moderation_page_test.dart
@@ -8,7 +8,7 @@ import 'package:spark/src/core/l10n/app_localizations.dart';
 import 'package:spark/src/core/moderation/moderation.dart';
 import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
-import 'package:spark/src/features/settings/providers/preferences_provider.dart';
+import 'package:spark/src/core/providers/preferences_provider.dart';
 import 'package:spark/src/features/settings/ui/pages/moderation_page.dart';
 import 'package:spark/src/features/settings/ui/widgets/label_setting_tile.dart';
 
diff --git a/test/src/features/stories/providers/stories_by_author_test.dart b/test/src/features/stories/providers/stories_by_author_test.dart
index f91b8bb1..5ca21f5d 100644
--- a/test/src/features/stories/providers/stories_by_author_test.dart
+++ b/test/src/features/stories/providers/stories_by_author_test.dart
@@ -3,6 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:poptart/poptart.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/features/stories/providers/stories_by_author.dart';
 import 'package:spark/src/features/stories/providers/story_repository_provider.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
@@ -39,13 +40,15 @@ void main() {
   });
 }
 
-StoryView _story(String id, {required ProfileViewBasic author}) {
-  return StoryView(
-    uri: AtUri('at://did:plc:me/so.sprk.story.post/$id'),
-    cid: 'cid-$id',
-    author: author,
-    record: const {},
-    indexedAt: DateTime.utc(2026, 7, 22, 10),
+ModeratedStoryView _story(String id, {required ProfileViewBasic author}) {
+  return ModeratedStoryView(
+    story: StoryView(
+      uri: AtUri('at://did:plc:me/so.sprk.story.post/$id'),
+      cid: 'cid-$id',
+      author: author,
+      record: const {},
+      indexedAt: DateTime.utc(2026, 7, 22, 10),
+    ),
   );
 }
 
@@ -53,7 +56,7 @@ class _FakeStoryTimelineRepository implements StoryRepository {
   _FakeStoryTimelineRepository({required this.timelineResult});
 
   final ({
-    Map<ProfileViewBasic, List<StoryView>> storiesByAuthor,
+    Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor,
     String? cursor,
   })
   timelineResult;
@@ -61,7 +64,10 @@ class _FakeStoryTimelineRepository implements StoryRepository {
 
   @override
   Future<
-    ({String? cursor, Map<ProfileViewBasic, List<StoryView>> storiesByAuthor})
+    ({
+      String? cursor,
+      Map<ProfileViewBasic, List<ModeratedStoryView>> storiesByAuthor,
+    })
   >
   getStoriesTimeline({int limit = 30, String? cursor}) async {
     timelineCalls.add((limit: limit, cursor: cursor));
diff --git a/test/src/features/stories/providers/story_manager_provider_test.dart b/test/src/features/stories/providers/story_manager_provider_test.dart
index c9bc1c46..f40639f7 100644
--- a/test/src/features/stories/providers/story_manager_provider_test.dart
+++ b/test/src/features/stories/providers/story_manager_provider_test.dart
@@ -6,6 +6,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:poptart/poptart.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 import 'package:spark/src/features/auth/providers/auth_providers.dart';
 import 'package:spark/src/features/stories/providers/story_auto_delete_provider.dart';
@@ -237,13 +238,15 @@ ProviderContainer _managerContainer({
   return container;
 }
 
-StoryView _story(String id, {required int hour}) {
-  return StoryView(
-    uri: AtUri('at://did:plc:me/so.sprk.story.post/$id'),
-    cid: 'cid-$id',
-    author: ProfileViewBasic(did: 'did:plc:me', handle: 'me.sprk.so'),
-    record: const {},
-    indexedAt: DateTime.utc(2026, 7, 22, hour),
+ModeratedStoryView _story(String id, {required int hour}) {
+  return ModeratedStoryView(
+    story: StoryView(
+      uri: AtUri('at://did:plc:me/so.sprk.story.post/$id'),
+      cid: 'cid-$id',
+      author: ProfileViewBasic(did: 'did:plc:me', handle: 'me.sprk.so'),
+      record: const {},
+      indexedAt: DateTime.utc(2026, 7, 22, hour),
+    ),
   );
 }
 
@@ -251,7 +254,7 @@ class _FakeStoryRepository implements StoryRepository {
   Future<StoryRecordPage> Function({required String did, String? cursor})?
   recordPageLoader;
   Future<void> Function(AtUri uri)? deleteRecord;
-  List<StoryView> storyViews = [];
+  List<ModeratedStoryView> storyViews = [];
   final List<List<AtUri>> storyViewCalls = [];
 
   @override
@@ -268,9 +271,9 @@ class _FakeStoryRepository implements StoryRepository {
   }
 
   @override
-  Future<List<StoryView>> getStoryViews(List<AtUri> storyUris) async {
+  Future<List<ModeratedStoryView>> getStoryViews(List<AtUri> storyUris) async {
     storyViewCalls.add(List<AtUri>.of(storyUris));
-    return List<StoryView>.of(storyViews);
+    return List<ModeratedStoryView>.of(storyViews);
   }
 
   @override
diff --git a/test/src/features/stories/ui/pages/story_page_test.dart b/test/src/features/stories/ui/pages/story_page_test.dart
index 36a21343..fc24ae70 100644
--- a/test/src/features/stories/ui/pages/story_page_test.dart
+++ b/test/src/features/stories/ui/pages/story_page_test.dart
@@ -13,6 +13,7 @@ import 'package:spark/src/core/moderation/moderated_content.dart';
 import 'package:spark/src/core/moderation/moderation.dart';
 import 'package:spark/src/core/moderation/moderation_provider.dart';
 import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/moderated_story_view.dart';
 import 'package:spark/src/features/stories/ui/pages/author_stories_page.dart';
 import 'package:spark/src/features/stories/ui/pages/story_page.dart';
 import 'package:sprk_poptart/so/sprk/actor/defs.dart';
@@ -163,7 +164,7 @@ Future<void> _cacheImage(String url) async {
   });
 }
 
-StoryView _story(
+ModeratedStoryView _story(
   String id, {
   bool authorLabeled = false,
   bool storyLabeled = false,
@@ -191,15 +192,19 @@ StoryView _story(
     record: const {},
     indexedAt: DateTime.utc(2026, 8, 12),
   );
-  if (!storyLabeled) return story;
-  return story.withModerationLabels([
-    Label(
-      src: 'did:plc:moderator',
-      uri: story.uri.toString(),
-      val: 'sexual',
-      cts: DateTime.utc(2026, 8, 12),
-    ),
-  ]);
+  return ModeratedStoryView(
+    story: story,
+    moderationLabels: storyLabeled
+        ? [
+            Label(
+              src: 'did:plc:moderator',
+              uri: story.uri.toString(),
+              val: 'sexual',
+              cts: DateTime.utc(2026, 8, 12),
+            ),
+          ]
+        : const [],
+  );
 }
 
 ModerationEngine _engine() => ModerationEngine(