diff --git a/lib/src/core/auth/data/repositories/onboarding_repository.dart b/lib/src/core/auth/data/repositories/onboarding_repository.dart
index 2650dc09..708fb094 100644
--- a/lib/src/core/auth/data/repositories/onboarding_repository.dart
+++ b/lib/src/core/auth/data/repositories/onboarding_repository.dart
@@ -1,5 +1,5 @@
 import 'package:bluesky_poptart/app/bsky/actor/profile.dart';
-import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_follows/output.dart';
 
 abstract class OnboardingRepository {
   /// Checks if the current user has a Spark profile
@@ -19,7 +19,7 @@ abstract class OnboardingRepository {
   });
 
   /// Fetches the list of DIDs that the user follows on Bluesky
-  Future<FollowsResponse> getBskyFollows({String? cursor});
+  Future<GraphGetFollowsOutput> getBskyFollows({String? cursor});
 
   /// Creates a follow record in Spark for the given subject DID
   Future<void> createSparkFollow(String subject);
diff --git a/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart b/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
index cd31bb50..06515a3c 100644
--- a/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
+++ b/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
@@ -11,11 +11,12 @@ import 'package:bluesky_poptart/app/bsky/actor/profile.dart';
 import 'package:get_it/get_it.dart';
 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/data/models/actor_models.dart';
-import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/repo_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_follows/output.dart'
+    as sprk_get_follows;
 
 class OnboardingRepositoryImpl implements OnboardingRepository {
   OnboardingRepositoryImpl({
@@ -172,7 +173,9 @@ class OnboardingRepositoryImpl implements OnboardingRepository {
   }
 
   @override
-  Future<FollowsResponse> getBskyFollows({String? cursor}) async {
+  Future<sprk_get_follows.GraphGetFollowsOutput> getBskyFollows({
+    String? cursor,
+  }) async {
     if (_did == null || _atproto == null) {
       throw Exception('Not authenticated');
     }
@@ -202,7 +205,8 @@ class OnboardingRepositoryImpl implements OnboardingRepository {
         )
         .toList();
 
-    return FollowsResponse(
+    return sprk_get_follows.GraphGetFollowsOutput(
+      subject: ProfileView.fromJson(rawData['subject'] as Map<String, dynamic>),
       follows: follows,
       cursor: rawData['cursor'] as String?,
     );
diff --git a/lib/src/core/design_system/components/molecules/known_interactions_bar.dart b/lib/src/core/design_system/components/molecules/known_interactions_bar.dart
index c8643749..2a450031 100644
--- a/lib/src/core/design_system/components/molecules/known_interactions_bar.dart
+++ b/lib/src/core/design_system/components/molecules/known_interactions_bar.dart
@@ -23,9 +23,14 @@ class KnownInteractionsBar extends StatelessWidget {
       return const SizedBox.shrink();
     }
 
-    // Filter interactions by type
-    final reposts = interactions!.whereType<KnownRepost>().toList();
-    final likes = interactions!.whereType<KnownLike>().toList();
+    final reposts = interactions!
+        .map((interaction) => interaction.knownRepost)
+        .whereType<KnownRepost>()
+        .toList();
+    final likes = interactions!
+        .map((interaction) => interaction.knownLike)
+        .whereType<KnownLike>()
+        .toList();
 
     // If no reposts or likes, don't render anything
     if (reposts.isEmpty && likes.isEmpty) {
diff --git a/lib/src/core/design_system/templates/profile_page_template.dart b/lib/src/core/design_system/templates/profile_page_template.dart
index 7a321da8..a39425cd 100644
--- a/lib/src/core/design_system/templates/profile_page_template.dart
+++ b/lib/src/core/design_system/templates/profile_page_template.dart
@@ -10,7 +10,7 @@ import 'package:spark/src/core/design_system/components/molecules/profile_stats.
 import 'package:spark/src/core/design_system/components/organisms/sticky_profile_tab_bar.dart';
 import 'package:spark/src/core/design_system/tokens/typography.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 class ProfilePageTemplate extends StatelessWidget {
   const ProfilePageTemplate({
diff --git a/lib/src/core/network/atproto/data/adapters/bsky/actor_adapter.dart b/lib/src/core/network/atproto/data/adapters/bsky/actor_adapter.dart
index 9a18f179..9c73a54c 100644
--- a/lib/src/core/network/atproto/data/adapters/bsky/actor_adapter.dart
+++ b/lib/src/core/network/atproto/data/adapters/bsky/actor_adapter.dart
@@ -3,8 +3,7 @@ import 'package:bluesky_poptart/app/bsky/actor/get_profile.dart'
 import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart'
     as bsky_actor_get_profiles;
 import 'package:poptart/poptart.dart';
-
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 /// Adapter for Bluesky actor models <-> Spark actor models
 ///
diff --git a/lib/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart b/lib/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart
index 654378ab..90b2e5c9 100644
--- a/lib/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart
+++ b/lib/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart
@@ -4,11 +4,14 @@ import 'package:poptart/poptart.dart';
 import 'package:bluesky_poptart/app/bsky/embed/images.dart';
 import 'package:bluesky_poptart/app/bsky/feed/defs.dart' as bsky_defs;
 import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart';
-import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart' hide ReplyRef;
+import 'package:bluesky_poptart/app/bsky/feed/post/reply_ref.dart'
+    as bsky_post_reply;
 import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart'
-    hide ReplyRef;
+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/utils/json_utils.dart';
+import 'package:sprk_poptart/so/sprk/feed/defs.dart' as sprk_feed_defs;
 
 /// Adapter for Bluesky feed models <-> Spark feed models
 ///
@@ -234,19 +237,84 @@ class BskyFeedAdapter {
   // ===========================================================================
   // Bluesky -> Spark Conversions
   // ===========================================================================
-  /// Transforms Bluesky images (multiple) to Spark single image format
-  /// For comments/replies, only the first image should be used
-  void _transformBskyImagesToSingleSparkImage(Map<String, dynamic> mediaJson) {
-    if (mediaJson[r'$type'] == 'app.bsky.embed.images#view') {
-      final images = mediaJson['images'] as List?;
-      if (images != null && images.isNotEmpty) {
-        final firstImage = images.first as Map<String, dynamic>;
-        // Transform to Spark single image format
-        mediaJson[r'$type'] = 'so.sprk.media.image#view';
-        mediaJson['image'] = firstImage;
-        mediaJson['alt'] = firstImage['alt'] ?? '';
-        mediaJson.remove('images');
-      }
+  /// Converts Bluesky app-view embeds into Spark media views.
+  ///
+  /// The rest of the app should only see `so.sprk.media.*#view` here; anything
+  /// Bluesky-specific is flattened or filtered at this adapter boundary.
+  Map<String, dynamic>? _convertBskyMediaToSparkMedia(
+    Map<String, dynamic> mediaJson, {
+    bool singleImage = false,
+  }) {
+    switch (mediaJson[r'$type']) {
+      case 'app.bsky.embed.images#view':
+        final images = mediaJson['images'] as List?;
+        if (images == null || images.isEmpty) return null;
+
+        if (singleImage) {
+          final firstImage = Map<String, dynamic>.from(
+            images.first as Map<String, dynamic>,
+          )..[r'$type'] = 'so.sprk.media.image#view';
+          return <String, dynamic>{
+            r'$type': 'so.sprk.media.image#view',
+            'image': firstImage,
+          };
+        }
+
+        final sparkImages = images
+            .whereType<Map<String, dynamic>>()
+            .map(
+              (image) =>
+                  Map<String, dynamic>.from(image)
+                    ..[r'$type'] = 'so.sprk.media.image#view',
+            )
+            .toList();
+        return <String, dynamic>{
+          r'$type': 'so.sprk.media.images#view',
+          'images': sparkImages,
+        };
+
+      case 'app.bsky.embed.video#view':
+        return <String, dynamic>{
+          ...mediaJson,
+          r'$type': 'so.sprk.media.video#view',
+          'thumbnail': mediaJson['thumbnail'] ?? '',
+        };
+
+      case 'app.bsky.embed.recordWithMedia#view':
+        final nestedMedia = mediaJson['media'];
+        if (nestedMedia is Map<String, dynamic>) {
+          return _convertBskyMediaToSparkMedia(
+            nestedMedia,
+            singleImage: singleImage,
+          );
+        }
+        return null;
+
+      case 'so.sprk.media.image#view':
+      case 'so.sprk.media.images#view':
+      case 'so.sprk.media.video#view':
+        return mediaJson;
+
+      default:
+        return null;
+    }
+  }
+
+  void _normalizeMediaField(
+    Map<String, dynamic> holder, {
+    bool singleImage = false,
+  }) {
+    final media = holder['media'];
+    if (media is! Map<String, dynamic>) return;
+
+    final normalized = _convertBskyMediaToSparkMedia(
+      media,
+      singleImage: singleImage,
+    );
+    if (normalized == null) {
+      holder.remove('media');
+    } else {
+      holder['media'] = normalized;
     }
   }
 
@@ -291,20 +359,14 @@ class BskyFeedAdapter {
           final reply = record['reply'] as Map<String, dynamic>;
           convertReplyRefJson(reply);
 
-          // Transform media for replies - only single image allowed
-          if (record.containsKey('media') && record['media'] != null) {
-            final mediaJson = record['media'] as Map<String, dynamic>;
-            _transformBskyImagesToSingleSparkImage(mediaJson);
-          }
+          _normalizeMediaField(record, singleImage: true);
+        } else {
+          _normalizeMediaField(record);
         }
       }
     }
 
-    // Also transform post-level media if this is a reply
-    if (isReply && post.containsKey('media') && post['media'] != null) {
-      final mediaJson = post['media'] as Map<String, dynamic>;
-      _transformBskyImagesToSingleSparkImage(mediaJson);
-    }
+    _normalizeMediaField(post, singleImage: isReply);
 
     if (!isNestedReply && post.containsKey('reply') && post['reply'] != null) {
       final replyRef = post['reply'] as Map<String, dynamic>;
@@ -459,7 +521,7 @@ class BskyFeedAdapter {
     return FeedPostRecord(
       text: text,
       createdAt: createdAt,
-      reply: ReplyRef(root: reply.root, parent: reply.parent),
+      reply: bsky_post_reply.ReplyRef(root: reply.root, parent: reply.parent),
       embed: embed,
       facets: facets,
     );
@@ -645,15 +707,12 @@ class BskyFeedAdapter {
 
   /// Check if a FeedViewPost has supported media
   bool _feedViewPostHasMedia(FeedViewPost feedViewPost) {
-    return feedViewPost.map(
-      post: (p) => p.post.hasSupportedMedia,
-      reply: (r) => r.reply.media != null,
-    );
+    return feedViewPost.localPost.hasSupportedMedia;
   }
 
   /// Check if a FeedViewPost is a reply
   bool _feedViewPostIsReply(FeedViewPost feedViewPost) {
-    return feedViewPost.map(post: (p) => p.reply != null, reply: (r) => true);
+    return feedViewPost.post.record['reply'] != null;
   }
 
   /// Process raw Bluesky FeedViewPost list and convert to Spark format
@@ -844,70 +903,7 @@ extension BskyRecordAdapter on Record {
         labels: labels,
         media: media,
       ),
-      story: (media, createdAt, sound, labels, tags, embeds) => StoryRecord(
-        media: media,
-        createdAt: createdAt,
-        sound: sound,
-        labels: labels,
-        tags: tags,
-        embeds: embeds,
-      ),
-      profile:
-          (
-            displayName,
-            description,
-            avatar,
-            banner,
-            selfLabels,
-            joinedViaStarterPack,
-            pinnedPost,
-            createdAt,
-          ) => ProfileRecord(
-            displayName: displayName,
-            description: description,
-            avatar: avatar,
-            banner: banner,
-            selfLabels: selfLabels,
-            joinedViaStarterPack: joinedViaStarterPack,
-            pinnedPost: pinnedPost,
-            createdAt: createdAt,
-          ),
-      audio: (sound, title, createdAt, origin, details, labels) => AudioRecord(
-        sound: sound,
-        title: title,
-        createdAt: createdAt,
-        origin: origin,
-        details: details,
-        labels: labels,
-      ),
-      plyrTrack:
-          (
-            title,
-            artist,
-            fileType,
-            createdAt,
-            audioUrl,
-            album,
-            duration,
-            features,
-            imageUrl,
-            supportGate,
-            description,
-            audioBlob,
-          ) => PlyrTrackRecord(
-            title: title,
-            artist: artist,
-            fileType: fileType,
-            createdAt: createdAt,
-            audioUrl: audioUrl,
-            album: album,
-            duration: duration,
-            features: features,
-            imageUrl: imageUrl,
-            supportGate: supportGate,
-            description: description,
-            audioBlob: audioBlob,
-          ),
+
       bskyPost:
           (createdAt, text, facets, reply, langs, tags, selfLabels, embed) =>
               BskyPostRecord(
@@ -926,37 +922,23 @@ extension BskyRecordAdapter on Record {
 
 extension BskyPostViewAdapter on PostView {
   PostView toSparkPostView() {
-    return copyWith(
-      record: record.toSparkRecord() as PostRecord,
-      likeCount: likeCount,
-      replyCount: replyCount,
-      repostCount: repostCount,
-    );
+    return this;
   }
 }
 
 extension BskyReplyViewAdapter on ReplyView {
   ReplyView toSparkReplyView() {
-    return copyWith(
-      record: record.toSparkRecord(),
-      media: media,
-      replyCount: replyCount,
-      likeCount: likeCount,
-    );
+    return this;
   }
 }
 
 extension BskyFeedViewPostAdapter on FeedViewPost {
   FeedViewPost toSparkFeedViewPost() {
-    return map(
-      post: (postVariant) => FeedViewPost.post(
-        post: postVariant.post.toSparkPostView(),
-        reply: postVariant.reply,
-      ),
-      reply: (replyVariant) => FeedViewPost.reply(
-        reply: replyVariant.reply.toSparkReplyView(),
-        replyRef: replyVariant.replyRef,
+    return FeedViewPost(
+      post: sprk_feed_defs.PostView.fromJson(
+        localPost.toSparkPostView().toJson(),
       ),
+      feedContext: feedContext,
     );
   }
 }
diff --git a/lib/src/core/network/atproto/data/models/actor_models.dart b/lib/src/core/network/atproto/data/models/actor_models.dart
deleted file mode 100644
index 43c58263..00000000
--- a/lib/src/core/network/atproto/data/models/actor_models.dart
+++ /dev/null
@@ -1,154 +0,0 @@
-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:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/utils/uri_converter.dart';
-
-part 'actor_models.freezed.dart';
-part 'actor_models.g.dart';
-
-@freezed
-abstract class ActorViewer with _$ActorViewer {
-  @JsonSerializable(explicitToJson: true)
-  const factory ActorViewer({
-    bool? muted,
-    // muted by list: when we add lists add this field
-    bool? blockedBy,
-    @AtUriConverter() AtUri? blocking,
-    // blocked by list: when we add lists add this field
-    @AtUriConverter() AtUri? following,
-    @AtUriConverter() AtUri? followedBy,
-    KnownFollowers? knownFollowers,
-  }) = _ActorViewer;
-  const ActorViewer._();
-
-  factory ActorViewer.fromJson(Map<String, dynamic> json) =>
-      _$ActorViewerFromJson(json);
-}
-
-@freezed
-abstract class KnownFollowers with _$KnownFollowers {
-  @JsonSerializable(explicitToJson: true)
-  const factory KnownFollowers({
-    required int count,
-    required List<ProfileViewBasic> followers,
-  }) = _KnownFollowers;
-  const KnownFollowers._();
-
-  factory KnownFollowers.fromJson(Map<String, dynamic> json) =>
-      _$KnownFollowersFromJson(json);
-}
-
-@freezed
-abstract class ProfileViewBasic with _$ProfileViewBasic {
-  @JsonSerializable(explicitToJson: true)
-  const factory ProfileViewBasic({
-    required String did,
-    required String handle,
-    String? displayName,
-    @UriConverter() Uri? avatar,
-    ActorViewer? viewer,
-    List<RepoStrongRef>? stories,
-  }) = _ProfileViewBasic;
-  const ProfileViewBasic._();
-
-  factory ProfileViewBasic.fromJson(Map<String, dynamic> json) =>
-      _$ProfileViewBasicFromJson(json);
-}
-
-@freezed
-abstract class ProfileView with _$ProfileView {
-  @JsonSerializable(explicitToJson: true)
-  const factory ProfileView({
-    required String did,
-    required String handle,
-    String? displayName,
-    String? description,
-    @UriConverter() Uri? avatar,
-    // indexedAt, createdAt
-    ActorViewer? viewer,
-    List<Label>? labels,
-    List<RepoStrongRef>? stories,
-  }) = _ProfileView;
-  const ProfileView._();
-
-  factory ProfileView.fromJson(Map<String, dynamic> json) =>
-      _$ProfileViewFromJson(json);
-}
-
-/// Response wrapper for paginated actor search.
-class SearchActorsResponse {
-  SearchActorsResponse({required this.actors, this.cursor});
-
-  /// Create a [SearchActorsResponse] from JSON.
-  factory SearchActorsResponse.fromJson(Map<String, dynamic> json) {
-    final actorsJson = json['actors'] as List<dynamic>? ?? <dynamic>[];
-    return SearchActorsResponse(
-      actors: actorsJson
-          .map((e) => ProfileView.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      cursor: json['cursor'] as String?,
-    );
-  }
-
-  /// List of returned actor profiles.
-  final List<ProfileView> actors;
-
-  /// Cursor indicating the next page of results, or null when no more pages.
-  final String? cursor;
-
-  /// Convert the object back to JSON.
-  Map<String, dynamic> toJson() => {
-    'actors': actors.map((e) => e.toJson()).toList(),
-    if (cursor != null) 'cursor': cursor,
-  };
-}
-
-/// Response wrapper for actor typeahead suggestions.
-class SearchActorsTypeaheadResponse {
-  SearchActorsTypeaheadResponse({required this.actors});
-
-  /// Create a [SearchActorsTypeaheadResponse] from JSON.
-  factory SearchActorsTypeaheadResponse.fromJson(Map<String, dynamic> json) {
-    final actorsJson = json['actors'] as List<dynamic>? ?? <dynamic>[];
-    return SearchActorsTypeaheadResponse(
-      actors: actorsJson
-          .map((e) => ProfileViewBasic.fromJson(e as Map<String, dynamic>))
-          .toList(),
-    );
-  }
-
-  /// List of returned actor suggestions.
-  final List<ProfileViewBasic> actors;
-
-  /// Convert the object back to JSON.
-  Map<String, dynamic> toJson() => {
-    'actors': actors.map((e) => e.toJson()).toList(),
-  };
-}
-
-@freezed
-abstract class ProfileViewDetailed with _$ProfileViewDetailed {
-  @JsonSerializable(explicitToJson: true)
-  const factory ProfileViewDetailed({
-    required String did,
-    required String handle,
-    String? displayName,
-    String? description,
-    @UriConverter() Uri? avatar,
-    @UriConverter() Uri? banner,
-    int? followersCount,
-    int? followsCount,
-    int? postsCount,
-    // indexedAt and createdAt
-    ActorViewer? viewer,
-    List<Label>? labels,
-    RepoStrongRef?
-    pinnedPost, // this is a list if the backend implements https://github.com/sprksocial/spark-back-end/issues/13
-    List<RepoStrongRef>? stories,
-  }) = _ProfileViewDetailed;
-  const ProfileViewDetailed._();
-
-  factory ProfileViewDetailed.fromJson(Map<String, dynamic> json) =>
-      _$ProfileViewDetailedFromJson(json);
-}
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 25ad6d46..ef2ccfa9 100644
--- a/lib/src/core/network/atproto/data/models/feed_models.dart
+++ b/lib/src/core/network/atproto/data/models/feed_models.dart
@@ -1,80 +1,51 @@
 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:bluesky_poptart/app/bsky/feed/get_post_thread.dart';
 import 'package:flutter/foundation.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:spark/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
-import 'package:spark/src/core/utils/uri_converter.dart';
+import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/record_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/sound_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
+
+import 'package:sprk_poptart/so/sprk/actor/defs.dart'
+    show $ProfileViewBasicCopyWith, ProfileViewBasic;
+import 'package:sprk_poptart/so/sprk/feed/defs.dart' as sprk_feed_defs;
+import 'package:sprk_poptart/so/sprk/feed/defs/generator_view.dart'
+    show $GeneratorViewCopyWith;
+
+import 'package:sprk_poptart/so/sprk/feed/get_feed/output.dart'
+    as sprk_get_feed;
+import 'package:sprk_poptart/so/sprk/feed/get_feed_skeleton/output.dart'
+    as sprk_get_feed_skeleton;
+import 'package:sprk_poptart/so/sprk/media/image/view.dart'
+    as sprk_media_image_view;
+import 'package:sprk_poptart/so/sprk/story/defs.dart' as sprk_story_defs;
 
 part 'feed_models.freezed.dart';
 part 'feed_models.g.dart';
 
-PostRecord _postRecordFromJson(dynamic json) {
-  if (json is! Map<String, dynamic>) {
-    throw Exception(
-      'Expected Map<String, dynamic> but got ${json.runtimeType}',
-    );
-  }
-  final record = Record.fromJson(json);
-  if (record is PostRecord) {
-    return record;
-  }
-  throw Exception('Expected PostRecord but got ${record.runtimeType}');
-}
-
-Map<String, dynamic> _postRecordToJson(PostRecord record) => record.toJson();
-
-StoryRecord _storyRecordFromJson(dynamic json) {
-  if (json is! Map<String, dynamic>) {
-    throw Exception(
-      'Expected Map<String, dynamic> but got ${json.runtimeType}',
-    );
-  }
-  final record = Record.fromJson(json);
-  if (record is StoryRecord) {
-    return record;
-  }
-  throw Exception('Expected StoryRecord but got ${record.runtimeType}');
-}
-
-Map<String, dynamic> _storyRecordToJson(StoryRecord record) => record.toJson();
-
-/// https://pub.dev/packages/freezed#union-types <= read this to know how to use pattern matching to know the type of the object
-@freezed
-abstract class GeneratorViewerState with _$GeneratorViewerState {
-  @JsonSerializable(explicitToJson: true)
-  const factory GeneratorViewerState({@AtUriConverter() AtUri? like}) =
-      _GeneratorViewerState;
-  const GeneratorViewerState._();
-
-  factory GeneratorViewerState.fromJson(Map<String, dynamic> json) =>
-      _$GeneratorViewerStateFromJson(json);
-}
-
-@freezed
-abstract class GeneratorView with _$GeneratorView {
-  @JsonSerializable(explicitToJson: true)
-  const factory GeneratorView({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required String did,
-    required ProfileViewBasic creator,
-    required String displayName,
-    required DateTime indexedAt,
-    String? description,
-    @Default([]) List<Facet> descriptionFacets,
-    @UriConverter() Uri? avatar,
-    @Default(0) int likeCount,
-    @Default(true) bool acceptsInteractions,
-    @Default([]) List<Label> labels,
-    GeneratorViewerState? viewer,
-  }) = _GeneratorView;
-  const GeneratorView._();
-
-  factory GeneratorView.fromJson(Map<String, dynamic> json) =>
-      _$GeneratorViewFromJson(json);
-}
+typedef FeedViewPost = sprk_feed_defs.FeedViewPost;
+typedef GeneratorViewerState = sprk_feed_defs.GeneratorViewerState;
+typedef GeneratorView = sprk_feed_defs.GeneratorView;
+typedef SkeletonFeedPost = sprk_feed_defs.SkeletonFeedPost;
+typedef BlockedAuthor = sprk_feed_defs.BlockedAuthor;
+typedef FeedView = sprk_get_feed.FeedGetFeedOutput;
+typedef FeedSkeleton = sprk_get_feed_skeleton.FeedGetFeedSkeletonOutput;
+typedef ReplyRef = sprk_feed_defs.ReplyRef;
+typedef ReplyRefPostReference = sprk_feed_defs.UReplyRefParent;
+typedef PostView = sprk_feed_defs.PostView;
+typedef ViewerState = sprk_feed_defs.ViewerState;
+typedef KnownInteraction = sprk_feed_defs.UViewerStateKnownInteractions;
+typedef KnownRepost = sprk_feed_defs.KnownRepost;
+typedef KnownLike = sprk_feed_defs.KnownLike;
+typedef KnownReply = sprk_feed_defs.KnownReply;
+typedef ReplyViewerState = sprk_feed_defs.ReplyViewerState;
+typedef ReplyView = sprk_feed_defs.ReplyView;
+typedef StoryView = sprk_story_defs.StoryView;
+typedef ThreadContext = sprk_feed_defs.ThreadContext;
 
 /// The feeds that are actually used in the app
 @freezed
@@ -90,17 +61,6 @@ abstract class Feed with _$Feed {
   factory Feed.fromJson(Map<String, dynamic> json) => _$FeedFromJson(json);
 }
 
-/// Skeleton of a FeedView. Needs to be hydrated.
-@freezed
-abstract class SkeletonFeedPost with _$SkeletonFeedPost {
-  @JsonSerializable(explicitToJson: true)
-  const factory SkeletonFeedPost({@AtUriConverter() required AtUri uri}) =
-      _SkeletonFeedPost;
-
-  factory SkeletonFeedPost.fromJson(Map<String, dynamic> json) =>
-      _$SkeletonFeedPostFromJson(json);
-}
-
 @freezed
 sealed class HardcodedFeedExtraInfo with _$HardcodedFeedExtraInfo {
   const HardcodedFeedExtraInfo._();
@@ -115,330 +75,277 @@ sealed class HardcodedFeedExtraInfo with _$HardcodedFeedExtraInfo {
       _$HardcodedFeedExtraInfoFromJson(json);
 }
 
-/// GetTimeline returns a FeedViewPost array
-@Freezed(unionKey: r'$type')
-sealed class FeedViewPost with _$FeedViewPost {
-  const FeedViewPost._();
-
-  @FreezedUnionValue('so.sprk.feed.defs#feedPostView')
-  @JsonSerializable(explicitToJson: true)
-  const factory FeedViewPost.post({required PostView post, ReplyRef? reply}) =
-      FeedViewPostPost;
-
-  @FreezedUnionValue('so.sprk.feed.defs#feedReplyView')
-  @JsonSerializable(explicitToJson: true)
-  const factory FeedViewPost.reply({
-    required ReplyView reply,
-    ReplyRef? replyRef,
-  }) = FeedViewPostReply;
-
-  factory FeedViewPost.fromJson(Map<String, dynamic> json) =>
-      _$FeedViewPostFromJson(json);
-
-  PostView? get asPost => mapOrNull(post: (p) => p.post);
-  ReplyView? get asReply => mapOrNull(reply: (r) => r.reply);
-
-  ProfileViewBasic get author =>
-      map(post: (p) => p.post.author, reply: (r) => r.reply.author);
-
-  AtUri get uri => map(post: (p) => p.post.uri, reply: (r) => r.reply.uri);
-
-  String get cid => map(post: (p) => p.post.cid, reply: (r) => r.reply.cid);
-
-  MediaView? get media =>
-      map(post: (p) => p.post.displayMedia, reply: (r) => r.reply.media);
-
-  ViewerState? get viewerState => mapOrNull(post: (p) => p.post.viewer);
-  ReplyViewerState? get replyViewerState =>
-      mapOrNull(reply: (r) => r.reply.viewer);
-
-  String get displayText =>
-      map(post: (p) => p.post.displayText, reply: (r) => r.reply.displayText);
-
-  List<Facet> get displayFacets => map(
-    post: (p) => p.post.displayFacets,
-    reply: (r) => r.reply.displayFacets,
+FeedViewPost feedViewPostFromPost(PostView post, {String? feedContext}) {
+  return FeedViewPost(
+    post: sprk_feed_defs.PostView.fromJson(post.toJson()),
+    feedContext: feedContext,
   );
 }
 
-@freezed
-abstract class FeedView with _$FeedView {
-  @JsonSerializable(explicitToJson: true)
-  const factory FeedView({required List<FeedViewPost> feed, String? cursor}) =
-      _FeedView;
-  const FeedView._();
+extension FeedViewPostConvenience on FeedViewPost {
+  PostView get localPost => post;
+  PostView? get asPost => localPost;
+  ReplyView? get asReply => null;
+  ProfileViewBasic get author => post.author;
+  AtUri get uri => post.uri;
+  String get cid => post.cid;
+  sprk_feed_defs.UPostViewMedia? get media => post.media;
+  ViewerState? get viewerState => post.viewer;
+  ReplyViewerState? get replyViewerState => null;
+  String get displayText => localPost.displayText;
+  List<Facet> get displayFacets => localPost.displayFacets;
+}
+
+extension KnownInteractionConvenience on KnownInteraction {
+  KnownRepost? get knownRepost => switch (this) {
+    sprk_feed_defs.UViewerStateKnownInteractionsKnownRepost(:final data) =>
+      data,
+    _ => null,
+  };
 
-  factory FeedView.fromJson(Map<String, dynamic> json) =>
-      _$FeedViewFromJson(json);
-}
+  KnownLike? get knownLike => switch (this) {
+    sprk_feed_defs.UViewerStateKnownInteractionsKnownLike(:final data) => data,
+    _ => null,
+  };
 
-@freezed
-abstract class ReplyRef with _$ReplyRef {
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRef({
-    required ReplyRefPostReference root, // post, not found or blocked
-    required ReplyRefPostReference parent, // post, not found or blocked
-    ProfileViewBasic? grandparentAuthor,
-  }) = _ReplyRef;
-  const ReplyRef._();
-
-  factory ReplyRef.fromJson(Map<String, dynamic> json) =>
-      _$ReplyRefFromJson(json);
+  KnownReply? get knownReply => switch (this) {
+    sprk_feed_defs.UViewerStateKnownInteractionsKnownReply(:final data) => data,
+    _ => null,
+  };
 }
 
-/// Can be a post, a not found post, or a blocked post
-@Freezed(unionKey: r'$type')
-sealed class ReplyRefPostReference with _$ReplyRefPostReference {
-  const ReplyRefPostReference._();
-  @FreezedUnionValue('so.sprk.feed.defs#post')
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRefPostReference.post({required PostView post}) =
-      ReplyRefPostReferencePost;
-
-  @FreezedUnionValue('app.bsky.feed.defs#postView')
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRefPostReference.bskyPost({required PostView post}) =
-      ReplyRefPostReferenceBskyPost;
+extension ReplyViewConvenience on ReplyView {
+  String get displayText {
+    final caption = record['caption'];
+    if (caption is Map<String, dynamic>) {
+      return caption['text'] as String? ?? '';
+    }
+    return record['text'] as String? ?? '';
+  }
 
-  @FreezedUnionValue('so.sprk.feed.defs#replyView')
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRefPostReference.reply({required ReplyView reply}) =
-      ReplyRefPostReferenceReply;
+  List<Facet> get displayFacets {
+    final caption = record['caption'];
+    final facets = caption is Map<String, dynamic>
+        ? caption['facets'] as List?
+        : record['facets'] as List?;
+    return facets
+            ?.whereType<Map<String, dynamic>>()
+            .map(Facet.fromJson)
+            .toList() ??
+        const [];
+  }
 
-  @FreezedUnionValue('so.sprk.feed.defs#notFoundPost')
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRefPostReference.notFoundPost({
-    @AtUriConverter() required AtUri uri,
-    required bool notFound,
-  }) = ReplyRefPostReferenceNotFoundPost;
+  List<String> get imageUrls {
+    final mediaToCheck = media ?? _hydratedMediaFromRecord;
+    switch (mediaToCheck) {
+      case sprk_feed_defs.UReplyViewMediaMediaImageView(:final data):
+        return [data.fullsize]
+            .where(
+              (url) => url.startsWith('http://') || url.startsWith('https://'),
+            )
+            .toList();
+      case sprk_feed_defs.UReplyViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.image#view') {
+          final image = data['image'];
+          final fullsize = image is Map<String, dynamic>
+              ? image['fullsize'] as String? ?? ''
+              : data['fullsize'] as String? ?? '';
+          return [fullsize]
+              .where(
+                (url) =>
+                    url.startsWith('http://') || url.startsWith('https://'),
+              )
+              .toList();
+        }
+        return const [];
+      case _:
+        return const [];
+    }
+  }
 
-  @FreezedUnionValue('so.sprk.feed.defs#blockedPost')
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyRefPostReference.blockedPost({
-    @AtUriConverter() required AtUri uri,
-    required bool blocked,
-    required BlockedAuthor author,
-  }) = ReplyRefPostReferenceBlockedPost;
+  sprk_feed_defs.UReplyViewMedia? get hydratedMedia =>
+      media ?? _hydratedMediaFromRecord;
 
-  factory ReplyRefPostReference.fromJson(Map<String, dynamic> json) =>
-      _$ReplyRefPostReferenceFromJson(json);
+  sprk_feed_defs.UReplyViewMedia? get _hydratedMediaFromRecord {
+    final mediaRecord = record['media'];
+    if (mediaRecord is! Map<String, dynamic>) return null;
+    final type = mediaRecord[r'$type'] as String?;
+    if (type != 'so.sprk.media.image') return null;
+
+    final imageData = mediaRecord['image'] as Map<String, dynamic>?;
+    final ref = imageData?['ref'] as Map<String, dynamic>?;
+    final cid = ref?[r'$link'] as String?;
+    if (cid == null) return null;
+
+    final alt = mediaRecord['alt'] as String? ?? '';
+    final authorDid = author.did;
+    const baseUrl = 'https://media.sprk.so/img';
+    return sprk_feed_defs.UReplyViewMedia.mediaImageView(
+      data: sprk_media_image_view.MediaImageView(
+        thumb: '$baseUrl/medium/$authorDid/$cid/webp',
+        fullsize: '$baseUrl/full/$authorDid/$cid/webp',
+        alt: alt,
+      ),
+    );
+  }
 }
 
-@freezed
-abstract class BlockedAuthor with _$BlockedAuthor {
-  @JsonSerializable(explicitToJson: true)
-  const factory BlockedAuthor({required String did, ViewerState? viewer}) =
-      _BlockedAuthor;
-  const BlockedAuthor._();
-
-  factory BlockedAuthor.fromJson(Map<String, dynamic> json) =>
-      _$BlockedAuthorFromJson(json);
-}
+extension StoryViewConvenience on StoryView {
+  StoryRecord? get localRecord {
+    try {
+      return StoryRecord.fromJson(record);
+    } catch (_) {
+      return null;
+    }
+  }
 
-@freezed
-abstract class PostThread with _$PostThread {
-  @JsonSerializable(explicitToJson: true)
-  const factory PostThread({
-    required PostView post,
-    List<PostView>? parent,
-    List<PostView>? replies,
-  }) = _PostThread;
-  const PostThread._();
-
-  factory PostThread.fromJson(Map<String, dynamic> json) =>
-      _$PostThreadFromJson(json);
-}
+  List<StoryEmbedView>? get localEmbeds {
+    final storyEmbeds = embeds;
+    if (storyEmbeds == null || storyEmbeds.isEmpty) return const [];
+    return storyEmbeds
+        .map((embed) {
+          try {
+            return StoryEmbedView.fromJson(embed.toJson());
+          } catch (_) {
+            return null;
+          }
+        })
+        .whereType<StoryEmbedView>()
+        .toList();
+  }
 
-/// Metadata about the requesting account's relationship with the subject.
-/// Only has meaningful content for authed requests.
-@freezed
-abstract class ViewerState with _$ViewerState {
-  @JsonSerializable(explicitToJson: true)
-  const factory ViewerState({
-    @AtUriConverter() AtUri? repost,
-    @AtUriConverter() AtUri? like,
-    bool? threadMuted,
-    bool? replyDisabled,
-    bool? embeddingDisabled,
-    List<KnownInteraction>? knownInteractions,
-  }) = _ViewerState;
-  const ViewerState._();
-
-  factory ViewerState.fromJson(Map<String, dynamic> json) =>
-      _$ViewerStateFromJson(json);
-}
+  bool get isVideoStory => videoUrl.isNotEmpty;
 
-/// Metadata about the requesting account's relationship with reply content.
-/// Only has meaningful content for authed requests.
-@freezed
-abstract class ReplyViewerState with _$ReplyViewerState {
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyViewerState({
-    @AtUriConverter() AtUri? like,
-    bool? threadMuted,
-    bool? replyDisabled,
-    bool? embeddingDisabled,
-  }) = _ReplyViewerState;
-  const ReplyViewerState._();
-
-  factory ReplyViewerState.fromJson(Map<String, dynamic> json) =>
-      _$ReplyViewerStateFromJson(json);
-}
+  String get videoUrl {
+    final mediaToCheck = media;
+    switch (mediaToCheck) {
+      case sprk_story_defs.UStoryViewMediaMediaVideoView(:final data):
+        return data.playlist;
+      case sprk_story_defs.UStoryViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.video#view') {
+          return data['playlist'] as String? ?? '';
+        }
+        return '';
+      case _:
+        return '';
+    }
+  }
 
-@Freezed(unionKey: r'$type')
-sealed class KnownInteraction with _$KnownInteraction {
-  const KnownInteraction._();
+  String get imageUrl {
+    final mediaToCheck = media;
+    switch (mediaToCheck) {
+      case sprk_story_defs.UStoryViewMediaMediaImageView(:final data):
+        return data.fullsize;
+      case sprk_story_defs.UStoryViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.image#view') {
+          final image = data['image'];
+          return image is Map<String, dynamic>
+              ? image['fullsize'] as String? ?? ''
+              : data['fullsize'] as String? ?? '';
+        }
+        return '';
+      case _:
+        return author.avatar?.toString() ?? '';
+    }
+  }
 
-  @FreezedUnionValue('so.sprk.feed.defs#knownRepost')
-  @JsonSerializable(explicitToJson: true)
-  const factory KnownInteraction.repost({
-    required ProfileViewBasic by,
-    required DateTime indexedAt,
-    @AtUriConverter() AtUri? uri,
-    String? cid,
-  }) = KnownRepost;
-
-  @FreezedUnionValue('so.sprk.feed.defs#knownLike')
-  @JsonSerializable(explicitToJson: true)
-  const factory KnownInteraction.like({
-    required ProfileViewBasic by,
-    required DateTime indexedAt,
-    @AtUriConverter() AtUri? uri,
-    String? cid,
-  }) = KnownLike;
-
-  @FreezedUnionValue('so.sprk.feed.defs#knownReply')
-  @JsonSerializable(explicitToJson: true)
-  const factory KnownInteraction.reply({
-    required ProfileViewBasic by,
-    required DateTime indexedAt,
-    @AtUriConverter() AtUri? uri,
-    String? cid,
-    String? text,
-  }) = KnownReply;
-
-  factory KnownInteraction.fromJson(Map<String, dynamic> json) =>
-      _$KnownInteractionFromJson(json);
+  String get thumbnailUrl {
+    final mediaToCheck = media;
+    switch (mediaToCheck) {
+      case sprk_story_defs.UStoryViewMediaMediaVideoView(:final data):
+        return data.thumbnail ?? author.avatar?.toString() ?? '';
+      case sprk_story_defs.UStoryViewMediaMediaImageView(:final data):
+        return data.thumb;
+      case sprk_story_defs.UStoryViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.image#view') {
+          final image = data['image'];
+          return image is Map<String, dynamic>
+              ? image['thumb'] as String? ?? ''
+              : data['thumb'] as String? ?? '';
+        }
+        if (data[r'$type'] == 'so.sprk.media.video#view') {
+          return data['thumbnail'] as String? ??
+              author.avatar?.toString() ??
+              '';
+        }
+        return author.avatar?.toString() ?? '';
+      case _:
+        return author.avatar?.toString() ?? '';
+    }
+  }
 }
 
-@freezed
-abstract class PostView with _$PostView {
-  @JsonSerializable(explicitToJson: true)
-  const factory PostView({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileViewBasic author,
-    @JsonKey(fromJson: _postRecordFromJson, toJson: _postRecordToJson)
-    required PostRecord record,
-    required DateTime indexedAt,
-    @Default(false) bool isRepost,
-    int? likeCount,
-    int? replyCount,
-    int? repostCount,
-    List<Label>? labels,
-    ViewerState? viewer,
-    MediaView? media,
-    AudioView? sound,
-  }) = _PostView;
-  const PostView._();
-
-  factory PostView.fromJson(Map<String, dynamic> json) =>
-      _$PostViewFromJson(json);
-
+extension PostViewConvenience on PostView {
   bool get isSprk => RegExp(
     r'^at://[^/]+/so\.sprk\.feed\.post/[^/]+$',
   ).hasMatch(uri.toString());
 
-  MediaView? get displayMedia => media;
+  sprk_feed_defs.UPostViewMedia? get displayMedia => media;
 
-  String get displayText => record.caption.text;
-
-  List<Facet> get displayFacets => record.caption.facets;
+  PostRecord? get localRecord {
+    try {
+      final parsed = Record.fromJson(record);
+      return parsed is PostRecord ? parsed : null;
+    } catch (_) {
+      return null;
+    }
+  }
 
-  /// Returns true if post has a video or image embed (content we want to show)
-  bool get hasSupportedMedia {
-    final mediaToCheck = displayMedia;
-    if (mediaToCheck == null) return false;
+  CaptionRef get caption {
+    final local = localRecord;
+    if (local != null) return local.caption;
 
-    switch (mediaToCheck) {
-      case MediaViewVideo():
-      case MediaViewBskyVideo():
-      case MediaViewBskyImages():
-      case MediaViewImage():
-      case MediaViewImages():
-        return true;
-      case MediaViewBskyRecordWithMedia(:final media):
-        // Check nested media in record with media
-        switch (media) {
-          case MediaViewVideo():
-          case MediaViewBskyVideo():
-          case MediaViewBskyImages():
-          case MediaViewImage():
-          case MediaViewImages():
-            return true;
-          case _:
-            return false;
-        }
-      case _:
-        return false;
+    final captionJson = record['caption'];
+    if (captionJson is Map<String, dynamic>) {
+      return CaptionRef.fromJson(captionJson);
     }
+
+    final text = record['text'] as String? ?? '';
+    final facets = record['facets'];
+    return CaptionRef(
+      text: text,
+      facets: facets is List
+          ? facets
+                .whereType<Map<String, dynamic>>()
+                .map(Facet.fromJson)
+                .toList()
+          : const [],
+    );
   }
 
-  /// Resolves AT Protocol blob URLs to HTTP URLs for display
-  String _resolveAtUriToHttpUrl(Uri uri, {bool isFullsize = false}) {
-    final uriString = uri.toString();
+  String get displayText => caption.text;
 
-    // If it's already an HTTP URL, return as is
-    if (uriString.startsWith('http://') || uriString.startsWith('https://')) {
-      return uriString;
-    }
+  List<Facet> get displayFacets => caption.facets;
 
-    // If it's an AT Protocol blob URL, convert to Bluesky CDN URL
-    if (uriString.startsWith('at://')) {
-      // Parse AT URI format: at://did/collection/rkey
-      final match = RegExp(
-        r'^at://([^/]+)/([^/]+)/(.+)$',
-      ).firstMatch(uriString);
-      if (match != null) {
-        final did = match.group(1)!;
-        final collection = match.group(2)!;
-        final rkey = match.group(3)!;
-
-        // For blob collections, use Bluesky's CDN
-        if (collection == 'blob') {
-          if (isFullsize) {
-            return 'https://cdn.bsky.app/img/feed_fullsize/plain/$did/$rkey@jpeg';
-          } else {
-            return 'https://cdn.bsky.app/img/feed_thumbnail/plain/$did/$rkey@jpeg';
-          }
-        }
-      }
-    }
+  List<SelfLabel>? get selfLabels => localRecord?.selfLabels;
+
+  List<String> get hashtags => localRecord?.hashtags ?? const [];
 
-    // Return empty string for unrecognized URI schemes (e.g., file://)
-    // to prevent invalid URLs from being passed to image loaders
-    return '';
+  List<RepoStrongRef>? get crossposts => localRecord?.crossposts;
+
+  AudioView? get localSound {
+    final postSound = sound;
+    if (postSound == null) return null;
+    return AudioView.fromJson(postSound.toJson());
+  }
+
+  /// Returns true if post has a video or image embed (content we want to show)
+  bool get hasSupportedMedia {
+    final mediaToCheck = displayMedia;
+    if (mediaToCheck == null) return false;
+    return true;
   }
 
   String get videoUrl {
     final mediaToCheck = displayMedia;
     switch (mediaToCheck) {
-      case MediaViewVideo(:final playlist):
-        return playlist.toString();
-      case MediaViewBskyVideo(:final playlist):
-        // For Bluesky videos, return the AT URI as-is for blob API handling
-        return playlist.toString();
-      case MediaViewBskyRecordWithMedia(:final media):
-        // Handle nested media in record with media
-        switch (media) {
-          case MediaViewVideo(:final playlist):
-            return playlist.toString();
-          case MediaViewBskyVideo(:final playlist):
-            // For Bluesky videos, return the AT URI as-is for blob API handling
-            return playlist.toString();
-          case _:
-            return '';
+      case sprk_feed_defs.UPostViewMediaMediaVideoView(:final data):
+        return data.playlist;
+      case sprk_feed_defs.UPostViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.video#view') {
+          return data['playlist'] as String? ?? '';
         }
+        return '';
       case _:
         return '';
     }
@@ -448,35 +355,27 @@ abstract class PostView with _$PostView {
     final mediaToCheck = displayMedia;
     final List<String> urls;
     switch (mediaToCheck) {
-      case MediaViewImage(:final image):
-        urls = [image.fullsize.toString()];
-      case MediaViewImages(:final images):
-        urls = images.map((img) => img.fullsize.toString()).toList();
-      case MediaViewBskyImages(:final images):
-        urls = images
-            .map(
-              (img) => _resolveAtUriToHttpUrl(img.fullsize, isFullsize: true),
-            )
-            .toList();
-      case MediaViewBskyRecordWithMedia(:final media):
-        // Handle nested media in record with media
-        switch (media) {
-          case MediaViewImage(:final image):
-            urls = [image.fullsize.toString()];
-          case MediaViewImages(:final images):
-            urls = images.map((img) => img.fullsize.toString()).toList();
-          case MediaViewBskyImages(:final images):
-            urls = images
-                .map(
-                  (img) =>
-                      _resolveAtUriToHttpUrl(img.fullsize, isFullsize: true),
-                )
-                .toList();
-          case _:
-            urls = [];
+      case sprk_feed_defs.UPostViewMediaMediaImagesView(:final data):
+        urls = data.images.map((img) => img.fullsize).toList();
+      case sprk_feed_defs.UPostViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.image#view') {
+          final image = data['image'];
+          urls = image is Map<String, dynamic>
+              ? [image['fullsize'] as String? ?? '']
+              : const [];
+        } else if (data[r'$type'] == 'so.sprk.media.images#view') {
+          final images = data['images'];
+          urls = images is List
+              ? images
+                    .whereType<Map<String, dynamic>>()
+                    .map((img) => img['fullsize'] as String? ?? '')
+                    .toList()
+              : const [];
+        } else {
+          urls = const [];
         }
       case _:
-        urls = [];
+        urls = const [];
     }
     // Filter out invalid URLs (must be http/https)
     return urls
@@ -487,195 +386,33 @@ abstract class PostView with _$PostView {
   String get thumbnailUrl {
     final mediaToCheck = displayMedia;
     switch (mediaToCheck) {
-      case MediaViewVideo(:final thumbnail):
-        return thumbnail.toString();
-      case MediaViewBskyVideo(:final thumbnail):
-        return _resolveAtUriToHttpUrl(thumbnail);
-      case MediaViewImage(:final image):
-        return image.thumb.toString();
-      case MediaViewImages(:final images):
-        return images.first.thumb.toString();
-      case MediaViewBskyImages(:final images):
-        return _resolveAtUriToHttpUrl(images.first.thumb);
-      case MediaViewBskyRecordWithMedia(:final media):
-        // Handle nested media in record with media
-        switch (media) {
-          case MediaViewVideo(:final thumbnail):
-            return thumbnail.toString();
-          case MediaViewBskyVideo(:final thumbnail):
-            return _resolveAtUriToHttpUrl(thumbnail);
-          case MediaViewImage(:final image):
-            return image.thumb.toString();
-          case MediaViewImages(:final images):
-            return images.first.thumb.toString();
-          case MediaViewBskyImages(:final images):
-            return _resolveAtUriToHttpUrl(images.first.thumb);
-          case _:
-            return '';
+      case sprk_feed_defs.UPostViewMediaMediaVideoView(:final data):
+        return data.thumbnail ?? '';
+      case sprk_feed_defs.UPostViewMediaMediaImagesView(:final data):
+        return data.images.isEmpty ? '' : data.images.first.thumb;
+      case sprk_feed_defs.UPostViewMediaUnknown(:final data):
+        if (data[r'$type'] == 'so.sprk.media.image#view') {
+          final image = data['image'];
+          return image is Map<String, dynamic>
+              ? image['thumb'] as String? ?? ''
+              : '';
         }
+        if (data[r'$type'] == 'so.sprk.media.images#view') {
+          final images = data['images'];
+          final firstImage = images is List && images.isNotEmpty
+              ? images.first
+              : null;
+          return firstImage is Map<String, dynamic>
+              ? firstImage['thumb'] as String? ?? ''
+              : '';
+        }
+        return '';
       case _:
         return '';
     }
   }
 }
 
-@Freezed(unionKey: r'$type')
-sealed class MediaView with _$MediaView {
-  const MediaView._();
-
-  @FreezedUnionValue('so.sprk.media.video#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.video({
-    required String cid,
-    @AtUriConverter() required Uri playlist,
-    @AtUriConverter() required Uri thumbnail,
-    String? alt,
-  }) = MediaViewVideo;
-
-  @FreezedUnionValue('so.sprk.media.image#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.image({required ViewImage image}) = MediaViewImage;
-
-  @FreezedUnionValue('so.sprk.media.images#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.images({required List<ViewImage> images}) =
-      MediaViewImages;
-
-  // Bluesky embed types
-  @FreezedUnionValue('app.bsky.embed.video#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.bskyVideo({
-    required String cid,
-    @AtUriConverter() required Uri playlist,
-    @AtUriConverter() required Uri thumbnail,
-    String? alt,
-  }) = MediaViewBskyVideo;
-
-  @FreezedUnionValue('app.bsky.embed.images#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.bskyImages({required List<ViewImage> images}) =
-      MediaViewBskyImages;
-
-  @FreezedUnionValue('app.bsky.embed.record#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.bskyRecord({required EmbedViewRecord record}) =
-      MediaViewBskyRecord;
-
-  @FreezedUnionValue('app.bsky.embed.recordWithMedia#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.bskyRecordWithMedia({
-    required EmbedViewRecord record,
-    required MediaView media,
-  }) = MediaViewBskyRecordWithMedia;
-
-  @FreezedUnionValue('app.bsky.embed.external#view')
-  @JsonSerializable(explicitToJson: true)
-  const factory MediaView.bskyExternal({required EmbedViewExternal external}) =
-      MediaViewBskyExternal;
-
-  factory MediaView.fromJson(Map<String, dynamic> json) =>
-      _$MediaViewFromJson(json);
-}
-
-@freezed
-abstract class EmbedViewExternal with _$EmbedViewExternal {
-  @JsonSerializable(explicitToJson: true)
-  const factory EmbedViewExternal({
-    required String uri,
-    @Default('') String title,
-    @Default('') String description,
-    @UriConverter() Uri? thumb,
-  }) = _EmbedViewExternal;
-  const EmbedViewExternal._();
-
-  factory EmbedViewExternal.fromJson(Map<String, dynamic> json) =>
-      _$EmbedViewExternalFromJson(json);
-}
-
-@Freezed(unionKey: r'$type')
-sealed class EmbedViewRecord with _$EmbedViewRecord {
-  const EmbedViewRecord._();
-
-  /// A full, viewable record.
-  @FreezedUnionValue('app.bsky.embed.record#viewRecord')
-  @JsonSerializable(explicitToJson: true)
-  const factory EmbedViewRecord.record({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileViewBasic author,
-    required dynamic value, // This is typically a PostRecord
-    required DateTime indexedAt,
-    @Default([]) List<Label> labels,
-    int? replyCount,
-    int? repostCount,
-    int? likeCount,
-    int? quoteCount,
-    @Default([]) List<MediaView> embeds,
-  }) = EmbedViewRecord_Record;
-
-  /// A placeholder for a record that could not be found.
-  @FreezedUnionValue('app.bsky.embed.record#viewNotFound')
-  @JsonSerializable(explicitToJson: true)
-  const factory EmbedViewRecord.notFound({
-    @AtUriConverter() required AtUri uri,
-    required bool notFound,
-  }) = EmbedViewRecord_NotFound;
-
-  /// A placeholder for a record that is blocked.
-  @FreezedUnionValue('app.bsky.embed.record#viewBlocked')
-  @JsonSerializable(explicitToJson: true)
-  const factory EmbedViewRecord.blocked({
-    @AtUriConverter() required AtUri uri,
-    required bool blocked,
-    required BlockedAuthor author,
-  }) = EmbedViewRecord_Blocked;
-
-  factory EmbedViewRecord.fromJson(Map<String, dynamic> json) {
-    final type = json[r'$type'] as String?;
-    // Handle unsupported record embed types by returning notFound
-    if (BskyFeedAdapter.isUnsupportedEmbedType(type)) {
-      return EmbedViewRecord.notFound(
-        uri: AtUri.parse(json['uri'] as String? ?? 'at://unknown'),
-        notFound: true,
-      );
-    }
-    // Route to appropriate subtype based on $type
-    return switch (type) {
-      'app.bsky.embed.record#viewRecord' => _$EmbedViewRecord_RecordFromJson(
-        json,
-      ),
-      'app.bsky.embed.record#viewNotFound' =>
-        _$EmbedViewRecord_NotFoundFromJson(json),
-      'app.bsky.embed.record#viewBlocked' => _$EmbedViewRecord_BlockedFromJson(
-        json,
-      ),
-      _ => EmbedViewRecord.notFound(
-        uri: AtUri.parse(json['uri'] as String? ?? 'at://unknown'),
-        notFound: true,
-      ),
-    };
-  }
-
-  Map<String, dynamic> toJson() => switch (this) {
-    EmbedViewRecord_Record() => (this as EmbedViewRecord_Record).toJson(),
-    EmbedViewRecord_NotFound() => (this as EmbedViewRecord_NotFound).toJson(),
-    EmbedViewRecord_Blocked() => (this as EmbedViewRecord_Blocked).toJson(),
-  };
-}
-
-@freezed
-abstract class FeedSkeleton with _$FeedSkeleton {
-  @JsonSerializable(explicitToJson: true)
-  const factory FeedSkeleton({
-    required List<SkeletonFeedPost> feed,
-    String? cursor,
-  }) = _FeedSkeleton;
-  const FeedSkeleton._();
-
-  factory FeedSkeleton.fromJson(Map<String, dynamic> json) =>
-      _$FeedSkeletonFromJson(json);
-}
-
 @freezed
 abstract class ImageUploadResult with _$ImageUploadResult {
   @JsonSerializable(explicitToJson: true)
@@ -783,22 +520,7 @@ abstract class Facet with _$Facet {
   factory Facet.fromJson(Map<String, dynamic> json) => _$FacetFromJson(json);
 }
 
-@freezed
-abstract class ViewImage with _$ViewImage {
-  @JsonSerializable(explicitToJson: true)
-  const factory ViewImage({
-    @AtUriConverter() required Uri thumb,
-    @AtUriConverter() required Uri fullsize,
-    String? alt,
-    // aspectRatio: {width: int, height: int}
-  }) = _ViewImage;
-  const ViewImage._();
-
-  factory ViewImage.fromJson(Map<String, dynamic> json) =>
-      _$ViewImageFromJson(json);
-}
-
-@Freezed(unionKey: r'$type')
+@Freezed(unionKey: r'$type', copyWith: false)
 sealed class ThreadPost with _$ThreadPost {
   const ThreadPost._();
 
@@ -846,26 +568,15 @@ sealed class ThreadPost with _$ThreadPost {
 
   List<String> get imageUrls => switch (this) {
     ThreadPostView(:final post) => post.imageUrls,
-    ThreadReplyView(:final reply) => switch (reply.hydratedMedia) {
-      // Replies/comments only support a single image (EmbedViewMediaImage)
-      MediaViewImage(:final image) => [image.fullsize.toString()],
-      MediaViewImages(:final images) =>
-        images.map((img) => img.fullsize.toString()).toList(),
-      MediaViewBskyImages(:final images) =>
-        images.map((img) => img.fullsize.toString()).toList(),
-      _ => <String>[],
-    },
+    ThreadReplyView(:final reply) => reply.imageUrls,
   };
 
   bool get isSprk => switch (this) {
     ThreadPostView(:final post) => post.isSprk,
     ThreadReplyView(:final reply) => () {
       final rec = reply.record;
-      if (rec is Map<String, dynamic>) {
-        final type = rec[r'$type'] as String?;
-        return type == 'so.sprk.feed.reply' || type == 'so.sprk.feed.post';
-      }
-      return false;
+      final type = rec[r'$type'] as String?;
+      return type == 'so.sprk.feed.reply' || type == 'so.sprk.feed.post';
     }(),
   };
 
@@ -874,7 +585,7 @@ sealed class ThreadPost with _$ThreadPost {
     ThreadReplyView(:final reply) => reply.author,
   };
 
-  MediaView? get media => switch (this) {
+  Object? get media => switch (this) {
     ThreadPostView(:final post) => post.media,
     ThreadReplyView(:final reply) => reply.hydratedMedia,
   };
@@ -895,7 +606,7 @@ sealed class ThreadPost with _$ThreadPost {
   };
 }
 
-@Freezed(unionKey: r'$type')
+@Freezed(unionKey: r'$type', copyWith: false)
 sealed class Thread with _$Thread {
   const Thread._();
 
@@ -1281,139 +992,3 @@ sealed class Thread with _$Thread {
     return buildWithReplies(anchorIndex);
   }
 }
-
-@freezed
-abstract class ThreadContext with _$ThreadContext {
-  @JsonSerializable(explicitToJson: true)
-  const factory ThreadContext({@AtUriConverter() AtUri? rootAuthorLike}) =
-      _ThreadContext;
-  const ThreadContext._();
-
-  factory ThreadContext.fromJson(Map<String, dynamic> json) =>
-      _$ThreadContextFromJson(json);
-}
-
-@freezed
-abstract class ReplyView with _$ReplyView {
-  @JsonSerializable(explicitToJson: true)
-  const factory ReplyView({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileViewBasic author,
-    required dynamic record,
-    required DateTime indexedAt,
-    MediaView? media,
-    int? replyCount,
-    int? likeCount,
-    List<Label>? labels,
-    ReplyViewerState? viewer,
-  }) = _ReplyView;
-  const ReplyView._();
-
-  factory ReplyView.fromJson(Map<String, dynamic> json) =>
-      _$ReplyViewFromJson(json);
-
-  String get displayText {
-    final rec = record;
-    if (rec is Map<String, dynamic>) {
-      final caption = rec['caption'];
-      if (caption is Map<String, dynamic>) {
-        return caption['text'] as String? ?? '';
-      }
-      return rec['text'] as String? ?? '';
-    }
-    return '';
-  }
-
-  List<Facet> get displayFacets {
-    final rec = record;
-    if (rec is Map<String, dynamic>) {
-      final caption = rec['caption'];
-      if (caption is Map<String, dynamic>) {
-        final facets = caption['facets'] as List?;
-        return facets
-                ?.map((f) => Facet.fromJson(f as Map<String, dynamic>))
-                .toList() ??
-            [];
-      }
-      final facets = rec['facets'] as List?;
-      return facets
-              ?.map((f) => Facet.fromJson(f as Map<String, dynamic>))
-              .toList() ??
-          [];
-    }
-    return [];
-  }
-
-  /// Hydrates media from the record into a view format
-  /// Necessary because API doesn't always return media field at the post level
-  MediaView? get hydratedMedia {
-    // If media is already present, use it
-    if (media != null) return media;
-
-    // Otherwise, try to hydrate from record
-    final rec = record;
-    if (rec is! Map<String, dynamic>) return null;
-
-    final mediaRecord = rec['media'];
-    if (mediaRecord is! Map<String, dynamic>) return null;
-
-    final type = mediaRecord[r'$type'] as String?;
-
-    try {
-      switch (type) {
-        case 'so.sprk.media.image':
-          // Single image - convert to view format
-          final imageData = mediaRecord['image'] as Map<String, dynamic>?;
-          if (imageData == null) return null;
-
-          // Extract the blob ref (CID)
-          final ref = imageData['ref'] as Map<String, dynamic>?;
-          final cid = ref?[r'$link'] as String?;
-          if (cid == null) return null;
-
-          final alt = mediaRecord['alt'] as String? ?? '';
-          final authorDid = author.did;
-
-          // Construct URLs using the same pattern as the server
-          const baseUrl = 'https://media.sprk.so/img';
-          final thumbUrl = '$baseUrl/medium/$authorDid/$cid/webp';
-          final fullsizeUrl = '$baseUrl/full/$authorDid/$cid/webp';
-
-          return MediaView.image(
-            image: ViewImage(
-              thumb: Uri.parse(thumbUrl),
-              fullsize: Uri.parse(fullsizeUrl),
-              alt: alt,
-            ),
-          );
-
-        default:
-          return null;
-      }
-    } catch (e) {
-      return null;
-    }
-  }
-}
-
-@freezed
-abstract class StoryView with _$StoryView {
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryView({
-    required String cid,
-    @AtUriConverter() required AtUri uri,
-    required ProfileViewBasic author,
-    @JsonKey(fromJson: _storyRecordFromJson, toJson: _storyRecordToJson)
-    required StoryRecord record,
-    required DateTime indexedAt,
-    MediaView? media,
-    @JsonKey(fromJson: storyEmbedViewsFromJson, toJson: storyEmbedViewsToJson)
-    List<StoryEmbedView>? embeds,
-    // viewer eventually i think
-  }) = _StoryView;
-  const StoryView._();
-
-  factory StoryView.fromJson(Map<String, dynamic> json) =>
-      _$StoryViewFromJson(json);
-}
diff --git a/lib/src/core/network/atproto/data/models/graph_models.dart b/lib/src/core/network/atproto/data/models/graph_models.dart
deleted file mode 100644
index 54eeea6c..00000000
--- a/lib/src/core/network/atproto/data/models/graph_models.dart
+++ /dev/null
@@ -1,56 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
-
-part 'graph_models.freezed.dart';
-part 'graph_models.g.dart';
-
-@freezed
-abstract class FollowersResponse with _$FollowersResponse {
-  const factory FollowersResponse({
-    required List<ProfileView> followers,
-    String? cursor,
-  }) = _FollowersResponse;
-
-  factory FollowersResponse.fromJson(Map<String, dynamic> json) =>
-      _$FollowersResponseFromJson(json);
-}
-
-@freezed
-abstract class FollowsResponse with _$FollowsResponse {
-  const factory FollowsResponse({
-    required List<ProfileView> follows,
-    String? cursor,
-  }) = _FollowsResponse;
-
-  factory FollowsResponse.fromJson(Map<String, dynamic> json) =>
-      _$FollowsResponseFromJson(json);
-}
-
-@freezed
-abstract class FollowUserResponse with _$FollowUserResponse {
-  const factory FollowUserResponse({required String uri, required String cid}) =
-      _FollowUserResponse;
-
-  factory FollowUserResponse.fromJson(Map<String, dynamic> json) =>
-      _$FollowUserResponseFromJson(json);
-}
-
-@freezed
-abstract class BlocksResponse with _$BlocksResponse {
-  const factory BlocksResponse({
-    required List<ProfileView> blocks,
-    String? cursor,
-  }) = _BlocksResponse;
-
-  factory BlocksResponse.fromJson(Map<String, dynamic> json) =>
-      _$BlocksResponseFromJson(json);
-}
-
-@freezed
-abstract class BlockUserResponse with _$BlockUserResponse {
-  const factory BlockUserResponse({required String uri, required String cid}) =
-      _BlockUserResponse;
-
-  factory BlockUserResponse.fromJson(Map<String, dynamic> json) =>
-      _$BlockUserResponseFromJson(json);
-}
diff --git a/lib/src/core/network/atproto/data/models/labeler_models.dart b/lib/src/core/network/atproto/data/models/labeler_models.dart
index 88125c9b..47865a3f 100644
--- a/lib/src/core/network/atproto/data/models/labeler_models.dart
+++ b/lib/src/core/network/atproto/data/models/labeler_models.dart
@@ -1,11 +1,14 @@
-import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart/poptart.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/labeler/defs.dart' as labeler_defs;
 
 part 'labeler_models.freezed.dart';
 part 'labeler_models.g.dart';
 
+typedef LabelerView = labeler_defs.LabelerView;
+typedef LabelerViewDetailed = labeler_defs.LabelerViewDetailed;
+typedef LabelerViewerState = labeler_defs.LabelerViewerState;
+typedef LabelerPolicies = labeler_defs.LabelerPolicies;
+
 const defaultLabels = [
   '!hide',
   '!no-promote',
@@ -84,65 +87,3 @@ abstract class LabelPreference with _$LabelPreference {
   factory LabelPreference.fromJson(Map<String, dynamic> json) =>
       _$LabelPreferenceFromJson(json);
 }
-
-@freezed
-abstract class LabelerView with _$LabelerView {
-  @JsonSerializable(explicitToJson: true)
-  factory LabelerView({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileView creator,
-    required DateTime indexedAt,
-    int? likeCount,
-    LabelerViewerState? labelerViewer,
-    List<Label>? labels,
-  }) = _LabelerView;
-  const LabelerView._();
-
-  factory LabelerView.fromJson(Map<String, dynamic> json) =>
-      _$LabelerViewFromJson(json);
-}
-
-@freezed
-abstract class LabelerViewDetailed with _$LabelerViewDetailed {
-  @JsonSerializable(explicitToJson: true)
-  factory LabelerViewDetailed({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileView creator,
-    required DateTime indexedAt,
-    int? likeCount,
-    LabelerViewerState? labelerViewer,
-    LabelerPolicies? policies,
-    List<Label>? labels,
-  }) = _LabelerViewDetailed;
-  const LabelerViewDetailed._();
-
-  factory LabelerViewDetailed.fromJson(Map<String, dynamic> json) =>
-      _$LabelerViewDetailedFromJson(json);
-}
-
-@freezed
-abstract class LabelerViewerState with _$LabelerViewerState {
-  @JsonSerializable(explicitToJson: true)
-  factory LabelerViewerState({@AtUriConverter() required AtUri like}) =
-      _LabelerViewerState;
-  const LabelerViewerState._();
-
-  factory LabelerViewerState.fromJson(Map<String, dynamic> json) =>
-      _$LabelerViewerStateFromJson(json);
-}
-
-@freezed
-abstract class LabelerPolicies with _$LabelerPolicies {
-  @JsonSerializable(explicitToJson: true)
-  factory LabelerPolicies({
-    required List<String>
-    labelValues, // Values are not limited to this set (aka, not a closed enum).
-    List<LabelValueDefinition>? labelValueDefinitions,
-  }) = _LabelerPolicies;
-  const LabelerPolicies._();
-
-  factory LabelerPolicies.fromJson(Map<String, dynamic> json) =>
-      _$LabelerPoliciesFromJson(json);
-}
diff --git a/lib/src/core/network/atproto/data/models/models.dart b/lib/src/core/network/atproto/data/models/models.dart
index fcae5f7c..164baa46 100644
--- a/lib/src/core/network/atproto/data/models/models.dart
+++ b/lib/src/core/network/atproto/data/models/models.dart
@@ -1,9 +1,5 @@
-export 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
-export 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
-export 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
 export 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
 export 'package:spark/src/core/network/atproto/data/models/notification_models.dart';
-export 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 export 'package:spark/src/core/network/atproto/data/models/record_models.dart';
 export 'package:spark/src/core/network/atproto/data/models/sound_models.dart';
 export 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
diff --git a/lib/src/core/network/atproto/data/models/notification_models.dart b/lib/src/core/network/atproto/data/models/notification_models.dart
index 795be525..61f593cc 100644
--- a/lib/src/core/network/atproto/data/models/notification_models.dart
+++ b/lib/src/core/network/atproto/data/models/notification_models.dart
@@ -1,65 +1,19 @@
-import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart/poptart.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
-
-part 'notification_models.freezed.dart';
-part 'notification_models.g.dart';
-
-@freezed
-abstract class Notification with _$Notification {
-  @JsonSerializable(explicitToJson: true)
-  const factory Notification({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileViewBasic author,
-    required String reason,
-    required Map<String, dynamic> record,
-    required bool isRead,
-    required DateTime indexedAt,
-    @JsonKey(name: r'$type') String? type,
-    @AtUriConverter() AtUri? reasonSubject,
-    @Default(null) List<Label>? labels,
-  }) = _Notification;
-  const Notification._();
-
-  factory Notification.fromJson(Map<String, dynamic> json) =>
-      _$NotificationFromJson(json);
-}
-
-@freezed
-abstract class ListNotificationsResponse with _$ListNotificationsResponse {
-  @JsonSerializable(explicitToJson: true)
-  const factory ListNotificationsResponse({
-    required List<Notification> notifications,
-    String? cursor,
-    bool? priority,
-    DateTime? seenAt,
-  }) = _ListNotificationsResponse;
-  const ListNotificationsResponse._();
-
-  factory ListNotificationsResponse.fromJson(Map<String, dynamic> json) =>
-      _$ListNotificationsResponseFromJson(json);
-}
-
-@freezed
-abstract class UnreadCountResponse with _$UnreadCountResponse {
-  @JsonSerializable(explicitToJson: true)
-  const factory UnreadCountResponse({required int count}) =
-      _UnreadCountResponse;
-  const UnreadCountResponse._();
-
-  factory UnreadCountResponse.fromJson(Map<String, dynamic> json) =>
-      _$UnreadCountResponseFromJson(json);
-}
-
-@freezed
-abstract class UpdateSeenRequest with _$UpdateSeenRequest {
-  @JsonSerializable(explicitToJson: true)
-  const factory UpdateSeenRequest({required DateTime seenAt}) =
-      _UpdateSeenRequest;
-  const UpdateSeenRequest._();
-
-  factory UpdateSeenRequest.fromJson(Map<String, dynamic> json) =>
-      _$UpdateSeenRequestFromJson(json);
+import 'package:sprk_poptart/so/sprk/notification/get_unread_count/output.dart'
+    as sprk_get_unread_count;
+import 'package:sprk_poptart/so/sprk/notification/list_notifications/notification.dart'
+    as sprk_notification;
+import 'package:sprk_poptart/so/sprk/notification/list_notifications/notification_reason.dart'
+    as sprk_notification_reason;
+import 'package:sprk_poptart/so/sprk/notification/list_notifications/output.dart'
+    as sprk_list_notifications;
+
+typedef Notification = sprk_notification.Notification;
+typedef NotificationReason = sprk_notification_reason.NotificationReason;
+typedef ListNotificationsResponse =
+    sprk_list_notifications.NotificationListNotificationsOutput;
+typedef UnreadCountResponse =
+    sprk_get_unread_count.NotificationGetUnreadCountOutput;
+
+extension NotificationConvenience on Notification {
+  String get reasonValue => reason.toJson();
 }
diff --git a/lib/src/core/network/atproto/data/models/pref_models.dart b/lib/src/core/network/atproto/data/models/pref_models.dart
index 87693ad9..cdff5bc6 100644
--- a/lib/src/core/network/atproto/data/models/pref_models.dart
+++ b/lib/src/core/network/atproto/data/models/pref_models.dart
@@ -1,269 +1,159 @@
 import 'package:poptart/poptart.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/content_label_pref.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/content_label_pref_visibility.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/labeler_pref_item.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/labelers_pref.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/muted_word.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/saved_feed.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/saved_feed_type.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/saved_feeds_pref.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/union_preferences.dart';
+import 'package:sprk_poptart/so/sprk/actor/get_preferences/output.dart';
+
+export 'package:sprk_poptart/so/sprk/actor/defs/content_label_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/content_label_pref_visibility.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/feed_view_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/hidden_posts_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/interests_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/labeler_pref_item.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/labelers_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/muted_word.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/muted_word_actor_target.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/muted_word_target.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/muted_words_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/personal_details_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/saved_feed.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/saved_feed_type.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/saved_feeds_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/thread_view_pref.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/thread_view_pref_sort.dart';
+export 'package:sprk_poptart/so/sprk/actor/defs/union_preferences.dart';
+export 'package:sprk_poptart/so/sprk/actor/get_preferences/output.dart';
+
+typedef Preferences = ActorGetPreferencesOutput;
+typedef Preference = UPreferences;
+
+Preferences preferencesFromJson(Map<String, dynamic> json) =>
+    Preferences.fromJson(json);
+
+SavedFeed makeSavedFeed({
+  required String type,
+  required String value,
+  required bool pinned,
+  String? id,
+}) {
+  return SavedFeed(
+    id: (id == null || id.isEmpty)
+        ? DateTime.now().toUtc().toIso8601String()
+        : id,
+    type: SavedFeedType.valueOf(type) ?? SavedFeedType.unknown(data: type),
+    value: value,
+    pinned: pinned,
+  );
+}
 
-part 'pref_models.freezed.dart';
-part 'pref_models.g.dart';
+Preference savedFeedsPreference(List<SavedFeed> items) =>
+    Preference.savedFeedsPref(data: SavedFeedsPref(items: items));
+
+Preference labelersPreference(List<LabelerPrefItem> labelers) =>
+    Preference.labelersPref(data: LabelersPref(labelers: labelers));
+
+Preference contentLabelPreference({
+  required String? labelerDid,
+  required String label,
+  required String visibility,
+}) {
+  return Preference.contentLabelPref(
+    data: ContentLabelPref(
+      labelerDid: labelerDid,
+      label: label,
+      visibility:
+          ContentLabelPrefVisibility.valueOf(visibility) ??
+          ContentLabelPrefVisibility.unknown(data: visibility),
+    ),
+  );
+}
 
-@freezed
-abstract class Preferences with _$Preferences {
-  @JsonSerializable(explicitToJson: true)
-  factory Preferences({required List<Preference> preferences}) {
-    final contentLabelPrefs = <ContentLabelPref>[];
-    final savedFeeds = <SavedFeed>[];
-    final labelers = <LabelerPrefItem>[];
-    final hiddenPosts = <AtUri>[];
-    final mutedWords = <MutedWord>[];
-    final feedViewPrefs = <Preference>[];
-    Preference? personalDetails;
-    Preference? threadViewPref;
-    Preference? interests;
-    Preference? postInteractionSettings;
+extension PreferencesConvenience on Preferences {
+  List<ContentLabelPref>? get contentLabelPrefs {
+    final prefs = preferences
+        .map((preference) => preference.contentLabelPref)
+        .nonNulls
+        .toList();
+    return prefs.isEmpty ? null : prefs;
+  }
 
+  List<SavedFeed>? get savedFeeds {
+    final feeds = <SavedFeed>[];
     for (final preference in preferences) {
-      preference.mapOrNull(
-        contentLabelPref: (pref) {
-          contentLabelPrefs.add(
-            ContentLabelPref(
-              labelerDid: pref.labelerDid,
-              label: pref.label,
-              visibility: pref.visibility,
-            ),
-          );
-        },
-        savedFeedsPref: (pref) {
-          savedFeeds.addAll(pref.items);
-        },
-        labelersPref: (pref) {
-          labelers.addAll(pref.labelers);
-        },
-        hiddenPostsPref: (pref) {
-          hiddenPosts.addAll(pref.posts);
-        },
-        mutedWordsPref: (pref) {
-          mutedWords.addAll(pref.words);
-        },
-        personalDetailsPref: (pref) {
-          personalDetails = preference;
-        },
-        feedViewPref: (pref) {
-          feedViewPrefs.add(preference);
-        },
-        threadViewPref: (pref) {
-          threadViewPref = preference;
-        },
-        interestsPref: (pref) {
-          interests = preference;
-        },
-        postInteractionSettingsPref: (pref) {
-          postInteractionSettings = preference;
-        },
-      );
+      final savedFeedsPref = preference.savedFeedsPref;
+      if (savedFeedsPref != null) {
+        feeds.addAll(savedFeedsPref.items);
+      }
     }
-
-    return Preferences.internal(
-      preferences: preferences,
-      contentLabelPrefs: contentLabelPrefs,
-      savedFeeds: savedFeeds,
-      labelers: labelers,
-      hiddenPosts: hiddenPosts,
-      mutedWords: mutedWords,
-      feedViewPrefs: feedViewPrefs,
-      personalDetails: personalDetails,
-      threadViewPref: threadViewPref,
-      interests: interests,
-      postInteractionSettings: postInteractionSettings,
-    );
+    return feeds.isEmpty ? null : feeds;
   }
 
-  const factory Preferences.internal({
-    required List<Preference> preferences,
-    List<ContentLabelPref>? contentLabelPrefs,
-    List<SavedFeed>? savedFeeds,
-    List<LabelerPrefItem>? labelers,
-    @AtUriConverter() List<AtUri>? hiddenPosts,
-    List<MutedWord>? mutedWords,
-    List<Preference>? feedViewPrefs,
-    Preference? personalDetails,
-    Preference? threadViewPref,
-    Preference? interests,
-    Preference? postInteractionSettings,
-  }) = _Preferences;
-  const Preferences._();
-
-  factory Preferences.fromJson(Map<String, dynamic> json) {
-    // Parse the preferences list and use the custom factory constructor
-    // which extracts labelers, savedFeeds, etc.
-    final preferencesJson = json['preferences'] as List<dynamic>? ?? [];
-    final preferences = preferencesJson
-        .map((e) => Preference.fromJson(e as Map<String, dynamic>))
-        .toList();
-    return Preferences(preferences: preferences);
+  List<LabelerPrefItem>? get labelers {
+    final items = <LabelerPrefItem>[];
+    for (final preference in preferences) {
+      final labelersPref = preference.labelersPref;
+      if (labelersPref != null) {
+        items.addAll(labelersPref.labelers);
+      }
+    }
+    return items.isEmpty ? null : items;
   }
 
-  Map<String, dynamic> toJson() => {
-    'preferences': preferences.map((e) => e.toJson()).toList(),
-  };
-}
-
-@Freezed(unionKey: r'$type')
-abstract class Preference with _$Preference {
-  const Preference._();
-
-  @FreezedUnionValue('so.sprk.actor.defs#contentLabelPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.contentLabelPref({
-    required String labelerDid,
-    required String label,
-    required String visibility, // ["ignore", "show", "warn", "hide"]
-  }) = _ContentLabelPreference;
-  bool isContentLabelPref(Preference preference) =>
-      preference.mapOrNull(contentLabelPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#savedFeedsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.savedFeedsPref({required List<SavedFeed> items}) =
-      _SavedFeedsPref;
-  bool isSavedFeedsPref(Preference preference) =>
-      preference.mapOrNull(savedFeedsPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#personalDetailsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.personalDetailsPref({required DateTime? birthDate}) =
-      _PersonalDetailsPref;
-  bool isPersonalDetailsPref(Preference preference) =>
-      preference.mapOrNull(personalDetailsPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#feedViewPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.feedViewPref({
-    required String feed,
-    bool? hideReplies,
-    bool? hideRepliesByUnfollowed,
-    bool? hideRepliesByLikeCount,
-    bool? hideReposts,
-    bool? hideQuotePosts,
-  }) = _FeedViewPref;
-  bool isFeedViewPref(Preference preference) =>
-      preference.mapOrNull(feedViewPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#threadViewPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.threadViewPref({
-    String? sort, // oldest, newest, most-likes, random, hotness
-    bool? prioritizeFollowedUsers,
-  }) = _ThreadViewPref;
-  bool isThreadViewPref(Preference preference) =>
-      preference.mapOrNull(threadViewPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#interestsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.interestsPref({required List<String> tags}) =
-      _InterestsPref;
-  bool isInterestsPref(Preference preference) =>
-      preference.mapOrNull(interestsPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#mutedWordsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.mutedWordsPref({required List<MutedWord> words}) =
-      _MutedWordsPref;
-  bool isMutedWordsPref(Preference preference) =>
-      preference.mapOrNull(mutedWordsPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#hiddenPostsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.hiddenPostsPref({
-    @AtUriConverter() required List<AtUri> posts,
-  }) = _HiddenPostsPref;
-  bool isHiddenPostsPref(Preference preference) =>
-      preference.mapOrNull(hiddenPostsPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#labelersPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.labelersPref({
-    required List<LabelerPrefItem> labelers,
-  }) = _LabelersPref;
-  bool isLabelersPref(Preference preference) =>
-      preference.mapOrNull(labelersPref: (pref) => pref) != null;
-
-  @FreezedUnionValue('so.sprk.actor.defs#postInteractionSettingsPref')
-  @JsonSerializable(explicitToJson: true)
-  const factory Preference.postInteractionSettingsPref({
-    required bool enabled,
-  }) = _PostInteractionSettingsPref;
-  bool isPostInteractionSettingsPref(Preference preference) =>
-      preference.mapOrNull(postInteractionSettingsPref: (pref) => pref) != null;
-
-  factory Preference.fromJson(Map<String, dynamic> json) =>
-      _$PreferenceFromJson(json);
-}
-
-@freezed
-abstract class SavedFeed with _$SavedFeed {
-  factory SavedFeed({
-    required String type,
-    required String value,
-    required bool pinned,
-    String? id,
-  }) {
-    final resolvedId = (id == null || id.isEmpty)
-        ? DateTime.now().toUtc().toIso8601String()
-        : id;
-
-    return SavedFeed.internal(
-      type: type,
-      value: value,
-      pinned: pinned,
-      id: resolvedId,
-    );
+  List<AtUri>? get hiddenPosts {
+    final posts = <AtUri>[];
+    for (final preference in preferences) {
+      final hiddenPostsPref = preference.hiddenPostsPref;
+      if (hiddenPostsPref != null) {
+        posts.addAll(hiddenPostsPref.items);
+      }
+    }
+    return posts.isEmpty ? null : posts;
   }
 
-  const factory SavedFeed.internal({
-    required String type, // ["feed", "timeline"]
-    required String value,
-    required bool pinned,
-    required String id,
-  }) = _SavedFeed;
+  List<MutedWord>? get mutedWords {
+    final words = <MutedWord>[];
+    for (final preference in preferences) {
+      final mutedWordsPref = preference.mutedWordsPref;
+      if (mutedWordsPref != null) {
+        words.addAll(mutedWordsPref.items);
+      }
+    }
+    return words.isEmpty ? null : words;
+  }
 
-  const SavedFeed._();
+  List<Preference>? get feedViewPrefs {
+    final prefs = preferences
+        .where((preference) => preference.isFeedViewPref)
+        .toList();
+    return prefs.isEmpty ? null : prefs;
+  }
 
-  factory SavedFeed.fromJson(Map<String, dynamic> json) =>
-      _$SavedFeedFromJson(json);
-}
+  Preference? get personalDetails => preferences.cast<Preference?>().firstWhere(
+    (preference) => preference?.isPersonalDetailsPref ?? false,
+    orElse: () => null,
+  );
 
-@freezed
-abstract class MutedWord with _$MutedWord {
-  @JsonSerializable(explicitToJson: true)
-  const factory MutedWord({
-    required String value,
-    required List<String> targets, // content, tag, String? id,
-    @Default('all') String actorTarget, // all, exclude-following
-  }) = _MutedWord;
-  const MutedWord._();
+  Preference? get threadViewPref => preferences.cast<Preference?>().firstWhere(
+    (preference) => preference?.isThreadViewPref ?? false,
+    orElse: () => null,
+  );
 
-  factory MutedWord.fromJson(Map<String, dynamic> json) =>
-      _$MutedWordFromJson(json);
+  Preference? get interests => preferences.cast<Preference?>().firstWhere(
+    (preference) => preference?.isInterestsPref ?? false,
+    orElse: () => null,
+  );
 }
 
-@freezed
-abstract class LabelerPrefItem with _$LabelerPrefItem {
-  @JsonSerializable(explicitToJson: true)
-  const factory LabelerPrefItem({required String did}) = _LabelerPrefItem;
-  const LabelerPrefItem._();
-
-  factory LabelerPrefItem.fromJson(Map<String, dynamic> json) =>
-      _$LabelerPrefItemFromJson(json);
+extension SavedFeedConvenience on SavedFeed {
+  String get typeValue => type.toJson();
 }
 
-@freezed
-abstract class ContentLabelPref with _$ContentLabelPref {
-  @JsonSerializable(explicitToJson: true)
-  const factory ContentLabelPref({
-    required String labelerDid,
-    required String label,
-    required String visibility,
-  }) = _ContentLabelPref;
-  const ContentLabelPref._();
-
-  factory ContentLabelPref.fromJson(Map<String, dynamic> json) =>
-      _$ContentLabelPrefFromJson(json);
+extension ContentLabelPrefConvenience on ContentLabelPref {
+  String get visibilityValue => visibility.toJson();
 }
diff --git a/lib/src/core/network/atproto/data/models/record_models.dart b/lib/src/core/network/atproto/data/models/record_models.dart
index 0ce429c7..ca3c4c85 100644
--- a/lib/src/core/network/atproto/data/models/record_models.dart
+++ b/lib/src/core/network/atproto/data/models/record_models.dart
@@ -2,11 +2,22 @@ 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:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
+import 'package:sprk_poptart/so/sprk/embed/defs.dart' as sprk_embed_defs;
+import 'package:sprk_poptart/so/sprk/story/post.dart' as sprk_story;
+import 'package:sprk_poptart/so/sprk/sound/audio.dart' as sprk_audio;
+import 'package:plyr_poptart/fm/plyr/track.dart' as plyr_track;
 
 part 'record_models.freezed.dart';
 part 'record_models.g.dart';
 
+typedef StoryRecord = sprk_story.StoryPostRecord;
+typedef AudioRecord = sprk_audio.SoundAudioRecord;
+typedef PlyrTrackRecord = plyr_track.TrackRecord;
+typedef PlyrSupportGate = plyr_track.SupportGate;
+typedef PlyrFeaturedArtist = plyr_track.FeaturedArtist;
+
 @Freezed(unionKey: r'$type')
 abstract class Record with _$Record {
   factory Record.fromJson(Map<String, dynamic> json) => _$RecordFromJson(json);
@@ -36,59 +47,6 @@ abstract class Record with _$Record {
     Media? media,
   }) = ReplyRecord;
 
-  @JsonSerializable(explicitToJson: true)
-  @FreezedUnionValue('so.sprk.story.post')
-  const factory Record.story({
-    required Media media,
-    required DateTime createdAt,
-    RepoStrongRef? sound,
-    List<SelfLabel>? labels,
-    List<String>? tags,
-    @JsonKey(fromJson: storyEmbedsFromJson, toJson: storyEmbedsToJson)
-    List<StoryEmbed>? embeds,
-  }) = StoryRecord;
-
-  @JsonSerializable(explicitToJson: true)
-  @FreezedUnionValue('so.sprk.actor.profile')
-  const factory Record.profile({
-    String? displayName,
-    String? description,
-    Blob? avatar,
-    Blob? banner,
-    List<SelfLabel>? selfLabels,
-    RepoStrongRef? joinedViaStarterPack,
-    RepoStrongRef? pinnedPost,
-    DateTime? createdAt,
-  }) = ProfileRecord;
-
-  @JsonSerializable(explicitToJson: true)
-  @FreezedUnionValue('so.sprk.sound.audio')
-  const factory Record.audio({
-    required Blob sound,
-    required String title,
-    required DateTime createdAt,
-    RepoStrongRef? origin,
-    AudioDetails? details,
-    List<SelfLabel>? labels,
-  }) = AudioRecord;
-
-  @JsonSerializable(explicitToJson: true)
-  @FreezedUnionValue('fm.plyr.track')
-  const factory Record.plyrTrack({
-    required String title,
-    required String artist,
-    required String fileType,
-    required DateTime createdAt,
-    String? audioUrl,
-    String? album,
-    int? duration,
-    List<PlyrFeaturedArtist>? features,
-    String? imageUrl,
-    PlyrSupportGate? supportGate,
-    String? description,
-    Blob? audioBlob,
-  }) = PlyrTrackRecord;
-
   @JsonSerializable(explicitToJson: true)
   @FreezedUnionValue('app.bsky.feed.post')
   const factory Record.bskyPost({
@@ -109,8 +67,6 @@ abstract class Record with _$Record {
         return tags ?? _extractHashtags(caption.text);
       case ReplyRecord(:final caption):
         return _extractHashtags(caption.text);
-      case StoryRecord(:final tags):
-        return tags ?? [];
       default:
         return [];
     }
@@ -122,26 +78,18 @@ abstract class Record with _$Record {
   }
 }
 
-@freezed
-abstract class PlyrSupportGate with _$PlyrSupportGate {
-  @JsonSerializable(explicitToJson: true)
-  const factory PlyrSupportGate({required String type}) = _PlyrSupportGate;
-
-  factory PlyrSupportGate.fromJson(Map<String, dynamic> json) =>
-      _$PlyrSupportGateFromJson(json);
-}
-
-@freezed
-abstract class PlyrFeaturedArtist with _$PlyrFeaturedArtist {
-  @JsonSerializable(explicitToJson: true)
-  const factory PlyrFeaturedArtist({
-    required String did,
-    String? handle,
-    String? displayName,
-  }) = _PlyrFeaturedArtist;
-
-  factory PlyrFeaturedArtist.fromJson(Map<String, dynamic> json) =>
-      _$PlyrFeaturedArtistFromJson(json);
+extension StoryRecordConvenience on StoryRecord {
+  List<StoryEmbed> get localEmbeds =>
+      embeds
+          ?.map(
+            (embed) => switch (embed) {
+              sprk_embed_defs.UEmbedsEmbedMention(:final data) => data,
+              _ => null,
+            },
+          )
+          .whereType<StoryEmbed>()
+          .toList() ??
+      const [];
 }
 
 /// Skeleton of a ReplyRef. Needs to be hydrated.
diff --git a/lib/src/core/network/atproto/data/models/record_write_adapters.dart b/lib/src/core/network/atproto/data/models/record_write_adapters.dart
new file mode 100644
index 00000000..fb14127c
--- /dev/null
+++ b/lib/src/core/network/atproto/data/models/record_write_adapters.dart
@@ -0,0 +1,157 @@
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart'
+    as local;
+import 'package:spark/src/core/network/atproto/data/models/models.dart'
+    as local;
+import 'package:sprk_poptart/so/sprk/feed/post.dart' as sprk_post;
+import 'package:sprk_poptart/so/sprk/feed/reply.dart' as sprk_reply;
+import 'package:sprk_poptart/so/sprk/embed/defs.dart' as sprk_embed_defs;
+
+import 'package:sprk_poptart/so/sprk/media/image.dart' as sprk_image;
+import 'package:sprk_poptart/so/sprk/media/images.dart' as sprk_images;
+import 'package:sprk_poptart/so/sprk/media/video.dart' as sprk_video;
+import 'package:sprk_poptart/so/sprk/richtext/facet.dart' as sprk_facet;
+import 'package:sprk_poptart/so/sprk/story/post.dart' as sprk_story;
+
+sprk_post.FeedPostRecord sprkPostRecordFromLocal(local.PostRecord record) {
+  final media = record.media;
+  if (media == null) {
+    throw ArgumentError('Spark feed posts require media');
+  }
+
+  return sprk_post.FeedPostRecord(
+    caption: _sprkCaptionRef(record.caption),
+    media: _sprkPostMedia(media),
+    sound: record.sound,
+    langs: record.langs,
+    labels: _sprkPostLabels(record.selfLabels),
+    tags: record.tags,
+    crossposts: record.crossposts,
+    createdAt: record.createdAt ?? DateTime.now().toUtc(),
+  );
+}
+
+sprk_reply.FeedReplyRecord sprkReplyRecordFromLocal(local.ReplyRecord record) {
+  return sprk_reply.FeedReplyRecord(
+    text: record.caption.text,
+    facets: _sprkFacets(record.caption.facets),
+    reply: sprk_reply.ReplyRef(
+      root: record.reply.root,
+      parent: record.reply.parent,
+    ),
+    media: record.media == null ? null : _sprkReplyMedia(record.media!),
+    langs: record.langs,
+    labels: _sprkReplyLabels(record.labels),
+    createdAt: record.createdAt ?? DateTime.now().toUtc(),
+  );
+}
+
+sprk_story.StoryPostRecord sprkStoryRecordFromLocal({
+  required local.Media media,
+  required DateTime createdAt,
+  RepoStrongRef? sound,
+  List<SelfLabel>? labels,
+  List<local.StoryEmbed>? embeds,
+}) {
+  return sprk_story.StoryPostRecord(
+    media: _sprkStoryMedia(media),
+    sound: sound,
+    embeds: _sprkStoryEmbeds(embeds),
+    labels: _sprkStoryLabels(labels),
+    createdAt: createdAt,
+  );
+}
+
+sprk_post.CaptionRef _sprkCaptionRef(local.CaptionRef caption) {
+  return sprk_post.CaptionRef(
+    text: caption.text,
+    facets: _sprkFacets(caption.facets),
+  );
+}
+
+List<sprk_facet.RichtextFacet>? _sprkFacets(List<local.Facet> facets) {
+  if (facets.isEmpty) return null;
+  return facets
+      .map((facet) => sprk_facet.RichtextFacet.fromJson(facet.toJson()))
+      .toList();
+}
+
+sprk_post.UFeedPostMedia _sprkPostMedia(local.Media media) {
+  return switch (media) {
+    local.MediaVideo(:final video, :final alt) =>
+      sprk_post.UFeedPostMedia.mediaVideo(
+        data: sprk_video.MediaVideo(video: video, alt: alt),
+      ),
+    local.MediaImages(:final images) => sprk_post.UFeedPostMedia.mediaImages(
+      data: sprk_images.MediaImages(
+        images: images.map(_sprkMediaImage).toList(),
+      ),
+    ),
+    local.MediaImage(:final image, :final alt) =>
+      sprk_post.UFeedPostMedia.mediaImages(
+        data: sprk_images.MediaImages(
+          images: [sprk_image.MediaImage(image: image, alt: alt ?? '')],
+        ),
+      ),
+    _ => sprk_post.UFeedPostMedia.unknown(data: media.toJson()),
+  };
+}
+
+sprk_reply.UFeedReplyMedia _sprkReplyMedia(local.Media media) {
+  return switch (media) {
+    local.MediaImage(:final image, :final alt) =>
+      sprk_reply.UFeedReplyMedia.mediaImage(
+        data: sprk_image.MediaImage(image: image, alt: alt ?? ''),
+      ),
+    _ => sprk_reply.UFeedReplyMedia.unknown(data: media.toJson()),
+  };
+}
+
+sprk_story.UStoryPostMedia _sprkStoryMedia(local.Media media) {
+  return switch (media) {
+    local.MediaImage(:final image, :final alt) =>
+      sprk_story.UStoryPostMedia.mediaImage(
+        data: sprk_image.MediaImage(image: image, alt: alt ?? ''),
+      ),
+    local.MediaVideo(:final video, :final alt) =>
+      sprk_story.UStoryPostMedia.mediaVideo(
+        data: sprk_video.MediaVideo(video: video, alt: alt),
+      ),
+    _ => sprk_story.UStoryPostMedia.unknown(data: media.toJson()),
+  };
+}
+
+sprk_image.MediaImage _sprkMediaImage(local.Image image) {
+  return sprk_image.MediaImage(image: image.image, alt: image.alt ?? '');
+}
+
+sprk_post.UFeedPostLabels? _sprkPostLabels(List<SelfLabel>? labels) {
+  if (labels == null || labels.isEmpty) return null;
+  return sprk_post.UFeedPostLabels.selfLabels(data: SelfLabels(values: labels));
+}
+
+sprk_reply.UFeedReplyLabels? _sprkReplyLabels(List<SelfLabel>? labels) {
+  if (labels == null || labels.isEmpty) return null;
+  return sprk_reply.UFeedReplyLabels.selfLabels(
+    data: SelfLabels(values: labels),
+  );
+}
+
+sprk_story.UStoryPostLabels? _sprkStoryLabels(List<SelfLabel>? labels) {
+  if (labels == null || labels.isEmpty) return null;
+  return sprk_story.UStoryPostLabels.selfLabels(
+    data: SelfLabels(values: labels),
+  );
+}
+
+List<sprk_embed_defs.UEmbeds>? _sprkStoryEmbeds(
+  List<local.StoryEmbed>? embeds,
+) {
+  if (embeds == null || embeds.isEmpty) return null;
+  return embeds.map(_sprkStoryEmbed).toList();
+}
+
+sprk_embed_defs.UEmbeds _sprkStoryEmbed(local.StoryEmbed embed) {
+  return sprk_embed_defs.UEmbeds.embedMention(data: embed);
+}
diff --git a/lib/src/core/network/atproto/data/models/sound_models.dart b/lib/src/core/network/atproto/data/models/sound_models.dart
index 4f1f80fc..ecac84d2 100644
--- a/lib/src/core/network/atproto/data/models/sound_models.dart
+++ b/lib/src/core/network/atproto/data/models/sound_models.dart
@@ -1,100 +1,46 @@
-import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:poptart/poptart.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
-import 'package:spark/src/core/utils/uri_converter.dart';
-
-part 'sound_models.freezed.dart';
-part 'sound_models.g.dart';
-
-Record _soundRecordFromJson(dynamic json) {
-  if (json is! Map<String, dynamic>) {
-    throw Exception(
-      'Expected Map<String, dynamic> but got ${json.runtimeType}',
-    );
+import 'package:spark/src/core/network/atproto/data/models/record_models.dart';
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_details.dart';
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_view.dart'
+    as sprk_audio_view;
+import 'package:sprk_poptart/so/sprk/sound/get_audio_posts/output.dart'
+    as sprk_audio_posts;
+import 'package:sprk_poptart/so/sprk/sound/get_trending_audios/output.dart'
+    as sprk_trending_audios;
+import 'package:sprk_poptart/so/sprk/sound/search_audios/output.dart'
+    as sprk_search_audios;
+
+typedef AudioView = sprk_audio_view.AudioView;
+typedef AudioPostsResponse = sprk_audio_posts.SoundGetAudioPostsOutput;
+typedef TrendingAudiosResponse =
+    sprk_trending_audios.SoundGetTrendingAudiosOutput;
+typedef SearchAudiosResponse = sprk_search_audios.SoundSearchAudiosOutput;
+
+extension AudioViewRecordParsing on AudioView {
+  Object? get localRecord {
+    final type = record[r'$type'] as String?;
+    final isPlyrTrack =
+        type == 'fm.plyr.track' ||
+        (type == null && record.containsKey('fileType'));
+    final jsonWithType = record.containsKey(r'$type')
+        ? record
+        : {
+            ...record,
+            r'$type': isPlyrTrack ? 'fm.plyr.track' : 'so.sprk.sound.audio',
+          };
+
+    try {
+      if (isPlyrTrack) {
+        return PlyrTrackRecord.fromJson(jsonWithType);
+      }
+      if (jsonWithType[r'$type'] == 'so.sprk.sound.audio') {
+        return AudioRecord.fromJson(jsonWithType);
+      }
+      return Record.fromJson(jsonWithType);
+    } catch (_) {
+      return null;
+    }
   }
-
-  final jsonWithType = json.containsKey(r'$type')
-      ? json
-      : {
-          ...json,
-          r'$type': json.containsKey('fileType')
-              ? 'fm.plyr.track'
-              : 'so.sprk.sound.audio',
-        };
-
-  return Record.fromJson(jsonWithType);
-}
-
-Map<String, dynamic> _soundRecordToJson(Record record) => record.toJson();
-
-@freezed
-abstract class AudioDetails with _$AudioDetails {
-  @JsonSerializable(explicitToJson: true)
-  const factory AudioDetails({String? artist, String? title}) = _AudioDetails;
-
-  factory AudioDetails.fromJson(Map<String, dynamic> json) =>
-      _$AudioDetailsFromJson(json);
-}
-
-@freezed
-abstract class AudioView with _$AudioView {
-  @JsonSerializable(explicitToJson: true)
-  const factory AudioView({
-    @AtUriConverter() required AtUri uri,
-    required String cid,
-    required ProfileViewBasic author,
-    @JsonKey(fromJson: _soundRecordFromJson, toJson: _soundRecordToJson)
-    required Record record,
-    required String title,
-    @UriConverter() required Uri coverArt,
-    required DateTime indexedAt,
-    @UriConverter() Uri? audio,
-    @Default(0) int useCount,
-    AudioDetails? details,
-    @Default([]) List<Label> labels,
-  }) = _AudioView;
-  const AudioView._();
-
-  factory AudioView.fromJson(Map<String, dynamic> json) =>
-      _$AudioViewFromJson(json);
-}
-
-@freezed
-abstract class AudioPostsResponse with _$AudioPostsResponse {
-  @JsonSerializable(explicitToJson: true)
-  const factory AudioPostsResponse({
-    required List<PostView> posts,
-    required AudioView audio,
-    String? cursor,
-  }) = _AudioPostsResponse;
-
-  factory AudioPostsResponse.fromJson(Map<String, dynamic> json) =>
-      _$AudioPostsResponseFromJson(json);
-}
-
-@freezed
-abstract class TrendingAudiosResponse with _$TrendingAudiosResponse {
-  @JsonSerializable(explicitToJson: true)
-  const factory TrendingAudiosResponse({
-    required List<AudioView> audios,
-    String? cursor,
-  }) = _TrendingAudiosResponse;
-
-  factory TrendingAudiosResponse.fromJson(Map<String, dynamic> json) =>
-      _$TrendingAudiosResponseFromJson(json);
-}
-
-@freezed
-abstract class SearchAudiosResponse with _$SearchAudiosResponse {
-  @JsonSerializable(explicitToJson: true)
-  const factory SearchAudiosResponse({
-    required List<AudioView> audios,
-    String? cursor,
-  }) = _SearchAudiosResponse;
-
-  factory SearchAudiosResponse.fromJson(Map<String, dynamic> json) =>
-      _$SearchAudiosResponseFromJson(json);
 }
 
 class VideoUploadResult {
diff --git a/lib/src/core/network/atproto/data/models/story_embed_models.dart b/lib/src/core/network/atproto/data/models/story_embed_models.dart
index 36c7a54b..3293362c 100644
--- a/lib/src/core/network/atproto/data/models/story_embed_models.dart
+++ b/lib/src/core/network/atproto/data/models/story_embed_models.dart
@@ -1,11 +1,13 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/embed/defs.dart' as sprk_embed_defs;
+import 'package:sprk_poptart/so/sprk/embed/mention.dart' as sprk_mention;
 
-part 'story_embed_models.freezed.dart';
-part 'story_embed_models.g.dart';
-
-const _storyMentionEmbedType = 'so.sprk.embed.mention';
-const _storyMentionEmbedViewType = 'so.sprk.embed.mention#view';
+typedef StoryEmbedFrame = sprk_embed_defs.Frame;
+typedef StoryEmbedMediaRef = sprk_embed_defs.MediaRef;
+typedef StoryEmbedPlacement = sprk_embed_defs.Placement;
+typedef StoryEmbed = sprk_mention.EmbedMention;
+typedef StoryMentionEmbed = sprk_mention.EmbedMention;
+typedef StoryEmbedView = sprk_mention.EmbedMentionView;
+typedef StoryMentionEmbedView = sprk_mention.EmbedMentionView;
 
 List<StoryEmbed> storyEmbedsFromJson(dynamic json) {
   if (json is! List<dynamic>) {
@@ -19,7 +21,7 @@ List<StoryEmbed> storyEmbedsFromJson(dynamic json) {
     }
 
     try {
-      embeds.add(_storyEmbedFromJson(item));
+      embeds.add(StoryEmbed.fromJson(item));
     } catch (_) {
       continue;
     }
@@ -33,143 +35,5 @@ List<Map<String, dynamic>>? storyEmbedsToJson(List<StoryEmbed>? embeds) {
     return null;
   }
 
-  return embeds.map(_storyEmbedToJson).toList();
-}
-
-List<StoryEmbedView> storyEmbedViewsFromJson(dynamic json) {
-  if (json is! List<dynamic>) {
-    return const [];
-  }
-
-  final embeds = <StoryEmbedView>[];
-  for (final item in json) {
-    if (item is! Map<String, dynamic>) {
-      continue;
-    }
-
-    try {
-      embeds.add(_storyEmbedViewFromJson(item));
-    } catch (_) {
-      continue;
-    }
-  }
-
-  return embeds;
-}
-
-List<Map<String, dynamic>>? storyEmbedViewsToJson(
-  List<StoryEmbedView>? embeds,
-) {
-  if (embeds == null || embeds.isEmpty) {
-    return null;
-  }
-
-  return embeds.map(_storyEmbedViewToJson).toList();
-}
-
-StoryEmbed _storyEmbedFromJson(Map<String, dynamic> json) {
-  final type = json[r'$type'] as String?;
-  if (type == null || type == _storyMentionEmbedType) {
-    return StoryEmbed.fromJson(json);
-  }
-
-  throw FormatException('Unsupported story embed type: $type');
-}
-
-Map<String, dynamic> _storyEmbedToJson(StoryEmbed embed) {
-  return embed.map(
-    mention: (value) => <String, dynamic>{
-      r'$type': _storyMentionEmbedType,
-      ...value.toJson(),
-    },
-  );
-}
-
-StoryEmbedView _storyEmbedViewFromJson(Map<String, dynamic> json) {
-  final type = json[r'$type'] as String?;
-  if (type == null || type == _storyMentionEmbedViewType) {
-    return StoryEmbedView.fromJson(json);
-  }
-
-  throw FormatException('Unsupported story embed view type: $type');
-}
-
-Map<String, dynamic> _storyEmbedViewToJson(StoryEmbedView embed) {
-  return embed.map(
-    mention: (value) => <String, dynamic>{
-      r'$type': _storyMentionEmbedViewType,
-      ...value.toJson(),
-    },
-  );
-}
-
-@freezed
-abstract class StoryEmbedFrame with _$StoryEmbedFrame {
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryEmbedFrame({
-    required int x,
-    required int y,
-    required int w,
-    required int h,
-  }) = _StoryEmbedFrame;
-  const StoryEmbedFrame._();
-
-  factory StoryEmbedFrame.fromJson(Map<String, dynamic> json) =>
-      _$StoryEmbedFrameFromJson(json);
-}
-
-@freezed
-abstract class StoryEmbedMediaRef with _$StoryEmbedMediaRef {
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryEmbedMediaRef({required int index}) = _StoryEmbedMediaRef;
-  const StoryEmbedMediaRef._();
-
-  factory StoryEmbedMediaRef.fromJson(Map<String, dynamic> json) =>
-      _$StoryEmbedMediaRefFromJson(json);
-}
-
-@freezed
-abstract class StoryEmbedPlacement with _$StoryEmbedPlacement {
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryEmbedPlacement({
-    required StoryEmbedFrame frame,
-    StoryEmbedMediaRef? mediaRef,
-    int? zIndex,
-    int? rotation,
-  }) = _StoryEmbedPlacement;
-  const StoryEmbedPlacement._();
-
-  factory StoryEmbedPlacement.fromJson(Map<String, dynamic> json) =>
-      _$StoryEmbedPlacementFromJson(json);
-}
-
-@Freezed(unionKey: r'$type')
-sealed class StoryEmbed with _$StoryEmbed {
-  const StoryEmbed._();
-
-  @FreezedUnionValue(_storyMentionEmbedType)
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryEmbed.mention({
-    required StoryEmbedPlacement placement,
-    required String did,
-  }) = StoryMentionEmbed;
-
-  factory StoryEmbed.fromJson(Map<String, dynamic> json) =>
-      _$StoryEmbedFromJson(json);
-}
-
-@Freezed(unionKey: r'$type')
-sealed class StoryEmbedView with _$StoryEmbedView {
-  const StoryEmbedView._();
-
-  @FreezedUnionValue(_storyMentionEmbedViewType)
-  @JsonSerializable(explicitToJson: true)
-  const factory StoryEmbedView.mention({
-    required StoryEmbedPlacement placement,
-    required String did,
-    ProfileViewBasic? actor,
-  }) = StoryMentionEmbedView;
-
-  factory StoryEmbedView.fromJson(Map<String, dynamic> json) =>
-      _$StoryEmbedViewFromJson(json);
+  return embeds.map((embed) => embed.toJson()).toList();
 }
diff --git a/lib/src/core/network/atproto/data/repositories/actor_repository.dart b/lib/src/core/network/atproto/data/repositories/actor_repository.dart
index a3521b28..b8701b40 100644
--- a/lib/src/core/network/atproto/data/repositories/actor_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/actor_repository.dart
@@ -1,5 +1,7 @@
 import 'package:poptart/poptart.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+import 'package:sprk_poptart/so/sprk/actor/search_actors/output.dart';
+import 'package:sprk_poptart/so/sprk/actor/search_actors_typeahead/output.dart';
 
 /// Interface for Actor-related API endpoints
 abstract class ActorRepository {
@@ -21,13 +23,13 @@ abstract class ActorRepository {
   /// Search actors by query string.
   ///
   /// [query] The search query.
-  Future<SearchActorsResponse> searchActors(String query, {String? cursor});
+  Future<ActorSearchActorsOutput> searchActors(String query, {String? cursor});
 
   /// Search actor suggestions by query prefix.
   ///
   /// [query] The search query prefix.
   /// [limit] Maximum number of suggestions to return.
-  Future<SearchActorsTypeaheadResponse> searchActorsTypeahead(
+  Future<ActorSearchActorsTypeaheadOutput> searchActorsTypeahead(
     String query, {
     int limit = 10,
   });
diff --git a/lib/src/core/network/atproto/data/repositories/actor_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/actor_repository_impl.dart
index ca47bd52..6b666d18 100644
--- a/lib/src/core/network/atproto/data/repositories/actor_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/actor_repository_impl.dart
@@ -8,11 +8,18 @@ import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
 import 'package:spark/src/core/config/app_config.dart';
 import 'package:spark/src/core/network/atproto/data/adapters/bsky/actor_adapter.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_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';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+import 'package:sprk_poptart/so/sprk/actor/get_profile.dart'
+    as sprk_get_profile;
+import 'package:sprk_poptart/so/sprk/actor/get_profiles.dart'
+    as sprk_get_profiles;
+import 'package:sprk_poptart/so/sprk/actor/profile.dart' as sprk_profile;
+import 'package:sprk_poptart/so/sprk/actor/search_actors.dart';
+import 'package:sprk_poptart/so/sprk/actor/search_actors_typeahead.dart';
 
 /// Actor-related API endpoints implementation
 class ActorRepositoryImpl implements ActorRepository {
@@ -58,21 +65,18 @@ class ActorRepositoryImpl implements ActorRepository {
       }
 
       // Use Spark API (no fallback)
-      final result = await atproto.get(
-        NSID.parse('so.sprk.actor.getProfile'),
-        parameters: {'actor': did},
+      final result = await atproto.call(
+        sprk_get_profile.soSprkActorGetProfile,
+        parameters: sprk_get_profile.ActorGetProfileInput(actor: did),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
       _logger.d('Profile retrieved successfully from Spark');
-      return ProfileViewDetailed.fromJson(result.data as Map<String, dynamic>);
+      return result.data;
     });
   }
 
   @override
-  Future<SearchActorsResponse> searchActors(
+  Future<ActorSearchActorsOutput> searchActors(
     String query, {
     String? cursor,
   }) async {
@@ -94,31 +98,19 @@ class ActorRepositoryImpl implements ActorRepository {
         parameters['cursor'] = cursor;
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.actor.searchActors'),
-        parameters: parameters,
+      final result = await atproto.call(
+        soSprkActorSearchActors,
+        parameters: ActorSearchActorsInput(q: query, cursor: cursor),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
       _logger.d('Actor search completed successfully');
-
-      final data = result.data as Map<String, dynamic>;
-      final actorsJson = (data['actors'] as List? ?? []).cast<dynamic>();
-      final cursorNext = data['cursor'] as String?;
-
-      final actors = actorsJson
-          .map((e) => ProfileView.fromJson(e as Map<String, dynamic>))
-          .toList();
-
-      return SearchActorsResponse(actors: actors, cursor: cursorNext);
+      return result.data;
     });
   }
 
   @override
-  Future<SearchActorsTypeaheadResponse> searchActorsTypeahead(
+  Future<ActorSearchActorsTypeaheadOutput> searchActorsTypeahead(
     String query, {
     int limit = 10,
   }) async {
@@ -130,57 +122,39 @@ class ActorRepositoryImpl implements ActorRepository {
         return _searchActorsTypeaheadFromAppView(query, limit: clampedLimit);
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.actor.searchActorsTypeahead'),
-        parameters: {'q': query, 'limit': clampedLimit.toString()},
+      final result = await atproto.call(
+        soSprkActorSearchActorsTypeahead,
+        parameters: ActorSearchActorsTypeaheadInput(
+          q: query,
+          limit: clampedLimit,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
       _logger.d('Actor typeahead search completed successfully');
 
-      return SearchActorsTypeaheadResponse.fromJson(
-        result.data as Map<String, dynamic>,
-      );
+      return result.data;
     });
   }
 
-  Future<SearchActorsTypeaheadResponse> _searchActorsTypeaheadFromAppView(
+  Future<ActorSearchActorsTypeaheadOutput> _searchActorsTypeaheadFromAppView(
     String query, {
     required int limit,
   }) async {
-    final uri = _appViewXrpcUri(
-      'so.sprk.actor.searchActorsTypeahead',
-      queryParameters: {'q': query, 'limit': limit.toString()},
+    final baseUri = Uri.parse(AppConfig.appViewUrl);
+    final client = XRPCClient(
+      protocol: baseUri.scheme == 'http' ? Protocol.http : Protocol.https,
+      service: baseUri.hasPort
+          ? '${baseUri.host}:${baseUri.port}'
+          : baseUri.host,
     );
-    final response = await http.get(uri);
 
-    if (response.statusCode != 200) {
-      throw Exception(
-        'Actor typeahead failed with status ${response.statusCode}',
-      );
-    }
-
-    return SearchActorsTypeaheadResponse.fromJson(
-      jsonDecode(response.body) as Map<String, dynamic>,
+    final response = await client.call(
+      soSprkActorSearchActorsTypeahead,
+      parameters: ActorSearchActorsTypeaheadInput(q: query, limit: limit),
     );
-  }
-
-  Uri _appViewXrpcUri(
-    String nsid, {
-    required Map<String, String> queryParameters,
-  }) {
-    final baseUri = Uri.parse(AppConfig.appViewUrl);
-    final basePath = baseUri.path.endsWith('/')
-        ? baseUri.path.substring(0, baseUri.path.length - 1)
-        : baseUri.path;
 
-    return baseUri.replace(
-      path: '$basePath/xrpc/$nsid',
-      queryParameters: queryParameters,
-    );
+    return response.data;
   }
 
   @override
@@ -193,7 +167,7 @@ class ActorRepositoryImpl implements ActorRepository {
       throw Exception('Not authenticated');
     }
 
-    final record = ProfileRecord(
+    final record = sprk_profile.ActorProfileRecord(
       displayName: displayName,
       description: description,
       avatar: avatar,
@@ -286,21 +260,13 @@ class ActorRepositoryImpl implements ActorRepository {
       }
 
       // Use Spark API (no fallback)
-      final result = await atproto.get(
-        NSID.parse('so.sprk.actor.getProfiles'),
-        parameters: {'actors': dids},
+      final result = await atproto.call(
+        sprk_get_profiles.soSprkActorGetProfiles,
+        parameters: sprk_get_profiles.ActorGetProfilesInput(actors: dids),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
       _logger.d('Profiles retrieved successfully from Spark');
-      return (result.data['profiles']! as List)
-          .map(
-            (json) =>
-                ProfileViewDetailed.fromJson(json as Map<String, dynamic>),
-          )
-          .toList();
+      return result.data.profiles;
     });
   }
 }
diff --git a/lib/src/core/network/atproto/data/repositories/feed_repository.dart b/lib/src/core/network/atproto/data/repositories/feed_repository.dart
index eba6f45e..4b21c317 100644
--- a/lib/src/core/network/atproto/data/repositories/feed_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/feed_repository.dart
@@ -2,7 +2,9 @@ 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:image_picker/image_picker.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';
 
 /// Interface for Feed-related API endpoints
 abstract class FeedRepository {
diff --git a/lib/src/core/network/atproto/data/repositories/feed_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/feed_repository_impl.dart
index b0c93cf6..6fca3ac9 100644
--- a/lib/src/core/network/atproto/data/repositories/feed_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/feed_repository_impl.dart
@@ -5,12 +5,24 @@ import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:poptart_lex/com/atproto/label/query_labels.dart'
+    as label_query_labels;
 import 'package:bluesky_poptart/app/bsky/feed/get_author_feed.dart'
     as bsky_feed_get_author_feed;
+import 'package:bluesky_poptart/app/bsky/feed/get_feed.dart'
+    as bsky_feed_get_feed;
+import 'package:bluesky_poptart/app/bsky/feed/get_feed_generator.dart'
+    as bsky_feed_get_feed_generator;
+import 'package:bluesky_poptart/app/bsky/feed/get_feed_generators.dart'
+    as bsky_feed_get_feed_generators;
 import 'package:bluesky_poptart/app/bsky/feed/get_posts.dart'
     as bsky_feed_get_posts;
 import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart'
     as bsky_feed_get_post_thread;
+import 'package:bluesky_poptart/app/bsky/feed/get_suggested_feeds.dart'
+    as bsky_feed_get_suggested_feeds;
+import 'package:bluesky_poptart/app/bsky/feed/like.dart' as bsky_like;
+import 'package:bluesky_poptart/app/bsky/feed/repost.dart' as bsky_repost;
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart_lex/com/atproto/repo/upload_blob.dart'
     as repo_upload_blob;
@@ -26,7 +38,10 @@ import 'package:image_picker/image_picker.dart';
 import 'package:path/path.dart' as path;
 import 'package:spark/src/core/config/app_config.dart';
 import 'package:spark/src/core/network/atproto/data/adapters/bsky/feed_adapter.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/models/record_write_adapters.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/bluesky_crosspost_text.dart';
@@ -34,6 +49,31 @@ import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 import 'package:spark/src/core/utils/share_urls.dart';
 import 'package:spark/src/core/utils/video_upload_exception.dart';
+import 'package:sprk_poptart/so/sprk/feed/like.dart' as sprk_like;
+import 'package:sprk_poptart/so/sprk/feed/get_author_feed.dart'
+    as sprk_get_author_feed;
+import 'package:sprk_poptart/so/sprk/feed/get_actor_likes.dart'
+    as sprk_get_actor_likes;
+import 'package:sprk_poptart/so/sprk/feed/get_actor_reposts.dart'
+    as sprk_get_actor_reposts;
+import 'package:sprk_poptart/so/sprk/feed/get_crosspost_thread.dart'
+    as sprk_get_crosspost_thread;
+import 'package:sprk_poptart/so/sprk/feed/get_feed.dart' as sprk_get_feed;
+import 'package:sprk_poptart/so/sprk/feed/get_feed_generator.dart'
+    as sprk_get_feed_generator;
+import 'package:sprk_poptart/so/sprk/feed/get_feed_generators.dart'
+    as sprk_get_feed_generators;
+import 'package:sprk_poptart/so/sprk/feed/get_posts.dart' as sprk_get_posts;
+import 'package:sprk_poptart/so/sprk/feed/get_post_thread.dart'
+    as sprk_get_post_thread;
+import 'package:sprk_poptart/so/sprk/feed/get_suggested_feeds.dart'
+    as sprk_get_suggested_feeds;
+import 'package:sprk_poptart/so/sprk/feed/get_timeline.dart'
+    as sprk_get_timeline;
+import 'package:sprk_poptart/so/sprk/feed/repost.dart' as sprk_repost;
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_details.dart';
+import 'package:sprk_poptart/so/sprk/feed/search_posts.dart'
+    as sprk_search_posts;
 
 /// Implementation of Feed-related API endpoints
 class FeedRepositoryImpl implements FeedRepository {
@@ -55,10 +95,7 @@ class FeedRepositoryImpl implements FeedRepository {
   bool _postViewHasMedia(PostView post) => post.hasSupportedMedia;
 
   bool _feedViewPostHasMedia(FeedViewPost feedViewPost) {
-    return feedViewPost.map(
-      post: (p) => p.post.hasSupportedMedia,
-      reply: (r) => r.reply.media != null,
-    );
+    return feedViewPost.localPost.hasSupportedMedia;
   }
 
   AtUri _getPostViewUri(PostView post) => post.uri;
@@ -202,36 +239,32 @@ class FeedRepositoryImpl implements FeedRepository {
       final headers = <String, String>{'atproto-proxy': _client.sprkDid};
       // Note: labeler header could be added here if needed for getPosts
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.feed.getPosts'),
-        parameters: {'uris': uris},
+      final result = await atproto.call(
+        sprk_get_posts.soSprkFeedGetPosts,
+        parameters: sprk_get_posts.FeedGetPostsInput(uris: uris),
         headers: headers,
-        to: (jsonMap) {
-          final posts = jsonMap['posts']! as List<dynamic>;
-          _logger.d(
-            'Raw API response for first post: '
-            '${posts.isNotEmpty ? posts[0] : "empty"}',
-          );
-          return _parseAndFilterPosts<PostView>(
-            rawPosts: posts,
-            fromJson: PostView.fromJson,
-            hasMedia: _postViewHasMedia,
-            getUri: _getPostViewUri,
-            source: 'sprk',
-          );
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
-      _logger.d('Posts retrieved successfully: ${result.data.length} posts');
-      if (result.data.isNotEmpty) {
+      final posts = result.data.toJson()['posts']! as List<dynamic>;
+      _logger.d(
+        'Raw API response for first post: '
+        '${posts.isNotEmpty ? posts[0] : "empty"}',
+      );
+      final parsedPosts = _parseAndFilterPosts<PostView>(
+        rawPosts: posts,
+        fromJson: PostView.fromJson,
+        hasMedia: _postViewHasMedia,
+        getUri: _getPostViewUri,
+        source: 'sprk',
+      );
+      _logger.d('Posts retrieved successfully: ${parsedPosts.length} posts');
+      if (parsedPosts.isNotEmpty) {
         _logger.d(
-          'First post replyCount: ${result.data.first.replyCount}, '
-          'likeCount: ${result.data.first.likeCount}',
+          'First post replyCount: ${parsedPosts.first.replyCount}, '
+          'likeCount: ${parsedPosts.first.likeCount}',
         );
       }
 
-      return result.data;
+      return parsedPosts;
     });
   }
 
@@ -284,41 +317,33 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final parameters = <String, dynamic>{
-        'actor': actorUri.hostname,
-        'limit': limit,
-      };
-
-      if (videosOnly) {
-        parameters['filter'] = 'posts_with_video';
-      }
-
-      if (cursor != null) {
-        parameters['cursor'] = cursor;
-      }
-
       try {
-        final result = await atproto.get(
-          NSID.parse('so.sprk.feed.getAuthorFeed'),
-          parameters: parameters,
+        final result = await atproto.call(
+          sprk_get_author_feed.soSprkFeedGetAuthorFeed,
+          parameters: sprk_get_author_feed.FeedGetAuthorFeedInput(
+            actor: actorUri.hostname,
+            limit: limit,
+            cursor: cursor,
+            filter: videosOnly
+                ? sprk_get_author_feed.FeedGetAuthorFeedFilter.valueOf(
+                    'posts_with_video',
+                  )
+                : null,
+          ),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) {
-            final rawFeed = jsonMap['feed']! as List<dynamic>;
-            final feedPosts = _parseAndFilterPosts<FeedViewPost>(
-              rawPosts: rawFeed,
-              fromJson: FeedViewPost.fromJson,
-              hasMedia: _feedViewPostHasMedia,
-              getUri: _getFeedViewPostUri,
-              source: 'sprk author feed',
-            );
-            return (posts: feedPosts, cursor: jsonMap['cursor'] as String?);
-          },
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
+        );
+        final output = result.data;
+        final outputJson = output.toJson();
+        final rawFeed = outputJson['feed']! as List<dynamic>;
+        final feedPosts = _parseAndFilterPosts<FeedViewPost>(
+          rawPosts: rawFeed,
+          fromJson: FeedViewPost.fromJson,
+          hasMedia: _feedViewPostHasMedia,
+          getUri: _getFeedViewPostUri,
+          source: 'sprk author feed',
         );
         _logger.d('Author feed retrieved successfully from Sprk');
-        return result.data;
+        return (posts: feedPosts, cursor: output.cursor);
       } catch (e) {
         _logger.e(
           'Error getting author feed from Sprk. Trying Bsky...',
@@ -399,67 +424,51 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final parameters = <String, dynamic>{'limit': limit};
-      if (cursor != null) {
-        parameters['cursor'] = cursor;
-      }
-
       final headers = <String, String>{'atproto-proxy': _client.sprkDid};
       if (labelerDids != null && labelerDids.isNotEmpty) {
         headers['atproto-accept-labelers'] = _formatLabelerHeader(labelerDids);
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.feed.getTimeline'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_timeline.soSprkFeedGetTimeline,
+        parameters: sprk_get_timeline.FeedGetTimelineInput(
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: headers,
-        to: (jsonMap) {
-          if (!jsonMap.containsKey('feed')) {
-            return const FeedView(feed: []);
-          }
+      );
+      final output = result.data;
+      final feedData = output.toJson()['feed'] as List<dynamic>;
 
-          final feedData = jsonMap['feed'] as List<dynamic>?;
-          if (feedData == null) {
-            return const FeedView(feed: []);
-          }
+      final feedPosts = <FeedViewPost>[];
+      for (final item in feedData) {
+        try {
+          final itemMap = item as Map<String, dynamic>;
 
-          final feedPosts = <FeedViewPost>[];
-          for (final item in feedData) {
-            try {
-              final itemMap = item as Map<String, dynamic>;
-
-              // Response has 'post' object containing fully hydrated post view
-              final postMap = itemMap['post'] as Map<String, dynamic>?;
-              if (postMap == null) {
-                continue;
-              }
-              final postView = PostView.fromJson(postMap);
-
-              // Create FeedViewPost.post variant (not a reply)
-              final feedViewPost = FeedViewPost.post(post: postView);
-              feedPosts.add(feedViewPost);
-            } catch (e, stackTrace) {
-              _logger.w(
-                'Failed to parse timeline feed item, skipping: $e',
-                stackTrace: stackTrace,
-              );
-            }
+          // Response has 'post' object containing fully hydrated post view
+          final postMap = itemMap['post'] as Map<String, dynamic>?;
+          if (postMap == null) {
+            continue;
           }
+          final postView = PostView.fromJson(postMap);
 
-          return FeedView(
-            feed: feedPosts,
-            cursor: jsonMap['cursor'] as String?,
+          final feedViewPost = feedViewPostFromPost(postView);
+          feedPosts.add(feedViewPost);
+        } catch (e, stackTrace) {
+          _logger.w(
+            'Failed to parse timeline feed item, skipping: $e',
+            stackTrace: stackTrace,
           );
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
-      );
+        }
+      }
+
+      final feedView = FeedView(feed: feedPosts, cursor: output.cursor);
 
       _logger.d(
         'Timeline feed retrieved successfully: '
-        '${result.data.feed.length} posts',
+        '${feedView.feed.length} posts',
       );
-      return result.data;
+      return feedView;
     });
   }
 
@@ -486,14 +495,6 @@ class FeedRepositoryImpl implements FeedRepository {
       final isBskyFeed =
           feedUri.collection == NSID.parse('app.bsky.feed.generator');
 
-      final parameters = <String, dynamic>{
-        'feed': feedUri.toString(),
-        'limit': limit,
-      };
-      if (cursor != null) {
-        parameters['cursor'] = cursor;
-      }
-
       final headers = <String, String>{
         'atproto-proxy': isBskyFeed ? _client.bskyDid : _client.sprkDid,
       };
@@ -501,66 +502,59 @@ class FeedRepositoryImpl implements FeedRepository {
         headers['atproto-accept-labelers'] = _formatLabelerHeader(labelerDids);
       }
 
-      final result = await atproto.get(
-        isBskyFeed
-            ? NSID.parse('app.bsky.feed.getFeed')
-            : NSID.parse('so.sprk.feed.getFeed'),
-        parameters: parameters,
-        headers: headers,
-        to: (jsonMap) {
-          if (!jsonMap.containsKey('feed')) {
-            return const FeedView(feed: []);
-          }
-
-          final feedData = jsonMap['feed'] as List<dynamic>?;
-          if (feedData == null) {
-            return const FeedView(feed: []);
-          }
-
-          List<FeedViewPost> feedPosts;
-
-          if (isBskyFeed) {
-            // Use adapter to process Bluesky feed items
-            feedPosts = bskyFeedAdapter.processBskyFeedItems(
-              feedData: feedData,
-              onWarning: _logger.w,
+      final FeedView feedView;
+      if (isBskyFeed) {
+        final result = await atproto.call(
+          bsky_feed_get_feed.appBskyFeedGetFeed,
+          parameters: bsky_feed_get_feed.FeedGetFeedInput(
+            feed: feedUri,
+            limit: limit,
+            cursor: cursor,
+          ),
+          headers: headers,
+        );
+        final processedFeed = bskyFeedAdapter.processBskyAuthorFeed(
+          rawFeed: result.data.feed,
+          cursor: result.data.cursor,
+          onError: (message, {error, stackTrace}) => _logger.w(
+            error == null ? message : '$message: $error',
+            stackTrace: stackTrace,
+          ),
+        );
+        feedView = FeedView(
+          feed: processedFeed.posts,
+          cursor: processedFeed.cursor,
+        );
+      } else {
+        final result = await atproto.call(
+          sprk_get_feed.soSprkFeedGetFeed,
+          parameters: sprk_get_feed.FeedGetFeedInput(
+            feed: feedUri,
+            limit: limit,
+            cursor: cursor,
+          ),
+          headers: headers,
+        );
+        final output = result.data;
+        final feedData = output.feed;
+        final feedPosts = <FeedViewPost>[];
+        for (final item in feedData) {
+          try {
+            final feedViewPost = feedViewPostFromPost(item.post);
+            feedPosts.add(feedViewPost);
+          } catch (e, stackTrace) {
+            _logger.w(
+              'Failed to parse feed item, skipping: $e',
+              stackTrace: stackTrace,
             );
-          } else {
-            // Spark feeds: parse directly
-            feedPosts = <FeedViewPost>[];
-            for (final item in feedData) {
-              try {
-                final itemMap = item as Map<String, dynamic>;
-                final postMap = itemMap['post'] as Map<String, dynamic>?;
-                if (postMap == null) {
-                  continue;
-                }
-
-                final postView = PostView.fromJson(postMap);
-                final feedViewPost = FeedViewPost.post(post: postView);
-                feedPosts.add(feedViewPost);
-              } catch (e, stackTrace) {
-                _logger.w(
-                  'Failed to parse feed item, skipping: $e',
-                  stackTrace: stackTrace,
-                );
-              }
-            }
           }
+        }
 
-          return FeedView(
-            feed: feedPosts,
-            cursor: jsonMap['cursor'] as String?,
-          );
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
-      );
+        feedView = FeedView(feed: feedPosts, cursor: output.cursor);
+      }
 
-      _logger.d(
-        'Feed retrieved successfully: ${result.data.feed.length} posts',
-      );
-      return result.data;
+      _logger.d('Feed retrieved successfully: ${feedView.feed.length} posts');
+      return feedView;
     });
   }
 
@@ -583,22 +577,29 @@ class FeedRepositoryImpl implements FeedRepository {
       final headers = isBskyFeed
           ? {'atproto-proxy': _client.bskyDid}
           : {'atproto-proxy': _client.sprkDid};
-      final response = await atproto.get(
-        isBskyFeed
-            ? NSID.parse('app.bsky.feed.getFeedGenerator')
-            : NSID.parse('so.sprk.feed.getFeedGenerator'),
-        parameters: {'feed': feed.toString()},
+      if (isBskyFeed) {
+        final response = await atproto.call(
+          bsky_feed_get_feed_generator.appBskyFeedGetFeedGenerator,
+          parameters: bsky_feed_get_feed_generator.FeedGetFeedGeneratorInput(
+            feed: feed,
+          ),
+          headers: headers,
+        );
+        final jsonMap = response.data.toJson();
+        final generatorData = jsonMap.containsKey('view')
+            ? jsonMap['view']! as Map<String, dynamic>
+            : jsonMap;
+        return GeneratorView.fromJson(generatorData);
+      }
+
+      final response = await atproto.call(
+        sprk_get_feed_generator.soSprkFeedGetFeedGenerator,
+        parameters: sprk_get_feed_generator.FeedGetFeedGeneratorInput(
+          feed: feed,
+        ),
         headers: headers,
-        to: (jsonMap) {
-          final generatorData = jsonMap.containsKey('view')
-              ? jsonMap['view']! as Map<String, dynamic>
-              : jsonMap;
-          return GeneratorView.fromJson(generatorData);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
-      return response.data;
+      return GeneratorView.fromJson(response.data.view.toJson());
     });
   }
 
@@ -625,36 +626,43 @@ class FeedRepositoryImpl implements FeedRepository {
       final headers = bluesky
           ? {'atproto-proxy': _client.bskyDid}
           : {'atproto-proxy': _client.sprkDid};
-      final feedStrings = feeds.map((feed) => feed.toString()).toList();
-      final response = await atproto.get(
-        bluesky
-            ? NSID.parse('app.bsky.feed.getFeedGenerators')
-            : NSID.parse('so.sprk.feed.getFeedGenerators'),
-        parameters: {'feeds': feedStrings},
-        headers: headers,
-        to: (jsonMap) {
-          final feedsData = jsonMap['feeds']! as List<dynamic>;
-          return feedsData
-              .map((feedData) {
-                try {
-                  final feedMap = feedData as Map<String, dynamic>;
-                  return GeneratorView.fromJson(feedMap);
-                } catch (e) {
-                  _logger.w('Failed to parse feed generator, skipping: $e');
-                  return null;
-                }
-              })
-              .whereType<GeneratorView>()
-              .toList();
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
-      );
+      final List<dynamic> feedsData;
+      if (bluesky) {
+        final response = await atproto.call(
+          bsky_feed_get_feed_generators.appBskyFeedGetFeedGenerators,
+          parameters: bsky_feed_get_feed_generators.FeedGetFeedGeneratorsInput(
+            feeds: feeds,
+          ),
+          headers: headers,
+        );
+        feedsData = response.data.toJson()['feeds']! as List<dynamic>;
+      } else {
+        final response = await atproto.call(
+          sprk_get_feed_generators.soSprkFeedGetFeedGenerators,
+          parameters: sprk_get_feed_generators.FeedGetFeedGeneratorsInput(
+            feeds: feeds,
+          ),
+          headers: headers,
+        );
+        feedsData = response.data.toJson()['feeds']! as List<dynamic>;
+      }
+      final generators = feedsData
+          .map((feedData) {
+            try {
+              final feedMap = feedData as Map<String, dynamic>;
+              return GeneratorView.fromJson(feedMap);
+            } catch (e) {
+              _logger.w('Failed to parse feed generator, skipping: $e');
+              return null;
+            }
+          })
+          .whereType<GeneratorView>()
+          .toList();
       _logger.d(
         'Feed generators retrieved successfully: '
-        '${response.data.length} generators',
+        '${generators.length} generators',
       );
-      return response.data;
+      return generators;
     });
   }
 
@@ -676,43 +684,46 @@ class FeedRepositoryImpl implements FeedRepository {
       final headers = bluesky
           ? {'atproto-proxy': _client.bskyDid}
           : {'atproto-proxy': _client.sprkDid};
-      final response = await atproto.get(
-        bluesky
-            ? NSID.parse('app.bsky.feed.getSuggestedFeeds')
-            : NSID.parse('so.sprk.feed.getSuggestedFeeds'),
-        headers: headers,
-        to: (jsonMap) {
-          final feedsData = (jsonMap['feeds'] as List<dynamic>?) ?? [];
-          return feedsData
-              .map((feedData) {
-                try {
-                  final feedMap = feedData as Map<String, dynamic>;
-                  return GeneratorView.fromJson(feedMap);
-                } catch (e) {
-                  _logger.w(
-                    'Failed to parse suggested feed generator, skipping: $e',
-                  );
-                  return null;
-                }
-              })
-              .whereType<GeneratorView>()
-              .toList();
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
-      );
+      final List<dynamic> feedsData;
+      if (bluesky) {
+        final response = await atproto.call(
+          bsky_feed_get_suggested_feeds.appBskyFeedGetSuggestedFeeds,
+          headers: headers,
+        );
+        feedsData = response.data.toJson()['feeds'] as List<dynamic>? ?? [];
+      } else {
+        final response = await atproto.call(
+          sprk_get_suggested_feeds.soSprkFeedGetSuggestedFeeds,
+          headers: headers,
+        );
+        feedsData = response.data.toJson()['feeds'] as List<dynamic>? ?? [];
+      }
+      final suggestedFeeds = feedsData
+          .map((feedData) {
+            try {
+              final feedMap = feedData as Map<String, dynamic>;
+              return GeneratorView.fromJson(feedMap);
+            } catch (e) {
+              _logger.w(
+                'Failed to parse suggested feed generator, skipping: $e',
+              );
+              return null;
+            }
+          })
+          .whereType<GeneratorView>()
+          .toList();
       _logger.d(
         'Suggested feeds retrieved successfully: '
-        '${response.data.length} generators',
+        '${suggestedFeeds.length} generators',
       );
-      return response.data;
+      return suggestedFeeds;
     });
   }
 
   @override
   Future<Feed> getFeedFromSavedFeed(SavedFeed savedFeed) async {
     return _client.executeWithRetry(() async {
-      if (savedFeed.type == 'timeline') {
+      if (savedFeed.typeValue == 'timeline') {
         return Feed(type: 'timeline', config: savedFeed);
       }
       final feedUri = AtUri(savedFeed.value);
@@ -732,7 +743,7 @@ class FeedRepositoryImpl implements FeedRepository {
       final sprkUris = <AtUri>[];
 
       for (final savedFeed in savedFeeds) {
-        if (savedFeed.type == 'timeline') {
+        if (savedFeed.typeValue == 'timeline') {
           // Timeline feeds don't need generator views
           continue;
         }
@@ -764,7 +775,7 @@ class FeedRepositoryImpl implements FeedRepository {
       // Build feeds list preserving the original order from savedFeeds
       final feeds = <Feed>[];
       for (final savedFeed in savedFeeds) {
-        if (savedFeed.type == 'timeline') {
+        if (savedFeed.typeValue == 'timeline') {
           feeds.add(Feed(type: 'timeline', config: savedFeed));
         } else {
           final feedUri = AtUri(savedFeed.value);
@@ -805,11 +816,17 @@ class FeedRepositoryImpl implements FeedRepository {
         '$likeType',
       );
 
-      final likeRecord = {
-        r'$type': likeType,
-        'subject': {'cid': postCid, 'uri': postUri.toString()},
-        'createdAt': DateTime.now().toUtc().toIso8601String(),
-      };
+      final subject = RepoStrongRef(uri: postUri, cid: postCid);
+      final createdAt = DateTime.now().toUtc();
+      final likeRecord = isBskyPost
+          ? bsky_like.FeedLikeRecord(
+              subject: subject,
+              createdAt: createdAt,
+            ).toJson()
+          : sprk_like.FeedLikeRecord(
+              subject: subject,
+              createdAt: createdAt,
+            ).toJson();
 
       final result = await _client.repo.createRecord(
         collection: likeType,
@@ -851,11 +868,17 @@ class FeedRepositoryImpl implements FeedRepository {
         '$repostType',
       );
 
-      final repostRecord = {
-        r'$type': repostType,
-        'subject': {'cid': postCid, 'uri': postUri.toString()},
-        'createdAt': DateTime.now().toUtc().toIso8601String(),
-      };
+      final subject = RepoStrongRef(uri: postUri, cid: postCid);
+      final createdAt = DateTime.now().toUtc();
+      final repostRecord = isBskyPost
+          ? bsky_repost.FeedRepostRecord(
+              subject: subject,
+              createdAt: createdAt,
+            ).toJson()
+          : sprk_repost.FeedRepostRecord(
+              subject: subject,
+              createdAt: createdAt,
+            ).toJson();
 
       final result = await _client.repo.createRecord(
         collection: repostType,
@@ -947,7 +970,7 @@ class FeedRepositoryImpl implements FeedRepository {
         createdAt: DateTime.now().toUtc(),
         media: media,
       );
-      recordJson = sprkRecord.toJson();
+      recordJson = sprkReplyRecordFromLocal(sprkRecord).toJson();
       collection = NSID.parse('so.sprk.feed.reply');
     } else {
       // Bluesky comment - use adapter to create Bluesky-specific models
@@ -1048,7 +1071,7 @@ class FeedRepositoryImpl implements FeedRepository {
 
     final result = await _client.repo.createRecord(
       collection: 'so.sprk.feed.post',
-      record: record.toJson(),
+      record: sprkPostRecordFromLocal(record).toJson(),
     );
 
     _logger.i('Image post created successfully: ${result.uri}');
@@ -1065,9 +1088,11 @@ class FeedRepositoryImpl implements FeedRepository {
           altTexts,
           facets,
         );
-        finalResult = await _client.repo.editRecord(
+        finalResult = await _client.repo.editRecordJson(
           uri: result.uri,
-          record: record.copyWith(crossposts: [bskyResult]),
+          record: sprkPostRecordFromLocal(
+            record.copyWith(crossposts: [bskyResult]),
+          ).toJson(),
         );
       } catch (e) {
         _logger.w('Failed to crosspost to Bluesky: $e');
@@ -1103,11 +1128,9 @@ class FeedRepositoryImpl implements FeedRepository {
             _logger.e('AtProto not initialized');
             throw Exception('AtProto not initialized');
           case final atproto:
-            final response = await atproto.post(
-              repo_upload_blob.comAtprotoRepoUploadBlob.nsid,
-              body: processedBytes,
-              to: const repo_upload_blob.RepoUploadBlobOutputConverter()
-                  .fromJson,
+            final response = await atproto.call(
+              repo_upload_blob.comAtprotoRepoUploadBlob,
+              input: processedBytes,
             );
 
             switch (response.status.code) {
@@ -1664,7 +1687,7 @@ class FeedRepositoryImpl implements FeedRepository {
 
     final result = await _client.repo.createRecord(
       collection: 'so.sprk.feed.post',
-      record: record.toJson(),
+      record: sprkPostRecordFromLocal(record).toJson(),
     );
 
     _logger.i('Video posted successfully: ${result.uri}');
@@ -1713,22 +1736,17 @@ class FeedRepositoryImpl implements FeedRepository {
           uri: uri,
         );
       }
-      const source = 'so.sprk.feed.getPostThread';
-      final response = await atproto.get(
-        NSID.parse(source),
-        parameters: {
-          'anchor': uri.toString(),
-          'depth': depth,
-          'parentHeight': parentHeight,
-        },
+      final response = await atproto.call(
+        sprk_get_post_thread.soSprkFeedGetPostThread,
+        parameters: sprk_get_post_thread.FeedGetPostThreadInput(
+          anchor: uri,
+          depth: depth,
+          parentHeight: parentHeight,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          final threadItems = jsonMap['thread']! as List<dynamic>;
-          return Thread.fromSparkFlatList(threadItems: threadItems);
-        },
       );
-
-      return response.data;
+      final threadItems = response.data.toJson()['thread']! as List<dynamic>;
+      return Thread.fromSparkFlatList(threadItems: threadItems);
     });
   }
 
@@ -1753,7 +1771,6 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      const source = 'so.sprk.feed.getCrosspostThread';
       final threadItems = <dynamic>[];
       String? cursor;
 
@@ -1763,25 +1780,24 @@ class FeedRepositoryImpl implements FeedRepository {
       }
 
       do {
-        final response = await atproto.get(
-          NSID.parse(source),
-          parameters: {
-            'anchor': anchor.toString(),
-            'depth': depth,
-            'parentHeight': parentHeight,
-            'sort': sort,
-            'limit': 100,
-            'cursor': cursor,
-          },
+        final response = await atproto.call(
+          sprk_get_crosspost_thread.soSprkFeedGetCrosspostThread,
+          parameters: sprk_get_crosspost_thread.FeedGetCrosspostThreadInput(
+            anchor: anchor,
+            depth: depth,
+            parentHeight: parentHeight,
+            sort: sprk_get_crosspost_thread.FeedGetCrosspostThreadSort.valueOf(
+              sort,
+            ),
+            limit: 100,
+            cursor: cursor,
+          ),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
 
         final pageItems =
-            response.data['thread'] as List<dynamic>? ?? const <dynamic>[];
+            response.data.toJson()['thread'] as List<dynamic>? ??
+            const <dynamic>[];
 
         var itemsToAppend = pageItems;
         while (threadItems.isNotEmpty &&
@@ -1791,7 +1807,7 @@ class FeedRepositoryImpl implements FeedRepository {
         }
 
         threadItems.addAll(itemsToAppend);
-        cursor = response.data['cursor'] as String?;
+        cursor = response.data.cursor;
       } while (cursor != null && cursor.isNotEmpty);
 
       return Thread.fromSparkFlatList(
@@ -1828,26 +1844,24 @@ class FeedRepositoryImpl implements FeedRepository {
           ? sources!
           : [defaultLabelerDid];
 
-      final parameters = {
-        'uriPatterns': uris,
-        'sources': labelers,
-        'limit': limit,
-        'cursor': cursor,
-      };
+      final parameters = label_query_labels.LabelQueryLabelsInput(
+        uriPatterns: uris.map((uri) => uri.toString()).toList(),
+        sources: labelers,
+        limit: limit ?? 50,
+        cursor: cursor,
+      );
 
-      final response = await atproto.get(
-        NSID.parse('com.atproto.label.queryLabels'),
+      final response = await atproto.call(
+        label_query_labels.comAtprotoLabelQueryLabels,
         headers: {'atproto-proxy': _client.modDid},
         parameters: parameters,
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
+      final responseJson = response.data.toJson();
       _logger
-        ..d('parameters: $parameters')
-        ..d('Labels retrieved: ${response.data}');
+        ..d('parameters: ${parameters.toJson()}')
+        ..d('Labels retrieved: $responseJson');
 
-      for (final label in response.data['labels']! as List<dynamic>) {
+      for (final label in responseJson['labels']! as List<dynamic>) {
         final cleanLabel = label as Map<String, Object?>
           ..remove('sig')
           ..putIfAbsent(
@@ -1857,7 +1871,7 @@ class FeedRepositoryImpl implements FeedRepository {
         labels.add(Label.fromJson(cleanLabel));
       }
 
-      return (labels: labels, cursor: response.data['cursor'] as String?);
+      return (labels: labels, cursor: responseJson['cursor'] as String?);
     });
   }
 
@@ -1885,30 +1899,25 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final parameters = <String, dynamic>{
-        'q': query,
-        'limit': limit,
-        'sort': sort,
-        'cursor': cursor,
-      };
-
-      final response = await atproto.get(
-        NSID.parse('so.sprk.feed.searchPosts'),
-        parameters: parameters,
+      final response = await atproto.call(
+        sprk_search_posts.soSprkFeedSearchPosts,
+        parameters: sprk_search_posts.FeedSearchPostsInput(
+          q: query,
+          limit: limit,
+          sort: sprk_search_posts.FeedSearchPostsSort.valueOf(sort),
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
-      final posts = (response.data['posts']! as List<dynamic>)
+      final output = response.data;
+      final outputJson = output.toJson();
+      final posts = (outputJson['posts']! as List<dynamic>)
           .map((post) => post as Map<String, dynamic>)
           .map(PostView.fromJson)
           .toList();
 
-      final newCursor = response.data['cursor'] as String?;
-
-      return (posts: posts, cursor: newCursor);
+      return (posts: posts, cursor: output.cursor);
     });
   }
 
@@ -1940,35 +1949,29 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final parameters = <String, dynamic>{'actor': actor, 'limit': limit};
-
-      if (cursor != null) {
-        parameters['cursor'] = cursor;
-      }
-
-      final result = await atproto.get(
-        NSID.parse('so.sprk.feed.getActorReposts'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_actor_reposts.soSprkFeedGetActorReposts,
+        parameters: sprk_get_actor_reposts.FeedGetActorRepostsInput(
+          actor: actor,
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          final rawFeed = jsonMap['feed']! as List<dynamic>;
-          final feedPosts = _parseAndFilterPosts<FeedViewPost>(
-            rawPosts: rawFeed,
-            fromJson: FeedViewPost.fromJson,
-            hasMedia: _feedViewPostHasMedia,
-            getUri: _getFeedViewPostUri,
-            source: 'sprk actor reposts',
-          );
-          return (posts: feedPosts, cursor: jsonMap['cursor'] as String?);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
+      );
+      final output = result.data;
+      final rawFeed = output.toJson()['feed']! as List<dynamic>;
+      final feedPosts = _parseAndFilterPosts<FeedViewPost>(
+        rawPosts: rawFeed,
+        fromJson: FeedViewPost.fromJson,
+        hasMedia: _feedViewPostHasMedia,
+        getUri: _getFeedViewPostUri,
+        source: 'sprk actor reposts',
       );
       _logger.d(
         'Actor reposts retrieved successfully: '
-        '${result.data.posts.length} posts',
+        '${feedPosts.length} posts',
       );
-      return result.data;
+      return (posts: feedPosts, cursor: output.cursor);
     });
   }
 
@@ -2015,35 +2018,29 @@ class FeedRepositoryImpl implements FeedRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final parameters = <String, dynamic>{'actor': actor, 'limit': limit};
-
-      if (cursor != null) {
-        parameters['cursor'] = cursor;
-      }
-
-      final result = await atproto.get(
-        NSID.parse('so.sprk.feed.getActorLikes'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_actor_likes.soSprkFeedGetActorLikes,
+        parameters: sprk_get_actor_likes.FeedGetActorLikesInput(
+          actor: actor,
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          final rawFeed = jsonMap['feed']! as List<dynamic>;
-          final feedPosts = _parseAndFilterPosts<FeedViewPost>(
-            rawPosts: rawFeed,
-            fromJson: FeedViewPost.fromJson,
-            hasMedia: _feedViewPostHasMedia,
-            getUri: _getFeedViewPostUri,
-            source: 'sprk actor likes',
-          );
-          return (posts: feedPosts, cursor: jsonMap['cursor'] as String?);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
+      );
+      final output = result.data;
+      final rawFeed = output.toJson()['feed']! as List<dynamic>;
+      final feedPosts = _parseAndFilterPosts<FeedViewPost>(
+        rawPosts: rawFeed,
+        fromJson: FeedViewPost.fromJson,
+        hasMedia: _feedViewPostHasMedia,
+        getUri: _getFeedViewPostUri,
+        source: 'sprk actor likes',
       );
       _logger.d(
         'Actor likes retrieved successfully: '
-        '${result.data.posts.length} posts',
+        '${feedPosts.length} posts',
       );
-      return result.data;
+      return (posts: feedPosts, cursor: output.cursor);
     });
   }
 
diff --git a/lib/src/core/network/atproto/data/repositories/graph_repository.dart b/lib/src/core/network/atproto/data/repositories/graph_repository.dart
index 4962f6fd..05e55ac5 100644
--- a/lib/src/core/network/atproto/data/repositories/graph_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/graph_repository.dart
@@ -1,5 +1,9 @@
 import 'package:poptart/poptart.dart';
-import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
+import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_blocks/output.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_followers/output.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_follows/output.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_known_followers/output.dart';
 
 /// Interface for Graph-related API endpoints
 abstract class GraphRepository {
@@ -7,25 +11,28 @@ abstract class GraphRepository {
   ///
   /// [did] The DID to get followers for
   /// [cursor] Optional cursor for pagination
-  Future<FollowersResponse> getFollowers(String did, {String? cursor});
+  Future<GraphGetFollowersOutput> getFollowers(String did, {String? cursor});
 
   /// Get followers for a DID who are followed by the viewer
   ///
   /// [did] The DID to get known followers for
   /// [cursor] Optional cursor for pagination
-  Future<FollowersResponse> getKnownFollowers(String did, {String? cursor});
+  Future<GraphGetKnownFollowersOutput> getKnownFollowers(
+    String did, {
+    String? cursor,
+  });
 
   /// Get follows for a DID
   ///
   /// [did] The DID to get follows for
   /// [cursor] Optional cursor for pagination
-  Future<FollowsResponse> getFollows(String did, {String? cursor});
+  Future<GraphGetFollowsOutput> getFollows(String did, {String? cursor});
 
   /// Follow a user
   ///
   /// [did] The DID of the user to follow
   /// [bsky] Whether to use Bluesky follow records instead of Spark
-  Future<FollowUserResponse> followUser(String did, {bool bsky = false});
+  Future<RepoStrongRef> followUser(String did, {bool bsky = false});
 
   /// Unfollow a user
   ///
@@ -48,12 +55,12 @@ abstract class GraphRepository {
   ///
   /// [did] The DID to get blocks for
   /// [cursor] Optional cursor for pagination
-  Future<BlocksResponse> getBlocks(String did, {String? cursor});
+  Future<GraphGetBlocksOutput> getBlocks(String did, {String? cursor});
 
   /// Block a user
   ///
   /// [did] The DID of the user to block
-  Future<BlockUserResponse> blockUser(String did);
+  Future<RepoStrongRef> blockUser(String did);
 
   /// Unblock a user
   ///
diff --git a/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
index 3a1e6b7a..e7b0b314 100644
--- a/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/graph_repository_impl.dart
@@ -1,13 +1,22 @@
-import 'dart:convert';
+import 'package:bluesky_poptart/app/bsky/graph/follow.dart' as bsky_follow;
 import 'package:poptart/poptart.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart'
     as repo_list_records;
+import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:get_it/get_it.dart';
-import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/graph_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';
+import 'package:sprk_poptart/so/sprk/graph/block.dart' as sprk_block;
+import 'package:sprk_poptart/so/sprk/graph/follow.dart' as sprk_follow;
+import 'package:sprk_poptart/so/sprk/graph/get_blocks.dart' as sprk_get_blocks;
+import 'package:sprk_poptart/so/sprk/graph/get_followers.dart'
+    as sprk_get_followers;
+import 'package:sprk_poptart/so/sprk/graph/get_follows.dart'
+    as sprk_get_follows;
+import 'package:sprk_poptart/so/sprk/graph/get_known_followers.dart'
+    as sprk_get_known_followers;
 
 /// Implementation of Graph-related API endpoints
 class GraphRepositoryImpl implements GraphRepository {
@@ -20,7 +29,10 @@ class GraphRepositoryImpl implements GraphRepository {
   );
 
   @override
-  Future<FollowersResponse> getFollowers(String did, {String? cursor}) async {
+  Future<sprk_get_followers.GraphGetFollowersOutput> getFollowers(
+    String did, {
+    String? cursor,
+  }) async {
     _logger.d('Getting followers for DID: $did with cursor: $cursor');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -38,17 +50,16 @@ class GraphRepositoryImpl implements GraphRepository {
         if (cursor != null) {
           params['cursor'] = cursor;
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.graph.getFollowers'),
-          parameters: params,
+        final result = await atproto.call(
+          sprk_get_followers.soSprkGraphGetFollowers,
+          parameters: sprk_get_followers.GraphGetFollowersInput(
+            actor: did,
+            cursor: cursor,
+          ),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         _logger.d('Followers retrieved successfully');
-        return FollowersResponse.fromJson(result.data as Map<String, dynamic>);
+        return result.data;
       } on FormatException catch (fe) {
         _logger.e('Error retrieving followers for DID: $did', error: fe);
         throw Exception('Failed to retrieve followers for DID: $did');
@@ -57,10 +68,8 @@ class GraphRepositoryImpl implements GraphRepository {
   }
 
   @override
-  Future<FollowersResponse> getKnownFollowers(
-    String did, {
-    String? cursor,
-  }) async {
+  Future<sprk_get_known_followers.GraphGetKnownFollowersOutput>
+  getKnownFollowers(String did, {String? cursor}) async {
     _logger.d('Getting known followers for DID: $did with cursor: $cursor');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -78,17 +87,16 @@ class GraphRepositoryImpl implements GraphRepository {
         if (cursor != null) {
           params['cursor'] = cursor;
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.graph.getKnownFollowers'),
-          parameters: params,
+        final result = await atproto.call(
+          sprk_get_known_followers.soSprkGraphGetKnownFollowers,
+          parameters: sprk_get_known_followers.GraphGetKnownFollowersInput(
+            actor: did,
+            cursor: cursor,
+          ),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         _logger.d('Known followers retrieved successfully');
-        return FollowersResponse.fromJson(result.data as Map<String, dynamic>);
+        return result.data;
       } on FormatException catch (fe) {
         _logger.e('Error retrieving known followers for DID: $did', error: fe);
         throw Exception('Failed to retrieve known followers for DID: $did');
@@ -97,7 +105,10 @@ class GraphRepositoryImpl implements GraphRepository {
   }
 
   @override
-  Future<FollowsResponse> getFollows(String did, {String? cursor}) async {
+  Future<sprk_get_follows.GraphGetFollowsOutput> getFollows(
+    String did, {
+    String? cursor,
+  }) async {
     _logger.d('Getting follows for DID: $did with cursor: $cursor');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -115,17 +126,16 @@ class GraphRepositoryImpl implements GraphRepository {
         if (cursor != null) {
           params['cursor'] = cursor;
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.graph.getFollows'),
-          parameters: params,
+        final result = await atproto.call(
+          sprk_get_follows.soSprkGraphGetFollows,
+          parameters: sprk_get_follows.GraphGetFollowsInput(
+            actor: did,
+            cursor: cursor,
+          ),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         _logger.d('Follows retrieved successfully');
-        return FollowsResponse.fromJson(result.data as Map<String, dynamic>);
+        return result.data;
       } on FormatException catch (fe) {
         _logger.e('Error retrieving follows for DID: $did', error: fe);
         throw Exception('Failed to retrieve follows for DID: $did');
@@ -134,7 +144,7 @@ class GraphRepositoryImpl implements GraphRepository {
   }
 
   @override
-  Future<FollowUserResponse> followUser(String did, {bool bsky = false}) async {
+  Future<RepoStrongRef> followUser(String did, {bool bsky = false}) async {
     _logger.d('Following user with DID: $did, bsky: $bsky');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -177,11 +187,16 @@ class GraphRepositoryImpl implements GraphRepository {
           throw Exception('Already following this user');
         }
 
-        final followRecord = {
-          r'$type': collection,
-          'subject': did,
-          'createdAt': DateTime.now().toUtc().toIso8601String(),
-        };
+        final createdAt = DateTime.now().toUtc();
+        final followRecord = bsky
+            ? bsky_follow.GraphFollowRecord(
+                subject: did,
+                createdAt: createdAt,
+              ).toJson()
+            : sprk_follow.GraphFollowRecord(
+                subject: did,
+                createdAt: createdAt,
+              ).toJson();
 
         final result = await _client.repo.createRecord(
           collection: collection,
@@ -191,7 +206,7 @@ class GraphRepositoryImpl implements GraphRepository {
 
         _logger.i('User followed successfully with $collection: ${result.uri}');
 
-        return FollowUserResponse(uri: result.uri.toString(), cid: result.cid);
+        return result;
       } catch (e) {
         _logger.e('Error in followUser', error: e);
         rethrow;
@@ -231,13 +246,16 @@ class GraphRepositoryImpl implements GraphRepository {
         // User is not following, so follow
         final response = await followUser(did, bsky: bsky);
         _logger.i('User followed via toggle: ${response.uri}');
-        return response.uri;
+        return response.uri.toString();
       }
     });
   }
 
   @override
-  Future<BlocksResponse> getBlocks(String did, {String? cursor}) async {
+  Future<sprk_get_blocks.GraphGetBlocksOutput> getBlocks(
+    String did, {
+    String? cursor,
+  }) async {
     _logger.d('Getting blocks for DID: $did with cursor: $cursor');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -255,17 +273,13 @@ class GraphRepositoryImpl implements GraphRepository {
         if (cursor != null) {
           params['cursor'] = cursor;
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.graph.getBlocks'),
-          parameters: params,
+        final result = await atproto.call(
+          sprk_get_blocks.soSprkGraphGetBlocks,
+          parameters: sprk_get_blocks.GraphGetBlocksInput(cursor: cursor),
           headers: {'atproto-proxy': _client.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         _logger.d('Blocks retrieved successfully');
-        return BlocksResponse.fromJson(result.data as Map<String, dynamic>);
+        return result.data;
       } on FormatException catch (fe) {
         _logger.e('Error retrieving blocks for DID: $did', error: fe);
         throw Exception('Failed to retrieve blocks for DID: $did');
@@ -274,7 +288,7 @@ class GraphRepositoryImpl implements GraphRepository {
   }
 
   @override
-  Future<BlockUserResponse> blockUser(String did) async {
+  Future<RepoStrongRef> blockUser(String did) async {
     _logger.d('Blocking user with DID: $did');
     return _client.executeWithRetry(() async {
       if (!_client.authRepository.isAuthenticated) {
@@ -315,11 +329,10 @@ class GraphRepositoryImpl implements GraphRepository {
           throw Exception('Already blocking this user');
         }
 
-        final blockRecord = {
-          r'$type': collection,
-          'subject': did,
-          'createdAt': DateTime.now().toUtc().toIso8601String(),
-        };
+        final blockRecord = sprk_block.GraphBlockRecord(
+          subject: did,
+          createdAt: DateTime.now().toUtc(),
+        ).toJson();
 
         final result = await _client.repo.createRecord(
           collection: collection,
@@ -329,7 +342,7 @@ class GraphRepositoryImpl implements GraphRepository {
 
         _logger.i('User blocked successfully with $collection: ${result.uri}');
 
-        return BlockUserResponse(uri: result.uri.toString(), cid: result.cid);
+        return result;
       } catch (e) {
         _logger.e('Error in blockUser', error: e);
         rethrow;
@@ -362,7 +375,7 @@ class GraphRepositoryImpl implements GraphRepository {
         // User is not blocking, so block
         final response = await blockUser(did);
         _logger.i('User blocked via toggle: ${response.uri}');
-        return response.uri;
+        return response.uri.toString();
       }
     });
   }
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 8d692b7d..48049d67 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
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
@@ -7,6 +5,9 @@ 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/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
+import 'package:sprk_poptart/so/sprk/labeler/get_services.dart'
+    as sprk_get_services;
+import 'package:sprk_poptart/so/sprk/labeler/get_services/union_main_views.dart';
 
 class LabelerRepositoryImpl extends LabelerRepository {
   LabelerRepositoryImpl(this._client) {
@@ -32,20 +33,27 @@ class LabelerRepositoryImpl extends LabelerRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.labeler.getServices'),
-        parameters: {'dids': dids, 'detailed': false},
+      final result = await atproto.call(
+        sprk_get_services.soSprkLabelerGetServices,
+        parameters: sprk_get_services.LabelerGetServicesInput(
+          dids: dids,
+          detailed: false,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: LabelerView.fromJson,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
       if (result.status != HttpStatus.ok) {
         _logger.e('Failed to retrieve labeler services for DIDs: $dids');
         throw Exception('Failed to retrieve labeler services for DIDs: $dids');
       }
+      if (result.data.views.isEmpty) {
+        throw Exception('No labeler services returned for DIDs: $dids');
+      }
+      final view = result.data.views.first.labelerView;
+      if (view == null) {
+        throw Exception('No basic labeler service returned for DIDs: $dids');
+      }
       _logger.d('Labeler services retrieved successfully');
-      return result.data;
+      return view;
     });
   }
 
@@ -64,20 +72,27 @@ class LabelerRepositoryImpl extends LabelerRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.labeler.getServices'),
-        parameters: {'dids': dids, 'detailed': true},
+      final result = await atproto.call(
+        sprk_get_services.soSprkLabelerGetServices,
+        parameters: sprk_get_services.LabelerGetServicesInput(
+          dids: dids,
+          detailed: true,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: LabelerViewDetailed.fromJson,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
       if (result.status != HttpStatus.ok) {
         _logger.e('Failed to retrieve labeler services for DIDs: $dids');
         throw Exception('Failed to retrieve labeler services for DIDs: $dids');
       }
+      if (result.data.views.isEmpty) {
+        throw Exception('No labeler services returned for DIDs: $dids');
+      }
+      final view = result.data.views.first.labelerViewDetailed;
+      if (view == null) {
+        throw Exception('No detailed labeler service returned for DIDs: $dids');
+      }
       _logger.d('Labeler services retrieved successfully');
-      return result.data;
+      return view;
     });
   }
 }
diff --git a/lib/src/core/network/atproto/data/repositories/notification_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/notification_repository_impl.dart
index ee0d625d..30bdf293 100644
--- a/lib/src/core/network/atproto/data/repositories/notification_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/notification_repository_impl.dart
@@ -1,6 +1,3 @@
-import 'dart:convert';
-
-import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/network/atproto/data/models/notification_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/notification_repository.dart';
@@ -8,6 +5,16 @@ import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository
 import 'package:spark/src/core/notifications/push_notification_service.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
+import 'package:sprk_poptart/so/sprk/notification/get_unread_count.dart'
+    as sprk_get_unread_count;
+import 'package:sprk_poptart/so/sprk/notification/list_notifications.dart'
+    as sprk_list_notifications;
+import 'package:sprk_poptart/so/sprk/notification/register_push.dart'
+    as sprk_register_push;
+import 'package:sprk_poptart/so/sprk/notification/update_seen.dart'
+    as sprk_update_seen;
+import 'package:sprk_poptart/so/sprk/notification/unregister_push.dart'
+    as sprk_unregister_push;
 
 /// Notification-related API endpoints implementation
 class NotificationRepositoryImpl implements NotificationRepository {
@@ -53,18 +60,19 @@ class NotificationRepositoryImpl implements NotificationRepository {
         parameters['reasons'] = reasons;
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.notification.listNotifications'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_list_notifications.soSprkNotificationListNotifications,
+        parameters: sprk_list_notifications.NotificationListNotificationsInput(
+          limit: limit,
+          cursor: cursor,
+          priority: priority,
+          reasons: reasons,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
-      final rawResponse = result.data as Map<String, dynamic>;
       _logger.d('Notifications retrieved successfully');
-      return ListNotificationsResponse.fromJson(rawResponse);
+      return result.data;
     });
   }
 
@@ -88,18 +96,17 @@ class NotificationRepositoryImpl implements NotificationRepository {
         parameters['priority'] = priority.toString();
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.notification.getUnreadCount'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_unread_count.soSprkNotificationGetUnreadCount,
+        parameters: sprk_get_unread_count.NotificationGetUnreadCountInput(
+          priority: priority,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
-      final rawResponse = result.data as Map<String, dynamic>;
+      final output = result.data;
       _logger.d('Unread count retrieved successfully');
-      return UnreadCountResponse.fromJson(rawResponse);
+      return output;
     });
   }
 
@@ -118,12 +125,9 @@ class NotificationRepositoryImpl implements NotificationRepository {
         throw Exception('AtProto not initialized');
       }
 
-      // Convert DateTime to ISO8601 string for the API
-      final body = {'seenAt': seenAt.toIso8601String()};
-
-      await atproto.post(
-        NSID.parse('so.sprk.notification.updateSeen'),
-        body: body,
+      await atproto.call(
+        sprk_update_seen.soSprkNotificationUpdateSeen,
+        input: sprk_update_seen.NotificationUpdateSeenInput(seenAt: seenAt),
         headers: {'atproto-proxy': _client.sprkDid},
       );
 
@@ -160,16 +164,22 @@ class NotificationRepositoryImpl implements NotificationRepository {
       // serviceDid needs just the DID without fragment (format validation)
       final serviceDid = _client.sprkDid.split('#').first;
 
-      final body = {
-        'serviceDid': serviceDid,
-        'token': token,
-        'platform': platform,
-        'appId': appId,
-      };
+      final input = sprk_register_push.NotificationRegisterPushInput(
+        serviceDid: serviceDid,
+        token: token,
+        platform:
+            sprk_register_push.NotificationRegisterPushPlatform.valueOf(
+              platform,
+            ) ??
+            sprk_register_push.NotificationRegisterPushPlatform.unknown(
+              data: platform,
+            ),
+        appId: appId,
+      );
 
-      await atproto.post(
-        NSID.parse('so.sprk.notification.registerPush'),
-        body: body,
+      await atproto.call(
+        sprk_register_push.soSprkNotificationRegisterPush,
+        input: input,
         headers: {'atproto-proxy': _client.sprkDid},
       );
 
@@ -199,16 +209,22 @@ class NotificationRepositoryImpl implements NotificationRepository {
       // serviceDid needs just the DID without fragment (format validation)
       final serviceDid = _client.sprkDid.split('#').first;
 
-      final body = {
-        'serviceDid': serviceDid,
-        'token': token,
-        'platform': platform,
-        'appId': appId,
-      };
+      final input = sprk_unregister_push.NotificationUnregisterPushInput(
+        serviceDid: serviceDid,
+        token: token,
+        platform:
+            sprk_unregister_push.NotificationUnregisterPushPlatform.valueOf(
+              platform,
+            ) ??
+            sprk_unregister_push.NotificationUnregisterPushPlatform.unknown(
+              data: platform,
+            ),
+        appId: appId,
+      );
 
-      await atproto.post(
-        NSID.parse('so.sprk.notification.unregisterPush'),
-        body: body,
+      await atproto.call(
+        sprk_unregister_push.soSprkNotificationUnregisterPush,
+        input: input,
         headers: {'atproto-proxy': _client.sprkDid},
       );
 
diff --git a/lib/src/core/network/atproto/data/repositories/pref_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/pref_repository_impl.dart
index 20b93330..185c22f3 100644
--- a/lib/src/core/network/atproto/data/repositories/pref_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/pref_repository_impl.dart
@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 
@@ -7,6 +6,10 @@ import 'package:spark/src/core/network/atproto/data/repositories/pref_repository
 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';
+import 'package:sprk_poptart/so/sprk/actor/get_preferences.dart'
+    as sprk_get_preferences;
+import 'package:sprk_poptart/so/sprk/actor/put_preferences.dart'
+    as sprk_put_preferences;
 
 class PrefRepositoryImpl implements PrefRepository {
   PrefRepositoryImpl(this._client) {
@@ -32,12 +35,9 @@ class PrefRepositoryImpl implements PrefRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.actor.getPreferences'),
+      final result = await atproto.call(
+        sprk_get_preferences.soSprkActorGetPreferences,
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) => jsonMap,
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
 
       if (result.status != HttpStatus.ok) {
@@ -45,7 +45,7 @@ class PrefRepositoryImpl implements PrefRepository {
         throw Exception('Failed to retrieve preferences');
       }
 
-      return Preferences.fromJson(result.data as Map<String, dynamic>);
+      return result.data;
     });
   }
 
@@ -63,9 +63,11 @@ class PrefRepositoryImpl implements PrefRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final result = await atproto.post(
-        NSID.parse('so.sprk.actor.putPreferences'),
-        body: preferences.toJson(),
+      final result = await atproto.call(
+        sprk_put_preferences.soSprkActorPutPreferences,
+        input: sprk_put_preferences.ActorPutPreferencesInput(
+          preferences: preferences.preferences,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
       );
 
diff --git a/lib/src/core/network/atproto/data/repositories/repo_repository.dart b/lib/src/core/network/atproto/data/repositories/repo_repository.dart
index 09c8f79c..7e44ac3e 100644
--- a/lib/src/core/network/atproto/data/repositories/repo_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/repo_repository.dart
@@ -20,6 +20,15 @@ abstract class RepoRepository {
     required Record record,
   });
 
+  /// Edit a record in the repository from serialized lexicon data
+  ///
+  /// [uri] The URI of the record to edit
+  /// [record] The serialized record data to edit
+  Future<RepoStrongRef> editRecordJson({
+    required AtUri uri,
+    required Map<String, dynamic> record,
+  });
+
   /// Create a record in the repository
   ///
   /// [collection] The NSID of the collection to create the record in
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 9b58c73d..56e465cc 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
@@ -68,6 +68,14 @@ class RepoRepositoryImpl implements RepoRepository {
   Future<RepoStrongRef> editRecord({
     required AtUri uri,
     required Record record,
+  }) async {
+    return editRecordJson(uri: uri, record: record.toJson());
+  }
+
+  @override
+  Future<RepoStrongRef> editRecordJson({
+    required AtUri uri,
+    required Map<String, dynamic> record,
   }) async {
     _logger.d('Editing record at URI: $uri');
     return _client.executeWithRetry(() async {
@@ -86,7 +94,7 @@ class RepoRepositoryImpl implements RepoRepository {
           repo: uri.hostname,
           collection: uri.collection.toString(),
           rkey: uri.rkey,
-          record: record.toJson(),
+          record: record,
         ),
       );
       _logger.d('Record edited successfully');
@@ -197,10 +205,9 @@ class RepoRepositoryImpl implements RepoRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final result = await atproto.post(
-        repo_upload_blob.comAtprotoRepoUploadBlob.nsid,
-        body: data,
-        to: const repo_upload_blob.RepoUploadBlobOutputConverter().fromJson,
+      final result = await atproto.call(
+        repo_upload_blob.comAtprotoRepoUploadBlob,
+        input: data,
       );
       _logger.d('Blob uploaded successfully');
 
@@ -282,36 +289,16 @@ class RepoRepositoryImpl implements RepoRepository {
         }
       } else {
         _logger.d('Using direct API call for moderation report');
-        final endpoint = NSID.parse('com.atproto.moderation.createReport');
         final subjectData = input.subject.data;
-
-        Map<String, dynamic> body;
-        var isBskyPost = false;
-
-        if (subjectData is RepoStrongRef) {
-          // Check if this is a Bluesky post
-          isBskyPost = subjectData.uri.collection.toString().startsWith(
-            'app.bsky',
-          );
-
-          body = {
-            'subject': {
-              r'$type': 'com.atproto.repo.strongRef',
-              'uri': subjectData.uri.toString(),
-              'cid': subjectData.cid,
-            },
-            'reasonType': input.reasonType.toJson(),
-          };
-        } else {
+        if (subjectData is! RepoStrongRef) {
           _logger.e('Invalid subject data type: ${subjectData.runtimeType}');
           throw Exception('Invalid subject data');
         }
 
-        if (input.reason != null) {
-          body['reason'] = input.reason;
-        }
-
-        // Route to appropriate moderation service
+        // Check if this is a Bluesky post and route to appropriate moderation service
+        final isBskyPost = subjectData.uri.collection.toString().startsWith(
+          'app.bsky',
+        );
         final modServiceDid = isBskyPost ? _client.bskyModDid : _client.modDid;
         _logger.d(
           'Routing report to ${isBskyPost ? 'Bluesky' : 'Spark'} moderation '
@@ -321,10 +308,10 @@ class RepoRepositoryImpl implements RepoRepository {
         final headers = {'atproto-proxy': modServiceDid};
 
         try {
-          final response = await atproto.post(
-            endpoint,
+          final response = await atproto.call(
+            comAtprotoModerationCreateReport,
             headers: headers,
-            body: body,
+            input: input,
           );
 
           if (response.status != HttpStatus.ok) {
diff --git a/lib/src/core/network/atproto/data/repositories/sound_repository.dart b/lib/src/core/network/atproto/data/repositories/sound_repository.dart
index 8f68fdb3..f5af7fba 100644
--- a/lib/src/core/network/atproto/data/repositories/sound_repository.dart
+++ b/lib/src/core/network/atproto/data/repositories/sound_repository.dart
@@ -1,6 +1,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/models.dart';
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_details.dart';
 
 abstract class SoundRepository {
   /// Create a new sound record.
diff --git a/lib/src/core/network/atproto/data/repositories/sound_repository_impl.dart b/lib/src/core/network/atproto/data/repositories/sound_repository_impl.dart
index 83395e46..f98576f6 100644
--- a/lib/src/core/network/atproto/data/repositories/sound_repository_impl.dart
+++ b/lib/src/core/network/atproto/data/repositories/sound_repository_impl.dart
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
@@ -8,6 +6,14 @@ import 'package:spark/src/core/network/atproto/data/repositories/sound_repositor
 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';
+import 'package:sprk_poptart/so/sprk/sound/audio.dart' as sprk_audio;
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_details.dart';
+import 'package:sprk_poptart/so/sprk/sound/get_audio_posts.dart'
+    as sprk_get_audio_posts;
+import 'package:sprk_poptart/so/sprk/sound/get_trending_audios.dart'
+    as sprk_get_trending_audios;
+import 'package:sprk_poptart/so/sprk/sound/search_audios.dart'
+    as sprk_search_audios;
 
 class SoundRepositoryImpl implements SoundRepository {
   SoundRepositoryImpl(this._client) {
@@ -26,7 +32,7 @@ class SoundRepositoryImpl implements SoundRepository {
   }) async {
     _logger.d('Creating sound record with title: $title');
 
-    final audioRecord = AudioRecord(
+    final audioRecord = sprk_audio.SoundAudioRecord(
       sound: sound,
       title: title,
       createdAt: DateTime.now().toUtc(),
@@ -71,21 +77,21 @@ class SoundRepositoryImpl implements SoundRepository {
         parameters['cursor'] = cursor;
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.sound.getAudioPosts'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_audio_posts.soSprkSoundGetAudioPosts,
+        parameters: sprk_get_audio_posts.SoundGetAudioPostsInput(
+          uri: uri,
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          return AudioPostsResponse.fromJson(jsonMap);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
+      final response = AudioPostsResponse.fromJson(result.data.toJson());
 
       _logger.d(
-        'Audio posts retrieved successfully: ${result.data.posts.length} posts',
+        'Audio posts retrieved successfully: ${response.posts.length} posts',
       );
-      return result.data;
+      return response;
     });
   }
 
@@ -111,22 +117,21 @@ class SoundRepositoryImpl implements SoundRepository {
         parameters['cursor'] = cursor;
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.sound.getTrendingAudios'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_get_trending_audios.soSprkSoundGetTrendingAudios,
+        parameters: sprk_get_trending_audios.SoundGetTrendingAudiosInput(
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          return TrendingAudiosResponse.fromJson(jsonMap);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
+      final response = TrendingAudiosResponse.fromJson(result.data.toJson());
 
       _logger.d(
         'Trending audios retrieved successfully: '
-        '${result.data.audios.length} audios',
+        '${response.audios.length} audios',
       );
-      return result.data;
+      return response;
     });
   }
 
@@ -159,22 +164,22 @@ class SoundRepositoryImpl implements SoundRepository {
         parameters['cursor'] = cursor;
       }
 
-      final result = await atproto.get(
-        NSID.parse('so.sprk.sound.searchAudios'),
-        parameters: parameters,
+      final result = await atproto.call(
+        sprk_search_audios.soSprkSoundSearchAudios,
+        parameters: sprk_search_audios.SoundSearchAudiosInput(
+          q: trimmedQuery,
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          return SearchAudiosResponse.fromJson(jsonMap);
-        },
-        adaptor: (uint8) =>
-            jsonDecode(utf8.decode(uint8 as List<int>)) as Map<String, dynamic>,
       );
+      final response = SearchAudiosResponse.fromJson(result.data.toJson());
 
       _logger.d(
         'Audio search retrieved successfully: '
-        '${result.data.audios.length} audios',
+        '${response.audios.length} audios',
       );
-      return result.data;
+      return response;
     });
   }
 }
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 b38c7c4c..387a1de7 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,9 @@
 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/models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 /// Interface for Story-related API endpoints
 abstract class StoryRepository {
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 bd6ec661..e55ba1f5 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
@@ -1,43 +1,38 @@
 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/models.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';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+import 'package:sprk_poptart/so/sprk/story/get_stories.dart'
+    as sprk_get_stories;
+import 'package:sprk_poptart/so/sprk/story/get_timeline.dart'
+    as sprk_get_timeline;
 
 /// Implementation of Story-related API endpoints
 class StoryRepositoryImpl implements StoryRepository {
   StoryRepositoryImpl(this._client);
   final SprkRepository _client;
 
-  /// Fixes the media structure in story JSON to match the expected model format
-  /// The API sometimes returns media fields directly instead of nested in
-  /// 'image' object
+  /// Fixes story media JSON to match generated sprk_poptart view models.
   void _fixMediaStructure(Map<String, dynamic> storyJson) {
     final media = storyJson['media'];
     if (media is! Map<String, dynamic>) return;
 
     final mediaType = media[r'$type'] as String?;
 
-    // Fix so.sprk.media.image#view - it should have an 'image' field with
-    //ViewImage structure
     if (mediaType == 'so.sprk.media.image#view') {
-      // If media has thumb/fullsize directly but no 'image' field, wrap them
-      if (media.containsKey('thumb') &&
-          media.containsKey('fullsize') &&
-          !media.containsKey('image')) {
-        media['image'] = {
-          'thumb': media['thumb'],
-          'fullsize': media['fullsize'],
-          'alt': media['alt'],
-        };
-        // Remove the direct fields (optional, but cleaner)
+      final image = media['image'];
+      if (image is Map<String, dynamic>) {
+        media['thumb'] ??= image['thumb'];
+        media['fullsize'] ??= image['fullsize'];
+        media['alt'] ??= image['alt'] ?? '';
         media
-          ..remove('thumb')
-          ..remove('fullsize');
-        if (media['alt'] != null) {
-          media.remove('alt');
-        }
+          ..remove('image')
+          ..removeWhere((key, value) => value == null);
       }
     }
   }
@@ -62,71 +57,72 @@ class StoryRepositoryImpl implements StoryRepository {
         parameters['cursor'] = cursor;
       }
 
-      final response = await atproto.get(
-        NSID.parse('so.sprk.story.getTimeline'),
-        parameters: parameters,
+      final rawResponse = await atproto.call(
+        sprk_get_timeline.soSprkStoryGetTimeline,
+        parameters: sprk_get_timeline.StoryGetTimelineInput(
+          limit: limit,
+          cursor: cursor,
+        ),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          final storiesByAuthorMap = <ProfileViewBasic, List<StoryView>>{};
-
-          // Handle missing or null storiesByAuthor field
-          if (!jsonMap.containsKey('storiesByAuthor') ||
-              jsonMap['storiesByAuthor'] == null) {
-            return (
-              storiesByAuthor: storiesByAuthorMap,
-              cursor: jsonMap['cursor'] as String?,
-            );
-          }
-
-          final storiesByAuthorArray =
-              (jsonMap['storiesByAuthor'] as List<dynamic>?) ?? <dynamic>[];
-
-          for (var i = 0; i < storiesByAuthorArray.length; i++) {
-            final item = storiesByAuthorArray[i];
-            try {
-              final itemMap = item as Map<String, dynamic>;
-              final author = ProfileViewBasic.fromJson(
-                itemMap['author'] as Map<String, dynamic>,
-              );
+      );
+      final response = (() {
+        final jsonMap = rawResponse.data.toJson();
+        final storiesByAuthorMap = <ProfileViewBasic, List<StoryView>>{};
 
-              final storiesArray = itemMap['stories'] as List<dynamic>?;
-              if (storiesArray == null) {
-                continue;
-              }
+        // Handle missing or null storiesByAuthor field
+        if (!jsonMap.containsKey('storiesByAuthor') ||
+            jsonMap['storiesByAuthor'] == null) {
+          return (
+            storiesByAuthor: storiesByAuthorMap,
+            cursor: jsonMap['cursor'] as String?,
+          );
+        }
 
-              final stories = <StoryView>[];
-              for (var j = 0; j < storiesArray.length; j++) {
-                final story = storiesArray[j];
-                try {
-                  // Fix the media structure if needed
-                  final storyMap = Map<String, dynamic>.from(
-                    story as Map<String, dynamic>,
-                  );
-                  _fixMediaStructure(storyMap);
-
-                  final storyView = StoryView.fromJson(storyMap);
-                  stories.add(storyView);
-                } catch (e) {
-                  // Don't rethrow - continue with other stories
+        final timelineJson = Map<String, dynamic>.from(jsonMap);
+        final storiesByAuthorArray =
+            (timelineJson['storiesByAuthor'] as List<dynamic>?) ?? <dynamic>[];
+
+        for (final item in storiesByAuthorArray) {
+          try {
+            final itemMap = item as Map<String, dynamic>;
+            final rawStories = itemMap['stories'] as List<dynamic>?;
+            if (rawStories != null) {
+              for (final story in rawStories) {
+                if (story is Map<String, dynamic>) {
+                  _fixMediaStructure(story);
                 }
               }
+            }
+          } catch (e) {
+            // Let generated parsing decide whether the remaining item is valid.
+          }
+        }
 
-              if (stories.isNotEmpty) {
-                storiesByAuthorMap[author] = stories;
-              }
-            } catch (e) {
-              // Skip this author if parsing fails
+        final output = sprk_get_timeline.StoryGetTimelineOutput.fromJson(
+          timelineJson,
+        );
+
+        for (final item in output.storiesByAuthor) {
+          try {
+            final author = ProfileViewBasic.fromJson(item.author.toJson());
+            final stories = item.stories
+                .map((story) => StoryView.fromJson(story.toJson()))
+                .toList();
+            if (stories.isNotEmpty) {
+              storiesByAuthorMap[author] = stories;
             }
+          } catch (e) {
+            // Skip this author if parsing fails
           }
+        }
 
-          return (
-            storiesByAuthor: storiesByAuthorMap,
-            cursor: jsonMap['cursor'] as String?,
-          );
-        },
-      );
+        return (
+          storiesByAuthor: storiesByAuthorMap,
+          cursor: jsonMap['cursor'] as String?,
+        );
+      })();
 
-      return response.data;
+      return response;
     });
   }
 
@@ -142,37 +138,37 @@ class StoryRepositoryImpl implements StoryRepository {
         throw Exception('AtProto not initialized');
       }
 
-      final response = await atproto.get(
-        NSID.parse('so.sprk.story.getStories'),
-        parameters: {'uris': storyUris},
+      final rawResponse = await atproto.call(
+        sprk_get_stories.soSprkStoryGetStories,
+        parameters: sprk_get_stories.StoryGetStoriesInput(uris: storyUris),
         headers: {'atproto-proxy': _client.sprkDid},
-        to: (jsonMap) {
-          final storiesArray = jsonMap['stories'] as List<dynamic>?;
-          if (storiesArray == null) {
-            return <StoryView>[];
-          }
+      );
+      final response = (() {
+        final jsonMap = rawResponse.data.toJson();
+        final storiesJson = Map<String, dynamic>.from(jsonMap);
+        final storiesArray = storiesJson['stories'] as List<dynamic>?;
+        if (storiesArray == null) {
+          return <StoryView>[];
+        }
 
-          final stories = <StoryView>[];
-          for (final story in storiesArray) {
-            try {
-              // Fix the media structure if needed
-              final storyMap = Map<String, dynamic>.from(
-                story as Map<String, dynamic>,
-              );
-              _fixMediaStructure(storyMap);
-
-              final storyView = StoryView.fromJson(storyMap);
-              stories.add(storyView);
-            } catch (e) {
-              // Don't rethrow - continue with other stories
-            }
+        for (final story in storiesArray) {
+          try {
+            // Fix the media structure if needed
+            _fixMediaStructure(story as Map<String, dynamic>);
+          } catch (e) {
+            // Let generated parsing decide whether the remaining item is valid.
           }
+        }
 
-          return stories;
-        },
-      );
+        final output = sprk_get_stories.StoryGetStoriesOutput.fromJson(
+          storiesJson,
+        );
+        return output.stories
+            .map((story) => StoryView.fromJson(story.toJson()))
+            .toList();
+      })();
 
-      return response.data;
+      return response;
     });
   }
 
@@ -187,21 +183,17 @@ class StoryRepositoryImpl implements StoryRepository {
     final normalizedLabels = selfLabels == null || selfLabels.isEmpty
         ? null
         : selfLabels;
-    final normalizedTags = tags == null || tags.isEmpty ? null : tags;
     final normalizedEmbeds = embeds == null || embeds.isEmpty ? null : embeds;
 
-    final record = StoryRecord(
-      createdAt: DateTime.now().toUtc(),
-      media: media,
-      tags: normalizedTags,
-      labels: normalizedLabels,
-      sound: soundRef,
-      embeds: normalizedEmbeds,
-    );
-
     return _client.repo.createRecord(
       collection: 'so.sprk.story.post',
-      record: record.toJson(),
+      record: sprkStoryRecordFromLocal(
+        createdAt: DateTime.now().toUtc(),
+        media: media,
+        labels: normalizedLabels,
+        sound: soundRef,
+        embeds: normalizedEmbeds,
+      ).toJson(),
     );
   }
 }
diff --git a/lib/src/core/network/messages/data/models/message_models.dart b/lib/src/core/network/messages/data/models/message_models.dart
index c3535931..10469a2c 100644
--- a/lib/src/core/network/messages/data/models/message_models.dart
+++ b/lib/src/core/network/messages/data/models/message_models.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'message_models.freezed.dart';
 part 'message_models.g.dart';
diff --git a/lib/src/core/pro_image_editor/story_mention_layer.dart b/lib/src/core/pro_image_editor/story_mention_layer.dart
index a9527e13..bd290dc6 100644
--- a/lib/src/core/pro_image_editor/story_mention_layer.dart
+++ b/lib/src/core/pro_image_editor/story_mention_layer.dart
@@ -2,7 +2,7 @@ import 'dart:math' as math;
 
 import 'package:flutter/material.dart';
 import 'package:pro_image_editor/pro_image_editor.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
 import 'package:spark/src/core/ui/widgets/story_mention_chip.dart';
 
@@ -86,7 +86,7 @@ List<StoryEmbed> extractStoryMentionEmbeds(
     }
 
     embeds.add(
-      StoryEmbed.mention(
+      StoryEmbed(
         placement: StoryEmbedPlacement(
           frame: StoryEmbedFrame(
             x: _normalize(visibleRect.left, canvasSize.width, clampMin: 0),
diff --git a/lib/src/core/pro_image_editor/ui/widgets/story_mention_picker_sheet.dart b/lib/src/core/pro_image_editor/ui/widgets/story_mention_picker_sheet.dart
index c113e800..28acb0ed 100644
--- a/lib/src/core/pro_image_editor/ui/widgets/story_mention_picker_sheet.dart
+++ b/lib/src/core/pro_image_editor/ui/widgets/story_mention_picker_sheet.dart
@@ -1,7 +1,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/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/features/search/providers/actor_typeahead_provider.dart';
 import 'package:spark/src/features/search/providers/actor_typeahead_state.dart';
 
diff --git a/lib/src/core/pro_video_editor/models/sound_audio_track.dart b/lib/src/core/pro_video_editor/models/sound_audio_track.dart
index 1e02775b..a3067912 100644
--- a/lib/src/core/pro_video_editor/models/sound_audio_track.dart
+++ b/lib/src/core/pro_video_editor/models/sound_audio_track.dart
@@ -9,7 +9,7 @@ const _fallbackAudioDuration = Duration(seconds: 9);
 const _fallbackAudioFileExtension = 'mp3';
 
 AudioTrack? audioViewToAudioTrack(AudioView audio) {
-  final audioUrl = audio.audio?.toString();
+  final audioUrl = audio.audio;
   if (audioUrl == null || audioUrl.isEmpty) return null;
 
   return AudioTrack(
@@ -95,7 +95,7 @@ String decodeSoundTrackAudioMimeType(String? encoded) {
 }
 
 String audioFileExtension(AudioView audio) {
-  final record = audio.record;
+  final record = audio.localRecord;
   if (record is PlyrTrackRecord) {
     return _normalizeAudioFileExtension(
       record.fileType,
@@ -109,7 +109,7 @@ String audioFileExtension(AudioView audio) {
 }
 
 String audioMimeType(AudioView audio) {
-  final record = audio.record;
+  final record = audio.localRecord;
   if (record is PlyrTrackRecord) {
     return _normalizeAudioMimeType(
       record.audioBlob?.mimeType,
diff --git a/lib/src/core/routing/app_router.dart b/lib/src/core/routing/app_router.dart
index c29a4d5d..8b476d38 100644
--- a/lib/src/core/routing/app_router.dart
+++ b/lib/src/core/routing/app_router.dart
@@ -9,10 +9,13 @@ import 'package:pro_video_editor/pro_video_editor.dart';
 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/routing/pages.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/profile/ui/pages/user_list_page.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+import 'package:sprk_poptart/so/sprk/embed/mention.dart' show EmbedMention;
 
 part 'app_router.gr.dart';
 
diff --git a/lib/src/core/storage/cache/download_manager_impl.dart b/lib/src/core/storage/cache/download_manager_impl.dart
index 2bfd9648..d6f8f027 100644
--- a/lib/src/core/storage/cache/download_manager_impl.dart
+++ b/lib/src/core/storage/cache/download_manager_impl.dart
@@ -3,7 +3,8 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:collection/collection.dart';
 import 'package:get_it/get_it.dart';
 import 'package:pool/pool.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/pref_models.dart';
 import 'package:spark/src/core/storage/cache/download_manager_interface.dart';
 import 'package:spark/src/core/utils/logging/logging.dart';
 import 'package:spark/src/features/feed/providers/feed_state.dart';
@@ -21,7 +22,7 @@ class DownloadManagerImpl implements DownloadManagerInterface {
     // via setActiveFeed() once preferences are loaded from the provider
     _activeFeed = Feed(
       type: 'timeline',
-      config: SavedFeed(type: 'timeline', value: 'following', pinned: true),
+      config: makeSavedFeed(type: 'timeline', value: 'following', pinned: true),
     );
   }
 
@@ -159,82 +160,39 @@ class DownloadManagerImpl implements DownloadManagerInterface {
 
       task.status = DownloadTaskStatus.active;
       // Actual caching work - start downloading the media
-      switch (task.post.media) {
-        case MediaViewVideo():
-          await DownloadManagerImpl.controller.preCache(
-            BetterPlayerDataSource(
-              BetterPlayerDataSourceType.network,
-              task.post.videoUrl,
-              cacheConfiguration: BetterPlayerCacheConfiguration(
-                useCache: true,
-                preCacheSize: 10 * 1024 * 1024, // 10 MB
-                maxCacheSize: 500 * 1024 * 1024, // 500 MB
-                key: task.post.videoUrl,
-              ),
+      if (task.post.videoUrl.isNotEmpty) {
+        await DownloadManagerImpl.controller.preCache(
+          BetterPlayerDataSource(
+            BetterPlayerDataSourceType.network,
+            task.post.videoUrl,
+            videoFormat: BetterPlayerVideoFormat.hls,
+            videoExtension: 'm3u8',
+            placeholder: task.post.thumbnailUrl.isNotEmpty
+                ? CachedNetworkImage(
+                    fadeInDuration: Duration.zero,
+                    imageUrl: task.post.thumbnailUrl,
+                  )
+                : null,
+            cacheConfiguration: BetterPlayerCacheConfiguration(
+              useCache: true,
+              preCacheSize: 10 * 1024 * 1024, // 10 MB
+              maxCacheSize: 500 * 1024 * 1024, // 500 MB
+              key: task.post.videoUrl,
             ),
-          );
-        case MediaViewImages():
-          for (final url in task.post.imageUrls) {
-            // Download the image and verify it's cached
-            final fileInfo = await CachedNetworkImageProvider
-                .defaultCacheManager
-                .downloadFile(url, key: url);
-            if (fileInfo.statusCode != 200) {
-              _logger.w(
-                'Image file was not properly cached after download: $url',
-              );
-            }
+          ),
+        );
+      } else if (task.post.imageUrls.isNotEmpty) {
+        for (final url in task.post.imageUrls) {
+          final fileInfo = await CachedNetworkImageProvider.defaultCacheManager
+              .downloadFile(url, key: url);
+          if (fileInfo.statusCode != 200) {
+            _logger.w(
+              'Image file was not properly cached after download: $url',
+            );
           }
-        case MediaViewBskyRecordWithMedia(:final media):
-          // Handle nested media in record with media embeds
-          switch (media) {
-            case MediaViewVideo() || MediaViewBskyVideo():
-              await DownloadManagerImpl.controller.preCache(
-                BetterPlayerDataSource(
-                  BetterPlayerDataSourceType.network,
-                  task.post.videoUrl,
-                  videoFormat: BetterPlayerVideoFormat.hls,
-                  videoExtension: 'm3u8',
-                  cacheConfiguration: BetterPlayerCacheConfiguration(
-                    useCache: true,
-                    preCacheSize: 10 * 1024 * 1024, // 10 MB
-                    maxCacheSize: 500 * 1024 * 1024, // 500 MB
-                    key: task.post.videoUrl,
-                  ),
-                ),
-              );
-            case MediaViewImage() || MediaViewImages() || MediaViewBskyImages():
-              for (final url in task.post.imageUrls) {
-                // Download the image and verify it's cached
-                await CachedNetworkImageProvider.defaultCacheManager
-                    .downloadFile(url, key: url);
-              }
-            default:
-              throw Exception('Unsupported media type: ${media.runtimeType}');
-          }
-        case MediaViewBskyVideo(:final thumbnail):
-          await DownloadManagerImpl.controller.preCache(
-            BetterPlayerDataSource(
-              BetterPlayerDataSourceType.network,
-              videoFormat: BetterPlayerVideoFormat.hls,
-              videoExtension: 'm3u8',
-              task.post.videoUrl,
-              placeholder: CachedNetworkImage(
-                fadeInDuration: Duration.zero,
-                imageUrl: thumbnail.toString(),
-              ),
-              cacheConfiguration: BetterPlayerCacheConfiguration(
-                useCache: true,
-                preCacheSize: 10 * 1024 * 1024, // 10 MB
-                maxCacheSize: 500 * 1024 * 1024, // 500 MB
-                key: task.post.videoUrl,
-              ),
-            ),
-          );
-        default:
-          throw Exception(
-            'Unsupported media type: ${task.post.media.runtimeType}',
-          );
+        }
+      } else {
+        throw Exception('Unsupported media type for ${task.post.uri}');
       }
 
       task.status = DownloadTaskStatus.completed;
diff --git a/lib/src/core/storage/preferences/default_preferences.dart b/lib/src/core/storage/preferences/default_preferences.dart
index d8dff665..e31fa259 100644
--- a/lib/src/core/storage/preferences/default_preferences.dart
+++ b/lib/src/core/storage/preferences/default_preferences.dart
@@ -10,14 +10,14 @@ class DefaultPreferences {
     final labelerDid = modServiceDid;
     // Default feeds: timeline, forYou, latest
     final defaultFeeds = [
-      SavedFeed(type: 'timeline', value: 'following', pinned: true),
-      SavedFeed(
+      makeSavedFeed(type: 'timeline', value: 'following', pinned: true),
+      makeSavedFeed(
         type: 'feed',
         value:
             'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/thevids',
         pinned: true,
       ),
-      SavedFeed(
+      makeSavedFeed(
         type: 'feed',
         value:
             'at://did:plc:cveom2iroj3mt747sd4qqnr2/so.sprk.feed.generator/discover',
@@ -27,42 +27,42 @@ class DefaultPreferences {
 
     // Default label preferences
     final defaultLabelPrefs = [
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: '!hide',
         visibility: 'hide',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: '!no-promote',
         visibility: 'hide',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: '!warn',
         visibility: 'warn',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: '!no-unauthenticated',
         visibility: 'ignore',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: 'dmca-violation',
         visibility: 'hide',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: 'doxxing',
         visibility: 'warn',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: 'nsfl',
         visibility: 'warn',
       ),
-      Preference.contentLabelPref(
+      contentLabelPreference(
         labelerDid: labelerDid,
         label: 'gore',
         visibility: 'warn',
@@ -74,8 +74,8 @@ class DefaultPreferences {
 
     return Preferences(
       preferences: [
-        Preference.savedFeedsPref(items: defaultFeeds),
-        Preference.labelersPref(labelers: defaultLabelers),
+        savedFeedsPreference(defaultFeeds),
+        labelersPreference(defaultLabelers),
         ...defaultLabelPrefs,
       ],
     );
diff --git a/lib/src/core/utils/blocking_utils.dart b/lib/src/core/utils/blocking_utils.dart
index 52d65d01..4ea062f4 100644
--- a/lib/src/core/utils/blocking_utils.dart
+++ b/lib/src/core/utils/blocking_utils.dart
@@ -1,22 +1,22 @@
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 /// Checks if the viewer is blocking the profile
-bool isBlocking(ActorViewer? viewer) {
+bool isBlocking(ViewerState? viewer) {
   return viewer?.blocking != null;
 }
 
 /// Checks if the viewer is blocked by the profile
-bool isBlockedBy(ActorViewer? viewer) {
+bool isBlockedBy(ViewerState? viewer) {
   return viewer?.blockedBy ?? false;
 }
 
 /// Checks if there is any block relationship (either direction)
-bool isBlocked(ActorViewer? viewer) {
+bool isBlocked(ViewerState? viewer) {
   return isBlocking(viewer) || isBlockedBy(viewer);
 }
 
 /// Determines if the follow button should be shown
 /// Returns false if the viewer is blocked by the profile
-bool shouldShowFollowButton(ActorViewer? viewer) {
+bool shouldShowFollowButton(ViewerState? viewer) {
   return !isBlockedBy(viewer);
 }
diff --git a/lib/src/core/utils/label_utils.dart b/lib/src/core/utils/label_utils.dart
index a9c81e54..c8e52285 100644
--- a/lib/src/core/utils/label_utils.dart
+++ b/lib/src/core/utils/label_utils.dart
@@ -21,10 +21,10 @@ class LabelUtils {
       );
       return LabelPreference(
         value: contentLabelPref.label,
-        blurs: _visibilityToBlurs(contentLabelPref.visibility),
-        severity: _visibilityToSeverity(contentLabelPref.visibility),
-        defaultSetting: _visibilityToSetting(contentLabelPref.visibility),
-        setting: _visibilityToSetting(contentLabelPref.visibility),
+        blurs: _visibilityToBlurs(contentLabelPref.visibilityValue),
+        severity: _visibilityToSeverity(contentLabelPref.visibilityValue),
+        defaultSetting: _visibilityToSetting(contentLabelPref.visibilityValue),
+        setting: _visibilityToSetting(contentLabelPref.visibilityValue),
         adultOnly: _isAdultOnlyLabel(value),
       );
     } catch (e) {
diff --git a/lib/src/features/auth/providers/onboarding_providers.dart b/lib/src/features/auth/providers/onboarding_providers.dart
index 8eab7e86..6d7bbdd9 100644
--- a/lib/src/features/auth/providers/onboarding_providers.dart
+++ b/lib/src/features/auth/providers/onboarding_providers.dart
@@ -4,8 +4,8 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 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/auth/data/repositories/onboarding_repository_impl.dart';
-import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
+import 'package:sprk_poptart/so/sprk/graph/get_follows/output.dart';
 
 part 'onboarding_providers.g.dart';
 
@@ -37,7 +37,7 @@ Future<ActorProfileRecord?> bskyProfile(Ref ref) async {
 
 /// Provider to get Bluesky follows
 @riverpod
-Future<FollowsResponse> bskyFollows(Ref ref, {String? cursor}) async {
+Future<GraphGetFollowsOutput> bskyFollows(Ref ref, {String? cursor}) async {
   final repository = ref.watch(onboardingRepositoryProvider);
   return repository.getBskyFollows(cursor: cursor);
 }
diff --git a/lib/src/features/auth/ui/pages/login_page.dart b/lib/src/features/auth/ui/pages/login_page.dart
index 9ba443e0..19562d98 100644
--- a/lib/src/features/auth/ui/pages/login_page.dart
+++ b/lib/src/features/auth/ui/pages/login_page.dart
@@ -10,7 +10,7 @@ import 'package:spark/src/core/design_system/components/atoms/buttons/app_overla
 import 'package:spark/src/core/design_system/components/atoms/buttons/long_button.dart';
 import 'package:spark/src/core/design_system/tokens/typography.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/auth/providers/auth_providers.dart';
 import 'package:spark/src/features/auth/providers/onboarding_providers.dart';
diff --git a/lib/src/features/comments/providers/comment_input_provider.dart b/lib/src/features/comments/providers/comment_input_provider.dart
index 92014ba2..07c39453 100644
--- a/lib/src/features/comments/providers/comment_input_provider.dart
+++ b/lib/src/features/comments/providers/comment_input_provider.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/utils/text_formatter.dart';
 import 'package:spark/src/core/utils/logging/logging.dart';
 import 'package:spark/src/features/comments/providers/comment_input_state.dart';
diff --git a/lib/src/features/comments/providers/comment_provider.dart b/lib/src/features/comments/providers/comment_provider.dart
index 03b7bd16..0877901f 100644
--- a/lib/src/features/comments/providers/comment_provider.dart
+++ b/lib/src/features/comments/providers/comment_provider.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.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/features/comments/providers/comment_state.dart';
 import 'package:spark/src/features/feed/providers/post_updates.dart';
 
@@ -42,14 +43,22 @@ class CommentNotifier extends _$CommentNotifier {
             ),
           ),
           ThreadReplyView(:final reply) => ThreadReplyView(
-            reply: reply.copyWith(
+            reply: ReplyView(
+              uri: reply.uri,
+              cid: reply.cid,
+              author: reply.author,
+              record: reply.record,
+              indexedAt: reply.indexedAt,
+              media: reply.media,
+              replyCount: reply.replyCount,
+              labels: reply.labels,
               viewer: reply.viewer?.copyWith(like: null),
               likeCount: currentLikeCount - 1,
             ),
           ),
         };
         state = state.copyWith(
-          thread: state.thread.copyWith(post: updatedPost),
+          thread: _withUpdatedPost(state.thread, updatedPost),
         );
 
         await _feedRepository.unlikePost(likeUri);
@@ -70,7 +79,15 @@ class CommentNotifier extends _$CommentNotifier {
             ),
           ),
           ThreadReplyView(:final reply) => ThreadReplyView(
-            reply: reply.copyWith(
+            reply: ReplyView(
+              uri: reply.uri,
+              cid: reply.cid,
+              author: reply.author,
+              record: reply.record,
+              indexedAt: reply.indexedAt,
+              media: reply.media,
+              replyCount: reply.replyCount,
+              labels: reply.labels,
               viewer:
                   reply.viewer?.copyWith(like: response.uri) ??
                   ReplyViewerState(like: response.uri),
@@ -79,7 +96,7 @@ class CommentNotifier extends _$CommentNotifier {
           ),
         };
         state = state.copyWith(
-          thread: state.thread.copyWith(post: updatedPost),
+          thread: _withUpdatedPost(state.thread, updatedPost),
         );
 
         ref.read(postUpdateProvider(postUri).notifier).state++;
@@ -96,4 +113,14 @@ class CommentNotifier extends _$CommentNotifier {
       precacheImage(CachedNetworkImageProvider(imageUrls.first), context);
     }
   }
+
+  ThreadViewPost _withUpdatedPost(ThreadViewPost thread, ThreadPost post) {
+    return Thread.threadViewPost(
+          post: post,
+          parent: thread.parent,
+          replies: thread.replies,
+          context: thread.context,
+        )
+        as ThreadViewPost;
+  }
 }
diff --git a/lib/src/features/comments/providers/comments_page_provider.dart b/lib/src/features/comments/providers/comments_page_provider.dart
index 21a3e4c6..e76cc92c 100644
--- a/lib/src/features/comments/providers/comments_page_provider.dart
+++ b/lib/src/features/comments/providers/comments_page_provider.dart
@@ -3,6 +3,7 @@ import 'package:get_it/get_it.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:riverpod_annotation/riverpod_annotation.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/features/comments/providers/comments_page_state.dart';
 import 'package:spark/src/features/feed/providers/post_updates.dart';
 
diff --git a/lib/src/features/comments/ui/pages/comments_page.dart b/lib/src/features/comments/ui/pages/comments_page.dart
index f5339a3f..4704f00c 100644
--- a/lib/src/features/comments/ui/pages/comments_page.dart
+++ b/lib/src/features/comments/ui/pages/comments_page.dart
@@ -232,7 +232,7 @@ class _CommentsListPageState extends ConsumerState<CommentsListPage> {
       return const Center(child: CircularProgressIndicator());
     }
 
-    final hasCrossposts = displayPost.record.crossposts?.isNotEmpty ?? false;
+    final hasCrossposts = displayPost.crossposts?.isNotEmpty ?? false;
 
     return Column(
       children: [
diff --git a/lib/src/features/comments/ui/pages/replies_page.dart b/lib/src/features/comments/ui/pages/replies_page.dart
index fc05d266..335af3ad 100644
--- a/lib/src/features/comments/ui/pages/replies_page.dart
+++ b/lib/src/features/comments/ui/pages/replies_page.dart
@@ -93,16 +93,14 @@ class _RepliesPageState extends ConsumerState<RepliesPage> {
     final post = thread.post;
     if (post is ThreadReplyView) {
       final record = post.reply.record;
-      if (record is Map<String, dynamic>) {
-        final reply = record['reply'] as Map<String, dynamic>?;
-        if (reply != null) {
-          final root = reply['root'] as Map<String, dynamic>?;
-          if (root != null) {
-            final uri = root['uri'] as String?;
-            final cid = root['cid'] as String?;
-            if (uri != null && cid != null) {
-              return (uri: uri, cid: cid);
-            }
+      final reply = record['reply'] as Map<String, dynamic>?;
+      if (reply != null) {
+        final root = reply['root'] as Map<String, dynamic>?;
+        if (root != null) {
+          final uri = root['uri'] as String?;
+          final cid = root['cid'] as String?;
+          if (uri != null && cid != null) {
+            return (uri: uri, cid: cid);
           }
         }
       }
diff --git a/lib/src/features/comments/ui/widgets/comment_item.dart b/lib/src/features/comments/ui/widgets/comment_item.dart
index 0d3453ec..093b98ad 100644
--- a/lib/src/features/comments/ui/widgets/comment_item.dart
+++ b/lib/src/features/comments/ui/widgets/comment_item.dart
@@ -123,9 +123,7 @@ class _CommentItemState extends ConsumerState<CommentItem> {
 
     final borderRadius = BorderRadius.circular(8);
 
-    // Comments only support a single image (EmbedViewMediaImage)
-    // The adapter transforms Bluesky comments to this format
-    final hasImages = commentState.thread.post.media is MediaViewImage;
+    final imageUrls = commentState.thread.post.imageUrls;
 
     return ColoredBox(
       color: widget.isHighlighted
@@ -228,11 +226,10 @@ class _CommentItemState extends ConsumerState<CommentItem> {
                           style: Theme.of(context).textTheme.bodyMedium,
                         ),
 
-                      if (commentState.thread.post.media != null &&
-                          hasImages) ...[
+                      if (imageUrls.isNotEmpty) ...[
                         const SizedBox(height: 8),
                         ImageContent(
-                          imageUrls: commentState.thread.post.imageUrls,
+                          imageUrls: imageUrls,
                           borderRadius: borderRadius,
                           thumbnailSize: thumbnailSize,
                         ),
diff --git a/lib/src/features/feed/providers/feed_provider.dart b/lib/src/features/feed/providers/feed_provider.dart
index fee95547..963953eb 100644
--- a/lib/src/features/feed/providers/feed_provider.dart
+++ b/lib/src/features/feed/providers/feed_provider.dart
@@ -184,8 +184,8 @@ class FeedNotifier extends _$FeedNotifier {
         final postLabels = <Label>[...?post.labels];
 
         // Add self-labels from the post record
-        if (post.record.selfLabels != null) {
-          for (final selfLabel in post.record.selfLabels!) {
+        if (post.selfLabels != null) {
+          for (final selfLabel in post.selfLabels!) {
             postLabels.add(
               Label(
                 uri: key,
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 37de8db4..47064456 100644
--- a/lib/src/features/feed/ui/pages/standalone_post_page.dart
+++ b/lib/src/features/feed/ui/pages/standalone_post_page.dart
@@ -384,39 +384,15 @@ class _StandalonePostPageState extends ConsumerState<StandalonePostPage> {
             children: [
               // Main content
               Positioned.fill(
-                child: switch (postData!.media) {
-                  MediaViewVideo() => PostVideoPlayer(
-                    key: _videoPlayerKey,
-                    videoUrl: postData.videoUrl,
-                    // For standalone, we don't need feed and index
-                    thumbnail: postData.thumbnailUrl,
-                  ),
-                  MediaViewBskyVideo() => PostVideoPlayer(
-                    key: _videoPlayerKey,
-                    videoUrl: postData.videoUrl,
-                    thumbnail: postData.thumbnailUrl,
-                  ),
-                  MediaViewImages() || MediaViewBskyImages() => ImageCarousel(
-                    imageUrls: postData.imageUrls,
-                  ),
-                  MediaViewBskyRecordWithMedia(:final media) => switch (media) {
-                    MediaViewVideo() => PostVideoPlayer(
-                      key: _videoPlayerKey,
-                      videoUrl: postData.videoUrl,
-                      thumbnail: postData.thumbnailUrl,
-                    ),
-                    MediaViewBskyVideo() => PostVideoPlayer(
-                      key: _videoPlayerKey,
-                      videoUrl: postData.videoUrl,
-                      thumbnail: postData.thumbnailUrl,
-                    ),
-                    MediaViewImages() || MediaViewBskyImages() => ImageCarousel(
-                      imageUrls: postData.imageUrls,
-                    ),
-                    _ => const SizedBox.shrink(),
-                  },
-                  _ => const SizedBox.shrink(),
-                },
+                child: postData!.videoUrl.isNotEmpty
+                    ? PostVideoPlayer(
+                        key: _videoPlayerKey,
+                        videoUrl: postData.videoUrl,
+                        thumbnail: postData.thumbnailUrl,
+                      )
+                    : postData.imageUrls.isNotEmpty
+                    ? ImageCarousel(imageUrls: postData.imageUrls)
+                    : const SizedBox.shrink(),
               ),
 
               // Overlay controls
diff --git a/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart b/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
index a183fbe8..bda04bec 100644
--- a/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
+++ b/lib/src/features/feed/ui/widgets/action_buttons/side_action_bar.dart
@@ -9,6 +9,7 @@ import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:spark/src/core/design_system/components/organisms/side_action_bar.dart';
 import 'package:spark/src/core/l10n/app_localizations.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/routing/app_router.dart';
 import 'package:spark/src/core/ui/widgets/options_panel.dart';
 import 'package:spark/src/core/ui/widgets/report_dialog.dart';
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 f7f73859..678174d4 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
@@ -236,46 +236,16 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
                   child: GestureDetector(
                     behavior: HitTestBehavior.opaque,
                     onDoubleTap: () => _handleDoubleTapLike(postData),
-                    child: switch (postData.media) {
-                      MediaViewVideo() => PostVideoPlayer(
-                        key: _videoPlayerKey,
-                        videoUrl: postData.videoUrl,
-                        feed: widget.feed,
-                        index: widget.index,
-                        thumbnail: postData.thumbnailUrl,
-                      ),
-                      MediaViewBskyVideo() => PostVideoPlayer(
-                        key: _videoPlayerKey,
-                        videoUrl: postData.videoUrl,
-                        feed: widget.feed,
-                        index: widget.index,
-                        thumbnail: postData.thumbnailUrl,
-                      ),
-                      MediaViewImages() ||
-                      MediaViewBskyImages() => ImageCarousel(
-                        imageUrls: postData.imageUrls,
-                        hasKnownInteractions:
-                            currentPost.viewer?.knownInteractions != null &&
-                            currentPost.viewer!.knownInteractions!.isNotEmpty,
-                      ),
-                      MediaViewBskyRecordWithMedia(:final media) =>
-                        switch (media) {
-                          MediaViewVideo() => PostVideoPlayer(
+                    child: postData.videoUrl.isNotEmpty
+                        ? PostVideoPlayer(
                             key: _videoPlayerKey,
                             videoUrl: postData.videoUrl,
                             feed: widget.feed,
                             index: widget.index,
                             thumbnail: postData.thumbnailUrl,
-                          ),
-                          MediaViewBskyVideo() => PostVideoPlayer(
-                            key: _videoPlayerKey,
-                            videoUrl: postData.videoUrl,
-                            feed: widget.feed,
-                            index: widget.index,
-                            thumbnail: postData.thumbnailUrl,
-                          ),
-                          MediaViewImages() ||
-                          MediaViewBskyImages() => ImageCarousel(
+                          )
+                        : postData.imageUrls.isNotEmpty
+                        ? ImageCarousel(
                             imageUrls: postData.imageUrls,
                             hasKnownInteractions:
                                 currentPost.viewer?.knownInteractions != null &&
@@ -283,15 +253,10 @@ class _FeedPostWidgetState extends ConsumerState<FeedPostWidget> {
                                     .viewer!
                                     .knownInteractions!
                                     .isNotEmpty,
-                          ),
-                          _ => const DecoratedBox(
+                          )
+                        : const DecoratedBox(
                             decoration: BoxDecoration(color: AppColors.black),
                           ),
-                        },
-                      _ => const DecoratedBox(
-                        decoration: BoxDecoration(color: AppColors.black),
-                      ),
-                    },
                   ),
                 ),
 
diff --git a/lib/src/features/feed/ui/widgets/post/post_overlay.dart b/lib/src/features/feed/ui/widgets/post/post_overlay.dart
index ed59996c..7ea37965 100644
--- a/lib/src/features/feed/ui/widgets/post/post_overlay.dart
+++ b/lib/src/features/feed/ui/widgets/post/post_overlay.dart
@@ -102,10 +102,10 @@ class PostOverlay extends ConsumerWidget {
                                   post.author.displayName ?? post.author.handle,
                               avatarUrl: post.author.avatar?.toString(),
                               description: post.displayText,
-                              hashtags: post.record.hashtags,
+                              hashtags: post.hashtags,
                               informLabels: informLabels,
                               isSprk: post.uri.toString().contains('so.sprk'),
-                              audio: post.sound,
+                              audio: post.localSound,
                               onUsernameTap: onUsernameTap,
                             );
                           },
@@ -125,9 +125,7 @@ class PostOverlay extends ConsumerWidget {
                       shareCount: '${post.repostCount ?? 0}',
                       isLiked: isLiked,
                       profileImageUrl: post.author.avatar.toString(),
-                      isImage:
-                          post.media is MediaViewImages ||
-                          post.media is MediaViewBskyImages,
+                      isImage: post.imageUrls.length > 1,
                       onProfilePressed: onProfilePressed,
                       showBlockOption: showBlockOption,
                     ),
diff --git a/lib/src/features/messages/providers/conversation_state.dart b/lib/src/features/messages/providers/conversation_state.dart
index 5276f732..b0d413d8 100644
--- a/lib/src/features/messages/providers/conversation_state.dart
+++ b/lib/src/features/messages/providers/conversation_state.dart
@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/messages/data/models/message_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'conversation_state.freezed.dart';
 
diff --git a/lib/src/features/messages/providers/conversations._state.dart b/lib/src/features/messages/providers/conversations._state.dart
index 3145a038..00386890 100644
--- a/lib/src/features/messages/providers/conversations._state.dart
+++ b/lib/src/features/messages/providers/conversations._state.dart
@@ -1,6 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/messages/data/models/message_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'conversations._state.freezed.dart';
 
diff --git a/lib/src/features/messages/providers/conversations_provider.dart b/lib/src/features/messages/providers/conversations_provider.dart
index 7bf414fb..9ce1f187 100644
--- a/lib/src/features/messages/providers/conversations_provider.dart
+++ b/lib/src/features/messages/providers/conversations_provider.dart
@@ -1,10 +1,10 @@
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/messages/data/models/message_models.dart';
 import 'package:spark/src/core/network/messages/data/repository/messages_repository.dart';
 import 'package:spark/src/features/messages/providers/conversations._state.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'conversations_provider.g.dart';
 
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 ea4e6d80..60a66e4a 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
@@ -5,7 +5,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_leading_button.dart';
 import 'package:spark/src/core/design_system/components/molecules/profile_card.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/messages/data/repository/messages_repository.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
diff --git a/lib/src/features/messages/ui/widgets/messages_list.dart b/lib/src/features/messages/ui/widgets/messages_list.dart
index 1f2b1696..04fc7c23 100644
--- a/lib/src/features/messages/ui/widgets/messages_list.dart
+++ b/lib/src/features/messages/ui/widgets/messages_list.dart
@@ -723,38 +723,13 @@ class _PostEmbedPreview extends StatelessWidget {
 
   // Pick a thumbnail and detect video vs image
   (String?, bool) _deriveThumb(PostView post) {
-    final mediaToCheck = post.displayMedia;
-    if (mediaToCheck == null) return (null, false);
-
-    switch (mediaToCheck) {
-      case MediaViewVideo():
-      case MediaViewBskyVideo():
-        return (post.thumbnailUrl.isNotEmpty ? post.thumbnailUrl : null, true);
-      case MediaViewImage():
-      case MediaViewImages():
-      case MediaViewBskyImages():
-        return (post.imageUrls.isNotEmpty ? post.imageUrls.first : null, false);
-      case MediaViewBskyRecordWithMedia(:final media):
-        switch (media) {
-          case MediaViewVideo():
-          case MediaViewBskyVideo():
-            return (
-              post.thumbnailUrl.isNotEmpty ? post.thumbnailUrl : null,
-              true,
-            );
-          case MediaViewImage():
-          case MediaViewImages():
-          case MediaViewBskyImages():
-            return (
-              post.imageUrls.isNotEmpty ? post.imageUrls.first : null,
-              false,
-            );
-          default:
-            return (null, false);
-        }
-      default:
-        return (null, false);
+    if (post.videoUrl.isNotEmpty) {
+      return (post.thumbnailUrl.isNotEmpty ? post.thumbnailUrl : null, true);
+    }
+    if (post.imageUrls.isNotEmpty) {
+      return (post.imageUrls.first, false);
     }
+    return (null, false);
   }
 
   Widget _embedSkeleton(BuildContext context) {
diff --git a/lib/src/features/notifications/models/grouped_notification.dart b/lib/src/features/notifications/models/grouped_notification.dart
index da5ef5f0..12379c2b 100644
--- a/lib/src/features/notifications/models/grouped_notification.dart
+++ b/lib/src/features/notifications/models/grouped_notification.dart
@@ -10,7 +10,7 @@ class GroupedNotification {
   final List<Notification> notifications;
 
   /// The reason for the notification (like, repost, follow, etc.)
-  String get reason => primaryNotification.reason;
+  String get reason => primaryNotification.reasonValue;
 
   /// The subject being acted upon (e.g., the post being liked)
   /// Null for follows
@@ -73,7 +73,7 @@ List<GroupedNotification> groupNotifications(List<Notification> notifications) {
 
   // First pass: collect all groupable notifications
   for (final notification in notifications) {
-    switch (notification.reason) {
+    switch (notification.reasonValue) {
       case 'follow':
         // Check if this is a follow-back (viewer follows the author)
         final isFollowBack = notification.author.viewer?.following != null;
diff --git a/lib/src/features/notifications/ui/widgets/notification_item.dart b/lib/src/features/notifications/ui/widgets/notification_item.dart
index 3d32a0b4..304d5de6 100644
--- a/lib/src/features/notifications/ui/widgets/notification_item.dart
+++ b/lib/src/features/notifications/ui/widgets/notification_item.dart
@@ -171,10 +171,11 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
 
   Future<void> _handleTap(BuildContext context) async {
     // Navigate based on notification type
-    if (notification.reason == 'follow') {
+    final reason = notification.reasonValue;
+    if (reason == 'follow') {
       // Navigate to profile (use first author for grouped follows)
       context.router.push(ProfileRoute(did: notification.author.did));
-    } else if (notification.reason == 'reply') {
+    } else if (reason == 'reply') {
       final replyUri = notification.uri.toString();
       context.router.push(StandalonePostRoute(postUri: replyUri));
     } else if (notification.reasonSubject != null) {
@@ -201,7 +202,8 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
       var recordToCheck = notification.record;
 
       // For like/repost notifications, get text from the subject record
-      if (notification.reason == 'like' || notification.reason == 'repost') {
+      final reason = notification.reasonValue;
+      if (reason == 'like' || reason == 'repost') {
         final subject = notification.record['subject'] as Map<String, dynamic>?;
         if (subject != null) {
           recordToCheck = subject;
@@ -234,7 +236,8 @@ class _NotificationItemState extends ConsumerState<NotificationItem> {
       Map<String, dynamic>? media;
 
       // For like/repost notifications, check for subjectMedia at top level first
-      if (notification.reason == 'like' || notification.reason == 'repost') {
+      final reason = notification.reasonValue;
+      if (reason == 'like' || reason == 'repost') {
         // Backend embeds subjectMedia at top level for like/repost notifications
         media = record['subjectMedia'] as Map<String, dynamic>?;
         // Fallback: check if subject has media directly
diff --git a/lib/src/features/posting/models/mention_controller.dart b/lib/src/features/posting/models/mention_controller.dart
index 09a5a5a3..4ab52c4d 100644
--- a/lib/src/features/posting/models/mention_controller.dart
+++ b/lib/src/features/posting/models/mention_controller.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/utils/text_formatter.dart';
 import 'package:spark/src/features/posting/models/mention.dart';
 import 'package:spark/src/features/posting/models/mention_text_editing_controller.dart';
diff --git a/lib/src/features/posting/providers/video_upload_provider.dart b/lib/src/features/posting/providers/video_upload_provider.dart
index a3778be0..01519f7e 100644
--- a/lib/src/features/posting/providers/video_upload_provider.dart
+++ b/lib/src/features/posting/providers/video_upload_provider.dart
@@ -5,6 +5,8 @@ import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:spark/src/core/network/atproto/data/models/record_write_adapters.dart';
 import 'package:spark/src/core/utils/bluesky_crosspost_text.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
@@ -205,7 +207,7 @@ Future<RepoStrongRef?> _postVideoRecord({
 
   final result = await GetIt.I<SprkRepository>().repo.createRecord(
     collection: 'so.sprk.feed.post',
-    record: postRecord.toJson(),
+    record: sprkPostRecordFromLocal(postRecord).toJson(),
   );
 
   var finalResult = result;
@@ -219,9 +221,11 @@ Future<RepoStrongRef?> _postVideoRecord({
         result.uri.rkey,
         facets,
       );
-      finalResult = await GetIt.I<SprkRepository>().repo.editRecord(
+      finalResult = await GetIt.I<SprkRepository>().repo.editRecordJson(
         uri: result.uri,
-        record: postRecord.copyWith(crossposts: [bskyResult]),
+        record: sprkPostRecordFromLocal(
+          postRecord.copyWith(crossposts: [bskyResult]),
+        ).toJson(),
       );
     } catch (e, s) {
       logger.w('Crosspost to Bluesky failed: $e', error: e, stackTrace: s);
diff --git a/lib/src/features/profile/providers/blocks_provider.dart b/lib/src/features/profile/providers/blocks_provider.dart
index 2e724d88..497abf47 100644
--- a/lib/src/features/profile/providers/blocks_provider.dart
+++ b/lib/src/features/profile/providers/blocks_provider.dart
@@ -2,6 +2,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/di/service_locator.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/features/profile/providers/user_list_provider.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'blocks_provider.g.dart';
 
diff --git a/lib/src/features/profile/providers/edit_profile_provider.dart b/lib/src/features/profile/providers/edit_profile_provider.dart
index 37bc7f44..dde12faa 100644
--- a/lib/src/features/profile/providers/edit_profile_provider.dart
+++ b/lib/src/features/profile/providers/edit_profile_provider.dart
@@ -8,7 +8,7 @@ import 'package:get_it/get_it.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.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/features/profile/providers/edit_profile_state.dart b/lib/src/features/profile/providers/edit_profile_state.dart
index 62d540c4..62c17907 100644
--- a/lib/src/features/profile/providers/edit_profile_state.dart
+++ b/lib/src/features/profile/providers/edit_profile_state.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'edit_profile_state.freezed.dart';
 
diff --git a/lib/src/features/profile/providers/profile_feed_provider.dart b/lib/src/features/profile/providers/profile_feed_provider.dart
index d0b836d8..b0a46815 100644
--- a/lib/src/features/profile/providers/profile_feed_provider.dart
+++ b/lib/src/features/profile/providers/profile_feed_provider.dart
@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
diff --git a/lib/src/features/profile/providers/profile_likes_provider.dart b/lib/src/features/profile/providers/profile_likes_provider.dart
index bf14329e..e146fd80 100644
--- a/lib/src/features/profile/providers/profile_likes_provider.dart
+++ b/lib/src/features/profile/providers/profile_likes_provider.dart
@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
diff --git a/lib/src/features/profile/providers/profile_provider.dart b/lib/src/features/profile/providers/profile_provider.dart
index 2c1cd801..028b7d56 100644
--- a/lib/src/features/profile/providers/profile_provider.dart
+++ b/lib/src/features/profile/providers/profile_provider.dart
@@ -12,6 +12,8 @@ import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 import 'package:spark/src/features/profile/providers/profile_feed_provider.dart';
 import 'package:spark/src/features/profile/providers/profile_state.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs/viewer_state.dart'
+    as actor_viewer;
 
 part 'profile_provider.g.dart';
 
@@ -191,7 +193,7 @@ class ProfileNotifier extends _$ProfileNotifier {
                 ? AtUri.parse(newFollowUriResult)
                 : null,
           ) ??
-          ActorViewer(
+          actor_viewer.ViewerState(
             following: newFollowUriResult != null
                 ? AtUri.parse(newFollowUriResult)
                 : null,
@@ -260,7 +262,7 @@ class ProfileNotifier extends _$ProfileNotifier {
                 ? AtUri.parse(newBlockUriResult)
                 : null,
           ) ??
-          ActorViewer(
+          actor_viewer.ViewerState(
             blocking: newBlockUriResult != null
                 ? AtUri.parse(newBlockUriResult)
                 : null,
diff --git a/lib/src/features/profile/providers/profile_reposts_provider.dart b/lib/src/features/profile/providers/profile_reposts_provider.dart
index 82d76b39..a55e03d2 100644
--- a/lib/src/features/profile/providers/profile_reposts_provider.dart
+++ b/lib/src/features/profile/providers/profile_reposts_provider.dart
@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/feed_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
diff --git a/lib/src/features/profile/providers/profile_state.dart b/lib/src/features/profile/providers/profile_state.dart
index 852790a1..9d115374 100644
--- a/lib/src/features/profile/providers/profile_state.dart
+++ b/lib/src/features/profile/providers/profile_state.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart'; // Assuming Profile model path
+import 'package:sprk_poptart/so/sprk/actor/defs.dart'; // Assuming Profile model path
 
 part 'profile_state.freezed.dart';
 
diff --git a/lib/src/features/profile/providers/user_list_provider.dart b/lib/src/features/profile/providers/user_list_provider.dart
index cbe508e8..50110f85 100644
--- a/lib/src/features/profile/providers/user_list_provider.dart
+++ b/lib/src/features/profile/providers/user_list_provider.dart
@@ -1,9 +1,11 @@
-import 'package:poptart/poptart.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
 import 'package:spark/src/core/di/service_locator.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
 import 'package:spark/src/features/profile/ui/pages/user_list_page.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart' hide ViewerState;
+import 'package:sprk_poptart/so/sprk/actor/defs/viewer_state.dart'
+    as actor_viewer;
 
 part 'user_list_provider.g.dart';
 
@@ -147,8 +149,8 @@ class UserList extends _$UserList {
         if (p.did == userDid) {
           return p.copyWith(
             viewer:
-                p.viewer?.copyWith(following: AtUri.parse(response.uri)) ??
-                ActorViewer(following: AtUri.parse(response.uri)),
+                p.viewer?.copyWith(following: response.uri) ??
+                actor_viewer.ViewerState(following: response.uri),
           );
         }
         return p;
diff --git a/lib/src/features/profile/ui/pages/edit_profile_page.dart b/lib/src/features/profile/ui/pages/edit_profile_page.dart
index 52f13429..a20eca41 100644
--- a/lib/src/features/profile/ui/pages/edit_profile_page.dart
+++ b/lib/src/features/profile/ui/pages/edit_profile_page.dart
@@ -4,7 +4,7 @@ import 'package:auto_route/auto_route.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/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/ui/widgets/custom_text_field.dart';
 import 'package:spark/src/features/profile/providers/edit_profile_provider.dart';
 
diff --git a/lib/src/features/profile/ui/pages/profile_page.dart b/lib/src/features/profile/ui/pages/profile_page.dart
index de3dd3c3..a3a4a8f4 100644
--- a/lib/src/features/profile/ui/pages/profile_page.dart
+++ b/lib/src/features/profile/ui/pages/profile_page.dart
@@ -11,8 +11,6 @@ import 'package:spark/src/core/design_system/components/molecules/profile_tab_ba
 import 'package:spark/src/core/design_system/templates/profile_page_template.dart';
 import 'package:spark/src/core/media/create_media_actions.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart'
-    as actor_models;
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/widgets/options_panel.dart';
 import 'package:spark/src/core/ui/widgets/report_dialog.dart';
@@ -32,6 +30,7 @@ import 'package:spark/src/features/profile/ui/widgets/profile_grid_tab.dart';
 import 'package:spark/src/features/profile/ui/widgets/profile_likes_tab.dart';
 import 'package:spark/src/features/profile/ui/widgets/profile_reposts_tab.dart';
 import 'package:spark/src/features/profile/ui/widgets/profile_tab_base.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart' as actor_defs;
 
 @RoutePage()
 class ProfilePage extends ConsumerStatefulWidget {
@@ -45,7 +44,7 @@ class ProfilePage extends ConsumerStatefulWidget {
 
   /// Optional initial profile data to show while loading.
   // Can be partially filled - only did & handle required in ProfileViewBasic.
-  final actor_models.ProfileViewBasic? initialProfile;
+  final actor_defs.ProfileViewBasic? initialProfile;
 
   /// Whether to use Bluesky API instead of Spark API.
   /// Defaults to false (Spark API).
@@ -599,7 +598,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
   }
 
   Future<void> _openStoriesViewer(
-    actor_models.ProfileViewDetailed profile,
+    actor_defs.ProfileViewDetailed profile,
   ) async {
     if (profile.stories?.isEmpty ?? true) return;
 
@@ -618,7 +617,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
 
       stories.sort((a, b) => a.indexedAt.compareTo(b.indexedAt));
 
-      final authorBasic = actor_models.ProfileViewBasic(
+      final authorBasic = actor_defs.ProfileViewBasic(
         did: profile.did,
         handle: profile.handle,
         displayName: profile.displayName,
diff --git a/lib/src/features/profile/ui/pages/standalone_likes_feed_page.dart b/lib/src/features/profile/ui/pages/standalone_likes_feed_page.dart
index c67ad268..63c3b586 100644
--- a/lib/src/features/profile/ui/pages/standalone_likes_feed_page.dart
+++ b/lib/src/features/profile/ui/pages/standalone_likes_feed_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_overlay_back_button.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/design_system/tokens/constants.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/foundation/colors.dart';
diff --git a/lib/src/features/profile/ui/pages/standalone_profile_feed_page.dart b/lib/src/features/profile/ui/pages/standalone_profile_feed_page.dart
index f268a7ad..87cae3df 100644
--- a/lib/src/features/profile/ui/pages/standalone_profile_feed_page.dart
+++ b/lib/src/features/profile/ui/pages/standalone_profile_feed_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_overlay_back_button.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/design_system/tokens/constants.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/foundation/colors.dart';
diff --git a/lib/src/features/profile/ui/pages/standalone_reposts_feed_page.dart b/lib/src/features/profile/ui/pages/standalone_reposts_feed_page.dart
index c6151ac0..f4d3617c 100644
--- a/lib/src/features/profile/ui/pages/standalone_reposts_feed_page.dart
+++ b/lib/src/features/profile/ui/pages/standalone_reposts_feed_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_overlay_back_button.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/design_system/tokens/constants.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/ui/foundation/colors.dart';
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 cbad7b67..99010a64 100644
--- a/lib/src/features/profile/ui/widgets/blocks_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/blocks_list_view.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/profile_card.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/profile/providers/blocks_provider.dart';
 
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 9c42d5d6..dd56ed4b 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
@@ -205,34 +205,8 @@ class _ProfileFeedPostWidgetState extends ConsumerState<ProfileFeedPostWidget> {
                 child: GestureDetector(
                   behavior: HitTestBehavior.opaque,
                   onDoubleTap: () => _handleDoubleTapLike(post),
-                  child: switch (post.media) {
-                    MediaViewVideo() => PostVideoPlayer(
-                      videoUrl: post.videoUrl,
-                      thumbnail: post.thumbnailUrl,
-                      profileFeedUri: widget.index != null
-                          ? widget.profileUri.toString()
-                          : null,
-                      index: widget.index,
-                      isInitialPost: widget.isInitialPost,
-                    ),
-                    MediaViewBskyVideo() => PostVideoPlayer(
-                      videoUrl: post.videoUrl,
-                      thumbnail: post.thumbnailUrl,
-                      profileFeedUri: widget.index != null
-                          ? widget.profileUri.toString()
-                          : null,
-                      index: widget.index,
-                      isInitialPost: widget.isInitialPost,
-                    ),
-                    MediaViewImages() || MediaViewBskyImages() => ImageCarousel(
-                      imageUrls: post.imageUrls,
-                      hasKnownInteractions:
-                          post.viewer?.knownInteractions != null &&
-                          post.viewer!.knownInteractions!.isNotEmpty,
-                    ),
-                    MediaViewBskyRecordWithMedia(:final media) =>
-                      switch (media) {
-                        MediaViewVideo() => PostVideoPlayer(
+                  child: post.videoUrl.isNotEmpty
+                      ? PostVideoPlayer(
                           videoUrl: post.videoUrl,
                           thumbnail: post.thumbnailUrl,
                           profileFeedUri: widget.index != null
@@ -240,31 +214,17 @@ class _ProfileFeedPostWidgetState extends ConsumerState<ProfileFeedPostWidget> {
                               : null,
                           index: widget.index,
                           isInitialPost: widget.isInitialPost,
-                        ),
-                        MediaViewBskyVideo() => PostVideoPlayer(
-                          videoUrl: post.videoUrl,
-                          thumbnail: post.thumbnailUrl,
-                          profileFeedUri: widget.index != null
-                              ? widget.profileUri.toString()
-                              : null,
-                          index: widget.index,
-                          isInitialPost: widget.isInitialPost,
-                        ),
-                        MediaViewImages() ||
-                        MediaViewBskyImages() => ImageCarousel(
+                        )
+                      : post.imageUrls.isNotEmpty
+                      ? ImageCarousel(
                           imageUrls: post.imageUrls,
                           hasKnownInteractions:
                               post.viewer?.knownInteractions != null &&
                               post.viewer!.knownInteractions!.isNotEmpty,
-                        ),
-                        _ => const DecoratedBox(
+                        )
+                      : const DecoratedBox(
                           decoration: BoxDecoration(color: AppColors.black),
                         ),
-                      },
-                    _ => const DecoratedBox(
-                      decoration: BoxDecoration(color: AppColors.black),
-                    ),
-                  },
                 ),
               ),
 
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 7333ebe1..2aa6495f 100644
--- a/lib/src/features/profile/ui/widgets/user_list_view.dart
+++ b/lib/src/features/profile/ui/widgets/user_list_view.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/profile_card.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/profile/providers/user_list_provider.dart';
 import 'package:spark/src/features/profile/ui/pages/user_list_page.dart';
diff --git a/lib/src/features/search/providers/actor_typeahead_state.dart b/lib/src/features/search/providers/actor_typeahead_state.dart
index 48efeb1f..7580dc25 100644
--- a/lib/src/features/search/providers/actor_typeahead_state.dart
+++ b/lib/src/features/search/providers/actor_typeahead_state.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'actor_typeahead_state.freezed.dart';
 
diff --git a/lib/src/features/search/providers/post_search_provider.dart b/lib/src/features/search/providers/post_search_provider.dart
index 49435607..c526d281 100644
--- a/lib/src/features/search/providers/post_search_provider.dart
+++ b/lib/src/features/search/providers/post_search_provider.dart
@@ -7,6 +7,7 @@ import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_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/utils/label_utils.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/features/search/providers/search_provider.dart b/lib/src/features/search/providers/search_provider.dart
index 9ed9657f..7eb99626 100644
--- a/lib/src/features/search/providers/search_provider.dart
+++ b/lib/src/features/search/providers/search_provider.dart
@@ -4,7 +4,7 @@ import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/graph_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
@@ -199,7 +199,7 @@ class Search extends _$Search {
         final user = updatedResults[userIndex];
 
         final updatedUser = user.copyWith(
-          viewer: ActorViewer(following: AtUri.parse(response.uri)),
+          viewer: ViewerState(following: response.uri),
         );
 
         updatedResults[userIndex] = updatedUser;
@@ -234,7 +234,7 @@ class Search extends _$Search {
       if (userIndex != -1) {
         final user = updatedResults[userIndex];
 
-        final updatedUser = user.copyWith(viewer: const ActorViewer());
+        final updatedUser = user.copyWith(viewer: const ViewerState());
 
         updatedResults[userIndex] = updatedUser;
         state = state.copyWith(searchResults: updatedResults);
diff --git a/lib/src/features/search/providers/search_state.dart b/lib/src/features/search/providers/search_state.dart
index 45c6e0a0..5e7c8efe 100644
--- a/lib/src/features/search/providers/search_state.dart
+++ b/lib/src/features/search/providers/search_state.dart
@@ -1,5 +1,5 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'search_state.freezed.dart';
 part 'search_state.g.dart';
diff --git a/lib/src/features/search/ui/pages/post_results.dart b/lib/src/features/search/ui/pages/post_results.dart
index 34c18ec1..6146dca8 100644
--- a/lib/src/features/search/ui/pages/post_results.dart
+++ b/lib/src/features/search/ui/pages/post_results.dart
@@ -2,6 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/post_tile.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/core/utils/label_utils.dart';
 import 'package:spark/src/features/search/providers/post_search_provider.dart';
diff --git a/lib/src/features/search/ui/pages/search_page.dart b/lib/src/features/search/ui/pages/search_page.dart
index 1c0c931e..e5fa8d01 100644
--- a/lib/src/features/search/ui/pages/search_page.dart
+++ b/lib/src/features/search/ui/pages/search_page.dart
@@ -7,7 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/input_field.dart';
 import 'package:spark/src/core/design_system/templates/explore_page_template.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/search/providers/actor_typeahead_provider.dart';
 import 'package:spark/src/features/search/providers/actor_typeahead_state.dart';
diff --git a/lib/src/features/search/ui/pages/user_results.dart b/lib/src/features/search/ui/pages/user_results.dart
index f872c6a0..b751dcfc 100644
--- a/lib/src/features/search/ui/pages/user_results.dart
+++ b/lib/src/features/search/ui/pages/user_results.dart
@@ -3,7 +3,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/molecules/profile_card.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/features/search/providers/search_provider.dart';
 import 'package:spark/src/features/stories/utils/story_navigation.dart';
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 28b23469..39dfdc26 100644
--- a/lib/src/features/search/ui/widgets/suggested_feeds_list.dart
+++ b/lib/src/features/search/ui/widgets/suggested_feeds_list.dart
@@ -70,7 +70,7 @@ class SuggestedFeedsList extends ConsumerWidget {
                 final generatorView = generatorViews[index];
 
                 // Create a SavedFeed config for this generator
-                final savedFeed = SavedFeed(
+                final savedFeed = makeSavedFeed(
                   type: 'feed',
                   value: generatorView.uri.toString(),
                   pinned: false,
@@ -135,7 +135,7 @@ class SuggestedFeedsList extends ConsumerWidget {
                           (f) => f.config.id != existingFeed.config.id,
                           orElse: () => Feed(
                             type: 'timeline',
-                            config: SavedFeed(
+                            config: makeSavedFeed(
                               type: 'timeline',
                               value: 'following',
                               pinned: true,
diff --git a/lib/src/features/settings/providers/settings_provider.dart b/lib/src/features/settings/providers/settings_provider.dart
index 2c0e0794..5a459036 100644
--- a/lib/src/features/settings/providers/settings_provider.dart
+++ b/lib/src/features/settings/providers/settings_provider.dart
@@ -1,9 +1,9 @@
-import 'dart:convert';
-
 import 'package:poptart/poptart.dart';
 import 'package:get_it/get_it.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/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/pref_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
@@ -13,6 +13,8 @@ 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/features/settings/providers/settings_state.dart';
+import 'package:sprk_poptart/so/sprk/labeler/get_services.dart'
+    as sprk_get_services;
 
 part 'settings_provider.g.dart';
 
@@ -60,7 +62,7 @@ class Settings extends _$Settings {
       _logger ??= GetIt.instance<LogService>().getLogger('Settings');
   Feed get defaultFeed => _defaultFeed ??= Feed(
     type: 'timeline',
-    config: SavedFeed(type: 'timeline', value: 'following', pinned: true),
+    config: makeSavedFeed(type: 'timeline', value: 'following', pinned: true),
   );
 
   /// Storage key for the last active feed, unique per user (DID)
@@ -123,10 +125,8 @@ class Settings extends _$Settings {
     );
 
     final updatedPreferencesList =
-        preferences.preferences
-            .where((pref) => !pref.isSavedFeedsPref(pref))
-            .toList()
-          ..add(Preference.savedFeedsPref(items: updatedSavedFeeds));
+        preferences.preferences.where((pref) => !pref.isSavedFeedsPref).toList()
+          ..add(savedFeedsPreference(updatedSavedFeeds));
 
     await _updatePreferences(Preferences(preferences: updatedPreferencesList));
     return _loadFeedsFromSavedFeeds(updatedSavedFeeds);
@@ -151,7 +151,9 @@ class Settings extends _$Settings {
         stackTrace: st,
       );
       return savedFeeds
-          .map((savedFeed) => Feed(type: savedFeed.type, config: savedFeed))
+          .map(
+            (savedFeed) => Feed(type: savedFeed.typeValue, config: savedFeed),
+          )
           .toList();
     }
   }
@@ -516,11 +518,10 @@ class Settings extends _$Settings {
     // Extract feeds from preferences (fromJson doesn't populate savedFeeds)
     final savedFeeds = <SavedFeed>[];
     for (final pref in preferences.preferences) {
-      pref.mapOrNull(
-        savedFeedsPref: (savedFeedsPref) {
-          savedFeeds.addAll(savedFeedsPref.items);
-        },
-      );
+      final savedFeedsPref = pref.savedFeedsPref;
+      if (savedFeedsPref != null) {
+        savedFeeds.addAll(savedFeedsPref.items);
+      }
     }
     return savedFeeds;
   }
@@ -542,7 +543,7 @@ class Settings extends _$Settings {
       return feeds.firstWhere((feed) => feed.config.id == activeSavedFeed!.id);
     } catch (e) {
       // Fallback to creating feed without view if not found
-      return Feed(type: activeSavedFeed.type, config: activeSavedFeed);
+      return Feed(type: activeSavedFeed.typeValue, config: activeSavedFeed);
     }
   }
 
@@ -570,9 +571,9 @@ class Settings extends _$Settings {
         ];
         final updatedPreferencesList =
             preferences.preferences
-                .where((pref) => !pref.isLabelersPref(pref))
+                .where((pref) => !pref.isLabelersPref)
                 .toList()
-              ..add(Preference.labelersPref(labelers: updatedLabelers));
+              ..add(labelersPreference(updatedLabelers));
 
         await _updatePreferences(
           Preferences(preferences: updatedPreferencesList),
@@ -627,10 +628,8 @@ class Settings extends _$Settings {
       // Create updated preferences with new labeler
       final updatedLabelers = [...currentLabelers, LabelerPrefItem(did: did)];
       final updatedPreferencesList =
-          preferences.preferences
-              .where((pref) => !pref.isLabelersPref(pref))
-              .toList()
-            ..add(Preference.labelersPref(labelers: updatedLabelers));
+          preferences.preferences.where((pref) => !pref.isLabelersPref).toList()
+            ..add(labelersPreference(updatedLabelers));
 
       await _updatePreferences(
         Preferences(preferences: updatedPreferencesList),
@@ -669,10 +668,8 @@ class Settings extends _$Settings {
 
       // Create updated preferences
       final updatedPreferencesList =
-          preferences.preferences
-              .where((pref) => !pref.isLabelersPref(pref))
-              .toList()
-            ..add(Preference.labelersPref(labelers: updatedLabelers));
+          preferences.preferences.where((pref) => !pref.isLabelersPref).toList()
+            ..add(labelersPreference(updatedLabelers));
 
       await _updatePreferences(
         Preferences(preferences: updatedPreferencesList),
@@ -709,9 +706,9 @@ class Settings extends _$Settings {
         ];
         final updatedPreferencesList =
             preferences.preferences
-                .where((pref) => !pref.isLabelersPref(pref))
+                .where((pref) => !pref.isLabelersPref)
                 .toList()
-              ..add(Preference.labelersPref(labelers: updatedLabelers));
+              ..add(labelersPreference(updatedLabelers));
         await _updatePreferences(
           Preferences(preferences: updatedPreferencesList),
         );
@@ -740,10 +737,10 @@ class Settings extends _$Settings {
     );
     return LabelPreference(
       value: contentLabelPref.label,
-      blurs: _visibilityToBlurs(contentLabelPref.visibility),
-      severity: _visibilityToSeverity(contentLabelPref.visibility),
-      defaultSetting: _visibilityToSetting(contentLabelPref.visibility),
-      setting: _visibilityToSetting(contentLabelPref.visibility),
+      blurs: _visibilityToBlurs(contentLabelPref.visibilityValue),
+      severity: _visibilityToSeverity(contentLabelPref.visibilityValue),
+      defaultSetting: _visibilityToSetting(contentLabelPref.visibilityValue),
+      setting: _visibilityToSetting(contentLabelPref.visibilityValue),
       adultOnly: _isAdultOnlyLabel(value),
     );
   }
@@ -757,13 +754,13 @@ class Settings extends _$Settings {
   ) async {
     final preferences = await _getPreferences();
     final updatedPreferencesList = preferences.preferences
-        .where((pref) => !pref.isContentLabelPref(pref))
+        .where((pref) => !pref.isContentLabelPref)
         .toList();
     final existingContentPrefs = preferences.contentLabelPrefs ?? [];
     for (final pref in existingContentPrefs) {
       if (pref.label == value) {
         updatedPreferencesList.add(
-          Preference.contentLabelPref(
+          contentLabelPreference(
             labelerDid: pref.labelerDid,
             label: value,
             visibility: _settingToVisibility(setting),
@@ -771,17 +768,17 @@ class Settings extends _$Settings {
         );
       } else {
         updatedPreferencesList.add(
-          Preference.contentLabelPref(
+          contentLabelPreference(
             labelerDid: pref.labelerDid,
             label: pref.label,
-            visibility: pref.visibility,
+            visibility: pref.visibilityValue,
           ),
         );
       }
     }
     if (!existingContentPrefs.any((pref) => pref.label == value)) {
       updatedPreferencesList.add(
-        Preference.contentLabelPref(
+        contentLabelPreference(
           labelerDid: _defaultModServiceDid,
           label: value,
           visibility: _settingToVisibility(setting),
@@ -800,11 +797,11 @@ class Settings extends _$Settings {
     // Get content label preferences from the main preferences list
     final contentLabelPrefsMap = <String, String>{}; // label -> visibility
     for (final pref in preferences.preferences) {
-      final contentLabelPref = pref.mapOrNull(contentLabelPref: (p) => p);
+      final contentLabelPref = pref.contentLabelPref;
       if (contentLabelPref != null &&
           contentLabelPref.labelerDid == labelerDid) {
         contentLabelPrefsMap[contentLabelPref.label] =
-            contentLabelPref.visibility;
+            contentLabelPref.visibilityValue;
       }
     }
 
@@ -813,7 +810,7 @@ class Settings extends _$Settings {
     for (final pref in contentLabelPrefsFromProperty) {
       final prefLabelerDid = pref.labelerDid;
       final prefLabel = pref.label;
-      final prefVisibility = pref.visibility;
+      final prefVisibility = pref.visibilityValue;
       if (prefLabelerDid == labelerDid &&
           !contentLabelPrefsMap.containsKey(prefLabel)) {
         contentLabelPrefsMap[prefLabel] = prefVisibility;
@@ -857,12 +854,12 @@ class Settings extends _$Settings {
 
     // Get all non-content-label preferences
     final updatedPreferencesList = preferences.preferences
-        .where((pref) => !pref.isContentLabelPref(pref))
+        .where((pref) => !pref.isContentLabelPref)
         .toList();
 
     // Get all existing content label preferences from preferences
     final existingContentLabelPreferences = preferences.preferences
-        .where((pref) => pref.isContentLabelPref(pref))
+        .where((pref) => pref.isContentLabelPref)
         .toList();
 
     // Track if we found the preference to update
@@ -870,13 +867,13 @@ class Settings extends _$Settings {
 
     // Preserve all other content label prefs & update the one we're changing
     for (final pref in existingContentLabelPreferences) {
-      final contentLabelPref = pref.mapOrNull(contentLabelPref: (p) => p);
+      final contentLabelPref = pref.contentLabelPref;
       if (contentLabelPref != null) {
         if (contentLabelPref.labelerDid == labelerDid &&
             contentLabelPref.label == value) {
           // Update this specific preference
           updatedPreferencesList.add(
-            Preference.contentLabelPref(
+            contentLabelPreference(
               labelerDid: labelerDid,
               label: value,
               visibility: _settingToVisibility(setting),
@@ -893,7 +890,7 @@ class Settings extends _$Settings {
     // If preference doesn't exist, add it
     if (!found) {
       updatedPreferencesList.add(
-        Preference.contentLabelPref(
+        contentLabelPreference(
           labelerDid: labelerDid,
           label: value,
           visibility: _settingToVisibility(setting),
@@ -980,22 +977,18 @@ class Settings extends _$Settings {
         if (atproto == null) {
           throw Exception('AtProto not initialized');
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.labeler.getServices'),
-          parameters: {
-            'dids': [did],
-            'detailed': true,
-          },
+        final result = await atproto.call(
+          sprk_get_services.soSprkLabelerGetServices,
+          parameters: sprk_get_services.LabelerGetServicesInput(
+            dids: [did],
+            detailed: true,
+          ),
           headers: {'atproto-proxy': sprkRepository.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         if (result.status != HttpStatus.ok) {
           throw Exception('Failed to retrieve labeler services');
         }
-        return result.data as Map<String, dynamic>;
+        return result.data.toJson();
       });
 
       final viewsJson = rawResponse['views'] as List<dynamic>?;
@@ -1034,7 +1027,7 @@ class Settings extends _$Settings {
 
       // Get all existing content label preferences from both sources
       final existingContentLabelPreferences = preferences.preferences
-          .where((pref) => pref.isContentLabelPref(pref))
+          .where((pref) => pref.isContentLabelPref)
           .toList();
       final existingContentPrefsFromProperty =
           preferences.contentLabelPrefs ?? [];
@@ -1043,17 +1036,17 @@ class Settings extends _$Settings {
       final existingPrefsMap =
           <String, String>{}; // "labelerDid:label" -> "visibility"
       for (final pref in existingContentLabelPreferences) {
-        final contentLabelPref = pref.mapOrNull(contentLabelPref: (p) => p);
+        final contentLabelPref = pref.contentLabelPref;
         if (contentLabelPref != null) {
           existingPrefsMap['${contentLabelPref.labelerDid}:'
                   '${contentLabelPref.label}'] =
-              contentLabelPref.visibility;
+              contentLabelPref.visibilityValue;
         }
       }
       for (final pref in existingContentPrefsFromProperty) {
         final key = '${pref.labelerDid}:${pref.label}';
         if (!existingPrefsMap.containsKey(key)) {
-          existingPrefsMap[key] = pref.visibility;
+          existingPrefsMap[key] = pref.visibilityValue;
         }
       }
 
@@ -1074,7 +1067,7 @@ class Settings extends _$Settings {
           }
 
           preferencesToAdd.add(
-            Preference.contentLabelPref(
+            contentLabelPreference(
               labelerDid: did,
               label: labelValue,
               visibility: defaultVisibility,
@@ -1086,9 +1079,7 @@ class Settings extends _$Settings {
       if (preferencesToAdd.isNotEmpty) {
         // Preserve all existing preferences and add new ones
         final updatedPreferencesList = [
-          ...preferences.preferences.where(
-            (pref) => !pref.isContentLabelPref(pref),
-          ),
+          ...preferences.preferences.where((pref) => !pref.isContentLabelPref),
           ...existingContentLabelPreferences,
           ...preferencesToAdd,
         ];
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 2dbfb9a0..13cf6dfb 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
@@ -1,5 +1,3 @@
-import 'dart:convert';
-
 import 'package:poptart/poptart.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:cached_network_image/cached_network_image.dart';
@@ -7,7 +5,7 @@ import 'package:flutter/material.dart';
 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_leading_button.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/models/labeler_models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
@@ -15,6 +13,8 @@ import 'package:spark/src/core/l10n/app_localizations.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/ui/widgets/widgets.dart';
+import 'package:sprk_poptart/so/sprk/labeler/get_services.dart'
+    as sprk_get_services;
 
 @RoutePage()
 class LabelerLabelSettingsPage extends ConsumerStatefulWidget {
@@ -84,22 +84,18 @@ class _LabelerLabelSettingsPageState
         if (atproto == null) {
           throw Exception('AtProto not initialized');
         }
-        final result = await atproto.get(
-          NSID.parse('so.sprk.labeler.getServices'),
-          parameters: {
-            'dids': [widget.did],
-            'detailed': true,
-          },
+        final result = await atproto.call(
+          sprk_get_services.soSprkLabelerGetServices,
+          parameters: sprk_get_services.LabelerGetServicesInput(
+            dids: [widget.did],
+            detailed: true,
+          ),
           headers: {'atproto-proxy': _sprkRepository.sprkDid},
-          to: (jsonMap) => jsonMap,
-          adaptor: (uint8) =>
-              jsonDecode(utf8.decode(uint8 as List<int>))
-                  as Map<String, dynamic>,
         );
         if (result.status != HttpStatus.ok) {
           throw Exception('Failed to retrieve labeler services');
         }
-        return result.data as Map<String, dynamic>;
+        return result.data.toJson();
       });
 
       final viewsJson = rawResponse['views'] as List<dynamic>?;
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 cb65655e..dceaedbf 100644
--- a/lib/src/features/settings/ui/pages/labeler_management_page.dart
+++ b/lib/src/features/settings/ui/pages/labeler_management_page.dart
@@ -6,7 +6,7 @@ import 'package:get_it/get_it.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_leading_button.dart';
 import 'package:spark/src/core/design_system/components/atoms/icons.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sprk_repository.dart';
 import 'package:spark/src/core/routing/app_router.dart';
diff --git a/lib/src/features/sound/providers/sound_page_provider.dart b/lib/src/features/sound/providers/sound_page_provider.dart
index 3a69ca63..e8e3140e 100644
--- a/lib/src/features/sound/providers/sound_page_provider.dart
+++ b/lib/src/features/sound/providers/sound_page_provider.dart
@@ -24,8 +24,13 @@ class SoundPage extends _$SoundPage {
         limit: SoundPageState.fetchLimit,
       );
 
+      final audio = response.audio;
+      if (audio == null) {
+        throw Exception('Audio not returned for URI: $audioUri');
+      }
+
       return SoundPageState(
-        audio: response.audio,
+        audio: audio,
         posts: response.posts,
         cursor: response.cursor,
         isEndOfNetwork: response.cursor == null,
@@ -84,9 +89,14 @@ class SoundPage extends _$SoundPage {
         limit: SoundPageState.fetchLimit,
       );
 
+      final audio = response.audio;
+      if (audio == null) {
+        throw Exception('Audio not returned for URI: $audioUri');
+      }
+
       state = AsyncValue.data(
         SoundPageState(
-          audio: response.audio,
+          audio: audio,
           posts: response.posts,
           cursor: response.cursor,
           isEndOfNetwork: response.cursor == null,
diff --git a/lib/src/features/sound/providers/sound_page_state.dart b/lib/src/features/sound/providers/sound_page_state.dart
index 84ca2366..39bfb2b3 100644
--- a/lib/src/features/sound/providers/sound_page_state.dart
+++ b/lib/src/features/sound/providers/sound_page_state.dart
@@ -1,5 +1,8 @@
 import 'package:freezed_annotation/freezed_annotation.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:sprk_poptart/so/sprk/sound/defs/audio_view.dart'
+    show $AudioViewCopyWith;
 
 part 'sound_page_state.freezed.dart';
 
diff --git a/lib/src/features/sound/ui/pages/sound_page.dart b/lib/src/features/sound/ui/pages/sound_page.dart
index 197ecc38..4d7f9e88 100644
--- a/lib/src/features/sound/ui/pages/sound_page.dart
+++ b/lib/src/features/sound/ui/pages/sound_page.dart
@@ -6,7 +6,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:spark/src/core/design_system/components/atoms/buttons/app_leading_button.dart';
 import 'package:spark/src/core/design_system/components/molecules/post_tile.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.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/sound/providers/sound_page_provider.dart';
 import 'package:spark/src/features/sound/ui/widgets/sound_header_card.dart';
diff --git a/lib/src/features/sound/ui/widgets/sound_header_card.dart b/lib/src/features/sound/ui/widgets/sound_header_card.dart
index 32bffe72..45584c77 100644
--- a/lib/src/features/sound/ui/widgets/sound_header_card.dart
+++ b/lib/src/features/sound/ui/widgets/sound_header_card.dart
@@ -123,7 +123,7 @@ class _SoundHeaderCardState extends State<SoundHeaderCard> {
                       ),
                       const SizedBox(width: 6),
                       Text(
-                        '${_formatUseCount(widget.audio.useCount)} videos',
+                        '${_formatUseCount(widget.audio.useCount ?? 0)} videos',
                         style: AppTypography.textExtraSmallMedium.copyWith(
                           color: colorScheme.onSurfaceVariant,
                         ),
diff --git a/lib/src/features/stories/providers/stories_by_author.dart b/lib/src/features/stories/providers/stories_by_author.dart
index 64e46e40..767965a9 100644
--- a/lib/src/features/stories/providers/stories_by_author.dart
+++ b/lib/src/features/stories/providers/stories_by_author.dart
@@ -1,6 +1,8 @@
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:spark/src/core/network/atproto/atproto.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 part 'stories_by_author.g.dart';
 
diff --git a/lib/src/features/stories/providers/story_manager_provider.dart b/lib/src/features/stories/providers/story_manager_provider.dart
index 69e537de..33ead359 100644
--- a/lib/src/features/stories/providers/story_manager_provider.dart
+++ b/lib/src/features/stories/providers/story_manager_provider.dart
@@ -4,6 +4,7 @@ import 'package:poptart_lex/com/atproto/repo/list_records.dart'
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.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/utils/logging/log_service.dart';
 import 'package:spark/src/core/utils/logging/logger.dart';
 import 'package:spark/src/features/stories/providers/story_auto_delete_provider.dart';
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 cc5917ee..be8a289d 100644
--- a/lib/src/features/stories/ui/pages/all_stories_page.dart
+++ b/lib/src/features/stories/ui/pages/all_stories_page.dart
@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.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/features/stories/ui/pages/author_stories_page.dart';
 
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 d8196bb3..9c62518b 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: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/actor_models.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/routing/app_router.dart';
 import 'package:spark/src/features/stories/ui/pages/story_page.dart';
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 a20607c6..c6dddbae 100644
--- a/lib/src/features/stories/ui/pages/story_manager_page.dart
+++ b/lib/src/features/stories/ui/pages/story_manager_page.dart
@@ -98,11 +98,7 @@ class StoryManagerPage extends ConsumerWidget {
                     : age.inMinutes >= 1
                     ? '${age.inMinutes}m'
                     : 'now';
-                final thumbUrl = switch (story.media) {
-                  MediaViewVideo(:final thumbnail) => thumbnail.toString(),
-                  MediaViewImage(:final image) => image.thumb.toString(),
-                  _ => story.author.avatar.toString(),
-                };
+                final thumbUrl = story.thumbnailUrl;
                 return Material(
                   color: Colors.transparent,
                   child: InkWell(
diff --git a/lib/src/features/stories/ui/pages/story_page.dart b/lib/src/features/stories/ui/pages/story_page.dart
index ef62e146..2d7fefe6 100644
--- a/lib/src/features/stories/ui/pages/story_page.dart
+++ b/lib/src/features/stories/ui/pages/story_page.dart
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart' as flutter_widgets show Image;
 import 'package:flutter_riverpod/flutter_riverpod.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:spark/src/core/routing/app_router.dart';
 import 'package:video_player/video_player.dart';
@@ -129,24 +130,18 @@ class _StoryPageState extends ConsumerState<StoryPage>
   }
 
   bool _isVideoStory(StoryView story) {
-    return switch (story.media) {
-      MediaViewVideo() => true,
-      _ => false,
-    };
+    return story.isVideoStory;
   }
 
   String _getVideoUrl(StoryView story) {
-    return switch (story.media) {
-      MediaViewVideo(:final playlist) => playlist.toString(),
-      _ => '',
-    };
+    return story.videoUrl;
   }
 
   String _getImageUrl(StoryView story) {
-    return switch (story.media) {
-      MediaViewImage(:final image) => image.fullsize.toString(),
-      _ => widget.story.author.avatar.toString(),
-    };
+    final imageUrl = story.imageUrl;
+    return imageUrl.isNotEmpty
+        ? imageUrl
+        : widget.story.author.avatar.toString();
   }
 
   Future<void> _handleEmbedTap(StoryMentionEmbedView embed) async {
@@ -381,8 +376,9 @@ class _StoryPageState extends ConsumerState<StoryPage>
   }
 
   List<StoryMentionEmbedView> get _storyMentionEmbeds {
-    if (widget.story.embeds != null && widget.story.embeds!.isNotEmpty) {
-      final hydratedEmbeds = widget.story.embeds!
+    final storyEmbeds = widget.story.localEmbeds;
+    if (storyEmbeds != null && storyEmbeds.isNotEmpty) {
+      final hydratedEmbeds = storyEmbeds
           .whereType<StoryMentionEmbedView>()
           .where((embed) => _isValidMentionEmbed(embed.placement))
           .toList(growable: false);
@@ -392,17 +388,15 @@ class _StoryPageState extends ConsumerState<StoryPage>
       }
     }
 
-    final recordEmbeds = widget.story.record.embeds ?? const <StoryEmbed>[];
+    final recordEmbeds =
+        widget.story.localRecord?.localEmbeds ?? const <StoryEmbed>[];
     return recordEmbeds
         .whereType<StoryMentionEmbed>()
         .where((embed) {
           return _isValidMentionEmbed(embed.placement);
         })
         .map((embed) {
-          return StoryEmbedView.mention(
-            placement: embed.placement,
-            did: embed.did,
-          );
+          return StoryEmbedView(placement: embed.placement, did: embed.did);
         })
         .whereType<StoryMentionEmbedView>()
         .toList(growable: false);
diff --git a/lib/src/features/stories/utils/story_navigation.dart b/lib/src/features/stories/utils/story_navigation.dart
index 95e7d0ad..1b41901a 100644
--- a/lib/src/features/stories/utils/story_navigation.dart
+++ b/lib/src/features/stories/utils/story_navigation.dart
@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/story_repository.dart';
 import 'package:spark/src/core/routing/app_router.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 543049e7..da1cc7fc 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1277,6 +1277,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  plyr_poptart:
+    dependency: "direct main"
+    description:
+      name: plyr_poptart
+      sha256: "9404131a51efd6d92ac91efbba74e54b32764d48297742b133ee7abb93488999"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   pointycastle:
     dependency: transitive
     description:
@@ -1610,6 +1618,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.2"
+  sprk_poptart:
+    dependency: "direct main"
+    description:
+      name: sprk_poptart
+      sha256: d8c37dbf559e36e49b22cabb37d2e81602a4d6749e8f37c33dcfc05d86523da8
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   sqflite:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 83da5df5..f18ea458 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -21,8 +21,10 @@ dependencies:
   better_player_plus: ^1.2.1
   bluesky_poptart: ^0.1.0
   ozone_poptart: ^0.1.0
+  plyr_poptart: ^0.1.0
   poptart: ^0.1.0
   poptart_lex: ^0.1.0
+  sprk_poptart: ^0.1.0
   cached_network_image: ^3.4.1
   camera: ^0.12.0+1
   collection: ^1.19.1
diff --git a/test/core/network/atproto/data/models/story_embed_models_test.dart b/test/core/network/atproto/data/models/story_embed_models_test.dart
index d982102f..bdf21785 100644
--- a/test/core/network/atproto/data/models/story_embed_models_test.dart
+++ b/test/core/network/atproto/data/models/story_embed_models_test.dart
@@ -3,6 +3,11 @@ import 'package:flutter_test/flutter_test.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:spark/src/core/network/atproto/data/models/record_write_adapters.dart';
+import 'package:sprk_poptart/so/sprk/story/get_stories/output.dart'
+    as sprk_get_stories;
+import 'package:sprk_poptart/so/sprk/story/get_timeline/output.dart'
+    as sprk_get_timeline;
 
 void main() {
   group('story embed parsing', () {
@@ -30,7 +35,7 @@ void main() {
 
         expect(embeds, hasLength(1));
 
-        final mention = embeds.single as StoryMentionEmbed;
+        final mention = embeds.single;
         expect(mention.did, 'did:plc:mentioned-user');
         expect(mention.placement.frame.x, 1200);
         expect(mention.placement.frame.y, 3400);
@@ -96,14 +101,14 @@ void main() {
           ],
         });
 
-        expect(story.record, isA<StoryRecord>());
-        expect(story.record.embeds, hasLength(1));
-        expect(story.embeds, hasLength(1));
+        expect(story.localRecord, isA<StoryRecord>());
+        expect(story.localRecord!.localEmbeds, hasLength(1));
+        expect(story.localEmbeds, hasLength(1));
 
-        final recordMention = story.record.embeds!.single as StoryMentionEmbed;
+        final recordMention = story.localRecord!.localEmbeds.single;
         expect(recordMention.did, 'did:plc:record-mentioned');
 
-        final viewMention = story.embeds!.single as StoryMentionEmbedView;
+        final viewMention = story.localEmbeds!.single;
         expect(viewMention.did, 'did:plc:view-mentioned');
         expect(viewMention.actor?.handle, 'mention.sprk.so');
         expect(viewMention.placement.rotation, 30);
@@ -111,32 +116,25 @@ void main() {
     );
 
     test('StoryRecord.toJson includes lexicon type on embeds', () {
-      final record =
-          Record.story(
-                media: Media.image(
-                  image: Blob.fromJson({
-                    r'$type': 'blob',
-                    'mimeType': 'image/jpeg',
-                    'size': 42,
-                    'ref': {r'$link': 'bafkreigh2akiscaildc2'},
-                  }),
-                ),
-                createdAt: DateTime.parse('2026-04-05T12:00:00.000Z'),
-                embeds: [
-                  StoryEmbed.mention(
-                    did: 'did:plc:mentioned-user',
-                    placement: const StoryEmbedPlacement(
-                      frame: StoryEmbedFrame(
-                        x: 1000,
-                        y: 2000,
-                        w: 3000,
-                        h: 1000,
-                      ),
-                    ),
-                  ),
-                ],
-              )
-              as StoryRecord;
+      final record = sprkStoryRecordFromLocal(
+        media: Media.image(
+          image: Blob.fromJson({
+            r'$type': 'blob',
+            'mimeType': 'image/jpeg',
+            'size': 42,
+            'ref': {r'$link': 'bafkreigh2akiscaildc2'},
+          }),
+        ),
+        createdAt: DateTime.parse('2026-04-05T12:00:00.000Z'),
+        embeds: [
+          StoryEmbed(
+            did: 'did:plc:mentioned-user',
+            placement: const StoryEmbedPlacement(
+              frame: StoryEmbedFrame(x: 1000, y: 2000, w: 3000, h: 1000),
+            ),
+          ),
+        ],
+      );
 
       final json = record.toJson();
       final embeds = json['embeds'] as List<dynamic>;
@@ -145,5 +143,81 @@ void main() {
       expect(mention[r'$type'], 'so.sprk.embed.mention');
       expect(mention['did'], 'did:plc:mentioned-user');
     });
+
+    test('sprk_poptart story responses parse image stories by author', () {
+      final author = {
+        'did': 'did:plc:author',
+        'handle': 'author.sprk.so',
+        'displayName': 'Author',
+        'avatar': 'https://cdn.example.com/avatar.jpg',
+      };
+      final storyJson = {
+        'cid': 'story-cid',
+        'uri': 'at://did:plc:author/so.sprk.story.post/1',
+        'author': author,
+        'record': {
+          r'$type': 'so.sprk.story.post',
+          'media': {
+            r'$type': 'so.sprk.media.image',
+            'image': {
+              r'$type': 'blob',
+              'mimeType': 'image/jpeg',
+              'size': 42,
+              'ref': {r'$link': 'bafkreigh2akiscaildc2'},
+            },
+          },
+          'createdAt': '2026-04-05T12:00:00.000Z',
+        },
+        'media': {
+          r'$type': 'so.sprk.media.image#view',
+          'thumb': 'https://cdn.example.com/story-thumb.jpg',
+          'fullsize': 'https://cdn.example.com/story-full.jpg',
+          'alt': 'story image',
+        },
+        'embeds': [
+          {
+            r'$type': 'so.sprk.embed.mention#view',
+            'placement': {
+              'frame': {'x': 1000, 'y': 2000, 'w': 3000, 'h': 1000},
+              'zIndex': 1,
+            },
+            'did': 'did:plc:view-mentioned',
+            'actor': {
+              'did': 'did:plc:view-mentioned',
+              'handle': 'mention.sprk.so',
+            },
+          },
+        ],
+        'indexedAt': '2026-04-05T12:00:01.000Z',
+      };
+
+      final timeline = sprk_get_timeline.StoryGetTimelineOutput.fromJson({
+        'cursor': 'story-cursor',
+        'storiesByAuthor': [
+          {
+            'author': author,
+            'stories': [storyJson],
+          },
+        ],
+      });
+      final stories = sprk_get_stories.StoryGetStoriesOutput.fromJson({
+        'stories': [storyJson],
+      });
+
+      expect(timeline.cursor, 'story-cursor');
+      expect(timeline.storiesByAuthor.single.author.handle, 'author.sprk.so');
+      expect(
+        timeline.storiesByAuthor.single.stories.single.imageUrl,
+        'https://cdn.example.com/story-full.jpg',
+      );
+      expect(
+        stories.stories.single.thumbnailUrl,
+        'https://cdn.example.com/story-thumb.jpg',
+      );
+      expect(
+        stories.stories.single.localEmbeds?.single.did,
+        'did:plc:view-mentioned',
+      );
+    });
   });
 }
diff --git a/test/core/pro_image_editor/story_mention_layer_test.dart b/test/core/pro_image_editor/story_mention_layer_test.dart
index 8028186e..0fd758b3 100644
--- a/test/core/pro_image_editor/story_mention_layer_test.dart
+++ b/test/core/pro_image_editor/story_mention_layer_test.dart
@@ -3,8 +3,7 @@ import 'dart:math' as math;
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:pro_image_editor/pro_image_editor.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
-import 'package:spark/src/core/network/atproto/data/models/story_embed_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/pro_image_editor/story_mention_layer.dart';
 import 'package:spark/src/core/ui/widgets/story_mention_chip.dart';
 
@@ -43,7 +42,7 @@ void main() {
 
         expect(embeds, hasLength(1));
 
-        final embed = embeds.single as StoryMentionEmbed;
+        final embed = embeds.single;
         final expectedWidth = 3000;
         final expectedHeight =
             ((200 * 1.5) * (baseSize.height / baseSize.width) / 1000 * 10000)
@@ -73,7 +72,7 @@ void main() {
         background,
         mention,
       ], canvasSize: const Size(1000, 1000));
-      final embed = embeds.single as StoryMentionEmbed;
+      final embed = embeds.single;
 
       expect(embeds, hasLength(1));
       expect(embed.did, 'did:plc:first');
@@ -96,7 +95,7 @@ void main() {
 
       expect(embeds, hasLength(1));
 
-      final embed = embeds.single as StoryMentionEmbed;
+      final embed = embeds.single;
       final renderedWidth = 200.0;
       final renderedHeight = renderedWidth * (baseSize.height / baseSize.width);
       final unclippedLeft = -450 + 500 - renderedWidth / 2;
diff --git a/test/features/posting/ui/widgets/mention_input_field_test.dart b/test/features/posting/ui/widgets/mention_input_field_test.dart
index 4d791966..52cc4c82 100644
--- a/test/features/posting/ui/widgets/mention_input_field_test.dart
+++ b/test/features/posting/ui/widgets/mention_input_field_test.dart
@@ -3,7 +3,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+import 'package:sprk_poptart/so/sprk/actor/search_actors/output.dart';
+import 'package:sprk_poptart/so/sprk/actor/search_actors_typeahead/output.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/actor_repository.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
 import 'package:spark/src/features/posting/models/mention.dart';
@@ -122,19 +124,19 @@ class _FakeActorRepository implements ActorRepository {
   Future<bool> isEarlySupporter(String did) async => false;
 
   @override
-  Future<SearchActorsResponse> searchActors(
+  Future<ActorSearchActorsOutput> searchActors(
     String query, {
     String? cursor,
   }) async {
-    return SearchActorsResponse(actors: const []);
+    return ActorSearchActorsOutput(actors: const []);
   }
 
   @override
-  Future<SearchActorsTypeaheadResponse> searchActorsTypeahead(
+  Future<ActorSearchActorsTypeaheadOutput> searchActorsTypeahead(
     String query, {
     int limit = 10,
   }) async {
-    return SearchActorsTypeaheadResponse(actors: const []);
+    return ActorSearchActorsTypeaheadOutput(actors: const []);
   }
 
   @override
diff --git a/test/src/core/design_system/templates/profile_page_template_test.dart b/test/src/core/design_system/templates/profile_page_template_test.dart
index 49e95cff..6e6b87ac 100644
--- a/test/src/core/design_system/templates/profile_page_template_test.dart
+++ b/test/src/core/design_system/templates/profile_page_template_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:spark/src/core/design_system/templates/profile_page_template.dart';
 import 'package:spark/src/core/l10n/app_localizations.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 
 void main() {
   group('KnownFollowersSummary', () {
diff --git a/test/src/core/network/atproto/data/adapters/bsky/feed_adapter_test.dart b/test/src/core/network/atproto/data/adapters/bsky/feed_adapter_test.dart
new file mode 100644
index 00000000..432ede28
--- /dev/null
+++ b/test/src/core/network/atproto/data/adapters/bsky/feed_adapter_test.dart
@@ -0,0 +1,169 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:spark/src/core/network/atproto/data/adapters/bsky/feed_adapter.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+
+void main() {
+  const adapter = BskyFeedAdapter();
+
+  Map<String, dynamic> profileJson() => {
+    'did': 'did:plc:author',
+    'handle': 'author.sprk.so',
+    'displayName': 'Author',
+    'avatar': 'https://cdn.example.com/avatar.jpg',
+  };
+
+  Map<String, dynamic> imageJson(String id) => {
+    'thumb': 'https://cdn.example.com/$id-thumb.jpg',
+    'fullsize': 'https://cdn.example.com/$id-full.jpg',
+    'alt': '$id alt',
+  };
+
+  Map<String, dynamic> strongRefJson(String rkey) => {
+    r'$type': 'com.atproto.repo.strongRef',
+    'uri': 'at://did:plc:author/app.bsky.feed.post/$rkey',
+    'cid': '$rkey-cid',
+  };
+
+  Map<String, dynamic> postViewJson({
+    Map<String, dynamic>? record,
+    Map<String, dynamic>? embed,
+  }) {
+    final json = {
+      'uri': 'at://did:plc:author/app.bsky.feed.post/1',
+      'cid': 'post-cid',
+      'author': profileJson(),
+      'record':
+          record ??
+          {
+            r'$type': 'app.bsky.feed.post',
+            'text': 'hello from bluesky',
+            'facets': [
+              {
+                'index': {'byteStart': 0, 'byteEnd': 5},
+                'features': [
+                  {r'$type': 'app.bsky.richtext.facet#tag', 'tag': 'hello'},
+                ],
+              },
+            ],
+            'createdAt': '2026-05-15T12:00:00.000Z',
+          },
+      'indexedAt': '2026-05-15T12:00:01.000Z',
+    };
+    if (embed != null) {
+      json['embed'] = embed;
+    }
+    return json;
+  }
+
+  group('convertPostViewJson', () {
+    test('converts Bluesky text and images into Spark post shape', () {
+      final post = postViewJson(
+        embed: {
+          r'$type': 'app.bsky.embed.images#view',
+          'images': [imageJson('first'), imageJson('second')],
+        },
+      );
+
+      adapter.convertPostViewJson(post);
+
+      final record = post['record'] as Map<String, dynamic>;
+      final caption = record['caption'] as Map<String, dynamic>;
+      final media = post['media'] as Map<String, dynamic>;
+
+      expect(record[r'$type'], 'so.sprk.feed.post');
+      expect(record.containsKey('text'), isFalse);
+      expect(record.containsKey('facets'), isFalse);
+      expect(caption['text'], 'hello from bluesky');
+      expect(caption['facets'], hasLength(1));
+      expect(media[r'$type'], 'so.sprk.media.images#view');
+      expect(media['images'], hasLength(2));
+
+      final parsed = PostView.fromJson(post);
+      expect(parsed.displayText, 'hello from bluesky');
+      expect(parsed.imageUrls, [
+        'https://cdn.example.com/first-full.jpg',
+        'https://cdn.example.com/second-full.jpg',
+      ]);
+    });
+
+    test('keeps reply image media parseable through local fallback', () {
+      final post = postViewJson(
+        record: {
+          r'$type': 'app.bsky.feed.post',
+          'text': 'reply with image',
+          'createdAt': '2026-05-15T12:00:00.000Z',
+          'reply': {
+            'root': strongRefJson('root'),
+            'parent': strongRefJson('parent'),
+          },
+        },
+        embed: {
+          r'$type': 'app.bsky.embed.images#view',
+          'images': [imageJson('reply')],
+        },
+      );
+
+      adapter.convertPostViewJson(post);
+
+      final parsed = PostView.fromJson(post);
+      expect(parsed.thumbnailUrl, 'https://cdn.example.com/reply-thumb.jpg');
+      expect(parsed.imageUrls, ['https://cdn.example.com/reply-full.jpg']);
+    });
+
+    test('unwraps recordWithMedia into Spark media view', () {
+      final post = postViewJson(
+        embed: {
+          r'$type': 'app.bsky.embed.recordWithMedia#view',
+          'record': {
+            r'$type': 'app.bsky.embed.record#view',
+            'record': {
+              r'$type': 'app.bsky.embed.record#viewNotFound',
+              'uri': 'at://did:plc:other/app.bsky.feed.post/2',
+              'notFound': true,
+            },
+          },
+          'media': {
+            r'$type': 'app.bsky.embed.images#view',
+            'images': [imageJson('nested')],
+          },
+        },
+      );
+
+      adapter.convertPostViewJson(post);
+
+      final media = post['media'] as Map<String, dynamic>;
+      expect(media[r'$type'], 'so.sprk.media.images#view');
+      expect(
+        media['images'].single['fullsize'],
+        'https://cdn.example.com/nested-full.jpg',
+      );
+      expect(PostView.fromJson(post).imageUrls, [
+        'https://cdn.example.com/nested-full.jpg',
+      ]);
+    });
+
+    test('drops malformed and unsupported embeds before parsing', () {
+      final missingExternalCid = postViewJson(
+        embed: {
+          r'$type': 'app.bsky.embed.external#view',
+          'external': {'uri': 'https://example.com', 'title': 'Example'},
+        },
+      );
+      final unsupportedRecord = postViewJson(
+        embed: {
+          r'$type': 'app.bsky.embed.record#view',
+          'record': {
+            r'$type': 'app.bsky.feed.defs#generatorView',
+            'uri': 'at://did:plc:feed/app.bsky.feed.generator/1',
+          },
+        },
+      );
+
+      adapter.sanitizeBskyPostViewJson(missingExternalCid);
+      adapter.sanitizeBskyPostViewJson(unsupportedRecord);
+
+      expect(missingExternalCid.containsKey('embed'), isFalse);
+      expect(unsupportedRecord.containsKey('embed'), isFalse);
+    });
+  });
+}
diff --git a/test/src/core/network/atproto/data/models/actor_models_test.dart b/test/src/core/network/atproto/data/models/actor_models_test.dart
deleted file mode 100644
index db743fa6..00000000
--- a/test/src/core/network/atproto/data/models/actor_models_test.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
-
-void main() {
-  group('ProfileViewDetailed', () {
-    test('parses viewer known followers with nested profile basics', () {
-      final profile = ProfileViewDetailed.fromJson({
-        'did': 'did:plc:profile',
-        'handle': 'profile.sprk.so',
-        'viewer': {
-          'following': 'at://did:plc:viewer/app.bsky.graph.follow/123',
-          'knownFollowers': {
-            'count': 2,
-            'followers': [
-              {
-                'did': 'did:plc:alice',
-                'handle': 'alice.sprk.so',
-                'displayName': 'Alice',
-                'avatar': 'https://cdn.example.com/alice.jpg',
-              },
-              {'did': 'did:plc:bob', 'handle': 'bob.sprk.so'},
-            ],
-          },
-        },
-      });
-
-      final knownFollowers = profile.viewer?.knownFollowers;
-      expect(knownFollowers, isNotNull);
-      expect(knownFollowers!.count, 2);
-      expect(knownFollowers.followers, hasLength(2));
-      expect(knownFollowers.followers.first.did, 'did:plc:alice');
-      expect(knownFollowers.followers.first.displayName, 'Alice');
-      expect(
-        knownFollowers.followers.first.avatar?.toString(),
-        contains('alice.jpg'),
-      );
-      expect(knownFollowers.followers.last.handle, 'bob.sprk.so');
-    });
-  });
-}
diff --git a/test/src/core/network/atproto/data/models/record_write_adapters_test.dart b/test/src/core/network/atproto/data/models/record_write_adapters_test.dart
new file mode 100644
index 00000000..f1fc9760
--- /dev/null
+++ b/test/src/core/network/atproto/data/models/record_write_adapters_test.dart
@@ -0,0 +1,157 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:poptart/poptart.dart';
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+import 'package:poptart_lex/com/atproto/repo/strong_ref.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/record_write_adapters.dart';
+
+void main() {
+  Blob blob(String mimeType) {
+    return Blob.fromJson({
+      r'$type': 'blob',
+      'mimeType': mimeType,
+      'size': 42,
+      'ref': {r'$link': 'bafkreigh2akiscaildc2'},
+    });
+  }
+
+  group('sprkPostRecordFromLocal', () {
+    test('writes video posts with generated Spark media and label unions', () {
+      final record = PostRecord(
+        caption: const CaptionRef(text: 'hello #spark'),
+        media: Media.video(video: blob('video/mp4'), alt: 'a clip'),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+        selfLabels: const [SelfLabel(val: 'porn')],
+        tags: const ['spark'],
+        sound: RepoStrongRef(
+          uri: AtUri.parse('at://did:plc:sound/so.sprk.sound.audio/1'),
+          cid: 'sound-cid',
+        ),
+      );
+
+      final json = sprkPostRecordFromLocal(record).toJson();
+
+      expect(json[r'$type'], 'so.sprk.feed.post');
+      expect(json['caption'][r'$type'], 'so.sprk.feed.post#captionRef');
+      expect(json['media'][r'$type'], 'so.sprk.media.video');
+      expect(json['media']['alt'], 'a clip');
+      expect(json['labels'][r'$type'], 'com.atproto.label.defs#selfLabels');
+      expect(json['labels']['values'], [
+        {r'$type': 'com.atproto.label.defs#selfLabel', 'val': 'porn'},
+      ]);
+      expect(json['tags'], ['spark']);
+      expect(json['sound']['cid'], 'sound-cid');
+    });
+
+    test('wraps a single local image as generated Spark images media', () {
+      final record = PostRecord(
+        caption: const CaptionRef(text: 'image'),
+        media: Media.image(image: blob('image/jpeg')),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+      );
+
+      final json = sprkPostRecordFromLocal(record).toJson();
+
+      expect(json['media'][r'$type'], 'so.sprk.media.images');
+      expect(json['media']['images'], hasLength(1));
+      expect(json['media']['images'].first[r'$type'], 'so.sprk.media.image');
+      expect(json['media']['images'].first['alt'], '');
+    });
+
+    test('omits absent optional labels, tags, and sound', () {
+      final record = PostRecord(
+        caption: const CaptionRef(text: 'minimal'),
+        media: Media.video(video: blob('video/mp4')),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+        selfLabels: const [],
+      );
+
+      final json = sprkPostRecordFromLocal(record).toJson();
+
+      expect(json['labels'], isNull);
+      expect(json['tags'], isNull);
+      expect(json['sound'], isNull);
+    });
+  });
+
+  group('sprkReplyRecordFromLocal', () {
+    test('writes reply refs and image media with generated Spark shapes', () {
+      final record = ReplyRecord(
+        caption: const CaptionRef(text: 'reply'),
+        reply: RecordReplyRef(
+          root: RepoStrongRef(
+            uri: AtUri.parse('at://did:plc:root/so.sprk.feed.post/1'),
+            cid: 'root-cid',
+          ),
+          parent: RepoStrongRef(
+            uri: AtUri.parse('at://did:plc:parent/so.sprk.feed.post/2'),
+            cid: 'parent-cid',
+          ),
+        ),
+        media: Media.image(image: blob('image/jpeg'), alt: 'reply image'),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+      );
+
+      final json = sprkReplyRecordFromLocal(record).toJson();
+
+      expect(json[r'$type'], 'so.sprk.feed.reply');
+      expect(json['reply'][r'$type'], 'so.sprk.feed.reply#replyRef');
+      expect(json['reply']['root']['cid'], 'root-cid');
+      expect(json['media'][r'$type'], 'so.sprk.media.image');
+      expect(json['media']['alt'], 'reply image');
+    });
+  });
+
+  group('sprkStoryRecordFromLocal', () {
+    test('writes story media, labels, sound, and mention embeds', () {
+      final json = sprkStoryRecordFromLocal(
+        media: Media.video(video: blob('video/mp4'), alt: 'story clip'),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+        labels: const [SelfLabel(val: 'nudity')],
+        sound: RepoStrongRef(
+          uri: AtUri.parse('at://did:plc:sound/so.sprk.sound.audio/1'),
+          cid: 'sound-cid',
+        ),
+        embeds: const [
+          StoryEmbed(
+            placement: StoryEmbedPlacement(
+              frame: StoryEmbedFrame(x: 10, y: 20, w: 30, h: 40),
+              mediaRef: StoryEmbedMediaRef(index: 0),
+              zIndex: 2,
+              rotation: 15,
+            ),
+            did: 'did:plc:mentioned',
+          ),
+        ],
+      ).toJson();
+
+      expect(json[r'$type'], 'so.sprk.story.post');
+      expect(json['media'][r'$type'], 'so.sprk.media.video');
+      expect(json['media']['alt'], 'story clip');
+      expect(json['labels'][r'$type'], 'com.atproto.label.defs#selfLabels');
+      expect(json['sound']['cid'], 'sound-cid');
+      expect(json['tags'], isNull);
+      expect(json['embeds'], hasLength(1));
+      expect(json['embeds'].first[r'$type'], 'so.sprk.embed.mention');
+      expect(json['embeds'].first['did'], 'did:plc:mentioned');
+      expect(json['embeds'].first['placement']['frame']['x'], 10);
+      expect(json['embeds'].first['placement']['mediaRef']['index'], 0);
+      expect(json['embeds'].first['placement']['zIndex'], 2);
+      expect(json['embeds'].first['placement']['rotation'], 15);
+    });
+
+    test('omits empty story labels, embeds, and absent sound', () {
+      final json = sprkStoryRecordFromLocal(
+        media: Media.image(image: blob('image/jpeg')),
+        createdAt: DateTime.parse('2026-05-15T12:00:00.000Z'),
+        labels: const [],
+        embeds: const [],
+      ).toJson();
+
+      expect(json['labels'], isNull);
+      expect(json['embeds'], isNull);
+      expect(json['sound'], isNull);
+    });
+  });
+}
diff --git a/test/src/core/network/atproto/data/models/sound_models_test.dart b/test/src/core/network/atproto/data/models/sound_models_test.dart
index eed3b153..7153c67d 100644
--- a/test/src/core/network/atproto/data/models/sound_models_test.dart
+++ b/test/src/core/network/atproto/data/models/sound_models_test.dart
@@ -21,7 +21,7 @@ void main() {
         'audio': 'https://media.sprk.so/sound/did%3Aplc%3Atest123/cid',
       });
 
-      expect(audio.record, isA<AudioRecord>());
+      expect(audio.localRecord, isA<AudioRecord>());
       expect(audio.title, 'Original Sound');
     });
 
@@ -46,7 +46,7 @@ void main() {
         'audio': 'https://media.sprk.so/sound/did%3Aplc%3Aplyr123/cid',
       });
 
-      final record = audio.record;
+      final record = audio.localRecord;
       expect(record, isA<PlyrTrackRecord>());
       expect((record as PlyrTrackRecord).artist, 'Dame');
       expect(audio.details?.artist, 'Dame');
diff --git a/test/src/core/network/atproto/data/models/sprk_actor_defs_test.dart b/test/src/core/network/atproto/data/models/sprk_actor_defs_test.dart
new file mode 100644
index 00000000..20c41137
--- /dev/null
+++ b/test/src/core/network/atproto/data/models/sprk_actor_defs_test.dart
@@ -0,0 +1,78 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+
+void main() {
+  group('ProfileViewDetailed', () {
+    test('parses viewer known followers with nested profile basics', () {
+      final profile = ProfileViewDetailed.fromJson({
+        'did': 'did:plc:profile',
+        'handle': 'profile.sprk.so',
+        'viewer': {
+          'following': 'at://did:plc:viewer/app.bsky.graph.follow/123',
+          'knownFollowers': {
+            'count': 2,
+            'followers': [
+              {
+                'did': 'did:plc:alice',
+                'handle': 'alice.sprk.so',
+                'displayName': 'Alice',
+                'avatar': 'https://cdn.example.com/alice.jpg',
+              },
+              {'did': 'did:plc:bob', 'handle': 'bob.sprk.so'},
+            ],
+          },
+        },
+      });
+
+      final knownFollowers = profile.viewer?.knownFollowers;
+      expect(knownFollowers, isNotNull);
+      expect(knownFollowers!.count, 2);
+      expect(knownFollowers.followers, hasLength(2));
+      expect(knownFollowers.followers.first.did, 'did:plc:alice');
+      expect(knownFollowers.followers.first.displayName, 'Alice');
+      expect(
+        knownFollowers.followers.first.avatar?.toString(),
+        contains('alice.jpg'),
+      );
+      expect(knownFollowers.followers.last.handle, 'bob.sprk.so');
+    });
+
+    test('parses viewer relationship fields and nullable profile details', () {
+      final profile = ProfileViewDetailed.fromJson({
+        'did': 'did:plc:profile',
+        'handle': 'profile.sprk.so',
+        'displayName': null,
+        'description': null,
+        'avatar': null,
+        'viewer': {
+          'muted': true,
+          'blockedBy': false,
+          'blocking': 'at://did:plc:viewer/app.bsky.graph.block/1',
+          'following': 'at://did:plc:viewer/app.bsky.graph.follow/2',
+          'followedBy': 'at://did:plc:profile/app.bsky.graph.follow/3',
+          'knownFollowers': {'count': 0, 'followers': []},
+        },
+      });
+
+      expect(profile.displayName, isNull);
+      expect(profile.description, isNull);
+      expect(profile.avatar, isNull);
+      expect(profile.viewer?.muted, isTrue);
+      expect(profile.viewer?.blockedBy, isFalse);
+      expect(
+        profile.viewer?.blocking?.toString(),
+        'at://did:plc:viewer/app.bsky.graph.block/1',
+      );
+      expect(
+        profile.viewer?.following?.toString(),
+        'at://did:plc:viewer/app.bsky.graph.follow/2',
+      );
+      expect(
+        profile.viewer?.followedBy?.toString(),
+        'at://did:plc:profile/app.bsky.graph.follow/3',
+      );
+      expect(profile.viewer?.knownFollowers?.count, 0);
+      expect(profile.viewer?.knownFollowers?.followers, isEmpty);
+    });
+  });
+}
diff --git a/test/src/core/network/atproto/data/models/sprk_feed_response_fixtures_test.dart b/test/src/core/network/atproto/data/models/sprk_feed_response_fixtures_test.dart
new file mode 100644
index 00000000..5929baf4
--- /dev/null
+++ b/test/src/core/network/atproto/data/models/sprk_feed_response_fixtures_test.dart
@@ -0,0 +1,105 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:spark/src/core/network/atproto/data/models/feed_models.dart';
+import 'package:sprk_poptart/so/sprk/feed/get_feed/output.dart'
+    as sprk_get_feed;
+import 'package:sprk_poptart/so/sprk/feed/get_posts/output.dart'
+    as sprk_get_posts;
+import 'package:sprk_poptart/so/sprk/feed/get_timeline/output.dart'
+    as sprk_get_timeline;
+import 'package:sprk_poptart/so/sprk/feed/search_posts/output.dart'
+    as sprk_search_posts;
+
+void main() {
+  Map<String, dynamic> authorJson() => {
+    'did': 'did:plc:author',
+    'handle': 'author.sprk.so',
+    'displayName': 'Author',
+    'avatar': 'https://cdn.example.com/avatar.jpg',
+  };
+
+  Map<String, dynamic> imageViewJson() => {
+    r'$type': 'so.sprk.media.image#view',
+    'thumb': 'https://cdn.example.com/thumb.jpg',
+    'fullsize': 'https://cdn.example.com/full.jpg',
+    'alt': 'fixture image',
+  };
+
+  Map<String, dynamic> postViewJson() => {
+    r'$type': 'so.sprk.feed.defs#postView',
+    'uri': 'at://did:plc:author/so.sprk.feed.post/1',
+    'cid': 'post-cid',
+    'author': authorJson(),
+    'record': {
+      r'$type': 'so.sprk.feed.post',
+      'caption': {
+        r'$type': 'so.sprk.feed.post#captionRef',
+        'text': 'spark fixture',
+      },
+      'createdAt': '2026-05-15T12:00:00.000Z',
+    },
+    'media': {
+      r'$type': 'so.sprk.media.images#view',
+      'images': [imageViewJson()],
+    },
+    'replyCount': 1,
+    'repostCount': 2,
+    'likeCount': 3,
+    'indexedAt': '2026-05-15T12:00:01.000Z',
+  };
+
+  Map<String, dynamic> feedViewPostJson() => {
+    r'$type': 'so.sprk.feed.defs#feedViewPost',
+    'post': postViewJson(),
+    'feedContext': 'context-token',
+  };
+
+  group('sprk_poptart feed response fixtures', () {
+    test('getTimeline parses into local feed views', () {
+      final output = sprk_get_timeline.FeedGetTimelineOutput.fromJson({
+        'cursor': 'next-cursor',
+        'feed': [feedViewPostJson()],
+      });
+
+      final post = output.feed.single.localPost;
+      expect(output.cursor, 'next-cursor');
+      expect(output.feed.single.feedContext, 'context-token');
+      expect(post.displayText, 'spark fixture');
+      expect(post.imageUrls, ['https://cdn.example.com/full.jpg']);
+    });
+
+    test('getFeed parses into local feed views', () {
+      final output = sprk_get_feed.FeedGetFeedOutput.fromJson({
+        'cursor': 'next-feed-cursor',
+        'feed': [feedViewPostJson()],
+      });
+
+      expect(output.cursor, 'next-feed-cursor');
+      expect(
+        output.feed.single.localPost.thumbnailUrl,
+        'https://cdn.example.com/thumb.jpg',
+      );
+    });
+
+    test('getPosts parses into local post views', () {
+      final output = sprk_get_posts.FeedGetPostsOutput.fromJson({
+        'posts': [postViewJson()],
+      });
+
+      expect(output.posts.single, isA<PostView>());
+      expect(output.posts.single.displayText, 'spark fixture');
+      expect(output.posts.single.hasSupportedMedia, isTrue);
+    });
+
+    test('searchPosts parses hits and local post views', () {
+      final output = sprk_search_posts.FeedSearchPostsOutput.fromJson({
+        'cursor': 'search-cursor',
+        'hitsTotal': 42,
+        'posts': [postViewJson()],
+      });
+
+      expect(output.cursor, 'search-cursor');
+      expect(output.hitsTotal, 42);
+      expect(output.posts.single.displayText, 'spark fixture');
+    });
+  });
+}
diff --git a/test/src/core/pro_video_editor/providers/sound_picker_search_provider_test.dart b/test/src/core/pro_video_editor/providers/sound_picker_search_provider_test.dart
index 1867b5c7..517277fc 100644
--- a/test/src/core/pro_video_editor/providers/sound_picker_search_provider_test.dart
+++ b/test/src/core/pro_video_editor/providers/sound_picker_search_provider_test.dart
@@ -1,5 +1,7 @@
 import 'dart:async';
 
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+
 import 'package:flutter_test/flutter_test.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:get_it/get_it.dart';
@@ -9,6 +11,7 @@ import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/atproto/data/repositories/sound_repository.dart';
 import 'package:spark/src/core/pro_video_editor/providers/sound_picker_search_provider.dart';
 import 'package:spark/src/core/utils/logging/log_service.dart';
+import 'package:sprk_poptart/so/sprk/sound/defs/audio_details.dart';
 
 void main() {
   late _FakeSoundRepository soundRepository;
@@ -24,17 +27,15 @@ void main() {
       uri: AtUri.parse('at://did:plc:test123/so.sprk.sound.audio/$id'),
       cid: 'cid-$id',
       author: ProfileViewBasic(did: 'did:plc:test123', handle: '$id.sprk.so'),
-      record:
-          Record.audio(
-                sound: blob,
-                title: 'Sound $id',
-                createdAt: DateTime.parse('2026-05-01T12:00:00.000Z'),
-              )
-              as AudioRecord,
+      record: AudioRecord(
+        sound: blob,
+        title: 'Sound $id',
+        createdAt: DateTime.parse('2026-05-01T12:00:00.000Z'),
+      ).toJson(),
       title: 'Sound $id',
-      coverArt: Uri.parse('https://example.com/$id.jpg'),
+      coverArt: 'https://example.com/$id.jpg',
       indexedAt: DateTime.parse('2026-05-01T12:00:00.000Z'),
-      audio: Uri.parse('https://example.com/$id.mp3'),
+      audio: 'https://example.com/$id.mp3',
     );
   }
 
diff --git a/test/src/core/utils/label_utils_test.dart b/test/src/core/utils/label_utils_test.dart
index 97b82811..43c5fa1c 100644
--- a/test/src/core/utils/label_utils_test.dart
+++ b/test/src/core/utils/label_utils_test.dart
@@ -8,20 +8,19 @@ void main() {
   group('LabelUtils', () {
     group('getLabelPreferenceFromPrefs', () {
       test('maps visibility to correct blurs/severity/setting/adultOnly', () {
-        final prefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final prefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:labeler',
               label: 'porn',
               visibility: 'warn',
             ),
-            ContentLabelPref(
+            contentLabelPreference(
               labelerDid: 'did:plc:labeler',
               label: 'gore',
               visibility: 'hide',
             ),
-            ContentLabelPref(
+            contentLabelPreference(
               labelerDid: 'did:plc:labeler',
               label: 'nudity',
               visibility: 'ignore',
@@ -48,7 +47,7 @@ void main() {
       });
 
       test('returns null when label not found', () {
-        final prefs = Preferences.internal(preferences: []);
+        final prefs = Preferences(preferences: []);
         expect(
           LabelUtils.getLabelPreferenceFromPrefs(prefs, 'unknown'),
           isNull,
@@ -56,34 +55,32 @@ void main() {
       });
 
       test('returns null when contentLabelPrefs is null', () {
-        final prefs = Preferences.internal(preferences: []);
+        final prefs = Preferences(preferences: []);
         expect(LabelUtils.getLabelPreferenceFromPrefs(prefs, 'porn'), isNull);
       });
     });
 
     group('shouldShowWarning', () {
       test('returns true only when severity=alert and setting=warn', () {
-        final warnPrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final warnPrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'porn',
               visibility: 'warn',
             ),
           ],
         );
-        final hidePrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final hidePrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'porn',
               visibility: 'hide',
             ),
           ],
         );
-        final noMatchPrefs = Preferences.internal(preferences: []);
+        final noMatchPrefs = Preferences(preferences: []);
 
         final label = Label(
           src: 'did:plc:l',
@@ -101,30 +98,27 @@ void main() {
 
     group('shouldBlurContent', () {
       test('blurs on hide (content) and warn (media)', () {
-        final hidePrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final hidePrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'porn',
               visibility: 'hide',
             ),
           ],
         );
-        final warnPrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final warnPrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'sexual',
               visibility: 'warn',
             ),
           ],
         );
-        final ignorePrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final ignorePrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'nudity',
               visibility: 'ignore',
@@ -156,30 +150,27 @@ void main() {
 
     group('shouldHideContent', () {
       test('hides when setting=hide or adultOnly=true', () {
-        final hidePrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final hidePrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'gore',
               visibility: 'hide',
             ),
           ],
         );
-        final warnAdultPrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final warnAdultPrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'porn',
               visibility: 'warn',
             ),
           ],
         );
-        final warnNonAdultPrefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final warnNonAdultPrefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'gore',
               visibility: 'warn',
@@ -207,10 +198,7 @@ void main() {
           isFalse,
         );
         expect(
-          LabelUtils.shouldHideContent(
-            Preferences.internal(preferences: []),
-            [],
-          ),
+          LabelUtils.shouldHideContent(Preferences(preferences: []), []),
           isFalse,
         );
       });
@@ -218,20 +206,19 @@ void main() {
 
     group('getWarningLabels', () {
       test('returns only labels with severity=alert and setting=warn', () {
-        final prefs = Preferences.internal(
-          preferences: [],
-          contentLabelPrefs: [
-            ContentLabelPref(
+        final prefs = Preferences(
+          preferences: [
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'gore',
               visibility: 'warn',
             ),
-            ContentLabelPref(
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'porn',
               visibility: 'warn',
             ),
-            ContentLabelPref(
+            contentLabelPreference(
               labelerDid: 'did:plc:l',
               label: 'nudity',
               visibility: 'ignore',
diff --git a/test/src/features/messages/providers/conversation_provider_test.dart b/test/src/features/messages/providers/conversation_provider_test.dart
index 17cd2e94..d640eeda 100644
--- a/test/src/features/messages/providers/conversation_provider_test.dart
+++ b/test/src/features/messages/providers/conversation_provider_test.dart
@@ -1,13 +1,14 @@
 import 'dart:async';
 import 'dart:collection';
 
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
+
 import 'package:poptart/poptart.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/auth/data/models/login_result.dart';
 import 'package:spark/src/core/auth/data/repositories/auth_repository.dart';
-import 'package:spark/src/core/network/atproto/data/models/models.dart';
 import 'package:spark/src/core/network/messages/data/models/message_models.dart';
 import 'package:spark/src/core/network/messages/data/repository/messages_repository.dart';
 import 'package:spark/src/features/messages/providers/conversation_provider.dart';
diff --git a/test/src/features/notifications/models/grouped_notification_test.dart b/test/src/features/notifications/models/grouped_notification_test.dart
index 6fc7c882..09e780f3 100644
--- a/test/src/features/notifications/models/grouped_notification_test.dart
+++ b/test/src/features/notifications/models/grouped_notification_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart/poptart.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:spark/src/core/network/atproto/data/models/actor_models.dart';
+import 'package:sprk_poptart/so/sprk/actor/defs.dart';
 import 'package:spark/src/core/network/atproto/data/models/notification_models.dart';
 import 'package:spark/src/features/notifications/models/grouped_notification.dart';
 
@@ -15,12 +15,12 @@ Notification _makeNotification({
   return Notification(
     uri: reasonSubject ?? AtUri('at://did:plc:test/so.sprk.feed.post/test'),
     cid: 'test-cid',
-    author: ProfileViewBasic(
+    author: ProfileView(
       did: did,
       handle: '$did.handle',
-      viewer: ActorViewer(following: following),
+      viewer: ViewerState(following: following),
     ),
-    reason: reason,
+    reason: NotificationReason.valueOf(reason)!,
     record: {},
     isRead: isRead,
     indexedAt: indexedAt ?? DateTime(2026, 1, 1),