diff --git a/lib/src/core/auth/data/models/onboarding_screen_state.dart b/lib/src/core/auth/data/models/onboarding_screen_state.dart
index f6c42d09..fe0a9fa3 100644
--- a/lib/src/core/auth/data/models/onboarding_screen_state.dart
+++ b/lib/src/core/auth/data/models/onboarding_screen_state.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:poptart_lex/app/bsky/actor/profile.dart';
+import 'package:bluesky_poptart/app/bsky/actor/profile.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'onboarding_screen_state.freezed.dart';
diff --git a/lib/src/core/auth/data/repositories/onboarding_repository.dart b/lib/src/core/auth/data/repositories/onboarding_repository.dart
index c67ebab1..2650dc09 100644
--- a/lib/src/core/auth/data/repositories/onboarding_repository.dart
+++ b/lib/src/core/auth/data/repositories/onboarding_repository.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/profile.dart';
+import 'package:bluesky_poptart/app/bsky/actor/profile.dart';
 import 'package:spark/src/core/network/atproto/data/models/graph_models.dart';
 
 abstract class OnboardingRepository {
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 72350211..cd31bb50 100644
--- a/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
+++ b/lib/src/core/auth/data/repositories/onboarding_repository_impl.dart
@@ -1,12 +1,12 @@
 import 'dart:typed_data';
-import 'package:poptart_lex/app/bsky/actor/get_profile.dart'
+import 'package:bluesky_poptart/app/bsky/actor/get_profile.dart'
     as bsky_actor_get_profile;
-import 'package:poptart_lex/app/bsky/graph/get_follows.dart'
+import 'package:bluesky_poptart/app/bsky/graph/get_follows.dart'
     as bsky_graph_get_follows;
 import 'package:poptart_lex/com/atproto/repo/get_record.dart'
     as repo_get_record;
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/actor/profile.dart';
+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';
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 d9ce30fb..9a18f179 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
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/get_profile.dart'
+import 'package:bluesky_poptart/app/bsky/actor/get_profile.dart'
     as bsky_actor_get_profile;
-import 'package:poptart_lex/app/bsky/actor/get_profiles.dart'
+import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart'
     as bsky_actor_get_profiles;
 import 'package:poptart/poptart.dart';
 
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 6eb3e3b7..654378ab 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
@@ -1,11 +1,11 @@
 import 'dart:convert';
 
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart' as bsky_defs;
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.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/richtext/facet.dart';
 import 'package:spark/src/core/network/atproto/data/models/models.dart'
     hide ReplyRef;
 import 'package:spark/src/core/utils/json_utils.dart';
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 a10a5ef7..25ad6d46 100644
--- a/lib/src/core/network/atproto/data/models/feed_models.dart
+++ b/lib/src/core/network/atproto/data/models/feed_models.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.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';
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 a9969cab..b0c93cf6 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,11 +5,11 @@ import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_author_feed.dart'
+import 'package:bluesky_poptart/app/bsky/feed/get_author_feed.dart'
     as bsky_feed_get_author_feed;
-import 'package:poptart_lex/app/bsky/feed/get_posts.dart'
+import 'package:bluesky_poptart/app/bsky/feed/get_posts.dart'
     as bsky_feed_get_posts;
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart'
+import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart'
     as bsky_feed_get_post_thread;
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart_lex/com/atproto/repo/upload_blob.dart'
@@ -17,7 +17,7 @@ import 'package:poptart_lex/com/atproto/repo/upload_blob.dart'
 import 'package:poptart_lex/com/atproto/server/get_service_auth.dart'
     as server_get_service_auth;
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 
 import 'package:get_it/get_it.dart';
 import 'package:http/http.dart' as http;
diff --git a/lib/src/features/auth/providers/onboarding_providers.dart b/lib/src/features/auth/providers/onboarding_providers.dart
index 9d3f59d7..8eab7e86 100644
--- a/lib/src/features/auth/providers/onboarding_providers.dart
+++ b/lib/src/features/auth/providers/onboarding_providers.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/profile.dart';
+import 'package:bluesky_poptart/app/bsky/actor/profile.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';
diff --git a/lib/src/features/posting/providers/video_upload_provider.dart b/lib/src/features/posting/providers/video_upload_provider.dart
index 7b28e11a..a3778be0 100644
--- a/lib/src/features/posting/providers/video_upload_provider.dart
+++ b/lib/src/features/posting/providers/video_upload_provider.dart
@@ -1,5 +1,5 @@
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:get_it/get_it.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
diff --git a/lib/src/features/search/providers/post_search_provider.dart b/lib/src/features/search/providers/post_search_provider.dart
index 29b4f650..49435607 100644
--- a/lib/src/features/search/providers/post_search_provider.dart
+++ b/lib/src/features/search/providers/post_search_provider.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'package:poptart/poptart.dart';
-import 'package:poptart_lex/app/bsky/feed/search_posts.dart'
+import 'package:bluesky_poptart/app/bsky/feed/search_posts.dart'
     as bsky_feed_search_posts;
 
 import 'package:get_it/get_it.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 746f05d0..543049e7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -185,6 +185,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  bluesky_poptart:
+    dependency: "direct main"
+    description:
+      name: bluesky_poptart
+      sha256: c55e2ac06fcf8f90aac18c90ef280216c48da1bbf4bac9d84b01bb69079b6b5c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -1141,6 +1149,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  ozone_poptart:
+    dependency: "direct main"
+    description:
+      name: ozone_poptart
+      sha256: "2764e4a75d9e2119b00717e30975b3b2f3983c4c7f1079e6ee24bba40608a38b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   package_config:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 371d26e3..83da5df5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -19,6 +19,8 @@ dependencies:
   audioplayers: ^6.6.0
   auto_route: ^11.1.0
   better_player_plus: ^1.2.1
+  bluesky_poptart: ^0.1.0
+  ozone_poptart: ^0.1.0
   poptart: ^0.1.0
   poptart_lex: ^0.1.0
   cached_network_image: ^3.4.1